ofiere-openclaw-plugin 4.40.1 → 4.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.40.1",
+  "version": "4.41.1",
   "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;
+  }
+
+  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. C-Suite: hardcoded roster
+  // 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")
@@ -134,6 +152,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

@@ -49,11 +49,12 @@ Actions: "list", "create", "update", "delete", "add_approval", "list_approvals",
 - resolve_approval: Approve/reject. Requires: approval_id, approval_status. Optional: comment`,
 
   OFIERE_AGENT_OPS: `Query + manage agents and their staff subagents.
-Actions: "list", "list_subagents", "create_subagent", "delete_subagent"
+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.`,
+- 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"

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) ────────────────────────────────
 
@@ -1093,7 +1094,8 @@ function registerAgentOps(
       `- "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.`,
+      `- "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"],
@@ -1101,10 +1103,11 @@ function registerAgentOps(
         action: {
           type: "string",
           description: "The operation to perform",
-          enum: ["list", "list_subagents", "create_subagent", "delete_subagent"],
+          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" },
@@ -1123,13 +1126,29 @@ function registerAgentOps(
           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, list_subagents, create_subagent, delete_subagent`);
+          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,