aamp-openclaw-plugin 0.1.22 → 0.1.25

package/bin/aamp-openclaw-plugin.mjs

@@ -62,9 +62,113 @@ function expandHome(pathValue) {
   return pathValue
 }
 
+function stripJsonComments(text) {
+  let result = ''
+  let inString = false
+  let stringQuote = ''
+  let escaped = false
+
+  for (let i = 0; i < text.length; i += 1) {
+    const char = text[i]
+    const next = text[i + 1]
+
+    if (inString) {
+      result += char
+      if (escaped) {
+        escaped = false
+      } else if (char === '\\') {
+        escaped = true
+      } else if (char === stringQuote) {
+        inString = false
+        stringQuote = ''
+      }
+      continue
+    }
+
+    if (char === '"' || char === "'") {
+      inString = true
+      stringQuote = char
+      result += char
+      continue
+    }
+
+    if (char === '/' && next === '/') {
+      i += 2
+      while (i < text.length && text[i] !== '\n') i += 1
+      if (i < text.length) result += text[i]
+      continue
+    }
+
+    if (char === '/' && next === '*') {
+      i += 2
+      while (i < text.length && !(text[i] === '*' && text[i + 1] === '/')) i += 1
+      i += 1
+      continue
+    }
+
+    result += char
+  }
+
+  return result
+}
+
+function stripTrailingCommas(text) {
+  let result = ''
+  let inString = false
+  let stringQuote = ''
+  let escaped = false
+
+  for (let i = 0; i < text.length; i += 1) {
+    const char = text[i]
+
+    if (inString) {
+      result += char
+      if (escaped) {
+        escaped = false
+      } else if (char === '\\') {
+        escaped = true
+      } else if (char === stringQuote) {
+        inString = false
+        stringQuote = ''
+      }
+      continue
+    }
+
+    if (char === '"' || char === "'") {
+      inString = true
+      stringQuote = char
+      result += char
+      continue
+    }
+
+    if (char === ',') {
+      let lookahead = i + 1
+      while (lookahead < text.length && /\s/.test(text[lookahead])) lookahead += 1
+      if (text[lookahead] === '}' || text[lookahead] === ']') {
+        continue
+      }
+    }
+
+    result += char
+  }
+
+  return result
+}
+
+function parseJsonConfig(raw, path) {
+  const normalized = raw.replace(/^\uFEFF/, '')
+  const sanitized = stripTrailingCommas(stripJsonComments(normalized))
+  try {
+    return JSON.parse(sanitized)
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error)
+    throw new Error(`Failed to parse ${path}: ${reason}`)
+  }
+}
+
 function readJsonFile(path) {
   if (!existsSync(path)) return null
-  return JSON.parse(readFileSync(path, 'utf-8'))
+  return parseJsonConfig(readFileSync(path, 'utf-8'), path)
 }
 
 function writeJsonFile(path, value) {
@@ -82,6 +186,7 @@ function ensurePluginConfig(config, pluginConfig, options = {}) {
   if (!next.plugins || typeof next.plugins !== 'object') next.plugins = {}
   if (!Array.isArray(next.plugins.allow)) next.plugins.allow = []
   if (!next.plugins.entries || typeof next.plugins.entries !== 'object') next.plugins.entries = {}
+  if (!next.channels || typeof next.channels !== 'object') next.channels = {}
 
   if (!next.plugins.allow.includes(PLUGIN_ID)) {
     next.plugins.allow.push(PLUGIN_ID)
@@ -89,29 +194,51 @@ function ensurePluginConfig(config, pluginConfig, options = {}) {
 
   const legacyEntry = next.plugins.entries.aamp
   const prevEntry = next.plugins.entries[PLUGIN_ID] ?? legacyEntry
-  const mergedConfig = {
-    ...(prevEntry?.config && typeof prevEntry.config === 'object' ? prevEntry.config : {}),
-    ...pluginConfig,
-  }
-  if (!pluginConfig.senderPolicies) {
-    delete mergedConfig.senderPolicies
-  }
-
   next.plugins.entries[PLUGIN_ID] = {
     enabled: true,
     ...(prevEntry && typeof prevEntry === 'object' ? prevEntry : {}),
-    config: mergedConfig,
   }
 
   if (next.plugins.entries.aamp) {
     delete next.plugins.entries.aamp
   }
 
+  const previousChannelConfig =
+    next.channels.aamp && typeof next.channels.aamp === 'object' ? next.channels.aamp : {}
+  const mergedChannelConfig = {
+    ...previousChannelConfig,
+    ...pluginConfig,
+    enabled: true,
+  }
+  if (!pluginConfig.senderPolicies) {
+    delete mergedChannelConfig.senderPolicies
+  }
+  next.channels.aamp = mergedChannelConfig
+
   next.tools = ensureAampToolAllowlist(next.tools, options)
 
   return next
 }
 
+function ensurePluginInstallRecord(config, installRecord) {
+  const next = config && typeof config === 'object' ? structuredClone(config) : {}
+  if (!next.plugins || typeof next.plugins !== 'object') next.plugins = {}
+  if (!next.plugins.installs || typeof next.plugins.installs !== 'object') next.plugins.installs = {}
+
+  next.plugins.installs[PLUGIN_ID] = {
+    ...(next.plugins.installs[PLUGIN_ID] && typeof next.plugins.installs[PLUGIN_ID] === 'object'
+      ? next.plugins.installs[PLUGIN_ID]
+      : {}),
+    ...installRecord,
+  }
+
+  if (next.plugins.installs.aamp) {
+    delete next.plugins.installs.aamp
+  }
+
+  return next
+}
+
 function ensureAampToolAllowlist(toolsConfig, options = {}) {
   const next = toolsConfig && typeof toolsConfig === 'object' ? structuredClone(toolsConfig) : {}
   const existingAllow = Array.isArray(next.allow) ? next.allow.filter((value) => typeof value === 'string' && value.trim()) : []
@@ -278,7 +405,7 @@ function installPluginFiles(credentialsFile = DEFAULT_CREDENTIALS_FILE) {
     writeFileSync(credentialsPath, existingCredentials)
   }
 
-  return extensionDir
+  return { extensionDir, packageJson, packageRoot }
 }
 
 function restartGateway() {
@@ -371,9 +498,12 @@ async function runInit() {
   const configPath = resolveOpenClawConfigPath()
   const existing = readJsonFile(configPath)
   const previousEntry = existing?.plugins?.entries?.[PLUGIN_ID] ?? existing?.plugins?.entries?.aamp
-  const previousConfig = previousEntry?.config && typeof previousEntry.config === 'object'
-    ? previousEntry.config
-    : null
+  const previousConfig =
+    existing?.channels?.aamp && typeof existing.channels.aamp === 'object'
+      ? existing.channels.aamp
+      : previousEntry?.config && typeof previousEntry.config === 'object'
+        ? previousEntry.config
+        : null
   const previousCredentialsFile = previousConfig?.credentialsFile || DEFAULT_CREDENTIALS_FILE
   const previousSlug = previousConfig?.slug || 'openclaw-agent'
 
@@ -466,10 +596,10 @@ async function runInit() {
   }
 
   output.write('\nInstalling OpenClaw plugin files...\n')
-  const extensionDir = installPluginFiles(previousCredentialsFile)
+  const { extensionDir, packageJson, packageRoot } = installPluginFiles(previousCredentialsFile)
 
   const toolPolicyPlan = planToolPolicyUpdate(existing?.tools, { includeCodingBaseline })
-  const next = ensurePluginConfig(existing, {
+  let next = ensurePluginConfig(existing, {
     aampHost,
     slug,
     credentialsFile: DEFAULT_CREDENTIALS_FILE,
@@ -478,6 +608,20 @@ async function runInit() {
     includeCodingBaseline,
   })
 
+  const now = new Date().toISOString()
+  next = ensurePluginInstallRecord(next, {
+    source: 'npm',
+    spec: packageJson?.name || PLUGIN_ID,
+    sourcePath: packageRoot,
+    installPath: extensionDir,
+    version: packageJson?.version || '0.0.0',
+    resolvedName: packageJson?.name || PLUGIN_ID,
+    resolvedVersion: packageJson?.version || '0.0.0',
+    resolvedSpec: `${packageJson?.name || PLUGIN_ID}@${packageJson?.version || '0.0.0'}`,
+    installedAt: now,
+    resolvedAt: now,
+  })
+
   writeJsonFile(configPath, next)
 
   const identityResult = await ensureMailboxIdentity({
@@ -496,6 +640,8 @@ async function runInit() {
       '',
       'Configured plugin entry:',
       `  plugins.entries["${PLUGIN_ID}"]`,
+      `  plugins.installs["${PLUGIN_ID}"]`,
+      `  channels.aamp.enabled: ${next.channels?.aamp?.enabled === true ? 'true' : 'false'}`,
       `  aampHost: ${aampHost}`,
       `  credentialsFile: ${DEFAULT_CREDENTIALS_FILE}`,
       `  senderPolicies: ${senderPolicies ? JSON.stringify(senderPolicies) : '(allow all)'}`,

package/dist/index.js

@@ -2,7 +2,9 @@
 import WebSocket from "ws";
 
 // ../sdk/src/types.ts
+var AAMP_PROTOCOL_VERSION = "1.0";
 var AAMP_HEADER = {
+  VERSION: "X-AAMP-Version",
   INTENT: "X-AAMP-Intent",
   TASK_ID: "X-AAMP-TaskId",
   TIMEOUT: "X-AAMP-Timeout",
@@ -122,6 +124,7 @@ function parseAampHeaders(meta) {
   const headers = normalizeHeaders(meta.headers);
   const intent = getAampHeader(headers, AAMP_HEADER.INTENT);
   const taskId = getAampHeader(headers, AAMP_HEADER.TASK_ID);
+  const protocolVersion = getAampHeader(headers, AAMP_HEADER.VERSION) ?? AAMP_PROTOCOL_VERSION;
   if (!intent || !taskId)
     return null;
   const from = meta.from.replace(/^<|>$/g, "");
@@ -135,6 +138,7 @@ function parseAampHeaders(meta) {
     );
     const parentTaskId = getAampHeader(headers, AAMP_HEADER.PARENT_TASK_ID);
     const dispatch = {
+      protocolVersion,
       intent: "task.dispatch",
       taskId,
       title: decodedSubject.replace(/^\[AAMP Task\]\s*/, "").trim() || "Untitled Task",
@@ -159,6 +163,7 @@ function parseAampHeaders(meta) {
       getAampHeader(headers, AAMP_HEADER.STRUCTURED_RESULT)
     );
     const result = {
+      protocolVersion,
       intent: "task.result",
       taskId,
       status,
@@ -171,12 +176,13 @@ function parseAampHeaders(meta) {
     };
     return result;
   }
-  if (intent === "task.help") {
+  if (intent === "task.help_needed" || intent === "task.help") {
     const question = getAampHeader(headers, AAMP_HEADER.QUESTION) ?? "";
     const blockedReason = getAampHeader(headers, AAMP_HEADER.BLOCKED_REASON) ?? "";
     const suggestedOptionsStr = getAampHeader(headers, AAMP_HEADER.SUGGESTED_OPTIONS) ?? "";
     const help = {
-      intent: "task.help",
+      protocolVersion,
+      intent: "task.help_needed",
       taskId,
       question: decodeMimeEncodedWords(question),
       blockedReason: decodeMimeEncodedWords(blockedReason),
@@ -189,6 +195,7 @@ function parseAampHeaders(meta) {
   }
   if (intent === "task.ack") {
     const ack = {
+      protocolVersion,
       intent: "task.ack",
       taskId,
       from,
@@ -201,6 +208,7 @@ function parseAampHeaders(meta) {
 }
 function buildDispatchHeaders(params) {
   const headers = {
+    [AAMP_HEADER.VERSION]: AAMP_PROTOCOL_VERSION,
     [AAMP_HEADER.INTENT]: "task.dispatch",
     [AAMP_HEADER.TASK_ID]: params.taskId
   };
@@ -221,12 +229,14 @@ function buildDispatchHeaders(params) {
 }
 function buildAckHeaders(opts) {
   return {
+    [AAMP_HEADER.VERSION]: AAMP_PROTOCOL_VERSION,
     [AAMP_HEADER.INTENT]: "task.ack",
     [AAMP_HEADER.TASK_ID]: opts.taskId
   };
 }
 function buildResultHeaders(params) {
   const headers = {
+    [AAMP_HEADER.VERSION]: AAMP_PROTOCOL_VERSION,
     [AAMP_HEADER.INTENT]: "task.result",
     [AAMP_HEADER.TASK_ID]: params.taskId,
     [AAMP_HEADER.STATUS]: params.status,
@@ -243,7 +253,8 @@ function buildResultHeaders(params) {
 }
 function buildHelpHeaders(params) {
   return {
-    [AAMP_HEADER.INTENT]: "task.help",
+    [AAMP_HEADER.VERSION]: AAMP_PROTOCOL_VERSION,
+    [AAMP_HEADER.INTENT]: "task.help_needed",
     [AAMP_HEADER.TASK_ID]: params.taskId,
     [AAMP_HEADER.QUESTION]: params.question,
     [AAMP_HEADER.BLOCKED_REASON]: params.blockedReason,
@@ -493,7 +504,7 @@ var JmapPushClient = class extends TinyEmitter {
    * Process a received email.
    *
    * Priority:
-   * 1. If X-AAMP-Intent is present → emit typed AAMP event (task.dispatch / task.result / task.help)
+   * 1. If X-AAMP-Intent is present → emit typed AAMP event (task.dispatch / task.result / task.help_needed)
    * 2. If In-Reply-To is present → emit 'reply' event so the application layer can
    *    resolve the thread (inReplyTo → taskId via Redis/DB) and handle human replies.
    * 3. Otherwise → ignore (not an AAMP-related email)
@@ -541,7 +552,8 @@ var JmapPushClient = class extends TinyEmitter {
         case "task.result":
           this.emit("task.result", aampMsg);
           break;
-        case "task.help":
+        case "task.help_needed":
+          this.emit("task.help_needed", aampMsg);
           this.emit("task.help", aampMsg);
           break;
         case "task.ack":
@@ -1240,7 +1252,8 @@ var AampClient = class extends TinyEmitter {
     this.jmapClient.on("task.result", (result) => {
       this.emit("task.result", result);
     });
-    this.jmapClient.on("task.help", (help) => {
+    this.jmapClient.on("task.help_needed", (help) => {
+      this.emit("task.help_needed", help);
       this.emit("task.help", help);
     });
     this.jmapClient.on("task.ack", (ack) => {
@@ -1523,7 +1536,7 @@ var src_default = {
   },
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   register(api) {
-    const cfg = api.pluginConfig ?? {};
+    const cfg = api.config?.channels?.aamp ?? api.pluginConfig ?? {};
     api.registerChannel({
       id: "aamp",
       meta: { label: "AAMP" },
@@ -1803,8 +1816,8 @@ ${notifyBody?.bodyText ?? "Sub-task completed."}${actionSection}`;
           api.logger.error(`[AAMP] Sub-task result processing failed: ${err.message}`);
         });
       });
-      aampClient.on("task.help", (help) => {
-        api.logger.info(`[AAMP] \u2190 task.help  ${help.taskId}  question="${help.question}"  from=${help.from}`);
+      aampClient.on("task.help_needed", (help) => {
+        api.logger.info(`[AAMP] \u2190 task.help_needed  ${help.taskId}  question="${help.question}"  from=${help.from}`);
         const waiter = waitingDispatches.get(help.taskId);
         if (waiter) {
           waitingDispatches.delete(help.taskId);
@@ -2264,7 +2277,7 @@ ${task.contextLinks.map((l) => `  - ${l}`).join("\n")}` : "",
           suggestedOptions: p.suggestedOptions ?? [],
           inReplyTo: task.messageId || void 0
         });
-        api.logger.info(`[AAMP] \u2192 task.help  ${task.taskId}`);
+        api.logger.info(`[AAMP] \u2192 task.help_needed  ${task.taskId}`);
         return {
           content: [
             {
@@ -2458,7 +2471,14 @@ Question: ${h.question}`,
           return { content: [{ type: "text", text: "Error: email parameter is required" }] };
         }
         try {
-          const res = await fetch(`${base}/api/aamp-check?email=${encodeURIComponent(email)}`);
+          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 res = await fetch(`${base}${apiUrl}?action=aamp.mailbox.check&email=${encodeURIComponent(email)}`);
           if (!res.ok)
             throw new Error(`HTTP ${res.status}`);
           const data = await res.json();