aamp-openclaw-plugin 0.1.15 → 0.1.17

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,60 +16355,12 @@ var src_default = {
       }
     }
     function wakeAgentForPendingTask(task) {
-      const fallback = () => triggerHeartbeatWake(currentSessionKey, `task ${task.taskId}`);
-      const dispatcher = channelRuntime?.reply?.dispatchReplyWithBufferedBlockDispatcher;
+      const sessionKey = dispatchSessionKey();
+      const fallback = () => triggerHeartbeatWake(sessionKey, `task ${task.taskId}`);
       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"} session=${sessionKey}`
       );
-      if (!channelRuntime || !channelCfg || typeof dispatcher !== "function") {
-        fallback();
-        return;
-      }
-      const prompt = [
-        "## New AAMP Task",
-        "",
-        "A new AAMP task just arrived.",
-        "Use the pending AAMP task in system context as the source of truth and handle it now.",
-        "Reply with aamp_send_result or aamp_send_help before responding."
-      ].join("\n");
-      try {
-        void Promise.resolve(dispatcher({
-          ctx: {
-            Body: task.bodyText || task.title,
-            BodyForAgent: prompt,
-            From: task.from,
-            To: agentEmail,
-            SessionKey: `aamp:default:task:${task.taskId}`,
-            AccountId: "default",
-            ChatType: "dm",
-            Provider: "aamp",
-            Surface: "aamp",
-            OriginatingChannel: "aamp",
-            OriginatingTo: task.from,
-            MessageSid: task.messageId || task.taskId,
-            Timestamp: Date.now(),
-            SenderName: task.from,
-            SenderId: task.from,
-            CommandAuthorized: true
-          },
-          cfg: channelCfg,
-          dispatcherOptions: {
-            deliver: async () => {
-            },
-            onError: (err) => {
-              api.logger.error(`[AAMP] Channel dispatch error for task ${task.taskId}: ${err instanceof Error ? err.message : String(err)}`);
-            }
-          }
-        })).then(() => {
-          api.logger.info(`[AAMP] Channel dispatch triggered for task ${task.taskId}`);
-        }).catch((err) => {
-          api.logger.error(`[AAMP] Channel dispatch failed for task ${task.taskId}: ${err.message}`);
-          fallback();
-        });
-      } catch (err) {
-        api.logger.error(`[AAMP] Channel dispatch threw synchronously for task ${task.taskId}: ${err.message}`);
-        fallback();
-      }
+      fallback();
     }
     async function doConnect(identity) {
       if (reconcileTimer) {
@@ -16538,58 +16493,11 @@ Reason: ${result.errorMsg ?? "unknown"}`,
             messageId: "",
             receivedAt: (/* @__PURE__ */ new Date()).toISOString()
           });
-          if (channelRuntime && channelCfg) {
-            const notifyBody = pendingTasks.get(`result:${result.taskId}`);
-            const actionableTasks = [...pendingTasks.entries()].filter(([key]) => !key.startsWith("result:") && !key.startsWith("help:")).map(([, t]) => t);
-            const actionSection = actionableTasks.length > 0 ? `
-
-### Action Required
-You MUST call aamp_send_result to complete the pending task(s):
-${actionableTasks.map((t) => `- Task ID: ${t.taskId} | From: ${t.from} | Title: "${t.title}"`).join("\n")}` : "";
-            const prompt = `## Sub-task Update
-
-${notifyBody?.bodyText ?? "Sub-task completed."}${actionSection}`;
-            channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher({
-              ctx: {
-                Body: `Sub-task result: ${result.taskId}`,
-                BodyForAgent: prompt,
-                From: result.from,
-                To: agentEmail,
-                SessionKey: `aamp:default:${result.from}`,
-                AccountId: "default",
-                ChatType: "dm",
-                Provider: "aamp",
-                Surface: "aamp",
-                OriginatingChannel: "aamp",
-                OriginatingTo: result.from,
-                MessageSid: result.taskId,
-                Timestamp: Date.now(),
-                SenderName: result.from,
-                SenderId: result.from,
-                CommandAuthorized: true
-              },
-              cfg: channelCfg,
-              dispatcherOptions: {
-                deliver: async () => {
-                },
-                onError: (err) => {
-                  api.logger.error(`[AAMP] Channel dispatch error: ${err instanceof Error ? err.message : String(err)}`);
-                }
-              }
-            }).then(() => {
-              api.logger.info(`[AAMP] Channel dispatch completed for sub-task result ${result.taskId}`);
-              pendingTasks.delete(`result:${result.taskId}`);
-            }).catch((err) => {
-              api.logger.error(`[AAMP] Channel dispatch failed: ${err.message}`);
-            });
-          } else {
-            const notifySessionKey = `agent:main:aamp-notify-${Date.now()}`;
-            try {
-              api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: notifySessionKey });
-              api.logger.info(`[AAMP] Heartbeat for sub-task result ${result.taskId}`);
-            } catch (err) {
-              api.logger.warn(`[AAMP] Heartbeat for sub-task result failed: ${err.message}`);
-            }
+          try {
+            api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: dispatchSessionKey() });
+            api.logger.info(`[AAMP] Heartbeat for sub-task result ${result.taskId}`);
+          } catch (err) {
+            api.logger.warn(`[AAMP] Heartbeat for sub-task result failed: ${err.message}`);
           }
         }).catch((err) => {
           api.logger.error(`[AAMP] Sub-task result processing failed: ${err.message}`);
@@ -16619,51 +16527,11 @@ Suggested options: ${help.suggestedOptions.join(", ")}` : ""}`,
           messageId: "",
           receivedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
-        if (channelRuntime && channelCfg) {
-          const notifyBody = pendingTasks.get(`help:${help.taskId}`);
-          const prompt = `## Sub-task Help Request
-
-${notifyBody?.bodyText ?? help.question}`;
-          channelRuntime.reply.dispatchReplyWithBufferedBlockDispatcher({
-            ctx: {
-              Body: `Sub-task help: ${help.taskId}`,
-              BodyForAgent: prompt,
-              From: help.from,
-              To: agentEmail,
-              SessionKey: `aamp:default:${help.from}`,
-              AccountId: "default",
-              ChatType: "dm",
-              Provider: "aamp",
-              Surface: "aamp",
-              OriginatingChannel: "aamp",
-              OriginatingTo: help.from,
-              MessageSid: help.taskId,
-              Timestamp: Date.now(),
-              SenderName: help.from,
-              SenderId: help.from,
-              CommandAuthorized: true
-            },
-            cfg: channelCfg,
-            dispatcherOptions: {
-              deliver: async () => {
-              },
-              onError: (err) => {
-                api.logger.error(`[AAMP] Channel dispatch error (help): ${err instanceof Error ? err.message : String(err)}`);
-              }
-            }
-          }).then(() => {
-            pendingTasks.delete(`help:${help.taskId}`);
-          }).catch((err) => {
-            api.logger.error(`[AAMP] Channel dispatch failed for help: ${err.message}`);
-          });
-        } else {
-          const helpSessionKey = `agent:main:aamp-notify-${Date.now()}`;
-          try {
-            api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: helpSessionKey });
-            api.logger.info(`[AAMP] Heartbeat fallback for sub-task help ${help.taskId}`);
-          } catch (err) {
-            api.logger.warn(`[AAMP] Heartbeat for sub-task help failed: ${err.message}`);
-          }
+        try {
+          api.runtime.system.requestHeartbeatNow({ reason: "wake", sessionKey: dispatchSessionKey() });
+          api.logger.info(`[AAMP] Heartbeat fallback for sub-task help ${help.taskId}`);
+        } catch (err) {
+          api.logger.warn(`[AAMP] Heartbeat for sub-task help failed: ${err.message}`);
         }
       });
       aampClient.on("connected", () => {
@@ -16676,6 +16544,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";