ofiere-openclaw-plugin 1.0.2 → 1.1.0

package/index.ts

@@ -4,7 +4,7 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { parseOfiereConfig } from "./src/config.js";
 import { getSupabase } from "./src/supabase.js";
-import { registerTools } from "./src/tools.js";
+import { registerTools, probeApiForAgentName } from "./src/tools.js";
 import { getSystemPrompt } from "./src/prompt.js";
 import { registerCli } from "./src/cli.js";
 import { seedAgentCache } from "./src/agent-resolver.js";
@@ -70,6 +70,10 @@ const ofierePlugin = {
     // ── Connect to Supabase and register tools ────────────────────────────
     try {
       const supabase = getSupabase(config.supabaseUrl, config.serviceRoleKey);
+
+      // Probe the api object for any agent identity info (for debugging + fallback)
+      probeApiForAgentName(api, api.logger);
+
       registerTools(api, supabase, config);
       promptState.toolCount = 5;
       promptState.ready = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofiere-openclaw-plugin",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "type": "module",
   "description": "OpenClaw plugin for Ofiere PM — manage tasks, agents, and projects from your agent",
   "keywords": ["openclaw", "ofiere", "project-management", "agents", "plugin"],

package/src/tools.ts

@@ -30,19 +30,74 @@ function err(message: string): ToolResult {
 
 // ─── Helper: extract calling agent's accountId from OpenClaw context ─────────
 
+// Module-level: set once at registration time from index.ts
+let _registrationAgentName = "";
+export function setRegistrationAgentName(name: string) {
+  if (name && !_registrationAgentName) _registrationAgentName = name;
+}
+
 function getCallingAgentName(api: any): string {
-  // OpenClaw passes agent context in various ways — try all known paths
+  // OpenClaw passes agent context in various ways — try ALL known paths
+  try {
+    const candidates = [
+      api?.agentContext?.accountId,
+      api?.agentContext?.name,
+      api?.agentContext?.id,
+      api?.currentAgent?.accountId,
+      api?.currentAgent?.name,
+      api?.currentAgent?.id,
+      api?.agent?.accountId,
+      api?.agent?.name,
+      api?.agent?.id,
+      api?.agentId,
+      api?.agentName,
+      api?.accountId,
+      api?.name,
+      api?.id,
+      api?.metadata?.agentId,
+      api?.metadata?.accountId,
+      api?.metadata?.agentName,
+      api?.context?.agentId,
+      api?.context?.accountId,
+      api?.context?.agent?.name,
+    ];
+    for (const c of candidates) {
+      if (typeof c === "string" && c.trim()) return c.trim();
+    }
+  } catch {
+    // ignore
+  }
+  return "";
+}
+
+/**
+ * Probe the API object for any agent identity info. Called once at registration.
+ * Logs ALL available keys for debugging.
+ */
+export function probeApiForAgentName(api: any, logger?: any): string {
+  // Direct detection
+  const name = getCallingAgentName(api);
+  if (name) {
+    logger?.info?.(`[ofiere] Detected agent from API: "${name}"`);
+    setRegistrationAgentName(name);
+    return name;
+  }
+
+  // Log all top-level keys for future debugging
   try {
-    return (
-      api?.agentContext?.accountId ||
-      api?.agentContext?.name ||
-      api?.currentAgent?.accountId ||
-      api?.currentAgent?.name ||
-      ""
-    );
+    const keys = Object.keys(api || {});
+    logger?.debug?.(`[ofiere] API object keys: ${JSON.stringify(keys)}`);
+    // Check if any key looks like it contains agent info
+    for (const key of keys) {
+      const val = api[key];
+      if (typeof val === "string" && val.length > 0 && val.length < 50) {
+        logger?.debug?.(`[ofiere] API.${key} = "${val}"`);
+      }
+    }
   } catch {
-    return "";
+    // ignore
   }
+  return "";
 }
 
 // ─── Tool Registration ───────────────────────────────────────────────────────
@@ -57,11 +112,23 @@ export function registerTools(
 
   /**
    * Resolve the agent ID for the calling agent.
-   * Priority: explicit param > runtime context > env var fallback
+   * Priority: explicit param > runtime context > registration-time detection > env var > DB fallback
    */
   async function resolveAgent(explicitId?: string): Promise<string | null> {
-    // 1. Explicit agent_id passed by the LLM (e.g. "create task for Daisy")
-    if (explicitId && explicitId.trim()) return explicitId.trim();
+    // 1. Explicit agent_id passed by the LLM (e.g. "ivy", "daisy", or a UUID)
+    if (explicitId && explicitId.trim()) {
+      const trimmed = explicitId.trim();
+      // If it looks like a UUID or our ID format, use directly
+      if (trimmed.match(/^[0-9a-f]{8}-/) || trimmed.match(/^agent-/)) {
+        return trimmed;
+      }
+      // Otherwise treat as a name and resolve to the actual agent ID
+      try {
+        return await resolveAgentId(trimmed, userId, supabase);
+      } catch {
+        return trimmed; // fallback: use as-is
+      }
+    }
 
     // 2. Runtime: read calling agent's name from OpenClaw context
     const callerName = getCallingAgentName(api);
@@ -69,12 +136,37 @@ export function registerTools(
       try {
         return await resolveAgentId(callerName, userId, supabase);
       } catch {
-        // Fall through to env var
+        // Fall through
+      }
+    }
+
+    // 3. Registration-time detection (set when plugin was loaded)
+    if (_registrationAgentName) {
+      try {
+        return await resolveAgentId(_registrationAgentName, userId, supabase);
+      } catch {
+        // Fall through
       }
     }
 
-    // 3. Env var fallback (OFIERE_AGENT_ID — legacy single-agent mode)
-    return fallbackAgentId || null;
+    // 4. Env var fallback (OFIERE_AGENT_ID — legacy single-agent mode)
+    if (fallbackAgentId) return fallbackAgentId;
+
+    // 5. Nuclear fallback: query the FIRST agent for this user
+    try {
+      const { data } = await supabase
+        .from("agents")
+        .select("id")
+        .eq("user_id", userId)
+        .order("name", { ascending: true })
+        .limit(1)
+        .single();
+      if (data?.id) return data.id;
+    } catch {
+      // ignore
+    }
+
+    return null;
   }
 
   // ── OFIERE_LIST_TASKS — Required (read-only, no side effects) ────────
@@ -134,21 +226,22 @@ export function registerTools(
       label: "Create Ofiere Task",
       description:
         "Create a new task in the Ofiere PM dashboard. " +
-        "If agent_id is not provided, the task is automatically assigned to you (the calling agent). " +
+        "IMPORTANT: You MUST always pass your own name as agent_id (e.g. 'ivy', 'daisy') to assign the task to yourself. " +
+        "If you want to assign to a different agent, pass their name instead. " +
         "Pass agent_id as 'none' or 'unassigned' to create an unassigned task. " +
         "The task will appear in the dashboard immediately via real-time sync.",
       parameters: {
         type: "object",
-        required: ["title"],
+        required: ["title", "agent_id"],
         properties: {
           title: { type: "string", description: "Task title (required)" },
           description: { type: "string", description: "Task description" },
           agent_id: {
             type: "string",
             description:
-              "Agent ID to assign the task to. If omitted, assigns to yourself. " +
-              "Pass 'none' or 'unassigned' to create a task with no assignee. " +
-              "Use OFIERE_LIST_AGENTS to see available agents.",
+              "REQUIRED. Your own agent name (e.g. 'ivy', 'daisy', 'celia') to self-assign, " +
+              "or another agent's name to assign to them. " +
+              "Pass 'none' or 'unassigned' to create a task with no assignee.",
           },
           status: {
             type: "string",