aamp-openclaw-plugin 0.1.34 → 0.1.35

package/dist/index.js

@@ -446,6 +446,27 @@ function describeError(err) {
   }
   return parts.join(" | ");
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function shouldRetrySessionFetch(status) {
+  return status === 429 || status >= 500;
+}
+function shouldRetryBlobDownload(status) {
+  return status === 404 || status === 429 || status === 503;
+}
+function rewriteUrlToConfiguredOrigin(rawUrl, configuredBaseUrl) {
+  const parsed = new URL(rawUrl);
+  const configured = new URL(configuredBaseUrl);
+  parsed.protocol = configured.protocol;
+  parsed.username = configured.username;
+  parsed.password = configured.password;
+  parsed.hostname = configured.hostname;
+  parsed.port = configured.port;
+  return parsed.toString();
+}
+var SESSION_FETCH_MAX_ATTEMPTS = 3;
+var SESSION_FETCH_RETRY_BASE_DELAY_MS = 250;
 var JmapPushClient = class extends TinyEmitter {
   ws = null;
   session = null;
@@ -522,18 +543,30 @@ var JmapPushClient = class extends TinyEmitter {
    */
   async fetchSession() {
     const url = `${this.jmapUrl}/.well-known/jmap`;
-    let res;
-    try {
-      res = await fetch(url, {
-        headers: { Authorization: this.getAuthHeader() }
-      });
-    } catch (err) {
-      throw new Error(`fetchSession ${url} failed: ${describeError(err)}`);
-    }
-    if (!res.ok) {
-      throw new Error(`Failed to fetch JMAP session: ${res.status} ${res.statusText}`);
+    let lastError = null;
+    for (let attempt = 1; attempt <= SESSION_FETCH_MAX_ATTEMPTS; attempt += 1) {
+      let res;
+      try {
+        res = await fetch(url, {
+          headers: { Authorization: this.getAuthHeader() }
+        });
+      } catch (err) {
+        lastError = new Error(`fetchSession ${url} failed: ${describeError(err)}`);
+        if (attempt >= SESSION_FETCH_MAX_ATTEMPTS)
+          throw lastError;
+        await sleep(SESSION_FETCH_RETRY_BASE_DELAY_MS * attempt);
+        continue;
+      }
+      if (res.ok) {
+        return res.json();
+      }
+      lastError = new Error(attempt >= SESSION_FETCH_MAX_ATTEMPTS || !shouldRetrySessionFetch(res.status) ? `Failed to fetch JMAP session: ${res.status} ${res.statusText}` : `Failed to fetch JMAP session after ${attempt} attempt(s): ${res.status} ${res.statusText}`);
+      if (attempt >= SESSION_FETCH_MAX_ATTEMPTS || !shouldRetrySessionFetch(res.status)) {
+        throw lastError;
+      }
+      await sleep(SESSION_FETCH_RETRY_BASE_DELAY_MS * attempt);
     }
-    return res.json();
+    throw lastError ?? new Error("Failed to fetch JMAP session");
   }
   /**
    * Perform a JMAP API call
@@ -967,27 +1000,37 @@ var JmapPushClient = class extends TinyEmitter {
     const accountId = this.session.primaryAccounts["urn:ietf:params:jmap:mail"] ?? Object.keys(this.session.accounts)[0];
     let downloadUrl = this.session.downloadUrl ?? `${this.jmapUrl}/jmap/download/{accountId}/{blobId}/{name}`;
     try {
-      const parsed = new URL(downloadUrl);
-      const configured = new URL(this.jmapUrl);
-      parsed.protocol = configured.protocol;
-      parsed.host = configured.host;
-      downloadUrl = parsed.toString();
+      downloadUrl = rewriteUrlToConfiguredOrigin(downloadUrl, this.jmapUrl);
     } catch {
     }
     const safeFilename = filename ?? "attachment";
     downloadUrl = downloadUrl.replace(/\{accountId\}|%7BaccountId%7D/gi, encodeURIComponent(accountId)).replace(/\{blobId\}|%7BblobId%7D/gi, encodeURIComponent(blobId)).replace(/\{name\}|%7Bname%7D/gi, encodeURIComponent(safeFilename)).replace(/\{type\}|%7Btype%7D/gi, "application/octet-stream");
     const maxAttempts = 8;
     let lastStatus = null;
+    let lastError = null;
     for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      const res = await fetch(downloadUrl, {
-        headers: { Authorization: this.getAuthHeader() }
-      });
+      let res;
+      try {
+        res = await fetch(downloadUrl, {
+          headers: { Authorization: this.getAuthHeader() }
+        });
+      } catch (err) {
+        lastError = new Error(`Blob download fetch failed: attempt=${attempt}/${maxAttempts} blobId=${blobId} filename=${filename ?? "attachment"} url=${downloadUrl} error=${describeError(err)}`);
+        if (attempt < maxAttempts) {
+          console.warn(`[AAMP-SDK] blob download retry fetch-error attempt=${attempt}/${maxAttempts} url=${downloadUrl} error=${describeError(err)}`);
+          const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 15e3);
+          await new Promise((r) => setTimeout(r, delay));
+          continue;
+        }
+        console.error(`[AAMP-SDK] blob download fetch-error attempt=${attempt}/${maxAttempts} url=${downloadUrl} error=${describeError(err)}`);
+        throw lastError;
+      }
       lastStatus = res.status;
       if (res.ok) {
         const arrayBuffer = await res.arrayBuffer();
         return Buffer.from(arrayBuffer);
       }
-      if (attempt < maxAttempts && (res.status === 404 || res.status === 429 || res.status === 503)) {
+      if (attempt < maxAttempts && shouldRetryBlobDownload(res.status)) {
         console.warn(`[AAMP-SDK] blob download retry status=${res.status} attempt=${attempt}/${maxAttempts} url=${downloadUrl}`);
         const delay = Math.min(1e3 * Math.pow(2, attempt - 1), 15e3);
         await new Promise((r) => setTimeout(r, delay));
@@ -996,6 +1039,8 @@ var JmapPushClient = class extends TinyEmitter {
       console.error(`[AAMP-SDK] blob download failed status=${res.status} attempt=${attempt}/${maxAttempts} url=${downloadUrl}`);
       throw new Error(`Blob download failed: status=${res.status} attempt=${attempt}/${maxAttempts} blobId=${blobId} filename=${filename ?? "attachment"} url=${downloadUrl}`);
     }
+    if (lastError)
+      throw lastError;
     throw new Error(`Blob download failed after retries: status=${lastStatus ?? "unknown"} attempt=${maxAttempts}/${maxAttempts} blobId=${blobId} filename=${filename ?? "attachment"} url=${downloadUrl}`);
   }
   /**
@@ -1829,6 +1874,29 @@ function renderThreadHistoryForAgent(events, options = {}) {
 }
 
 // ../sdk/src/client.js
+function buildRegisteredCommandDispatchPayload(opts) {
+  const command = opts.command.trim();
+  if (!command) {
+    throw new Error("Registered command name cannot be empty.");
+  }
+  if (opts.args != null && (typeof opts.args !== "object" || Array.isArray(opts.args))) {
+    throw new Error("Registered command args must be an object when provided.");
+  }
+  if (opts.inputs) {
+    for (const input of opts.inputs) {
+      if (!input.slot?.trim() || !input.attachmentName?.trim()) {
+        throw new Error("Each registered command input must include slot and attachmentName.");
+      }
+    }
+  }
+  return {
+    kind: "registered-command/v1",
+    command,
+    ...opts.args && Object.keys(opts.args).length > 0 ? { args: opts.args } : {},
+    ...opts.inputs?.length ? { inputs: opts.inputs } : {},
+    stream: { mode: opts.streamMode ?? "full" }
+  };
+}
 var AampClient = class _AampClient extends TinyEmitter {
   jmapClient;
   smtpSender;
@@ -2032,6 +2100,21 @@ var AampClient = class _AampClient extends TinyEmitter {
   async sendTask(opts) {
     return this.smtpSender.sendTask(opts);
   }
+  async sendRegisteredCommand(opts) {
+    const payload = buildRegisteredCommandDispatchPayload(opts);
+    return this.smtpSender.sendTask({
+      to: opts.to,
+      taskId: opts.taskId,
+      title: opts.title?.trim() || `Registered command: ${payload.command}`,
+      rawBodyText: JSON.stringify(payload, null, 2),
+      priority: opts.priority,
+      expiresAt: opts.expiresAt,
+      contextLinks: opts.contextLinks,
+      dispatchContext: opts.dispatchContext,
+      parentTaskId: opts.parentTaskId,
+      attachments: opts.attachments
+    });
+  }
   async sendCancel(opts) {
     return this.smtpSender.sendCancel(opts);
   }
@@ -2535,8 +2618,6 @@ 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";
@@ -2556,7 +2637,6 @@ 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) {
@@ -2705,80 +2785,6 @@ 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());
 }
@@ -2957,7 +2963,12 @@ var src_default = {
     const cfg = api.config?.channels?.aamp ?? api.pluginConfig ?? {};
     api.registerChannel({
       id: "aamp",
-      meta: { label: "AAMP" },
+      meta: {
+        label: "AAMP",
+        selectionLabel: "AAMP",
+        docsPath: "/channels/aamp",
+        blurb: "AAMP mailbox channel for receiving and replying to tasks over email."
+      },
       capabilities: { chatTypes: ["dm"] },
       config: {
         listAccountIds: () => cfg.aampHost ? ["default"] : [],
@@ -2990,22 +3001,6 @@ 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)
@@ -3174,7 +3169,6 @@ 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(() => {
         });
@@ -3507,13 +3501,6 @@ ${notifyBody?.bodyText ?? help.question}`;
           } catch {
           }
         }
-        if (stopAgentEventSubscription) {
-          try {
-            stopAgentEventSubscription();
-          } catch {
-          }
-          stopAgentEventSubscription = null;
-        }
       }
     });
     api.on("gateway_start", () => {
@@ -3584,10 +3571,6 @@ ${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 ? [
@@ -3811,17 +3794,14 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           state: "completing",
           label: `Sending ${p.status} result`
         });
-        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 });
+        if (p.output) {
+          await appendTaskStream(task.taskId, "text.delta", { text: p.output });
         }
         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,
@@ -3895,18 +3875,37 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           state: "help_needed",
           label: p.blockedReason
         });
+        try {
+          await aampClient.sendHelp({
+            to: task.from,
+            taskId: task.taskId,
+            question: p.question,
+            blockedReason: p.blockedReason,
+            suggestedOptions: p.suggestedOptions ?? [],
+            inReplyTo: task.messageId || void 0
+          });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          await appendTaskStream(task.taskId, "error", {
+            message: `Failed to send help request: ${message}`
+          });
+          await appendTaskStream(task.taskId, "status", {
+            state: "running",
+            label: "Help request failed; task still needs a reply"
+          });
+          api.logger.error(`[AAMP] aamp_send_help failed for ${task.taskId}: ${message}`);
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error: failed to send help request for task ${task.taskId}: ${message}`
+              }
+            ]
+          };
+        }
         await closeTaskStream(task.taskId, {
           reason: "task.help_needed"
         });
-        forgetTaskStreamContext(task.taskId);
-        await aampClient.sendHelp({
-          to: task.from,
-          taskId: task.taskId,
-          question: p.question,
-          blockedReason: p.blockedReason,
-          suggestedOptions: p.suggestedOptions ?? [],
-          inReplyTo: task.messageId || void 0
-        });
         pendingTasks.set(task.taskId, {
           ...task,
           awaitingHelpReply: true