aamp-openclaw-plugin 0.1.30 → 0.1.32

package/dist/index.js

@@ -1833,6 +1833,7 @@ var AampClient = class _AampClient extends TinyEmitter {
   jmapClient;
   smtpSender;
   config;
+  streamAppendQueues = /* @__PURE__ */ new Map();
   constructor(config) {
     super();
     this.config = config;
@@ -2162,7 +2163,15 @@ var AampClient = class _AampClient extends TinyEmitter {
     }
     return res.json();
   }
-  async appendStreamEvent(opts) {
+  getStreamAppendQueue(streamId) {
+    let queue = this.streamAppendQueues.get(streamId);
+    if (!queue) {
+      queue = { running: false, operations: [] };
+      this.streamAppendQueues.set(streamId, queue);
+    }
+    return queue;
+  }
+  async dispatchStreamAppend(opts) {
     const stream = await this.resolveStreamCapability();
     const res = await _AampClient.callDiscoveredApi(this.config.baseUrl, {
       action: stream.appendAction ?? "aamp.stream.append",
@@ -2176,7 +2185,98 @@ var AampClient = class _AampClient extends TinyEmitter {
     }
     return res.json();
   }
+  enqueueStreamAppend(streamId, operation) {
+    const queue = this.getStreamAppendQueue(streamId);
+    queue.operations.push(operation);
+    void this.drainStreamAppendQueue(streamId);
+  }
+  async drainStreamAppendQueue(streamId) {
+    const queue = this.streamAppendQueues.get(streamId);
+    if (!queue || queue.running)
+      return;
+    queue.running = true;
+    try {
+      while (queue.operations.length) {
+        const operation = queue.operations.shift();
+        if (!operation)
+          continue;
+        if (operation.kind === "text-delta-batch") {
+          try {
+            const event = await this.dispatchStreamAppend({
+              streamId,
+              type: "text.delta",
+              payload: {
+                ...operation.payload,
+                text: operation.text
+              }
+            });
+            for (const resolve of operation.resolvers)
+              resolve(event);
+          } catch (error) {
+            for (const reject of operation.rejecters)
+              reject(error);
+          }
+          continue;
+        }
+        try {
+          const event = await this.dispatchStreamAppend(operation.opts);
+          operation.resolve(event);
+        } catch (error) {
+          operation.reject(error);
+        }
+      }
+    } finally {
+      queue.running = false;
+      if (queue.operations.length === 0) {
+        this.streamAppendQueues.delete(streamId);
+      }
+    }
+  }
+  async flushStreamAppendQueue(streamId) {
+    while (true) {
+      const queue = this.streamAppendQueues.get(streamId);
+      if (!queue)
+        return;
+      if (!queue.running && queue.operations.length === 0) {
+        this.streamAppendQueues.delete(streamId);
+        return;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    }
+  }
+  async appendStreamEvent(opts) {
+    if (opts.type === "text.delta" && typeof opts.payload.text === "string") {
+      return await new Promise((resolve, reject) => {
+        const queue = this.getStreamAppendQueue(opts.streamId);
+        const lastOperation = queue.operations.at(-1);
+        if (lastOperation?.kind === "text-delta-batch") {
+          lastOperation.text += String(opts.payload.text ?? "");
+          lastOperation.resolvers.push(resolve);
+          lastOperation.rejecters.push(reject);
+          return;
+        }
+        this.enqueueStreamAppend(opts.streamId, {
+          kind: "text-delta-batch",
+          text: String(opts.payload.text ?? ""),
+          payload: {
+            ...opts.payload
+          },
+          resolvers: [resolve],
+          rejecters: [reject]
+        });
+      });
+    }
+    return await new Promise((resolve, reject) => {
+      this.enqueueStreamAppend(opts.streamId, {
+        kind: "single-event",
+        opts,
+        resolve,
+        reject
+      });
+    });
+  }
   async closeStream(opts) {
+    await this.flushStreamAppendQueue(opts.streamId);
     const stream = await this.resolveStreamCapability();
     const res = await _AampClient.callDiscoveredApi(this.config.baseUrl, {
       action: stream.closeAction ?? "aamp.stream.close",
@@ -2436,6 +2536,13 @@ function baseUrl(aampHost) {
 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;
@@ -2447,7 +2554,6 @@ var lastLoggedTransportMode = "disconnected";
 var reconcileTimer = null;
 var transportMonitorTimer = null;
 var historicalReconcileCompleted = false;
-var currentSessionKey = "agent:main:main";
 var channelRuntime = null;
 var channelCfg = null;
 async function ensureTaskStream(task) {
@@ -2514,6 +2620,50 @@ function logTransportState(api, mode, email, previousMode) {
 function isSyntheticPendingKey(taskKey) {
   return taskKey.startsWith("result:") || taskKey.startsWith("help:");
 }
+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" && 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 saveTerminalTaskIds() {
   saveTaskState({ terminalTaskIds: [...terminalTaskIds] }, defaultTaskStatePath());
 }
@@ -2749,10 +2899,12 @@ var src_default = {
       api.logger.info(`[AAMP] Directory profile synced${cardText ? " (card text registered)" : ""}`);
     }
     function wakeAgentForPendingTask(task) {
-      const fallback = () => triggerHeartbeatWake(currentSessionKey, `task ${task.taskId}`);
+      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"} session=${currentSessionKey}`
+        `[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();
@@ -2772,7 +2924,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",
@@ -2879,7 +3031,7 @@ var src_default = {
           } catch (err) {
             api.logger.error(`[AAMP] task.dispatch handler failed for ${task.taskId}: ${err.message}`);
             if (pendingTasks.has(task.taskId)) {
-              triggerHeartbeatWake(currentSessionKey, `task ${task.taskId}`);
+              triggerHeartbeatWake(buildAampWakeSessionKey("task", task.taskId), `task ${task.taskId}`);
             }
           }
         })();
@@ -2986,7 +3138,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",
@@ -3014,7 +3166,7 @@ ${notifyBody?.bodyText ?? "Sub-task completed."}${actionSection}`;
               api.logger.error(`[AAMP] Channel dispatch failed: ${err.message}`);
             });
           } else {
-            const notifySessionKey = `agent:main:aamp-notify-${Date.now()}`;
+            const notifySessionKey = buildAampWakeSessionKey("result", result.taskId);
             try {
               api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: notifySessionKey });
               api.logger.info(`[AAMP] Heartbeat for sub-task result ${result.taskId}`);
@@ -3063,7 +3215,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",
@@ -3090,7 +3242,7 @@ ${notifyBody?.bodyText ?? help.question}`;
             api.logger.error(`[AAMP] Channel dispatch failed for help: ${err.message}`);
           });
         } else {
-          const helpSessionKey = `agent:main:aamp-notify-${Date.now()}`;
+          const helpSessionKey = buildAampWakeSessionKey("help", help.taskId);
           try {
             api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: helpSessionKey });
             api.logger.info(`[AAMP] Heartbeat fallback for sub-task help ${help.taskId}`);
@@ -3230,7 +3382,10 @@ ${notifyBody?.bodyText ?? help.question}`;
         return;
       api.logger.info(`[AAMP] gateway_start: re-triggering heartbeat for ${pendingTasks.size} pending task(s)`);
       try {
-        api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: currentSessionKey });
+        api.runtime.system.requestHeartbeatNow({
+          reason: "wake",
+          sessionKey: buildAampWakeSessionKey("queue", "gateway-start")
+        });
       } catch (err) {
         api.logger.warn(`[AAMP] gateway_start heartbeat failed: ${err.message}`);
       }
@@ -3238,8 +3393,8 @@ ${notifyBody?.bodyText ?? help.question}`;
     api.on(
       "before_prompt_build",
       (_event, ctx) => {
-        if (ctx?.sessionKey && !String(ctx.sessionKey).startsWith("aamp:")) {
-          currentSessionKey = ctx.sessionKey;
+        if (!isAampSessionKey(ctx?.sessionKey)) {
+          return {};
         }
         for (const [id, t] of pendingTasks) {
           if (hasExpired(t)) {
@@ -3525,7 +3680,10 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
         api.logger.info(`[AAMP] \u2192 task.result  ${task.taskId}  ${p.status}`);
         if (pendingTasks.size > 0) {
           try {
-            api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: currentSessionKey });
+            api.runtime.system.requestHeartbeatNow({
+              reason: "wake",
+              sessionKey: buildAampWakeSessionKey("queue", "follow-up")
+            });
           } catch {
           }
         }