aamp-openclaw-plugin 0.1.14 → 0.1.16

package/bin/aamp-openclaw-plugin.mjs

@@ -175,6 +175,28 @@ function restartGateway() {
   }
 }
 
+async function fetchJson(url, init, stepLabel) {
+  let res
+  try {
+    res = await fetch(url, init)
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`${stepLabel} failed for ${url}: ${message}`)
+  }
+
+  if (!res.ok) {
+    const text = await res.text().catch(() => '')
+    throw new Error(`${stepLabel} failed (${res.status}) for ${url}: ${text || res.statusText}`)
+  }
+
+  try {
+    return await res.json()
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`${stepLabel} returned invalid JSON for ${url}: ${message}`)
+  }
+}
+
 async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   const resolvedCreds = expandHome(credentialsFile)
   if (existsSync(resolvedCreds)) {
@@ -182,33 +204,30 @@ async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   }
 
   const base = normalizeBaseUrl(aampHost)
-  const registerRes = await fetch(`${base}/api/nodes/self-register`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      slug,
-      description: 'OpenClaw AAMP agent node',
-    }),
-  })
-
-  if (!registerRes.ok) {
-    const text = await registerRes.text().catch(() => '')
-    throw new Error(`AAMP self-register failed (${registerRes.status}): ${text || registerRes.statusText}`)
-  }
-
-  const registerData = await registerRes.json()
+  const registerUrl = `${base}/api/nodes/self-register`
+  const registerData = await fetchJson(
+    registerUrl,
+    {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        slug,
+        description: 'OpenClaw AAMP agent node',
+      }),
+    },
+    'AAMP self-register',
+  )
   const code = registerData?.registrationCode
   if (!code) {
     throw new Error('AAMP self-register succeeded but no registrationCode was returned')
   }
 
-  const credRes = await fetch(`${base}/api/nodes/credentials?code=${encodeURIComponent(code)}`)
-  if (!credRes.ok) {
-    const text = await credRes.text().catch(() => '')
-    throw new Error(`AAMP credential exchange failed (${credRes.status}): ${text || credRes.statusText}`)
-  }
-
-  const credData = await credRes.json()
+  const credUrl = `${base}/api/nodes/credentials?code=${encodeURIComponent(code)}`
+  const credData = await fetchJson(
+    credUrl,
+    undefined,
+    'AAMP credential exchange',
+  )
   const identity = {
     email: credData?.email,
     jmapToken: credData?.jmap?.token,

package/dist/index.js

@@ -16222,6 +16222,9 @@ var transportMonitorTimer = null;
 var currentSessionKey = "agent:main:main";
 var channelRuntime = null;
 var channelCfg = null;
+function dispatchSessionKey() {
+  return currentSessionKey || "agent:main:main";
+}
 function logTransportState(api, mode, email, previousMode) {
   if (mode === previousMode)
     return;
@@ -16352,10 +16355,11 @@ var src_default = {
       }
     }
     function wakeAgentForPendingTask(task) {
-      const fallback = () => triggerHeartbeatWake(currentSessionKey, `task ${task.taskId}`);
+      const sessionKey = dispatchSessionKey();
+      const fallback = () => triggerHeartbeatWake(sessionKey, `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=${sessionKey}`
       );
       if (!channelRuntime || !channelCfg || typeof dispatcher !== "function") {
         fallback();
@@ -16369,13 +16373,24 @@ var src_default = {
         "Reply with aamp_send_result or aamp_send_help before responding."
       ].join("\n");
       try {
+        const startedAt = Date.now();
+        let settled = false;
+        const fallbackTimer = setTimeout(() => {
+          if (settled || !pendingTasks.has(task.taskId))
+            return;
+          api.logger.warn(
+            `[AAMP] Channel dispatch still pending after ${Date.now() - startedAt}ms for task ${task.taskId} \u2014 triggering heartbeat fallback`
+          );
+          fallback();
+        }, 2e3);
+        api.logger.info(`[AAMP] Channel dispatch starting for task ${task.taskId}`);
         void Promise.resolve(dispatcher({
           ctx: {
             Body: task.bodyText || task.title,
             BodyForAgent: prompt,
             From: task.from,
             To: agentEmail,
-            SessionKey: `aamp:default:task:${task.taskId}`,
+            SessionKey: sessionKey,
             AccountId: "default",
             ChatType: "dm",
             Provider: "aamp",
@@ -16397,8 +16412,14 @@ var src_default = {
             }
           }
         })).then(() => {
-          api.logger.info(`[AAMP] Channel dispatch triggered for task ${task.taskId}`);
+          settled = true;
+          clearTimeout(fallbackTimer);
+          api.logger.info(
+            `[AAMP] Channel dispatch triggered for task ${task.taskId} after ${Date.now() - startedAt}ms`
+          );
         }).catch((err) => {
+          settled = true;
+          clearTimeout(fallbackTimer);
           api.logger.error(`[AAMP] Channel dispatch failed for task ${task.taskId}: ${err.message}`);
           fallback();
         });
@@ -16555,7 +16576,7 @@ ${notifyBody?.bodyText ?? "Sub-task completed."}${actionSection}`;
                 BodyForAgent: prompt,
                 From: result.from,
                 To: agentEmail,
-                SessionKey: `aamp:default:${result.from}`,
+                SessionKey: dispatchSessionKey(),
                 AccountId: "default",
                 ChatType: "dm",
                 Provider: "aamp",
@@ -16630,7 +16651,7 @@ ${notifyBody?.bodyText ?? help.question}`;
               BodyForAgent: prompt,
               From: help.from,
               To: agentEmail,
-              SessionKey: `aamp:default:${help.from}`,
+              SessionKey: dispatchSessionKey(),
               AccountId: "default",
               ChatType: "dm",
               Provider: "aamp",
@@ -16676,6 +16697,10 @@ ${notifyBody?.bodyText ?? help.question}`;
       });
       aampClient.on("disconnected", (reason) => {
         lastDisconnectReason = reason;
+        if (aampClient?.isUsingPollingFallback()) {
+          lastTransportMode = "polling";
+          return;
+        }
         if (lastTransportMode !== "disconnected") {
           api.logger.warn(`[AAMP] Disconnected: ${reason} (will auto-reconnect)`);
           lastTransportMode = "disconnected";