aamp-openclaw-plugin 0.1.35 → 0.1.37

package/README.md

@@ -38,6 +38,7 @@ npm run build
         "enabled": true,
         "config": {
           "aampHost": "https://meshmail.ai",
+          "taskDispatchConcurrency": 10,
           "slug": "openclaw-agent",
           "credentialsFile": "~/.openclaw/extensions/aamp-openclaw-plugin/.credentials.json",
           "senderPolicies": [
@@ -57,6 +58,7 @@ npm run build
 ```
 
 If `senderPolicies` is omitted, all senders are accepted. If set, the dispatch sender must match one policy and all configured dispatch-context rules for that sender must pass.
+`taskDispatchConcurrency` is optional and defaults to `10`.
 
 The plugin also understands:
 

package/dist/chunk-ORTVVAMV.js

@@ -0,0 +1,82 @@
+import { createRequire as __aampCreateRequire } from "module"; const require = __aampCreateRequire(import.meta.url);
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// src/file-store.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+function defaultCredentialsPath() {
+  return join(homedir(), ".openclaw", "extensions", "aamp-openclaw-plugin", ".credentials.json");
+}
+function loadCachedIdentity(file) {
+  const resolved = file ?? defaultCredentialsPath();
+  if (!existsSync(resolved))
+    return null;
+  try {
+    const parsed = JSON.parse(readFileSync(resolved, "utf-8"));
+    if (!parsed.email || !parsed.jmapToken || !parsed.smtpPassword)
+      return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function saveCachedIdentity(identity, file) {
+  const resolved = file ?? defaultCredentialsPath();
+  mkdirSync(dirname(resolved), { recursive: true });
+  writeFileSync(resolved, JSON.stringify(identity, null, 2), "utf-8");
+}
+function ensureDir(dir) {
+  mkdirSync(dir, { recursive: true });
+}
+function readBinaryFile(path) {
+  return readFileSync(path);
+}
+function writeBinaryFile(path, content) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, content);
+}
+
+export {
+  __require,
+  __commonJS,
+  __toESM,
+  defaultCredentialsPath,
+  loadCachedIdentity,
+  saveCachedIdentity,
+  ensureDir,
+  readBinaryFile,
+  writeBinaryFile
+};
+//# sourceMappingURL=chunk-ORTVVAMV.js.map

package/dist/chunk-ORTVVAMV.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/file-store.ts"],
+  "sourcesContent": ["import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'\nimport { dirname, join } from 'node:path'\nimport { homedir } from 'node:os'\n\nexport interface Identity {\n  email: string\n  jmapToken: string\n  smtpPassword: string\n}\n\nexport function defaultCredentialsPath(): string {\n  return join(homedir(), '.openclaw', 'extensions', 'aamp-openclaw-plugin', '.credentials.json')\n}\n\nexport function loadCachedIdentity(file?: string): Identity | null {\n  const resolved = file ?? defaultCredentialsPath()\n  if (!existsSync(resolved)) return null\n  try {\n    const parsed = JSON.parse(readFileSync(resolved, 'utf-8')) as Partial<Identity>\n    if (!parsed.email || !parsed.jmapToken || !parsed.smtpPassword) return null\n    return parsed as Identity\n  } catch {\n    return null\n  }\n}\n\nexport function saveCachedIdentity(identity: Identity, file?: string): void {\n  const resolved = file ?? defaultCredentialsPath()\n  mkdirSync(dirname(resolved), { recursive: true })\n  writeFileSync(resolved, JSON.stringify(identity, null, 2), 'utf-8')\n}\n\nexport function ensureDir(dir: string): void {\n  mkdirSync(dir, { recursive: true })\n}\n\nexport function readBinaryFile(path: string): Buffer {\n  return readFileSync(path)\n}\n\nexport function writeBinaryFile(path: string, content: Uint8Array | Buffer): void {\n  mkdirSync(dirname(path), { recursive: true })\n  writeFileSync(path, content)\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,YAAY,WAAW,cAAc,qBAAqB;AACnE,SAAS,SAAS,YAAY;AAC9B,SAAS,eAAe;AAQjB,SAAS,yBAAiC;AAC/C,SAAO,KAAK,QAAQ,GAAG,aAAa,cAAc,wBAAwB,mBAAmB;AAC/F;AAEO,SAAS,mBAAmB,MAAgC;AACjE,QAAM,WAAW,QAAQ,uBAAuB;AAChD,MAAI,CAAC,WAAW,QAAQ;AAAG,WAAO;AAClC,MAAI;AACF,UAAM,SAAS,KAAK,MAAM,aAAa,UAAU,OAAO,CAAC;AACzD,QAAI,CAAC,OAAO,SAAS,CAAC,OAAO,aAAa,CAAC,OAAO;AAAc,aAAO;AACvE,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,mBAAmB,UAAoB,MAAqB;AAC1E,QAAM,WAAW,QAAQ,uBAAuB;AAChD,YAAU,QAAQ,QAAQ,GAAG,EAAE,WAAW,KAAK,CAAC;AAChD,gBAAc,UAAU,KAAK,UAAU,UAAU,MAAM,CAAC,GAAG,OAAO;AACpE;AAEO,SAAS,UAAU,KAAmB;AAC3C,YAAU,KAAK,EAAE,WAAW,KAAK,CAAC;AACpC;AAEO,SAAS,eAAe,MAAsB;AACnD,SAAO,aAAa,IAAI;AAC1B;AAEO,SAAS,gBAAgB,MAAc,SAAoC;AAChF,YAAU,QAAQ,IAAI,GAAG,EAAE,WAAW,KAAK,CAAC;AAC5C,gBAAc,MAAM,OAAO;AAC7B;",
+  "names": []
+}

package/dist/chunk-W4C7IUCH.js

@@ -0,0 +1,81 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// src/file-store.ts
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+function defaultCredentialsPath() {
+  return join(homedir(), ".openclaw", "extensions", "aamp-openclaw-plugin", ".credentials.json");
+}
+function loadCachedIdentity(file) {
+  const resolved = file ?? defaultCredentialsPath();
+  if (!existsSync(resolved))
+    return null;
+  try {
+    const parsed = JSON.parse(readFileSync(resolved, "utf-8"));
+    if (!parsed.email || !parsed.jmapToken || !parsed.smtpPassword)
+      return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+function saveCachedIdentity(identity, file) {
+  const resolved = file ?? defaultCredentialsPath();
+  mkdirSync(dirname(resolved), { recursive: true });
+  writeFileSync(resolved, JSON.stringify(identity, null, 2), "utf-8");
+}
+function ensureDir(dir) {
+  mkdirSync(dir, { recursive: true });
+}
+function readBinaryFile(path) {
+  return readFileSync(path);
+}
+function writeBinaryFile(path, content) {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, content);
+}
+
+export {
+  __require,
+  __commonJS,
+  __toESM,
+  defaultCredentialsPath,
+  loadCachedIdentity,
+  saveCachedIdentity,
+  ensureDir,
+  readBinaryFile,
+  writeBinaryFile
+};
+//# sourceMappingURL=chunk-W4C7IUCH.js.map

package/dist/chunk-W4C7IUCH.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/file-store.ts"],
+  "sourcesContent": ["import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'\nimport { dirname, join } from 'node:path'\nimport { homedir } from 'node:os'\n\nexport interface Identity {\n  email: string\n  jmapToken: string\n  smtpPassword: string\n}\n\nexport function defaultCredentialsPath(): string {\n  return join(homedir(), '.openclaw', 'extensions', 'aamp-openclaw-plugin', '.credentials.json')\n}\n\nexport function loadCachedIdentity(file?: string): Identity | null {\n  const resolved = file ?? defaultCredentialsPath()\n  if (!existsSync(resolved)) return null\n  try {\n    const parsed = JSON.parse(readFileSync(resolved, 'utf-8')) as Partial<Identity>\n    if (!parsed.email || !parsed.jmapToken || !parsed.smtpPassword) return null\n    return parsed as Identity\n  } catch {\n    return null\n  }\n}\n\nexport function saveCachedIdentity(identity: Identity, file?: string): void {\n  const resolved = file ?? defaultCredentialsPath()\n  mkdirSync(dirname(resolved), { recursive: true })\n  writeFileSync(resolved, JSON.stringify(identity, null, 2), 'utf-8')\n}\n\nexport function ensureDir(dir: string): void {\n  mkdirSync(dir, { recursive: true })\n}\n\nexport function readBinaryFile(path: string): Buffer {\n  return readFileSync(path)\n}\n\nexport function writeBinaryFile(path: string, content: Uint8Array | Buffer): void {\n  mkdirSync(dirname(path), { recursive: true })\n  writeFileSync(path, content)\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,YAAY,WAAW,cAAc,qBAAqB;AACnE,SAAS,SAAS,YAAY;AAC9B,SAAS,eAAe;AAQjB,SAAS,yBAAiC;AAC/C,SAAO,KAAK,QAAQ,GAAG,aAAa,cAAc,wBAAwB,mBAAmB;AAC/F;AAEO,SAAS,mBAAmB,MAAgC;AACjE,QAAM,WAAW,QAAQ,uBAAuB;AAChD,MAAI,CAAC,WAAW,QAAQ;AAAG,WAAO;AAClC,MAAI;AACF,UAAM,SAAS,KAAK,MAAM,aAAa,UAAU,OAAO,CAAC;AACzD,QAAI,CAAC,OAAO,SAAS,CAAC,OAAO,aAAa,CAAC,OAAO;AAAc,aAAO;AACvE,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,mBAAmB,UAAoB,MAAqB;AAC1E,QAAM,WAAW,QAAQ,uBAAuB;AAChD,YAAU,QAAQ,QAAQ,GAAG,EAAE,WAAW,KAAK,CAAC;AAChD,gBAAc,UAAU,KAAK,UAAU,UAAU,MAAM,CAAC,GAAG,OAAO;AACpE;AAEO,SAAS,UAAU,KAAmB;AAC3C,YAAU,KAAK,EAAE,WAAW,KAAK,CAAC;AACpC;AAEO,SAAS,eAAe,MAAsB;AACnD,SAAO,aAAa,IAAI;AAC1B;AAEO,SAAS,gBAAgB,MAAc,SAAoC;AAChF,YAAU,QAAQ,IAAI,GAAG,EAAE,WAAW,KAAK,CAAC;AAC5C,gBAAc,MAAM,OAAO;AAC7B;",
+  "names": []
+}

package/dist/index.js

@@ -421,6 +421,17 @@ var TinyEmitter = class {
     }
     return true;
   }
+  async emitAsync(event, ...args) {
+    const bucket = this.listeners.get(event);
+    if (!bucket || bucket.size === 0)
+      return false;
+    const settled = await Promise.allSettled([...bucket].map((listener) => Promise.resolve(listener(...args))));
+    const rejected = settled.find((result) => result.status === "rejected");
+    if (rejected) {
+      throw rejected.reason;
+    }
+    return true;
+  }
 };
 
 // ../sdk/src/jmap-push.js
@@ -1897,14 +1908,27 @@ function buildRegisteredCommandDispatchPayload(opts) {
     stream: { mode: opts.streamMode ?? "full" }
   };
 }
+var DEFAULT_TASK_DISPATCH_CONCURRENCY = 10;
+function normalizeTaskDispatchConcurrency(value) {
+  if (value == null)
+    return DEFAULT_TASK_DISPATCH_CONCURRENCY;
+  if (!Number.isFinite(value) || !Number.isInteger(value) || value < 1) {
+    throw new Error("taskDispatchConcurrency must be a positive integer");
+  }
+  return value;
+}
 var AampClient = class _AampClient extends TinyEmitter {
   jmapClient;
   smtpSender;
   config;
+  taskDispatchConcurrency;
+  pendingTaskDispatches = [];
+  activeTaskDispatchCount = 0;
   streamAppendQueues = /* @__PURE__ */ new Map();
   constructor(config) {
     super();
     this.config = config;
+    this.taskDispatchConcurrency = normalizeTaskDispatchConcurrency(config.taskDispatchConcurrency);
     const mailboxToken = config.mailboxToken;
     const resolvedBaseUrl = config.baseUrl;
     const derived = deriveMailboxServiceDefaults(config.email, resolvedBaseUrl);
@@ -1940,7 +1964,7 @@ var AampClient = class _AampClient extends TinyEmitter {
       rejectUnauthorized: config.rejectUnauthorized
     });
     this.jmapClient.on("task.dispatch", (task) => {
-      this.emit("task.dispatch", task);
+      this.enqueueTaskDispatch(task);
     });
     this.jmapClient.on("task.cancel", (task) => {
       this.emit("task.cancel", task);
@@ -1993,6 +2017,7 @@ var AampClient = class _AampClient extends TinyEmitter {
       smtpPort: config.smtpPort ?? 587,
       smtpPassword: config.smtpPassword,
       reconnectInterval: config.reconnectInterval,
+      taskDispatchConcurrency: config.taskDispatchConcurrency,
       rejectUnauthorized: config.rejectUnauthorized
     });
   }
@@ -2246,6 +2271,30 @@ var AampClient = class _AampClient extends TinyEmitter {
     }
     return res.json();
   }
+  enqueueTaskDispatch(task) {
+    this.pendingTaskDispatches.push(task);
+    this.drainTaskDispatchQueue();
+  }
+  drainTaskDispatchQueue() {
+    while (this.activeTaskDispatchCount < this.taskDispatchConcurrency && this.pendingTaskDispatches.length > 0) {
+      const nextTask = this.pendingTaskDispatches.shift();
+      if (!nextTask)
+        return;
+      this.activeTaskDispatchCount += 1;
+      void this.runTaskDispatch(nextTask);
+    }
+  }
+  async runTaskDispatch(task) {
+    try {
+      await this.emitAsync("task.dispatch", task);
+    } catch (err) {
+      const error = err instanceof Error ? err : new Error(String(err));
+      this.emit("error", error);
+    } finally {
+      this.activeTaskDispatchCount = Math.max(0, this.activeTaskDispatchCount - 1);
+      this.drainTaskDispatchQueue();
+    }
+  }
   getStreamAppendQueue(streamId) {
     let queue = this.streamAppendQueues.get(streamId);
     if (!queue) {
@@ -2706,6 +2755,24 @@ function isSyntheticPendingKey(taskKey) {
 function isTaskAwaitingHelpReply(task) {
   return task.awaitingHelpReply === true;
 }
+function isConversationalTask(task) {
+  return task.dispatchContext?.source === "feishu";
+}
+function firstDispatchContextValue(context, keys) {
+  if (!context)
+    return void 0;
+  for (const key of keys) {
+    const value = context[key]?.trim();
+    if (value)
+      return value;
+  }
+  return void 0;
+}
+function threadAlreadyTerminal(events) {
+  return (events ?? []).some(
+    (event) => event.intent === "task.result" || event.intent === "task.cancel"
+  );
+}
 function isActionablePendingTask(taskKey, task) {
   return !isSyntheticPendingKey(taskKey) && !isTaskAwaitingHelpReply(task);
 }
@@ -2747,12 +2814,36 @@ function buildOpenClawMainSessionKey(mainKey, config) {
 function buildAampConversationSessionKey(value, config) {
   return buildOpenClawMainSessionKey(`${AAMP_SESSION_PREFIX}default:${value}`, config);
 }
+function buildAampStickySessionKey(dispatchContext, config) {
+  const stickyValue = firstDispatchContextValue(dispatchContext, ["session_key", "conversation_key", "thread_key"]);
+  if (!stickyValue)
+    return void 0;
+  return buildAampConversationSessionKey(`session:${stickyValue}`, config);
+}
 function buildAampTaskSessionKey(taskId, config) {
   return buildAampConversationSessionKey(`task:${taskId}`, config);
 }
 function buildAampWakeSessionKey(kind, id) {
   return `${AAMP_SESSION_PREFIX}wake:${kind}:${id}`;
 }
+function buildSessionKeyForPendingTask(task, config) {
+  return buildAampStickySessionKey(task.dispatchContext, config) ?? buildAampTaskSessionKey(task.taskId, config);
+}
+function buildWakeSessionKeyForPendingTask(task, config) {
+  return buildAampStickySessionKey(task.dispatchContext, config) ?? buildAampWakeSessionKey("task", task.taskId);
+}
+function findPendingEntryForSession(sessionKey, config) {
+  if (typeof sessionKey !== "string" || !isAampSessionKey(sessionKey))
+    return void 0;
+  const requested = buildOpenClawMainSessionKey(stripOpenClawAgentScope(sessionKey), config);
+  const entries = [...pendingTasks.entries()].filter(([key, task]) => isActionablePendingTask(key, task)).filter(([, task]) => buildSessionKeyForPendingTask(task, config) === requested).sort((a, b) => {
+    const rankDiff = priorityRank(a[1].priority) - priorityRank(b[1].priority);
+    if (rankDiff !== 0)
+      return rankDiff;
+    return new Date(a[1].receivedAt).getTime() - new Date(b[1].receivedAt).getTime();
+  });
+  return entries[0];
+}
 function resolvePendingKeyFromSessionKey(sessionKey) {
   if (typeof sessionKey !== "string")
     return void 0;
@@ -2843,6 +2934,7 @@ function queuePendingTask(task) {
     from: task.from,
     title: task.title,
     bodyText: task.bodyText ?? "",
+    dispatchContext: task.dispatchContext,
     threadHistory: task.threadHistory ?? [],
     threadContextText: task.threadContextText ?? "",
     priority: task.priority ?? "normal",
@@ -3025,8 +3117,8 @@ var src_default = {
       api.logger.info(`[AAMP] Directory profile synced${cardText ? " (card text registered)" : ""}`);
     }
     function wakeAgentForPendingTask(task) {
-      const fallbackSessionKey = buildAampWakeSessionKey("task", task.taskId);
-      const openClawSessionKey = buildAampTaskSessionKey(task.taskId, api.config);
+      const fallbackSessionKey = buildWakeSessionKeyForPendingTask(task, api.config);
+      const openClawSessionKey = buildSessionKeyForPendingTask(task, api.config);
       const fallback = () => triggerHeartbeatWake(fallbackSessionKey, `task ${task.taskId}`);
       const dispatcher = channelRuntime?.reply?.dispatchReplyWithBufferedBlockDispatcher;
       api.logger.info(
@@ -3112,13 +3204,14 @@ var src_default = {
         email: identity.email,
         smtpPassword: identity.smtpPassword,
         baseUrl: base,
+        taskDispatchConcurrency: cfg.taskDispatchConcurrency,
         // Local/dev: management-service proxy uses plain HTTP, no TLS cert to verify.
         // Production: set to true when using wss:// with valid certs.
         rejectUnauthorized: false
       });
       aampClient.on("task.dispatch", (task) => {
         api.logger.info(`[AAMP] \u2190 task.dispatch  ${task.taskId}  "${task.title}"  from=${task.from}`);
-        void (async () => {
+        return (async () => {
           try {
             if (terminalTaskIds.has(task.taskId)) {
               api.logger.info(`[AAMP] Skipping already-terminal task ${task.taskId}`);
@@ -3146,6 +3239,11 @@ var src_default = {
                 threadContextText: ""
               };
             });
+            if (threadAlreadyTerminal(hydratedTask.threadHistory)) {
+              rememberTerminalTask(task.taskId);
+              api.logger.info(`[AAMP] Skipping historical task ${task.taskId} because the thread already reached a terminal state`);
+              return;
+            }
             if (!queuePendingTask(hydratedTask)) {
               api.logger.info(`[AAMP] Ignoring already-terminal or expired task ${task.taskId}`);
               return;
@@ -3157,7 +3255,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(buildAampWakeSessionKey("task", task.taskId), `task ${task.taskId}`);
+              triggerHeartbeatWake(buildWakeSessionKeyForPendingTask(pendingTasks.get(task.taskId), api.config), `task ${task.taskId}`);
             }
           }
         })();
@@ -3557,7 +3655,8 @@ ${notifyBody?.bodyText ?? help.question}`;
           }
           return [targetedPendingKey, targetedTask];
         })() : void 0;
-        const nextEntry = targetedPendingKey ? targetedEntry : nextPendingEntry();
+        const sessionScopedEntry = targetedPendingKey ? void 0 : findPendingEntryForSession(ctx?.sessionKey, api.config);
+        const nextEntry = targetedPendingKey ? targetedEntry : sessionScopedEntry ?? nextPendingEntry();
         if (!nextEntry)
           return {};
         const [taskKey, task] = nextEntry;
@@ -3592,19 +3691,45 @@ ${notifyBody?.bodyText ?? help.question}`;
             `   Example: attachments: [{ filename: "file.html", path: "/tmp/aamp-files/file.html" }]`
           ] : []
         ].join("\n") : "";
-        const lines = isNotification ? [
-          `## Sub-task Update`,
+        const dispatchContextLines = task.dispatchContext && Object.keys(task.dispatchContext).length > 0 ? `Dispatch Context:
+${Object.entries(task.dispatchContext).map(([key, value]) => `  - ${key}: ${value}`).join("\n")}` : "";
+        const taskPromptLines = isConversationalTask(task) ? [
+          `## Pending AAMP Conversation Turn`,
           ``,
-          `A sub-task you dispatched has returned a result. Review the information below.`,
-          `If the sub-task included attachments, use aamp_download_attachment to fetch them.`,
+          `This AAMP task came from a chat surface (${task.dispatchContext?.source ?? "unknown"}).`,
+          `Treat it as an ongoing conversation turn, not a one-off work order.`,
+          `Your job is to reply naturally to the user's latest message and keep the conversation moving.`,
+          ``,
+          `### Tool selection rules for chat turns:`,
+          ``,
+          `Use aamp_send_result for normal conversation replies, including:`,
+          `  - greetings, acknowledgements, and small talk ("hi", "hello", "thanks", "got it")`,
+          `  - short follow-up questions that help narrow the user's intent`,
+          `  - direct answers, suggestions, or next-step guidance`,
+          ``,
+          `Use aamp_send_help ONLY when you are truly blocked and cannot produce a meaningful`,
+          `reply without waiting for specific missing information from the human.`,
+          `Do NOT use aamp_send_help just because the message is brief or casual.`,
+          ``,
+          `IMPORTANT: For conversational traffic, replying to "hi" with a natural greeting and an`,
+          `offer to help is CORRECT. Do not reject greetings as invalid tasks.`,
+          ``,
+          `### Sub-task dispatch rules:`,
+          `If you delegate work to another agent via aamp_dispatch_task, you MUST pass`,
+          `parentTaskId: "${task.taskId}" to establish the parent-child relationship.`,
+          `If you need to find a suitable agent first, call aamp_directory_search.`,
           ``,
           `Task ID:  ${task.taskId}`,
-          `Priority: ${task.priority}`,
           `From:     ${task.from}`,
           `Title:    ${task.title}`,
-          task.bodyText ? `
+          dispatchContextLines,
+          task.threadContextText ? `${task.threadContextText}` : "",
+          task.bodyText ? `Latest user message:
 ${task.bodyText}` : "",
-          actionRequiredSection,
+          task.contextLinks.length ? `Context Links:
+${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
+          task.expiresAt ? `Expires: ${task.expiresAt}` : `Expires: none`,
+          `Received: ${task.receivedAt}`,
           otherActionableTasks.length > 0 ? `
 (+${otherActionableTasks.length} more tasks queued)` : ""
         ] : [
@@ -3639,6 +3764,7 @@ ${task.bodyText}` : "",
           `Task ID:  ${task.taskId}`,
           `From:     ${task.from}`,
           `Title:    ${task.title}`,
+          dispatchContextLines,
           task.threadContextText ? `${task.threadContextText}` : "",
           task.bodyText ? `Description:
 ${task.bodyText}` : "",
@@ -3648,7 +3774,23 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           `Received: ${task.receivedAt}`,
           otherActionableTasks.length > 0 ? `
 (+${otherActionableTasks.length} more tasks queued)` : ""
-        ].filter(Boolean).join("\n");
+        ];
+        const lines = isNotification ? [
+          `## Sub-task Update`,
+          ``,
+          `A sub-task you dispatched has returned a result. Review the information below.`,
+          `If the sub-task included attachments, use aamp_download_attachment to fetch them.`,
+          ``,
+          `Task ID:  ${task.taskId}`,
+          `Priority: ${task.priority}`,
+          `From:     ${task.from}`,
+          `Title:    ${task.title}`,
+          task.bodyText ? `
+${task.bodyText}` : "",
+          actionRequiredSection,
+          otherActionableTasks.length > 0 ? `
+(+${otherActionableTasks.length} more tasks queued)` : ""
+        ] : taskPromptLines.filter(Boolean).join("\n");
         return { prependContext: lines };
       },
       { priority: 5 }