ofiere-openclaw-plugin 4.41.0 → 4.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.41.0",
+  "version": "4.42.0",
   "type": "module",
   "description": "OpenClaw plugin for Ofiere PM - 16 meta-tools covering tasks, agents, projects, scheduling, knowledge, workflows, notifications, memory, prompts, constellation, space file management, execution plan builder, SOP management, agent brain, talent management, and corporate frameworks",
   "keywords": ["openclaw", "ofiere", "project-management", "agents", "plugin"],

package/src/agent-tier.ts

@@ -53,12 +53,12 @@ export async function resolveAgentTier(
   if (!id || !userId) return { tier: null, source: "none" };
 
   const key = k(userId, id);
-  const hit = cache.get(key);
-  if (hit && hit.expires > Date.now()) return hit.value;
 
-  let result: TierResolution = { tier: null, source: "none" };
-
-  // 1. Manual override
+  // 1. Manual override — ALWAYS fresh (uncached). Direct-SQL writes to
+  //    agent_tier_overrides must win immediately, even when a non-override
+  //    branch is already cached from a prior call.
+  let overrideRow: { tier?: string | null } | null = null;
+  let overrideQueryFailed = false;
   try {
     const { data } = await supabase
       .from("agent_tier_overrides")
@@ -66,23 +66,41 @@ export async function resolveAgentTier(
       .eq("user_id", userId)
       .eq("agent_id", id)
       .maybeSingle();
-    if (data?.tier === "c-suite" || data?.tier === "staff") {
-      result = { tier: data.tier, source: "manual" };
-      cache.set(key, { value: result, expires: Date.now() + TTL_MS });
-      return result;
-    }
+    overrideRow = data ?? null;
   } catch {
-    // Table missing in older installs — fall through
+    // Table missing in older installs — skip override path
+    overrideQueryFailed = true;
   }
 
-  // 2. C-Suite: hardcoded roster
+  if (overrideRow?.tier === "c-suite" || overrideRow?.tier === "staff") {
+    const result: TierResolution = { tier: overrideRow.tier, source: "manual" };
+    cache.set(key, { value: result, expires: Date.now() + TTL_MS });
+    return result;
+  }
+
+  // Override absent: if cache holds a stale `manual` entry from a deleted
+  // override row, drop it so the auto branches re-resolve.
+  if (!overrideQueryFailed) {
+    const cachedManual = cache.get(key);
+    if (cachedManual && cachedManual.value.source === "manual") {
+      cache.delete(key);
+    }
+  }
+
+  // 2. Cache lookup for non-override branches.
+  const hit = cache.get(key);
+  if (hit && hit.expires > Date.now()) return hit.value;
+
+  let result: TierResolution = { tier: null, source: "none" };
+
+  // 3. C-Suite: hardcoded roster
   if (ROSTER_IDS.has(id)) {
     result = { tier: "c-suite", source: "roster" };
     cache.set(key, { value: result, expires: Date.now() + TTL_MS });
     return result;
   }
 
-  // 3. agent_architectures.executive_role / department_role
+  // 4. agent_architectures.executive_role / department_role
   try {
     const { data } = await supabase
       .from("agent_architectures")
@@ -105,7 +123,7 @@ export async function resolveAgentTier(
     // Table missing — fall through
   }
 
-  // 4. Staff: registered as subagent
+  // 5. Staff: registered as subagent
   try {
     const { data } = await supabase
       .from("agent_subagents")

package/src/tools.ts

@@ -38,6 +38,42 @@ function err(message: string): ToolResult {
   };
 }
 
+// ─── Subagent ↔ chief invariant ──────────────────────────────────────────────
+// Mirrors dashboard/lib/subagentValidation.ts. Used by TASK_OPS + SCHEDULE_OPS
+// when a chief delegates work to one of their staff via tool call.
+//
+// Returns:
+//   { ok: true, subagentId: <id> | null } — passed (or no subagent provided)
+//   { ok: false, reason: string }         — invariant violated
+async function validateSubagentForChief(
+  supabase: SupabaseClient,
+  userId: string,
+  subagentIdInput: unknown,
+  chiefAgentId: string | null | undefined,
+): Promise<{ ok: true; subagentId: string | null } | { ok: false; reason: string }> {
+  const subagentId =
+    typeof subagentIdInput === "string" && subagentIdInput.trim()
+      ? subagentIdInput.trim()
+      : null;
+  if (!subagentId) return { ok: true, subagentId: null };
+
+  const { data: sub } = await supabase
+    .from("agent_subagents")
+    .select("id, chief_agent_id")
+    .eq("user_id", userId)
+    .eq("id", subagentId)
+    .maybeSingle();
+
+  if (!sub) {
+    return { ok: false, reason: "subagent_not_found_or_not_yours" };
+  }
+  const chief = (chiefAgentId || "").trim();
+  if (!chief || sub.chief_agent_id !== chief) {
+    return { ok: false, reason: "subagent_chief_mismatch" };
+  }
+  return { ok: true, subagentId };
+}
+
 // ─── Helper: extract calling agent's accountId from OpenClaw context ─────────
 
 // Module-level: set once at registration time from index.ts
@@ -205,8 +241,8 @@ function registerTaskOps(
       `Actions:\n` +
       `- "list": List/filter tasks. Optional: status, agent_id, space_id, folder_id, task_id, limit\n` +
       `- "get": Get a single task by ID. Required: task_id\n` +
-      `- "create": Create a task. Required: title. Optional: agent_id, description, status, priority, space_id, folder_id, start_date, due_date, tags, instructions, execution_plan, goals, constraints, system_prompt, recurrence_type, recurrence_interval, scheduled_time. ⚠️ PLANNING GATE: If the task has 3+ execution steps, goals, or constraints, FIRST ask the user "Plan first or create directly?" If they choose to plan, use OFIERE_PLAN_OPS instead.\n` +
-      `- "update": Update a task. Required: task_id. Optional: all create fields + progress\n` +
+      `- "create": Create a task. Required: title. Optional: agent_id, subagent_id, description, status, priority, space_id, folder_id, start_date, due_date, tags, instructions, execution_plan, goals, constraints, system_prompt, recurrence_type, recurrence_interval, scheduled_time. ⚠️ PLANNING GATE: If the task has 3+ execution steps, goals, or constraints, FIRST ask the user "Plan first or create directly?" If they choose to plan, use OFIERE_PLAN_OPS instead.\n` +
+      `- "update": Update a task. Required: task_id. Optional: all create fields + progress + subagent_id\n` +
       `- "delete": Delete task + subtasks. Required: task_id\n` +
       `- "add_approval": Request approval on a task. Required: task_id, approver_name. Optional: approver_type (human|agent, auto-detected), due_date, comment\n` +
       `- "list_approvals": List approvals. Optional: task_id, approval_status filter (pending|approved|rejected)\n` +
@@ -214,6 +250,7 @@ function registerTaskOps(
       `For complex tasks, fill in execution_plan (step-by-step plan), goals, constraints, and system_prompt to help the executing agent.\n` +
       `For simple tasks, just provide title and optionally description.\n` +
       `agent_id: Pass your name to self-assign, another agent's name, or 'none'.\n` +
+      `subagent_id: When delegating to one of your own staff, pass the staff UUID here AND set agent_id to yourself (or the chief). The staff's chief_agent_id MUST match agent_id or the call rejects with subagent_chief_mismatch. Use OFIERE_AGENT_OPS list_subagents to discover available staff under a chief.\n` +
       `For recurring tasks: set start_date + recurrence_type + recurrence_interval. Example: every 2 minutes = recurrence_type: "minutely", recurrence_interval: 2.\n` +
       `Approvals: Use add_approval to request sign-off from humans or agents. Approvals are separate from workflow gate nodes.\n` +
       `Status: PENDING, IN_PROGRESS, DONE, FAILED | Priority: 0=LOW, 1=MEDIUM, 2=HIGH, 3=CRITICAL`,
@@ -237,6 +274,10 @@ function registerTaskOps(
           type: "string",
           description: "Agent name or ID. Your name to self-assign, 'none' for unassigned.",
         },
+        subagent_id: {
+          type: "string",
+          description: "Staff subagent UUID for delegation. Must belong to the chief in agent_id (verified server-side). Discover available staff via OFIERE_AGENT_OPS list_subagents.",
+        },
         status: {
           type: "string",
           description: "Task status",
@@ -437,6 +478,13 @@ async function handleCreateTask(
 
     const assignee = isUnassigned ? null : await resolveAgent(rawAgentId);
 
+    // ── Subagent delegation: validate staff↔chief invariant ──────────────
+    const subCheck = await validateSubagentForChief(supabase, userId, params.subagent_id, assignee);
+    if (!subCheck.ok) {
+      return err(subCheck.reason);
+    }
+    const subagentId = subCheck.subagentId;
+
     // Build custom_fields from task-ops extended fields
     const cf: Record<string, unknown> = {};
 
@@ -533,6 +581,7 @@ async function handleCreateTask(
       title: params.title,
       description: (params.description as string) || (params.instructions as string) || null,
       agent_id: assignee,
+      subagent_id: subagentId,
       assignee_type: "agent",
       status: (params.status as string) || "PENDING",
       priority: params.priority !== undefined ? params.priority : 1,
@@ -666,6 +715,7 @@ async function handleCreateTask(
           user_id: userId,
           task_id: id,
           agent_id: effectiveAgentId,
+          subagent_id: subagentId,
           title: params.title,
           description: (params.description as string) || (params.instructions as string) || null,
           scheduled_date: scheduledDateFinal,
@@ -743,6 +793,37 @@ async function handleUpdateTask(
     }
     if (params.status === "DONE") updates.completed_at = new Date().toISOString();
 
+    // ── Subagent + chief invariant ───────────────────────────────────────
+    // Mirrors dashboard PATCH: chief change without explicit subagent_id
+    // clears any existing subagent assignment; subagent_id alone validates
+    // against the row's current agent_id.
+    if (params.agent_id !== undefined || params.subagent_id !== undefined) {
+      if (params.agent_id !== undefined && params.subagent_id === undefined) {
+        // Chief switched, no explicit subagent — clear subagent_id.
+        updates.subagent_id = null;
+      } else {
+        let effectiveAgentId: string | null | undefined =
+          params.agent_id !== undefined ? (params.agent_id as string) : undefined;
+        if (effectiveAgentId === undefined) {
+          const { data: row } = await supabase
+            .from("tasks")
+            .select("agent_id")
+            .eq("id", params.task_id as string)
+            .eq("user_id", userId)
+            .maybeSingle();
+          effectiveAgentId = (row?.agent_id as string) ?? null;
+        }
+        const subCheck = await validateSubagentForChief(
+          supabase,
+          userId,
+          params.subagent_id,
+          effectiveAgentId,
+        );
+        if (!subCheck.ok) return err(subCheck.reason);
+        updates.subagent_id = subCheck.subagentId;
+      }
+    }
+
     // If task is being marked DONE or FAILED, auto-complete any linked scheduler events
     if (params.status === "DONE" || params.status === "FAILED") {
       try {
@@ -1395,8 +1476,8 @@ function registerScheduleOps(
       `Manage calendar events and schedule tasks on the timeline.\n\n` +
       `Actions:\n` +
       `- "list": List events. Optional: start_date, end_date, agent_id\n` +
-      `- "create": Schedule an event. Required: title, scheduled_date. Optional: task_id, agent_id, scheduled_time, duration_minutes, recurrence_type, recurrence_interval, color, priority\n` +
-      `- "update": Update event. Required: id. Optional: title, scheduled_date, scheduled_time, duration_minutes, status, recurrence_type\n` +
+      `- "create": Schedule an event. Required: title, scheduled_date. Optional: task_id, agent_id, subagent_id, scheduled_time, duration_minutes, recurrence_type, recurrence_interval, color, priority\n` +
+      `- "update": Update event. Required: id. Optional: title, scheduled_date, scheduled_time, duration_minutes, status, recurrence_type, agent_id, subagent_id\n` +
       `- "delete": Remove event. Required: id\n` +
       `recurrence_type: none, hourly, daily, weekly, monthly\n` +
       `priority: 0=low, 1=medium, 2=high, 3=critical`,
@@ -1410,6 +1491,7 @@ function registerScheduleOps(
         description: { type: "string" },
         task_id: { type: "string", description: "Link to a task" },
         agent_id: { type: "string", description: "Assigned agent" },
+        subagent_id: { type: "string", description: "Staff subagent UUID for delegation. Must belong to the chief in agent_id (verified server-side)." },
         scheduled_date: { type: "string", description: "Date (YYYY-MM-DD)" },
         scheduled_time: { type: "string", description: "Time (HH:MM)" },
         start_date: { type: "string", description: "List filter: start (YYYY-MM-DD)" },
@@ -1442,6 +1524,15 @@ function registerScheduleOps(
           const pVal = typeof params.priority === "number" ? params.priority
             : priorityMap[String(params.priority || "").toLowerCase()] ?? 0;
 
+          // Validate subagent ↔ chief invariant before insert
+          const evtSubCheck = await validateSubagentForChief(
+            supabase,
+            userId,
+            params.subagent_id,
+            (params.agent_id as string) || null,
+          );
+          if (!evtSubCheck.ok) return err(evtSubCheck.reason);
+
           // Compute next_run_at from scheduled_date + scheduled_time
           let nextRunAt: number | null = null;
           try {
@@ -1461,6 +1552,7 @@ function registerScheduleOps(
             user_id: userId,
             task_id: (params.task_id as string) || null,
             agent_id: (params.agent_id as string) || null,
+            subagent_id: evtSubCheck.subagentId,
             title: params.title,
             description: (params.description as string) || null,
             scheduled_date: params.scheduled_date,
@@ -1498,6 +1590,33 @@ function registerScheduleOps(
                            "recurrence_type", "recurrence_interval", "status", "color", "priority", "agent_id"]) {
             if ((params as any)[f] !== undefined) upd[f] = (params as any)[f];
           }
+
+          // Subagent + chief invariant. Same rule as TASK_OPS update.
+          if (params.agent_id !== undefined || params.subagent_id !== undefined) {
+            if (params.agent_id !== undefined && params.subagent_id === undefined) {
+              upd.subagent_id = null;
+            } else {
+              let effectiveAgent: string | null | undefined =
+                params.agent_id !== undefined ? (params.agent_id as string) : undefined;
+              if (effectiveAgent === undefined) {
+                const { data: row } = await supabase
+                  .from("scheduler_events")
+                  .select("agent_id")
+                  .eq("id", params.id as string)
+                  .eq("user_id", userId)
+                  .maybeSingle();
+                effectiveAgent = (row?.agent_id as string) ?? null;
+              }
+              const evtUpdSub = await validateSubagentForChief(
+                supabase,
+                userId,
+                params.subagent_id,
+                effectiveAgent,
+              );
+              if (!evtUpdSub.ok) return err(evtUpdSub.reason);
+              upd.subagent_id = evtUpdSub.subagentId;
+            }
+          }
           // Map string priority to number if provided
           if (upd.priority !== undefined && typeof upd.priority === "string") {
             const pMap: Record<string, number> = { low: 0, medium: 1, high: 2, critical: 3 };