ofiere-openclaw-plugin 4.40.0 → 4.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.40.0",
+  "version": "4.41.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

@@ -134,6 +134,36 @@ export async function getAgentTier(
   return (await resolveAgentTier(supabase, agentId, userId)).tier;
 }
 
+// Target-aware resolution: when a work target carries a subagent_id, the
+// work is staff-tier regardless of which chief routes it. Uncached lookup —
+// subagent rows can be deleted out from under us.
+export interface TargetTierInput {
+  agentId: string | null;
+  subagentId?: string | null;
+}
+
+export async function resolveTargetTier(
+  supabase: SupabaseClient,
+  target: TargetTierInput,
+  userId: string,
+): Promise<TierResolution> {
+  if (target.subagentId) {
+    try {
+      const { data } = await supabase
+        .from("agent_subagents")
+        .select("id")
+        .eq("user_id", userId)
+        .eq("id", target.subagentId)
+        .maybeSingle();
+      if (data?.id) return { tier: "staff", source: "subagent" };
+    } catch {
+      // Fall through to chief lookup
+    }
+  }
+  if (target.agentId) return resolveAgentTier(supabase, target.agentId, userId);
+  return { tier: null, source: "none" };
+}
+
 export function isDocKindValidForTier(
   docKind: "sop" | "framework",
   tier: AgentTier,

package/src/attachments.ts

@@ -10,7 +10,7 @@
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { renderAttachmentBlock } from "./sop-render.js";
 import {
-  resolveAgentTier,
+  resolveTargetTier,
   isDocKindValidForTier,
   invalidateAgentTier,
 } from "./agent-tier.js";
@@ -99,24 +99,33 @@ async function applyAttachmentWrite(args: {
   return { ok: false, error: "unsupported target_kind" };
 }
 
-// ── Load target row (mainly to read its agent_id for tier check) ──
-async function loadTargetAgentId(args: {
+// ── Load target row identity (chief agent + optional subagent) for tier check ──
+interface TargetIdentity {
+  agentId: string | null;
+  subagentId: string | null;
+}
+
+async function loadTargetIdentity(args: {
   supabase: SupabaseClient;
   userId: string;
   targetKind: TargetKind;
   targetId: string;
-}): Promise<string | null> {
+}): Promise<TargetIdentity | null> {
   const { supabase, userId, targetKind, targetId } = args;
   const tbl =
     targetKind === "conversation" ? "conversations" :
     targetKind === "task" ? "tasks" : "scheduler_events";
   const { data } = await supabase
     .from(tbl)
-    .select("agent_id")
+    .select("agent_id, subagent_id")
     .eq("user_id", userId)
     .eq("id", targetId)
     .maybeSingle();
-  return (data?.agent_id as string) || null;
+  if (!data) return null;
+  return {
+    agentId: (data.agent_id as string | null) ?? null,
+    subagentId: (data.subagent_id as string | null) ?? null,
+  };
 }
 
 // ── Validate that every doc id belongs to userId in the right table ──
@@ -159,12 +168,14 @@ export async function handleProposeAttach(args: {
     (x): x is string => typeof x === "string",
   );
 
-  const targetAgentId = await loadTargetAgentId({
+  const identity = await loadTargetIdentity({
     supabase, userId, targetKind, targetId,
   });
-  if (!targetAgentId) return err("target_not_found_or_no_agent");
+  if (!identity || (!identity.agentId && !identity.subagentId)) {
+    return err("target_not_found_or_no_agent");
+  }
 
-  const tierResolution = await resolveAgentTier(supabase, targetAgentId, userId);
+  const tierResolution = await resolveTargetTier(supabase, identity, userId);
   if (!tierResolution.tier) {
     return err("agent_unclassified — set tier in dashboard agent settings or via override");
   }

package/src/prompt.ts

@@ -13,7 +13,7 @@
 
 const TOOL_SUMMARIES: Record<string, string> = {
   OFIERE_TASK_OPS: "Manage tasks: list, create, update, delete, approvals",
-  OFIERE_AGENT_OPS: "Query agents: list all with IDs, names, roles",
+  OFIERE_AGENT_OPS: "Query + manage agents and their staff subagents",
   OFIERE_PROJECT_OPS: "PM hierarchy: spaces, folders, dependencies",
   OFIERE_SCHEDULE_OPS: "Calendar: list, create, update, delete events",
   OFIERE_KNOWLEDGE_OPS: "Knowledge library: search, list, create, update, delete",
@@ -48,7 +48,13 @@ Actions: "list", "create", "update", "delete", "add_approval", "list_approvals",
 - list_approvals: List approvals. Optional: task_id, approval_status (pending|approved|rejected)
 - resolve_approval: Approve/reject. Requires: approval_id, approval_status. Optional: comment`,
 
-  OFIERE_AGENT_OPS: `Query agents. Action: "list" — see all agents with IDs, names, roles for task assignment.`,
+  OFIERE_AGENT_OPS: `Query + manage agents and their staff subagents.
+Actions: "list", "list_subagents", "create_subagent", "delete_subagent", "invalidate_tier_cache"
+- list: All top-level agents (chiefs / native + OpenClaw) with IDs, names, roles. Use for task assignment lookup.
+- list_subagents: Staff under a chief. Required: chief_agent_id.
+- create_subagent: Add a staff subagent under a chief (max 5 per chief). Required: chief_agent_id, name. Optional: role (default "Staff"), codename, color_hex.
+- delete_subagent: Remove a staff subagent. Required: subagent_id.
+- invalidate_tier_cache: Flush plugin's in-process tier cache (5 min TTL). Optional: agent_id. Use after direct-DB mutation of agent_tier_overrides.`,
 
   OFIERE_PROJECT_OPS: `Manage PM hierarchy.
 Actions: "list_spaces", "create_space", "update_space", "delete_space", "list_folders", "create_folder", "update_folder", "delete_folder", "list_dependencies", "add_dependency", "remove_dependency"
@@ -107,7 +113,7 @@ Actions: "list", "get", "create", "update", "delete", "add_nodes", "execute"
 - Execution maps ALL fields: execution_steps, goals, constraints, system_prompt`,
 
   OFIERE_SOP_OPS: `Standard Operating Procedures.
-Actions: "list_templates", "create", "list", "get", "update", "delete", "list_subagents", "create_subagent", "delete_subagent", "apply_template", "propose_attach", "commit_attach"
+Actions: "list_templates", "create", "list", "get", "update", "delete", "list_subagents", "apply_template", "propose_attach", "commit_attach"
 - sop_data: { title, purpose, scope, applicability, prerequisites:{ conditions, required_tools, required_permissions, safety_warnings }, procedure_steps[], expected_outputs[], escalation_rules[], acceptance_criteria[], rollback_procedure, notes }
 - Legacy field names still accepted (objective→purpose, steps→procedure_steps, deliverables→expected_outputs, escalationRules→escalation_rules, successCriteria→acceptance_criteria) — prefer new names.
 - propose_attach / commit_attach: attach SOPs to a run (target_kind: conversation|task|scheduler_event). Tier rule: SOPs only attach to STAFF-tier targets; for c-suite use OFIERE_FRAMEWORK_OPS instead. propose_attach returns a token-cost summary + confirmation_token (5-min ttl). You MUST surface the cost and ask the user before calling commit_attach. The user must explicitly approve.

package/src/tools.ts

@@ -18,6 +18,7 @@ import {
   handleCommitAttach,
   registerAttachmentContextHook,
 } from "./attachments.js";
+import { invalidateAgentTier } from "./agent-tier.js";
 
 // ─── Tool result shape (matches OpenClaw SDK) ────────────────────────────────
 
@@ -1088,9 +1089,13 @@ function registerAgentOps(
     name: "OFIERE_AGENT_OPS",
     label: "Ofiere Agent Operations",
     description:
-      `Query agents in the Ofiere PM system.\n\n` +
+      `Query and manage agents + their staff subagents in the Ofiere PM system.\n\n` +
       `Actions:\n` +
-      `- "list": List all available agents with their IDs, names, roles, and status. Use this to find the correct agent_id for task assignment.`,
+      `- "list": List all top-level agents (chiefs / native + OpenClaw) with their IDs, names, roles, and status. Use this to find the correct agent_id for task assignment.\n` +
+      `- "list_subagents": List staff subagents under a chief. Required: chief_agent_id.\n` +
+      `- "create_subagent": Create a staff subagent under a chief (max 5 per chief). Required: chief_agent_id, name. Optional: role (default "Staff"), codename, color_hex (default "#64748b").\n` +
+      `- "delete_subagent": Remove a staff subagent. Required: subagent_id.\n` +
+      `- "invalidate_tier_cache": Flush the plugin's in-process tier resolver cache (5 min TTL). Optional: agent_id to flush a single entry; omit to flush all entries for the calling user. Use after any direct-DB mutation of agent_tier_overrides.`,
     parameters: {
       type: "object",
       required: ["action"],
@@ -1098,8 +1103,15 @@ function registerAgentOps(
         action: {
           type: "string",
           description: "The operation to perform",
-          enum: ["list"],
+          enum: ["list", "list_subagents", "create_subagent", "delete_subagent", "invalidate_tier_cache"],
         },
+        chief_agent_id: { type: "string", description: "Chief agent ID (required for list_subagents, create_subagent)" },
+        subagent_id: { type: "string", description: "Subagent ID (required for delete_subagent)" },
+        agent_id: { type: "string", description: "Agent ID (optional for invalidate_tier_cache — omit to flush all entries for the user)" },
+        name: { type: "string", description: "Subagent display name (required for create_subagent)" },
+        role: { type: "string", description: "Subagent role label, e.g. 'Staff', 'Analyst'. Defaults to 'Staff'." },
+        codename: { type: "string", description: "Optional subagent codename" },
+        color_hex: { type: "string", description: "Optional subagent UI color, default '#64748b'" },
       },
     },
     async execute(_id: string, params: Record<string, unknown>) {
@@ -1108,13 +1120,35 @@ function registerAgentOps(
       switch (action) {
         case "list":
           return handleListAgents(api, supabase, userId, fallbackAgentId);
+        case "list_subagents":
+          return handleListSubagents(supabase, userId, params);
+        case "create_subagent":
+          return handleCreateSubagent(supabase, userId, params);
+        case "delete_subagent":
+          return handleDeleteSubagent(supabase, userId, params);
+        case "invalidate_tier_cache":
+          return handleInvalidateTierCache(userId, params);
         default:
-          return err(`Unknown action "${action}". Valid actions: list`);
+          return err(`Unknown action "${action}". Valid actions: list, list_subagents, create_subagent, delete_subagent, invalidate_tier_cache`);
       }
     },
   });
 }
 
+function handleInvalidateTierCache(userId: string, params: Record<string, unknown>): ToolResult {
+  const agentId = params.agent_id as string | undefined;
+  invalidateAgentTier(userId, agentId);
+  return ok({
+    ok: true,
+    scope: agentId ? "single" : "user",
+    user_id: userId,
+    agent_id: agentId ?? null,
+    message: agentId
+      ? `Plugin tier cache flushed for agent ${agentId}.`
+      : `Plugin tier cache flushed for all entries belonging to user ${userId}.`,
+  });
+}
+
 async function handleListAgents(
   api: any,
   supabase: SupabaseClient,
@@ -4847,9 +4881,7 @@ function registerSOPOps(
       `- "get": Get full SOP details. Required: sop_id\n` +
       `- "update": Modify SOP. Required: sop_id. Optional: title, sop_data, status, department\n` +
       `- "delete": Remove SOP. Required: sop_id\n` +
-      `- "list_subagents": List subagents for a chief. Required: chief_agent_id\n` +
-      `- "create_subagent": Create a staff subagent under a chief (max 5 per chief). Required: chief_agent_id, name. Optional: role (default "Staff"), codename, color_hex (default "#64748b").\n` +
-      `- "delete_subagent": Delete a staff subagent. Required: subagent_id\n` +
+      `- "list_subagents": List subagents for a chief. Required: chief_agent_id. (Provided here for convenience when scoping SOP authoring; team management lives in OFIERE_AGENT_OPS.)\n` +
       `- "apply_template": Create SOP from template. Required: agent_id, template_id. Optional: title, department\n` +
       `- "propose_attach": Propose attaching SOPs to a run target (conversation/task/scheduler_event). Returns token cost + confirmation_token. Required: target_kind, target_id, doc_ids[]. The user MUST be asked to approve before commit.\n` +
       `- "commit_attach": Commit a proposed attachment. Required: target_kind, target_id, doc_ids[], confirmation_token (from propose_attach). Only call AFTER user approves the token cost.\n` +
@@ -4873,15 +4905,10 @@ function registerSOPOps(
       type: "object",
       required: ["action"],
       properties: {
-        action: { type: "string", enum: ["list_templates", "create", "list", "get", "update", "delete", "list_subagents", "create_subagent", "delete_subagent", "apply_template", "propose_attach", "commit_attach"], description: "Valid actions: list_templates, create, list, get, update, delete, list_subagents, create_subagent, delete_subagent, apply_template, propose_attach, commit_attach" },
+        action: { type: "string", enum: ["list_templates", "create", "list", "get", "update", "delete", "list_subagents", "apply_template", "propose_attach", "commit_attach"], description: "Valid actions: list_templates, create, list, get, update, delete, list_subagents, apply_template, propose_attach, commit_attach" },
         sop_id: { type: "string", description: "SOP ID (required for get, update, delete)" },
         agent_id: { type: "string", description: "Agent ID (required for create, list filter, apply_template)" },
-        chief_agent_id: { type: "string", description: "Chief agent ID (required for list_subagents, create_subagent)" },
-        subagent_id: { type: "string", description: "Subagent ID (required for delete_subagent)" },
-        name: { type: "string", description: "Subagent display name (required for create_subagent)" },
-        role: { type: "string", description: "Subagent role label, e.g. 'Staff', 'Analyst'. Defaults to 'Staff'." },
-        codename: { type: "string", description: "Optional subagent codename" },
-        color_hex: { type: "string", description: "Optional subagent UI color, default '#64748b'" },
+        chief_agent_id: { type: "string", description: "Chief agent ID (required for list_subagents)" },
         template_id: { type: "string", description: "Template ID (required for apply_template)" },
         target_kind: { type: "string", enum: ["conversation", "task", "scheduler_event"], description: "Run target kind (for propose_attach/commit_attach)" },
         target_id: { type: "string", description: "Run target id (for propose_attach/commit_attach)" },
@@ -4938,13 +4965,11 @@ function registerSOPOps(
         case "get": return handleSOPGet(supabase, userId, params);
         case "update": return handleSOPUpdate(supabase, userId, params);
         case "delete": return handleSOPDelete(supabase, userId, params);
-        case "list_subagents": return handleSOPListSubagents(supabase, userId, params);
-        case "create_subagent": return handleSOPCreateSubagent(supabase, userId, params);
-        case "delete_subagent": return handleSOPDeleteSubagent(supabase, userId, params);
+        case "list_subagents": return handleListSubagents(supabase, userId, params);
         case "apply_template": return handleSOPApplyTemplate(supabase, userId, resolveAgent, params);
         case "propose_attach": return handleProposeAttach({ supabase, userId, docKind: "sop", params });
         case "commit_attach": return handleCommitAttach({ supabase, userId, docKind: "sop", params });
-        default: return err(`Unknown action "${action}". Valid: list_templates, create, list, get, update, delete, list_subagents, create_subagent, delete_subagent, apply_template, propose_attach, commit_attach`);
+        default: return err(`Unknown action "${action}". Valid: list_templates, create, list, get, update, delete, list_subagents, apply_template, propose_attach, commit_attach`);
       }
     },
   });
@@ -5185,7 +5210,12 @@ async function handleSOPDelete(supabase: SupabaseClient, userId: string, params:
   } catch (e) { return err(e instanceof Error ? e.message : String(e)); }
 }
 
-async function handleSOPListSubagents(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
+// ── Shared subagent handlers (used by OFIERE_AGENT_OPS; SOP_OPS keeps a
+//    convenience wrapper for `list_subagents` only). ──────────────────────────
+
+const MAX_SUBAGENTS_PER_CHIEF = 5;
+
+async function handleListSubagents(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
   try {
     if (!params.chief_agent_id) return err("Missing required field: chief_agent_id");
     const { data, error } = await supabase
@@ -5195,13 +5225,11 @@ async function handleSOPListSubagents(supabase: SupabaseClient, userId: string,
       .eq("chief_agent_id", params.chief_agent_id as string)
       .order("created_at", { ascending: true });
     if (error) return err(error.message);
-    return ok({ subagents: data || [], count: (data || []).length, max_allowed: 5 });
+    return ok({ subagents: data || [], count: (data || []).length, max_allowed: MAX_SUBAGENTS_PER_CHIEF });
   } catch (e) { return err(e instanceof Error ? e.message : String(e)); }
 }
 
-const MAX_SUBAGENTS_PER_CHIEF = 5;
-
-async function handleSOPCreateSubagent(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
+async function handleCreateSubagent(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
   try {
     const chiefAgentId = params.chief_agent_id as string | undefined;
     const name = params.name as string | undefined;
@@ -5233,7 +5261,7 @@ async function handleSOPCreateSubagent(supabase: SupabaseClient, userId: string,
   } catch (e) { return err(e instanceof Error ? e.message : String(e)); }
 }
 
-async function handleSOPDeleteSubagent(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
+async function handleDeleteSubagent(supabase: SupabaseClient, userId: string, params: Record<string, unknown>): Promise<ToolResult> {
   try {
     const subagentId = params.subagent_id as string | undefined;
     if (!subagentId) return err("Missing required field: subagent_id");