aamp-openclaw-plugin 0.1.32 → 0.1.34

package/dist/index.js

@@ -2535,6 +2535,8 @@ function baseUrl(aampHost) {
 }
 var pendingTasks = /* @__PURE__ */ new Map();
 var activeTaskStreams = /* @__PURE__ */ new Map();
+var sessionTaskBindings = /* @__PURE__ */ new Map();
+var taskVisibleStreamState = /* @__PURE__ */ new Map();
 var terminalTaskIds = new Set(loadTaskState(defaultTaskStatePath()).terminalTaskIds ?? []);
 var AAMP_SESSION_PREFIX = "aamp:";
 var DEFAULT_OPENCLAW_AGENT_ID = "main";
@@ -2554,6 +2556,7 @@ var lastLoggedTransportMode = "disconnected";
 var reconcileTimer = null;
 var transportMonitorTimer = null;
 var historicalReconcileCompleted = false;
+var stopAgentEventSubscription = null;
 var channelRuntime = null;
 var channelCfg = null;
 async function ensureTaskStream(task) {
@@ -2620,6 +2623,12 @@ 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)
@@ -2664,6 +2673,112 @@ function buildAampTaskSessionKey(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 normalizeBoundSessionKey(sessionKey) {
+  if (typeof sessionKey !== "string")
+    return void 0;
+  const normalized = stripOpenClawAgentScope(sessionKey).trim();
+  return normalized || void 0;
+}
+function bindSessionToTask(sessionKey, taskId) {
+  const normalized = normalizeBoundSessionKey(sessionKey);
+  if (!normalized)
+    return;
+  if (!taskId) {
+    sessionTaskBindings.delete(normalized);
+    return;
+  }
+  sessionTaskBindings.set(normalized, taskId);
+}
+function resolveStreamTaskId(sessionKey) {
+  const pendingKey = resolvePendingKeyFromSessionKey(sessionKey);
+  if (pendingKey && !isSyntheticPendingKey(pendingKey))
+    return pendingKey;
+  const normalized = normalizeBoundSessionKey(sessionKey);
+  if (!normalized)
+    return void 0;
+  const taskId = sessionTaskBindings.get(normalized);
+  if (!taskId)
+    return void 0;
+  if (!pendingTasks.has(taskId) && !activeTaskStreams.has(taskId)) {
+    sessionTaskBindings.delete(normalized);
+    return void 0;
+  }
+  return taskId;
+}
+function forgetTaskStreamContext(taskId) {
+  taskVisibleStreamState.delete(taskId);
+  for (const [sessionKey, boundTaskId] of sessionTaskBindings) {
+    if (boundTaskId === taskId) {
+      sessionTaskBindings.delete(sessionKey);
+    }
+  }
+}
+async function handleAgentVisibleTextEvent(event) {
+  if (event.stream !== "assistant")
+    return;
+  const taskId = resolveStreamTaskId(event.sessionKey);
+  if (!taskId || !activeTaskStreams.has(taskId))
+    return;
+  const payload = event.data && typeof event.data === "object" ? event.data : {};
+  const fullText = typeof payload.text === "string" ? payload.text : void 0;
+  const deltaText = typeof payload.delta === "string" ? payload.delta : void 0;
+  if (!fullText && !deltaText)
+    return;
+  const runId = typeof event.runId === "string" && event.runId.trim() ? event.runId : "__default__";
+  const previousState = taskVisibleStreamState.get(taskId);
+  const previousText = previousState?.runId === runId ? previousState.text : "";
+  let nextText = previousText;
+  let nextDelta = "";
+  if (typeof fullText === "string") {
+    nextText = fullText;
+    if (fullText.startsWith(previousText)) {
+      nextDelta = fullText.slice(previousText.length);
+    } else if (!previousText) {
+      nextDelta = fullText;
+    } else if (deltaText) {
+      nextDelta = deltaText;
+    }
+  } else if (deltaText) {
+    nextText = `${previousText}${deltaText}`;
+    nextDelta = deltaText;
+  }
+  taskVisibleStreamState.set(taskId, { runId, text: nextText });
+  if (!nextDelta)
+    return;
+  await appendTaskStream(taskId, "text.delta", { text: nextDelta });
+}
 function saveTerminalTaskIds() {
   saveTaskState({ terminalTaskIds: [...terminalTaskIds] }, defaultTaskStatePath());
 }
@@ -2706,7 +2821,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;
@@ -2875,6 +2990,22 @@ var src_default = {
         api.logger.warn(`[AAMP] Could not trigger heartbeat for ${label}: ${err.message}`);
       }
     }
+    if (stopAgentEventSubscription) {
+      try {
+        stopAgentEventSubscription();
+      } catch {
+      }
+      stopAgentEventSubscription = null;
+    }
+    const onAgentEvent = api.runtime?.events?.onAgentEvent;
+    if (typeof onAgentEvent === "function") {
+      const unsubscribe = onAgentEvent((event) => {
+        void handleAgentVisibleTextEvent(event).catch((err) => {
+          api.logger.warn(`[AAMP] Failed to mirror assistant stream: ${err.message}`);
+        });
+      });
+      stopAgentEventSubscription = typeof unsubscribe === "function" ? unsubscribe : null;
+    }
     function getConfiguredCardText() {
       const inline = cfg.cardText?.trim();
       if (inline)
@@ -3043,6 +3174,7 @@ var src_default = {
         pendingTasks.delete(`help:${cancel.taskId}`);
         dispatchedSubtasks.delete(cancel.taskId);
         waitingDispatches.delete(cancel.taskId);
+        forgetTaskStreamContext(cancel.taskId);
         rememberTerminalTask(cancel.taskId);
         void closeTaskStream(cancel.taskId, { reason: "task.cancel" }).catch(() => {
         });
@@ -3375,6 +3507,13 @@ ${notifyBody?.bodyText ?? help.question}`;
           } catch {
           }
         }
+        if (stopAgentEventSubscription) {
+          try {
+            stopAgentEventSubscription();
+          } catch {
+          }
+          stopAgentEventSubscription = null;
+        }
       }
     });
     api.on("gateway_start", () => {
@@ -3421,7 +3560,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;
@@ -3429,12 +3578,17 @@ ${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();
         });
+        bindSessionToTask(
+          ctx?.sessionKey,
+          isNotification ? actionableTasks.length === 1 ? actionableTasks[0]?.taskId : void 0 : task.taskId
+        );
+        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 ? [
           ``,
@@ -3468,8 +3622,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)`,
           ``,
@@ -3509,8 +3663,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 };
       },
@@ -3657,14 +3811,17 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           state: "completing",
           label: `Sending ${p.status} result`
         });
-        if (p.output) {
-          await appendTaskStream(task.taskId, "text.delta", { text: p.output });
+        const streamedText = taskVisibleStreamState.get(task.taskId)?.text ?? "";
+        const finalOutputDelta = streamedText && p.output.startsWith(streamedText) ? p.output.slice(streamedText.length) : p.output;
+        if (finalOutputDelta) {
+          await appendTaskStream(task.taskId, "text.delta", { text: finalOutputDelta });
         }
         await closeTaskStream(task.taskId, {
           reason: "task.result",
           status: p.status,
           ...p.errorMsg ? { error: p.errorMsg } : {}
         });
+        forgetTaskStreamContext(task.taskId);
         await aampClient.sendResult({
           to: task.from,
           taskId: task.taskId,
@@ -3741,6 +3898,7 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
         await closeTaskStream(task.taskId, {
           reason: "task.help_needed"
         });
+        forgetTaskStreamContext(task.taskId);
         await aampClient.sendHelp({
           to: task.from,
           taskId: task.taskId,
@@ -3749,12 +3907,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.`
             }
           ]
         };
@@ -3774,7 +3936,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 {