aamp-openclaw-plugin 0.1.31 → 0.1.33

package/dist/index.js

@@ -2537,6 +2537,12 @@ var pendingTasks = /* @__PURE__ */ new Map();
 var activeTaskStreams = /* @__PURE__ */ new Map();
 var terminalTaskIds = new Set(loadTaskState(defaultTaskStatePath()).terminalTaskIds ?? []);
 var AAMP_SESSION_PREFIX = "aamp:";
+var DEFAULT_OPENCLAW_AGENT_ID = "main";
+var OPENCLAW_AGENT_SESSION_PREFIX = "agent:";
+var VALID_OPENCLAW_AGENT_ID_RE = /^[a-z0-9][a-z0-9_-]{0,63}$/i;
+var INVALID_OPENCLAW_AGENT_ID_RE = /[^a-z0-9_-]+/g;
+var LEADING_DASH_RE = /^-+/;
+var TRAILING_DASH_RE = /-+$/;
 var dispatchedSubtasks = /* @__PURE__ */ new Map();
 var waitingDispatches = /* @__PURE__ */ new Map();
 var aampClient = null;
@@ -2614,12 +2620,88 @@ function logTransportState(api, mode, email, previousMode) {
 function isSyntheticPendingKey(taskKey) {
   return taskKey.startsWith("result:") || taskKey.startsWith("help:");
 }
+function isTaskAwaitingHelpReply(task) {
+  return task.awaitingHelpReply === true;
+}
+function isActionablePendingTask(taskKey, task) {
+  return !isSyntheticPendingKey(taskKey) && !isTaskAwaitingHelpReply(task);
+}
+function normalizeOpenClawAgentId(value) {
+  const trimmed = typeof value === "string" ? value.trim() : "";
+  if (!trimmed)
+    return DEFAULT_OPENCLAW_AGENT_ID;
+  if (VALID_OPENCLAW_AGENT_ID_RE.test(trimmed))
+    return trimmed.toLowerCase();
+  return trimmed.toLowerCase().replace(INVALID_OPENCLAW_AGENT_ID_RE, "-").replace(LEADING_DASH_RE, "").replace(TRAILING_DASH_RE, "").slice(0, 64) || DEFAULT_OPENCLAW_AGENT_ID;
+}
+function resolveDefaultOpenClawAgentId(config) {
+  const agents = config?.agents?.list;
+  if (!Array.isArray(agents) || agents.length === 0)
+    return DEFAULT_OPENCLAW_AGENT_ID;
+  const defaults = agents.filter((agent) => agent?.default);
+  return normalizeOpenClawAgentId((defaults[0] ?? agents[0])?.id);
+}
+function stripOpenClawAgentScope(sessionKey) {
+  const trimmed = sessionKey.trim();
+  if (!trimmed.toLowerCase().startsWith(OPENCLAW_AGENT_SESSION_PREFIX))
+    return trimmed;
+  const parts = trimmed.split(":");
+  if (parts.length < 3 || parts[0]?.toLowerCase() !== "agent")
+    return trimmed;
+  return parts.slice(2).join(":");
+}
 function isAampSessionKey(sessionKey) {
-  return typeof sessionKey === "string" && sessionKey.startsWith(AAMP_SESSION_PREFIX);
+  return typeof sessionKey === "string" && stripOpenClawAgentScope(sessionKey).toLowerCase().startsWith(AAMP_SESSION_PREFIX);
+}
+function buildOpenClawMainSessionKey(mainKey, config) {
+  const trimmed = mainKey.trim();
+  if (!trimmed)
+    return `${OPENCLAW_AGENT_SESSION_PREFIX}${resolveDefaultOpenClawAgentId(config)}:main`;
+  if (trimmed.toLowerCase().startsWith(OPENCLAW_AGENT_SESSION_PREFIX))
+    return trimmed;
+  return `${OPENCLAW_AGENT_SESSION_PREFIX}${resolveDefaultOpenClawAgentId(config)}:${trimmed}`;
+}
+function buildAampConversationSessionKey(value, config) {
+  return buildOpenClawMainSessionKey(`${AAMP_SESSION_PREFIX}default:${value}`, config);
+}
+function buildAampTaskSessionKey(taskId, config) {
+  return buildAampConversationSessionKey(`task:${taskId}`, config);
 }
 function buildAampWakeSessionKey(kind, id) {
   return `${AAMP_SESSION_PREFIX}wake:${kind}:${id}`;
 }
+function resolvePendingKeyFromSessionKey(sessionKey) {
+  if (typeof sessionKey !== "string")
+    return void 0;
+  const normalized = stripOpenClawAgentScope(sessionKey).trim();
+  if (!normalized)
+    return void 0;
+  const parts = normalized.split(":");
+  if (parts[0]?.toLowerCase() !== "aamp")
+    return void 0;
+  if (parts[1]?.toLowerCase() === "wake") {
+    const kind = parts[2]?.toLowerCase();
+    const id = parts.slice(3).join(":").trim();
+    if (!id)
+      return void 0;
+    if (kind === "task")
+      return id;
+    if (kind === "result" || kind === "help")
+      return `${kind}:${id}`;
+    return void 0;
+  }
+  if (parts[1]?.toLowerCase() === "default") {
+    const kind = parts[2]?.toLowerCase();
+    const id = parts.slice(3).join(":").trim();
+    if (!id)
+      return void 0;
+    if (kind === "task")
+      return id;
+    if (kind === "result" || kind === "help")
+      return `${kind}:${id}`;
+  }
+  return void 0;
+}
 function saveTerminalTaskIds() {
   saveTaskState({ terminalTaskIds: [...terminalTaskIds] }, defaultTaskStatePath());
 }
@@ -2662,7 +2744,7 @@ function nextPendingEntry() {
   if (notifications.length > 0) {
     return notifications.sort((a, b) => new Date(a[1].receivedAt).getTime() - new Date(b[1].receivedAt).getTime())[0];
   }
-  return entries.filter(([key]) => !key.startsWith("result:") && !key.startsWith("help:")).sort((a, b) => {
+  return entries.filter(([key, task]) => isActionablePendingTask(key, task)).sort((a, b) => {
     const rankDiff = priorityRank(a[1].priority) - priorityRank(b[1].priority);
     if (rankDiff !== 0)
       return rankDiff;
@@ -2856,10 +2938,11 @@ var src_default = {
     }
     function wakeAgentForPendingTask(task) {
       const fallbackSessionKey = buildAampWakeSessionKey("task", task.taskId);
+      const openClawSessionKey = buildAampTaskSessionKey(task.taskId, api.config);
       const fallback = () => triggerHeartbeatWake(fallbackSessionKey, `task ${task.taskId}`);
       const dispatcher = channelRuntime?.reply?.dispatchReplyWithBufferedBlockDispatcher;
       api.logger.info(
-        `[AAMP] Wake requested for task ${task.taskId} \u2014 channelRuntime=${channelRuntime ? "yes" : "no"} channelCfg=${channelCfg ? "yes" : "no"} dispatcher=${typeof dispatcher === "function" ? "yes" : "no"} fallbackSession=${fallbackSessionKey}`
+        `[AAMP] Wake requested for task ${task.taskId} \u2014 channelRuntime=${channelRuntime ? "yes" : "no"} channelCfg=${channelCfg ? "yes" : "no"} dispatcher=${typeof dispatcher === "function" ? "yes" : "no"} session=${openClawSessionKey} fallbackSession=${fallbackSessionKey}`
       );
       if (!channelRuntime || !channelCfg || typeof dispatcher !== "function") {
         fallback();
@@ -2879,7 +2962,7 @@ var src_default = {
             BodyForAgent: prompt,
             From: task.from,
             To: agentEmail,
-            SessionKey: `aamp:default:task:${task.taskId}`,
+            SessionKey: openClawSessionKey,
             AccountId: "default",
             ChatType: "dm",
             Provider: "aamp",
@@ -3093,7 +3176,7 @@ ${notifyBody?.bodyText ?? "Sub-task completed."}${actionSection}`;
                 BodyForAgent: prompt,
                 From: result.from,
                 To: agentEmail,
-                SessionKey: `aamp:default:${result.from}`,
+                SessionKey: buildAampConversationSessionKey(result.from, api.config),
                 AccountId: "default",
                 ChatType: "dm",
                 Provider: "aamp",
@@ -3170,7 +3253,7 @@ ${notifyBody?.bodyText ?? help.question}`;
               BodyForAgent: prompt,
               From: help.from,
               To: agentEmail,
-              SessionKey: `aamp:default:${help.from}`,
+              SessionKey: buildAampConversationSessionKey(help.from, api.config),
               AccountId: "default",
               ChatType: "dm",
               Provider: "aamp",
@@ -3376,7 +3459,17 @@ ${notifyBody?.bodyText ?? help.question}`;
         }
         if (pendingTasks.size === 0)
           return {};
-        const nextEntry = nextPendingEntry();
+        const targetedPendingKey = resolvePendingKeyFromSessionKey(ctx?.sessionKey);
+        const targetedEntry = targetedPendingKey ? (() => {
+          const targetedTask = pendingTasks.get(targetedPendingKey);
+          if (!targetedTask)
+            return void 0;
+          if (!isSyntheticPendingKey(targetedPendingKey) && isTaskAwaitingHelpReply(targetedTask)) {
+            return void 0;
+          }
+          return [targetedPendingKey, targetedTask];
+        })() : void 0;
+        const nextEntry = targetedPendingKey ? targetedEntry : nextPendingEntry();
         if (!nextEntry)
           return {};
         const [taskKey, task] = nextEntry;
@@ -3384,12 +3477,13 @@ ${notifyBody?.bodyText ?? help.question}`;
         if (isNotification && taskKey) {
           pendingTasks.delete(taskKey);
         }
-        const actionableTasks = [...pendingTasks.entries()].filter(([key]) => !key.startsWith("result:") && !key.startsWith("help:")).map(([, t]) => t).sort((a, b) => {
+        const actionableTasks = [...pendingTasks.entries()].filter(([key, pendingTask]) => isActionablePendingTask(key, pendingTask)).map(([, t]) => t).sort((a, b) => {
           const rankDiff = priorityRank(a.priority) - priorityRank(b.priority);
           if (rankDiff !== 0)
             return rankDiff;
           return new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime();
         });
+        const otherActionableTasks = actionableTasks.filter((pendingTask) => pendingTask.taskId !== task.taskId);
         const hasAttachmentInfo = isNotification && (task.bodyText?.includes("aamp_download_attachment") ?? false);
         const actionRequiredSection = isNotification && actionableTasks.length > 0 ? [
           ``,
@@ -3423,8 +3517,8 @@ ${notifyBody?.bodyText ?? help.question}`;
           task.bodyText ? `
 ${task.bodyText}` : "",
           actionRequiredSection,
-          pendingTasks.size > 1 ? `
-(+${pendingTasks.size - 1} more items queued)` : ""
+          otherActionableTasks.length > 0 ? `
+(+${otherActionableTasks.length} more tasks queued)` : ""
         ] : [
           `## Pending AAMP Task (action required)`,
           ``,
@@ -3464,8 +3558,8 @@ ${task.bodyText}` : "",
 ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           task.expiresAt ? `Expires: ${task.expiresAt}` : `Expires: none`,
           `Received: ${task.receivedAt}`,
-          pendingTasks.size > 1 ? `
-(+${pendingTasks.size - 1} more tasks queued)` : ""
+          otherActionableTasks.length > 0 ? `
+(+${otherActionableTasks.length} more tasks queued)` : ""
         ].filter(Boolean).join("\n");
         return { prependContext: lines };
       },
@@ -3704,12 +3798,16 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           suggestedOptions: p.suggestedOptions ?? [],
           inReplyTo: task.messageId || void 0
         });
+        pendingTasks.set(task.taskId, {
+          ...task,
+          awaitingHelpReply: true
+        });
         api.logger.info(`[AAMP] \u2192 task.help_needed  ${task.taskId}`);
         return {
           content: [
             {
               type: "text",
-              text: `Help request sent for task ${task.taskId}. The task remains pending until the dispatcher replies.`
+              text: `Help request sent for task ${task.taskId}. The task is now suspended until the dispatcher replies.`
             }
           ]
         };
@@ -3729,7 +3827,7 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
             return rankDiff;
           return new Date(a.receivedAt).getTime() - new Date(b.receivedAt).getTime();
         }).map(
-          (t, i) => `${i + 1}. [${t.priority}] [${t.taskId}] "${t.title}"${t.bodyText ? `
+          (t, i) => `${i + 1}. [${t.priority}] [${t.taskId}] "${t.title}"${isTaskAwaitingHelpReply(t) ? " (waiting for dispatcher reply)" : ""}${t.bodyText ? `
    Description: ${t.bodyText}` : ""} \u2014 from ${t.from} (received ${t.receivedAt})`
         );
         return {