aamp-openclaw-plugin 0.1.33 → 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) {
@@ -2702,6 +2705,80 @@ function resolvePendingKeyFromSessionKey(sessionKey) {
   }
   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());
 }
@@ -2913,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)
@@ -3081,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(() => {
         });
@@ -3413,6 +3507,13 @@ ${notifyBody?.bodyText ?? help.question}`;
           } catch {
           }
         }
+        if (stopAgentEventSubscription) {
+          try {
+            stopAgentEventSubscription();
+          } catch {
+          }
+          stopAgentEventSubscription = null;
+        }
       }
     });
     api.on("gateway_start", () => {
@@ -3483,6 +3584,10 @@ ${notifyBody?.bodyText ?? help.question}`;
             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 ? [
@@ -3706,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,
@@ -3790,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,