aamp-openclaw-plugin 0.1.31 → 0.1.32

package/dist/index.js

@@ -2537,6 +2537,12 @@ 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;
@@ -2614,8 +2620,46 @@ 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" && sessionKey.startsWith(AAMP_SESSION_PREFIX);
+  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}`;
@@ -2856,10 +2900,11 @@ var src_default = {
     }
     function wakeAgentForPendingTask(task) {
       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"} fallbackSession=${fallbackSessionKey}`
+        `[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();
@@ -2879,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",
@@ -3093,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",
@@ -3170,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",