aamp-openclaw-plugin 0.1.37 → 0.1.38

package/bin/aamp-openclaw-plugin.mjs

@@ -8,6 +8,7 @@ import { stdin as input, stdout as output, stderr } from 'node:process'
 import { spawnSync } from 'node:child_process'
 import { createRequire } from 'node:module'
 import { fileURLToPath } from 'node:url'
+import { AampClient } from 'aamp-sdk'
 
 const PLUGIN_ID = 'aamp-openclaw-plugin'
 const DEFAULT_AAMP_HOST = 'https://meshmail.ai'
@@ -444,50 +445,15 @@ export async function ensureMailboxIdentity({ aampHost, slug, credentialsFile })
     }
   }
 
-  const base = normalizeBaseUrl(aampHost)
-  const discoveryRes = await fetch(`${base}/.well-known/aamp`)
-  if (!discoveryRes.ok) {
-    const text = await discoveryRes.text().catch(() => '')
-    throw new Error(`AAMP discovery failed (${discoveryRes.status}): ${text || discoveryRes.statusText}`)
-  }
-  const discovery = await discoveryRes.json()
-  const apiUrl = discovery?.api?.url
-  if (!apiUrl) {
-    throw new Error('AAMP discovery did not return api.url')
-  }
-  const apiBase = new URL(apiUrl, `${base}/`).toString()
-
-  const registerRes = await fetch(`${apiBase}?action=aamp.mailbox.register`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      slug,
-      description: 'OpenClaw AAMP agent node',
-    }),
+  const credData = await AampClient.registerMailbox({
+    aampHost: normalizeBaseUrl(aampHost),
+    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 code = registerData?.registrationCode
-  if (!code) {
-    throw new Error('AAMP self-register succeeded but no registrationCode was returned')
-  }
-
-  const credRes = await fetch(`${apiBase}?action=aamp.mailbox.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 identity = {
     email: credData?.email,
-    mailboxToken: credData?.mailbox?.token ?? credData?.jmap?.token,
-    smtpPassword: credData?.smtp?.password,
+    mailboxToken: credData?.mailboxToken,
+    smtpPassword: credData?.smtpPassword,
   }
 
   if (!identity.email || !identity.mailboxToken || !identity.smtpPassword) {

package/dist/index.js

@@ -1,12 +1,13 @@
-// ../sdk/src/jmap-push.js
+// ../sdk/dist/jmap-push.js
 import WebSocket from "ws";
 
-// ../sdk/src/types.js
+// ../sdk/dist/types.js
 var AAMP_PROTOCOL_VERSION = "1.1";
 var AAMP_HEADER = {
   VERSION: "X-AAMP-Version",
   INTENT: "X-AAMP-Intent",
   TASK_ID: "X-AAMP-TaskId",
+  SESSION_KEY: "X-AAMP-Session-Key",
   CONTEXT_LINKS: "X-AAMP-ContextLinks",
   DISPATCH_CONTEXT: "X-AAMP-Dispatch-Context",
   PRIORITY: "X-AAMP-Priority",
@@ -23,7 +24,7 @@ var AAMP_HEADER = {
   CARD_SUMMARY: "X-AAMP-Card-Summary"
 };
 
-// ../sdk/src/parser.js
+// ../sdk/dist/parser.js
 function normalizeBodyText(value) {
   return value?.replace(/\r\n/g, "\n").trim() ?? "";
 }
@@ -171,6 +172,7 @@ function parseAampHeaders(meta) {
   if (intent === "task.dispatch") {
     const contextLinksStr = getAampHeader(headers, AAMP_HEADER.CONTEXT_LINKS) ?? "";
     const dispatchContext = parseDispatchContextHeader(getAampHeader(headers, AAMP_HEADER.DISPATCH_CONTEXT));
+    const sessionKey = getAampHeader(headers, AAMP_HEADER.SESSION_KEY);
     const parentTaskId = getAampHeader(headers, AAMP_HEADER.PARENT_TASK_ID);
     const priority = getAampHeader(headers, AAMP_HEADER.PRIORITY) ?? "normal";
     const expiresAt = getAampHeader(headers, AAMP_HEADER.EXPIRES_AT);
@@ -178,6 +180,7 @@ function parseAampHeaders(meta) {
       protocolVersion,
       intent: "task.dispatch",
       taskId,
+      ...sessionKey ? { sessionKey } : {},
       title: decodedSubject.replace(/^\[AAMP Task\]\s*/, "").trim() || "Untitled Task",
       priority: priority === "urgent" || priority === "high" ? priority : "normal",
       ...expiresAt ? { expiresAt } : {},
@@ -310,6 +313,9 @@ function buildDispatchHeaders(params) {
   if (params.expiresAt) {
     headers[AAMP_HEADER.EXPIRES_AT] = params.expiresAt;
   }
+  if (params.sessionKey?.trim()) {
+    headers[AAMP_HEADER.SESSION_KEY] = params.sessionKey.trim();
+  }
   if (params.contextLinks.length > 0) {
     headers[AAMP_HEADER.CONTEXT_LINKS] = params.contextLinks.join(",");
   }
@@ -381,7 +387,7 @@ function buildCardResponseHeaders(params) {
   };
 }
 
-// ../sdk/src/tiny-emitter.js
+// ../sdk/dist/tiny-emitter.js
 var TinyEmitter = class {
   listeners = /* @__PURE__ */ new Map();
   onceWrappers = /* @__PURE__ */ new WeakMap();
@@ -434,7 +440,7 @@ var TinyEmitter = class {
   }
 };
 
-// ../sdk/src/jmap-push.js
+// ../sdk/dist/jmap-push.js
 function describeError(err) {
   if (!(err instanceof Error))
     return String(err);
@@ -1114,7 +1120,7 @@ var JmapPushClient = class extends TinyEmitter {
   }
 };
 
-// ../sdk/src/smtp-sender.js
+// ../sdk/dist/smtp-sender.js
 import { createTransport } from "nodemailer";
 import { randomUUID } from "crypto";
 var sanitize = (s) => s.replace(/[\r\n]/g, " ").trim();
@@ -1372,7 +1378,7 @@ var SmtpSender = class _SmtpSender {
       from: this.config.user,
       to: opts.to,
       subject: `[AAMP Task] ${sanitize(opts.title)}`,
-      text: [
+      text: opts.rawBodyText ?? [
         `Task: ${opts.title}`,
         `Task ID: ${taskId}`,
         `Priority: ${opts.priority ?? "normal"}`,
@@ -1440,7 +1446,7 @@ ${opts.contextLinks.map((l) => `  ${l}`).join("\n")}` : "",
       from: this.config.user,
       to: opts.to,
       subject: `[AAMP Result] Task ${opts.taskId} \u2014 ${opts.status}`,
-      text: [
+      text: opts.rawBodyText ?? [
         `AAMP Task Result`,
         ``,
         `Task ID: ${opts.taskId}`,
@@ -1514,7 +1520,7 @@ Error: ${opts.errorMsg}` : ""
       from: this.config.user,
       to: opts.to,
       subject: `[AAMP Help] Task ${opts.taskId} needs assistance`,
-      text: [
+      text: opts.rawBodyText ?? [
         `AAMP Task Help Request`,
         ``,
         `Task ID: ${opts.taskId}`,
@@ -1830,7 +1836,7 @@ Stream ID: ${opts.streamId}`,
   }
 };
 
-// ../sdk/src/thread.js
+// ../sdk/dist/thread.js
 function singleLine(value, maxLength = 220) {
   const normalized = (value ?? "").replace(/\s+/g, " ").trim();
   if (!normalized)
@@ -1884,7 +1890,7 @@ function renderThreadHistoryForAgent(events, options = {}) {
   ].join("\n");
 }
 
-// ../sdk/src/client.js
+// ../sdk/dist/client.js
 function buildRegisteredCommandDispatchPayload(opts) {
   const command = opts.command.trim();
   if (!command) {
@@ -2088,6 +2094,22 @@ var AampClient = class _AampClient extends TinyEmitter {
       baseUrl: base
     };
   }
+  static async checkMailbox(opts) {
+    const base = opts.aampHost.replace(/\/$/, "");
+    const res = await _AampClient.callDiscoveredApi(base, {
+      action: "aamp.mailbox.check",
+      query: { email: opts.email }
+    });
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      throw new Error(`Mailbox check failed: ${res.status} ${body || res.statusText}`);
+    }
+    const payload = await res.json();
+    return {
+      aamp: Boolean(payload.aamp),
+      ...payload.domain ? { domain: payload.domain } : {}
+    };
+  }
   // =====================================================
   // Lifecycle
   // =====================================================
@@ -2134,6 +2156,7 @@ var AampClient = class _AampClient extends TinyEmitter {
       rawBodyText: JSON.stringify(payload, null, 2),
       priority: opts.priority,
       expiresAt: opts.expiresAt,
+      sessionKey: opts.sessionKey,
       contextLinks: opts.contextLinks,
       dispatchContext: opts.dispatchContext,
       parentTaskId: opts.parentTaskId,
@@ -2756,17 +2779,8 @@ 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;
+  const source = task.dispatchContext?.source?.trim().toLowerCase();
+  return source === "feishu" || source === "wechat";
 }
 function threadAlreadyTerminal(events) {
   return (events ?? []).some(
@@ -2814,8 +2828,8 @@ 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"]);
+function buildAampStickySessionKey(sessionKey, config) {
+  const stickyValue = sessionKey?.trim();
   if (!stickyValue)
     return void 0;
   return buildAampConversationSessionKey(`session:${stickyValue}`, config);
@@ -2827,10 +2841,10 @@ function buildAampWakeSessionKey(kind, id) {
   return `${AAMP_SESSION_PREFIX}wake:${kind}:${id}`;
 }
 function buildSessionKeyForPendingTask(task, config) {
-  return buildAampStickySessionKey(task.dispatchContext, config) ?? buildAampTaskSessionKey(task.taskId, config);
+  return buildAampStickySessionKey(task.sessionKey, config) ?? buildAampTaskSessionKey(task.taskId, config);
 }
 function buildWakeSessionKeyForPendingTask(task, config) {
-  return buildAampStickySessionKey(task.dispatchContext, config) ?? buildAampWakeSessionKey("task", task.taskId);
+  return buildAampStickySessionKey(task.sessionKey, config) ?? buildAampWakeSessionKey("task", task.taskId);
 }
 function findPendingEntryForSession(sessionKey, config) {
   if (typeof sessionKey !== "string" || !isAampSessionKey(sessionKey))
@@ -2952,39 +2966,15 @@ function queuePendingTask(task) {
 }
 async function registerNode(cfg) {
   const slug = (cfg.slug ?? "openclaw-agent").toLowerCase().replace(/[\s_]+/g, "-").replace(/[^a-z0-9-]/g, "");
-  const base = baseUrl(cfg.aampHost);
-  const discoveryRes = await fetch(`${base}/.well-known/aamp`);
-  if (!discoveryRes.ok) {
-    throw new Error(`AAMP discovery failed (${discoveryRes.status}): ${discoveryRes.statusText}`);
-  }
-  const discovery = await discoveryRes.json();
-  const apiUrl = discovery.api?.url;
-  if (!apiUrl) {
-    throw new Error("AAMP discovery did not return api.url");
-  }
-  const apiBase = new URL(apiUrl, `${base}/`).toString();
-  const res = await fetch(`${apiBase}?action=aamp.mailbox.register`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ slug, description: "OpenClaw AAMP agent node" })
+  const credData = await AampClient.registerMailbox({
+    aampHost: cfg.aampHost,
+    slug,
+    description: "OpenClaw AAMP agent node"
   });
-  if (!res.ok) {
-    const err = await res.json().catch(() => ({}));
-    throw new Error(`AAMP registration failed (${res.status}): ${err.error ?? res.statusText}`);
-  }
-  const regData = await res.json();
-  const credRes = await fetch(
-    `${apiBase}?action=aamp.mailbox.credentials&code=${encodeURIComponent(regData.registrationCode)}`
-  );
-  if (!credRes.ok) {
-    const err = await credRes.json().catch(() => ({}));
-    throw new Error(`AAMP credential exchange failed (${credRes.status}): ${err.error ?? credRes.statusText}`);
-  }
-  const credData = await credRes.json();
   return {
     email: credData.email,
-    mailboxToken: credData.mailbox.token,
-    smtpPassword: credData.smtp.password
+    mailboxToken: credData.mailboxToken,
+    smtpPassword: credData.smtpPassword
   };
 }
 async function resolveIdentity(cfg) {
@@ -4207,17 +4197,9 @@ ${lines.join("\n")}`
               const dir = "/tmp/aamp-files";
               ensureDir(dir);
               const downloaded = [];
-              const base = baseUrl(cfg.aampHost);
-              const identity = loadCachedIdentity(cfg.credentialsFile ?? defaultCredentialsPath());
-              const authHeader = identity ? `Basic ${Buffer.from(identity.email + ":" + identity.smtpPassword).toString("base64")}` : "";
               for (const att of r.attachments) {
                 try {
-                  const dlUrl = `${base}/jmap/download/n/${encodeURIComponent(att.blobId)}/${encodeURIComponent(att.filename)}?accept=application/octet-stream`;
-                  api.logger.info(`[AAMP] Fetching ${dlUrl}`);
-                  const dlRes = await fetch(dlUrl, { headers: { Authorization: authHeader } });
-                  if (!dlRes.ok)
-                    throw new Error(`HTTP ${dlRes.status}`);
-                  const buffer = Buffer.from(await dlRes.arrayBuffer());
+                  const buffer = await aampClient.downloadBlob(att.blobId, att.filename);
                   const filepath = `${dir}/${att.filename}`;
                   writeBinaryFile(filepath, buffer);
                   downloaded.push(`${att.filename} (${(buffer.length / 1024).toFixed(1)} KB) \u2192 ${filepath}`);
@@ -4289,18 +4271,10 @@ Question: ${h.question}`,
           return { content: [{ type: "text", text: "Error: email parameter is required" }] };
         }
         try {
-          const discoveryRes = await fetch(`${base}/.well-known/aamp`);
-          if (!discoveryRes.ok)
-            throw new Error(`HTTP ${discoveryRes.status}`);
-          const discovery = await discoveryRes.json();
-          const apiUrl = discovery.api?.url;
-          if (!apiUrl)
-            throw new Error("AAMP discovery did not return api.url");
-          const apiBase = new URL(apiUrl, `${base}/`).toString();
-          const res = await fetch(`${apiBase}?action=aamp.mailbox.check&email=${encodeURIComponent(email)}`);
-          if (!res.ok)
-            throw new Error(`HTTP ${res.status}`);
-          const data = await res.json();
+          const data = await AampClient.checkMailbox({
+            aampHost: base,
+            email
+          });
           return {
             content: [{
               type: "text",