ofiere-openclaw-plugin 4.29.0 → 4.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "4.29.0",
+  "version": "4.30.0",
   "type": "module",
   "description": "OpenClaw plugin for Ofiere PM - 14 meta-tools covering tasks, agents, projects, scheduling, knowledge, workflows, notifications, memory, prompts, constellation, space file management, execution plan builder, SOP management, and agent brain (memory + self-improvement)",
   "keywords": ["openclaw", "ofiere", "project-management", "agents", "plugin"],

package/src/tools.ts

@@ -5095,7 +5095,9 @@ function registerBrainOps(
   userId: string,
   resolveAgent: (id?: string) => Promise<string | null>,
 ): void {
-  api.registerTool({
+  // Register as a FACTORY so OpenClaw passes ToolContext with agentAccountId.
+  // This is the primary fix for the Daisy→Celia misattribution bug.
+  api.registerTool((toolCtx: any) => ({
     name: "OFIERE_BRAIN_OPS",
     label: "Ofiere Brain Operations",
     description:
@@ -5165,6 +5167,21 @@ function registerBrainOps(
     async execute(_id: string, params: Record<string, unknown>) {
       const action = params.action as string;
 
+      // ── Resolve agent identity ──────────────────────────────────
+      // Priority: explicit param > factory context > resolver fallback
+      // The factory context (toolCtx) carries the actual calling agent's
+      // accountId from OpenClaw, fixing the Daisy→Celia misattribution.
+      const ctxAgentHint = toolCtx?.agentAccountId || toolCtx?.agentId || "";
+
+      async function resolveCallingAgent(explicitId?: string): Promise<string | null> {
+        // 1. Explicit param from LLM
+        if (explicitId && explicitId.trim()) return resolveAgent(explicitId);
+        // 2. OpenClaw tool context (the fix)
+        if (ctxAgentHint) return resolveAgent(ctxAgentHint);
+        // 3. Original resolver fallback
+        return resolveAgent();
+      }
+
       switch (action) {
         // ── Memory: Save ──
         case "save_memory": {
@@ -5174,7 +5191,7 @@ function registerBrainOps(
             if (!params.tier) missing.push("tier");
             if (missing.length > 0) return err(`Missing required: ${missing.join(", ")}`);
           }
-          const agentId = await resolveAgent(params.agent_id as string);
+          const agentId = await resolveCallingAgent(params.agent_id as string);
           if (!agentId) return err("Could not resolve agent_id");
 
           const tier = params.tier as string;
@@ -5202,7 +5219,9 @@ function registerBrainOps(
         // ── Memory: Recall (Full-text search) ──
         case "recall": {
           if (!params.query) return err("Missing required: query");
-          const agentId = params.agent_id ? await resolveAgent(params.agent_id as string) : null;
+          const agentId = params.agent_id
+            ? await resolveAgent(params.agent_id as string)
+            : (ctxAgentHint ? await resolveAgent(ctxAgentHint) : null);
           const limit = (params.limit as number) || 20;
           const queryText = params.query as string;
 
@@ -5281,7 +5300,7 @@ function registerBrainOps(
             if (!params.category) missing.push("category");
             if (missing.length > 0) return err(`Missing required: ${missing.join(", ")}`);
           }
-          const agentId = await resolveAgent(params.agent_id as string);
+          const agentId = await resolveCallingAgent(params.agent_id as string);
           if (!agentId) return err("Could not resolve agent_id");
 
           const content = `[${params.category}] ${params.title}${params.detail ? `: ${params.detail}` : ""}`;
@@ -5305,7 +5324,9 @@ function registerBrainOps(
 
         // ── Learning: List (→ L4_rule query) ──
         case "list_learnings": {
-          const agentId = params.agent_id ? await resolveAgent(params.agent_id as string) : null;
+          const agentId = params.agent_id
+            ? await resolveAgent(params.agent_id as string)
+            : (ctxAgentHint ? await resolveAgent(ctxAgentHint) : null);
           const limit = (params.limit as number) || 20;
 
           let q = supabase.from("agent_memories")
@@ -5331,7 +5352,7 @@ function registerBrainOps(
 
           if (params.resolution) {
             // Create a superseding memory with the resolution
-            const agentId = await resolveAgent(params.agent_id as string);
+            const agentId = await resolveCallingAgent(params.agent_id as string);
             const { data: newMem } = await supabase.from("agent_memories").insert({
               user_id: userId,
               agent_id: agentId || "system",
@@ -5364,7 +5385,7 @@ function registerBrainOps(
         case "save_entity": {
           if (!params.label) return err("Missing required: label");
           if (!params.node_type) return err("Missing required: node_type");
-          const agentId = await resolveAgent(params.agent_id as string);
+          const agentId = await resolveCallingAgent(params.agent_id as string);
           if (!agentId) return err("Could not resolve agent_id");
 
           const { data, error } = await supabase.from("knowledge_graph_nodes").insert({
@@ -5404,7 +5425,9 @@ function registerBrainOps(
         // ── Knowledge Graph: Query ──
         case "query_graph": {
           if (!params.query) return err("Missing required: query");
-          const agentId = params.agent_id ? await resolveAgent(params.agent_id as string) : null;
+          const agentId = params.agent_id
+            ? await resolveAgent(params.agent_id as string)
+            : (ctxAgentHint ? await resolveAgent(ctxAgentHint) : null);
           const limit = (params.limit as number) || 20;
 
           let q = supabase.from("knowledge_graph_nodes")
@@ -5436,7 +5459,7 @@ function registerBrainOps(
 
         // ── Trajectory: Start ──
         case "start_trajectory": {
-          const agentId = await resolveAgent(params.agent_id as string);
+          const agentId = await resolveCallingAgent(params.agent_id as string);
           if (!agentId) return err("Could not resolve agent_id");
 
           const { data, error } = await supabase.from("execution_trajectories").insert({
@@ -5475,7 +5498,9 @@ function registerBrainOps(
 
         // ── Brain Status ──
         case "get_brain_status": {
-          const agentId = params.agent_id ? await resolveAgent(params.agent_id as string) : null;
+          const agentId = params.agent_id
+            ? await resolveAgent(params.agent_id as string)
+            : (ctxAgentHint ? await resolveAgent(ctxAgentHint) : null);
           const now = new Date().toISOString();
 
           // Parallel queries for speed
@@ -5533,7 +5558,7 @@ function registerBrainOps(
           return err(`Unknown action "${action}". Valid: save_memory, recall, delete_memory, promote_memory, log_learning, list_learnings, resolve_learning, save_entity, link_entities, query_graph, start_trajectory, end_trajectory, get_brain_status`);
       }
     },
-  });
+  }));
 }
 
 // ═══════════════════════════════════════════════════════════════════════════════
@@ -5568,13 +5593,12 @@ export function registerTools(
   registerSOPOps(api, supabase, userId, resolveAgent);        // 13
   registerBrainOps(api, supabase, userId, resolveAgent);      // 14
 
-  // ── Inject brain context at bootstrap ──
-  // This loads the agent's active memories + unresolved learnings into the
-  // system prompt so the agent starts every conversation with full context.
-  // Runs async — does NOT block registration.
-  injectBrainContext(api, supabase, userId, fallbackAgentId).catch((e: any) => {
-    api.logger.warn?.(`[ofiere] Brain context injection failed: ${e?.message || e}`);
-  });
+  // ── Register dynamic brain context hook ──
+  // FIX (v4.30.0): Was injectBrainContext() which loaded once at registration.
+  // Now registers a before_prompt_build hook that dynamically resolves the
+  // calling agent from ctx.agentId and loads THAT agent's brain memories.
+  // Each agent sees its own brain context — Daisy sees Daisy's, Ivy sees Ivy's.
+  registerBrainContextHook(api, supabase, userId, fallbackAgentId);
 
   // ── Register agent_end hook for server-side brain extraction ──
   // This is the FIX for Bug 2: extraction was client-side only (useSocket.ts).
@@ -5596,6 +5620,10 @@ export function registerTools(
 // Extracts L1 raw fragments and lightweight L2 summaries.
 // Replaces the client-side extractBrainMemory() in useSocket.ts.
 // Requires allowConversationAccess: true in plugin config on the OpenClaw side.
+//
+// FIX (v4.30.0): OpenClaw passes (event, ctx: PluginHookAgentContext) where
+// ctx.agentId is the calling agent's accountId. Previously we only read the
+// event arg, causing all writes to fall back to the first DB agent alphabetically.
 
 function registerBrainExtractionHook(
   api: any,
@@ -5604,7 +5632,7 @@ function registerBrainExtractionHook(
   fallbackAgentId: string,
 ): void {
   try {
-    api.on("agent_end", async (event: any) => {
+    api.on("agent_end", async (event: any, ctx: any) => {
       try {
         // Extract messages from event — agent_end provides the conversation
         const messages: any[] = event?.messages || event?.context?.messages || [];
@@ -5635,9 +5663,14 @@ function registerBrainExtractionHook(
         // Skip trivial exchanges
         if (lastUser.length < 20 || lastAssistant.length < 30) return;
 
-        // Resolve agent identity from event context
-        const agentId = event?.agentId
+        // ── Agent identity resolution (FIX) ──────────────────────────
+        // Priority: ctx.agentId (from PluginHookAgentContext, the CORRECT source)
+        //         > event fields (legacy compat)
+        //         > fallbackAgentId (last resort)
+        const agentId = ctx?.agentId
+          || event?.agentId
           || event?.context?.agentId
+          || ctx?.sessionKey?.split?.(":")?.[0]
           || event?.sessionKey?.split?.(":")?.[0]
           || fallbackAgentId
           || "";
@@ -5653,7 +5686,9 @@ function registerBrainExtractionHook(
           // Use raw agentId
         }
 
-        const sessionKey = event?.sessionKey || event?.context?.sessionKey || undefined;
+        const sessionKey = ctx?.sessionKey || event?.sessionKey || event?.context?.sessionKey || undefined;
+
+        api.logger.debug?.(`[ofiere-brain] agent_end identity: ctx.agentId=${ctx?.agentId || "(none)"} event.agentId=${event?.agentId || "(none)"} resolved=${resolvedAgentId}`);
 
         // ── Fast Stream: Write L1_focus ──
         const rawContent = `User: ${lastUser}\nAssistant: ${lastAssistant}`;
@@ -5762,79 +5797,112 @@ function registerBrainExtractionHook(
 }
 
 // ── Brain Context Bootstrap Injection ──────────────────────────────────────
-// Queries the agent's active memories at boot and injects them into the system
-// prompt via api.on("before_prompt_build"). Uses the TMT hierarchy:
+// Injects the calling agent's active memories into the system prompt via
+// api.on("before_prompt_build"). Uses the TMT hierarchy:
 //   L1_focus  — active working memory (not expired, sorted by importance)
-//   L4_rule   — operational guardrails (source='reflection', sorted by importance)
+//   L4_rule   — operational guardrails (non-superseded, sorted by importance)
 //   L5_persona — identity context (permanent, top 3)
-// Runs once at registration time (~20ms, 3 parallel queries).
+//
+// FIX (v4.30.0): Previously loaded brain context ONCE at registration time
+// using fallbackAgentId (= first agent alphabetically). Now the hook is
+// DYNAMIC — it reads ctx.agentId from the PluginHookAgentContext passed by
+// OpenClaw on every prompt build, resolves the correct agent, and loads
+// that specific agent's brain. Each agent gets its own memories.
 
-async function injectBrainContext(
+function registerBrainContextHook(
   api: any,
   supabase: SupabaseClient,
   userId: string,
-  agentId: string,
-): Promise<void> {
-  if (!agentId) return;
+  fallbackAgentId: string,
+): void {
+  // Cache to avoid querying Supabase on every single prompt build.
+  // Key: resolved agent UUID. Value: { brainContext, loadedAt }.
+  // Cache TTL: 60 seconds — brain context refreshes at most once per minute.
+  const brainCache = new Map<string, { text: string; at: number }>();
+  const CACHE_TTL_MS = 60_000;
 
-  const now = new Date().toISOString();
+  try {
+    api.on("before_prompt_build", async (_event: any, ctx: any) => {
+      try {
+        // ── Resolve which agent is building its prompt ──
+        const ctxAgentId = ctx?.agentId || "";
+        let resolvedAgentId = fallbackAgentId;
 
-  const [l1Res, l4Res, l5Res] = await Promise.all([
-    // L1: Active working memory (not expired)
-    supabase.from("agent_memories")
-      .select("content, importance")
-      .eq("user_id", userId)
-      .eq("agent_id", agentId)
-      .eq("tier", "L1_focus")
-      .gt("decay_score", 0.1)
-      .or(`expires_at.is.null,expires_at.gt.${now}`)
-      .order("importance", { ascending: false })
-      .limit(5),
-    // L4: Guardrails (non-superseded reflections)
-    supabase.from("agent_memories")
-      .select("content, importance")
-      .eq("user_id", userId)
-      .eq("agent_id", agentId)
-      .eq("tier", "L4_rule")
-      .is("superseded_by", null)
-      .order("importance", { ascending: false })
-      .limit(10),
-    // L5: Persona (permanent identity)
-    supabase.from("agent_memories")
-      .select("content")
-      .eq("user_id", userId)
-      .eq("agent_id", agentId)
-      .eq("tier", "L5_persona")
-      .order("importance", { ascending: false })
-      .limit(3),
-  ]);
+        if (ctxAgentId && !isSystemName(ctxAgentId)) {
+          try {
+            const resolved = await resolveAgentId(ctxAgentId, userId, supabase);
+            if (resolved) resolvedAgentId = resolved;
+          } catch {
+            // Fall through to fallback
+          }
+        }
 
-  const l1 = l1Res.data || [];
-  const l4 = l4Res.data || [];
-  const l5 = l5Res.data || [];
+        if (!resolvedAgentId) return;
 
-  if (l1.length === 0 && l4.length === 0 && l5.length === 0) return;
+        // ── Check cache ──
+        const cached = brainCache.get(resolvedAgentId);
+        if (cached && Date.now() - cached.at < CACHE_TTL_MS) {
+          return cached.text ? { appendSystemContext: cached.text } : undefined;
+        }
 
-  const sections: string[] = [];
+        // ── Query brain memories for THIS specific agent ──
+        const now = new Date().toISOString();
 
-  if (l5.length > 0) {
-    sections.push("### Identity (L5_persona)\n" + l5.map((m: any) => `- ${m.content}`).join("\n"));
-  }
+        const [l1Res, l4Res, l5Res] = await Promise.all([
+          supabase.from("agent_memories")
+            .select("content, importance")
+            .eq("user_id", userId)
+            .eq("agent_id", resolvedAgentId)
+            .eq("tier", "L1_focus")
+            .gt("decay_score", 0.1)
+            .or(`expires_at.is.null,expires_at.gt.${now}`)
+            .order("importance", { ascending: false })
+            .limit(5),
+          supabase.from("agent_memories")
+            .select("content, importance")
+            .eq("user_id", userId)
+            .eq("agent_id", resolvedAgentId)
+            .eq("tier", "L4_rule")
+            .is("superseded_by", null)
+            .order("importance", { ascending: false })
+            .limit(10),
+          supabase.from("agent_memories")
+            .select("content")
+            .eq("user_id", userId)
+            .eq("agent_id", resolvedAgentId)
+            .eq("tier", "L5_persona")
+            .order("importance", { ascending: false })
+            .limit(3),
+        ]);
 
-  if (l4.length > 0) {
-    sections.push("### ⚠️ Guardrails (L4_rule — DO NOT violate)\n" + l4.map((m: any) => `- ${m.content}`).join("\n"));
-  }
+        const l1 = l1Res.data || [];
+        const l4 = l4Res.data || [];
+        const l5 = l5Res.data || [];
 
-  if (l1.length > 0) {
-    sections.push("### Active Focus (L1_focus)\n" + l1.map((m: any) => `- ${m.content}`).join("\n"));
-  }
+        if (l1.length === 0 && l4.length === 0 && l5.length === 0) {
+          brainCache.set(resolvedAgentId, { text: "", at: Date.now() });
+          return;
+        }
+
+        const sections: string[] = [];
+        if (l5.length > 0) {
+          sections.push("### Identity (L5_persona)\n" + l5.map((m: any) => `- ${m.content}`).join("\n"));
+        }
+        if (l4.length > 0) {
+          sections.push("### ⚠️ Guardrails (L4_rule — DO NOT violate)\n" + l4.map((m: any) => `- ${m.content}`).join("\n"));
+        }
+        if (l1.length > 0) {
+          sections.push("### Active Focus (L1_focus)\n" + l1.map((m: any) => `- ${m.content}`).join("\n"));
+        }
 
-  const brainContext = `<agent-brain>\n## Your Brain Context (TMT)\n\n${sections.join("\n\n")}\n</agent-brain>`;
+        const brainContext = `<agent-brain>\n## Your Brain Context (TMT)\n\n${sections.join("\n\n")}\n</agent-brain>`;
+        brainCache.set(resolvedAgentId, { text: brainContext, at: Date.now() });
 
-  try {
-    api.on("before_prompt_build", () => ({
-      appendSystemContext: brainContext,
-    }));
+        return { appendSystemContext: brainContext };
+      } catch (e) {
+        api.logger.debug?.(`[ofiere-brain] before_prompt_build error: ${e instanceof Error ? e.message : e}`);
+      }
+    });
   } catch {
     api.logger.debug?.("[ofiere] Could not register brain context hook — appendSystemContext may not be supported");
   }