aamp-openclaw-plugin 0.1.26 → 0.1.28

package/README.md

@@ -57,3 +57,17 @@ 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.
+
+The plugin also understands:
+
+- dispatch priority via `X-AAMP-Priority`
+- dispatch expiry via `X-AAMP-Expires-At`
+- sender-side cancellation via `task.cancel`
+
+When multiple tasks are pending locally, the plugin schedules them in this order:
+
+1. `urgent`
+2. `high`
+3. `normal`
+
+Within the same priority, tasks are processed FIFO by receive time. On startup, the plugin reconciles recent mailbox history so that still-valid tasks can be recovered after the agent was offline.

package/bin/aamp-openclaw-plugin.mjs

@@ -43,19 +43,19 @@ const AAMP_PLUGIN_TOOL_ALLOWLIST = [
   'aamp_download_attachment',
 ]
 
-function resolveOpenClawHome() {
+export function resolveOpenClawHome() {
   return process.env.OPENCLAW_HOME?.trim() || join(homedir(), '.openclaw')
 }
 
-function resolveOpenClawConfigPath() {
+export function resolveOpenClawConfigPath() {
   return join(resolveOpenClawHome(), 'openclaw.json')
 }
 
-function resolveExtensionDir() {
+export function resolveExtensionDir() {
   return join(resolveOpenClawHome(), 'extensions', PLUGIN_ID)
 }
 
-function expandHome(pathValue) {
+export function expandHome(pathValue) {
   if (!pathValue) return pathValue
   if (pathValue === '~') return homedir()
   if (pathValue.startsWith('~/')) return join(homedir(), pathValue.slice(2))
@@ -155,7 +155,7 @@ function stripTrailingCommas(text) {
   return result
 }
 
-function parseJsonConfig(raw, path) {
+export function parseJsonConfig(raw, path) {
   const normalized = raw.replace(/^\uFEFF/, '')
   const sanitized = stripTrailingCommas(stripJsonComments(normalized))
   try {
@@ -166,22 +166,22 @@ function parseJsonConfig(raw, path) {
   }
 }
 
-function readJsonFile(path) {
+export function readJsonFile(path) {
   if (!existsSync(path)) return null
   return parseJsonConfig(readFileSync(path, 'utf-8'), path)
 }
 
-function writeJsonFile(path, value) {
+export function writeJsonFile(path, value) {
   mkdirSync(dirname(path), { recursive: true })
   writeFileSync(path, JSON.stringify(value, null, 2) + '\n', 'utf-8')
 }
 
-function normalizeBaseUrl(url) {
+export function normalizeBaseUrl(url) {
   if (url.startsWith('http://') || url.startsWith('https://')) return url.replace(/\/$/, '')
   return `https://${url.replace(/\/$/, '')}`
 }
 
-function ensurePluginConfig(config, pluginConfig, options = {}) {
+export function ensurePluginConfig(config, pluginConfig, options = {}) {
   const next = config && typeof config === 'object' ? structuredClone(config) : {}
   if (!next.plugins || typeof next.plugins !== 'object') next.plugins = {}
   if (!Array.isArray(next.plugins.allow)) next.plugins.allow = []
@@ -239,7 +239,7 @@ function ensurePluginInstallRecord(config, installRecord) {
   return next
 }
 
-function ensureAampToolAllowlist(toolsConfig, options = {}) {
+export 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()) : []
   const includeCodingBaseline = options.includeCodingBaseline === true
@@ -255,7 +255,7 @@ function ensureAampToolAllowlist(toolsConfig, options = {}) {
   return next
 }
 
-function planToolPolicyUpdate(toolsConfig, options = {}) {
+export function planToolPolicyUpdate(toolsConfig, options = {}) {
   const current = toolsConfig && typeof toolsConfig === 'object' ? structuredClone(toolsConfig) : {}
   const existingAllow = Array.isArray(current.allow) ? current.allow.filter((value) => typeof value === 'string' && value.trim()) : []
   const includeCodingBaseline = options.includeCodingBaseline === true
@@ -293,7 +293,7 @@ function currentToolPolicySummary(plan) {
   return lines.join('\n')
 }
 
-function parseDispatchContextRules(raw) {
+export function parseDispatchContextRules(raw) {
   const trimmed = raw.trim()
   if (!trimmed) return undefined
   const rules = {}
@@ -359,7 +359,7 @@ function ensureBuiltArtifacts(packageRoot) {
   }
 }
 
-function installPluginFiles(credentialsFile = DEFAULT_CREDENTIALS_FILE) {
+export function installPluginFiles(credentialsFile = DEFAULT_CREDENTIALS_FILE) {
   const extensionDir = resolveExtensionDir()
   const packageRoot = packageRootFromEntry(fileURLToPath(import.meta.url))
   ensureBuiltArtifacts(packageRoot)
@@ -408,7 +408,7 @@ function installPluginFiles(credentialsFile = DEFAULT_CREDENTIALS_FILE) {
   return { extensionDir, packageJson, packageRoot }
 }
 
-function restartGateway() {
+export function restartGateway() {
   const result = spawnSync('openclaw', ['gateway', 'restart'], {
     encoding: 'utf-8',
   })
@@ -433,7 +433,7 @@ function restartGateway() {
   }
 }
 
-async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
+export async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   const resolvedCreds = expandHome(credentialsFile)
   if (existsSync(resolvedCreds)) {
     const cachedIdentity = readJsonFile(resolvedCreds)
@@ -445,7 +445,19 @@ async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   }
 
   const base = normalizeBaseUrl(aampHost)
-  const registerRes = await fetch(`${base}/api/nodes/self-register`, {
+  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({
@@ -465,7 +477,7 @@ async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
     throw new Error('AAMP self-register succeeded but no registrationCode was returned')
   }
 
-  const credRes = await fetch(`${base}/api/nodes/credentials?code=${encodeURIComponent(code)}`)
+  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}`)
@@ -474,11 +486,11 @@ async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   const credData = await credRes.json()
   const identity = {
     email: credData?.email,
-    jmapToken: credData?.jmap?.token,
+    mailboxToken: credData?.mailbox?.token ?? credData?.jmap?.token,
     smtpPassword: credData?.smtp?.password,
   }
 
-  if (!identity.email || !identity.jmapToken || !identity.smtpPassword) {
+  if (!identity.email || !identity.mailboxToken || !identity.smtpPassword) {
     throw new Error('AAMP credential exchange returned an incomplete identity payload')
   }
 
@@ -499,7 +511,7 @@ function printHelp() {
   )
 }
 
-async function runInit() {
+export async function runInit() {
   const configPath = resolveOpenClawConfigPath()
   const existing = readJsonFile(configPath)
   const previousEntry = existing?.plugins?.entries?.[PLUGIN_ID] ?? existing?.plugins?.entries?.aamp
@@ -669,7 +681,7 @@ async function runInit() {
   )
 }
 
-async function main() {
+export async function main() {
   const command = process.argv[2] || 'help'
 
   if (command === 'help' || command === '--help' || command === '-h') {
@@ -687,7 +699,9 @@ async function main() {
   process.exitCode = 1
 }
 
-main().catch((err) => {
-  stderr.write(`${err instanceof Error ? err.message : String(err)}\n`)
-  process.exit(1)
-})
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+  main().catch((err) => {
+    stderr.write(`${err instanceof Error ? err.message : String(err)}\n`)
+    process.exit(1)
+  })
+}

package/dist/file-store.js

@@ -5,15 +5,22 @@ import { homedir } from "node:os";
 function defaultCredentialsPath() {
   return join(homedir(), ".openclaw", "extensions", "aamp-openclaw-plugin", ".credentials.json");
 }
+function defaultTaskStatePath() {
+  return join(homedir(), ".openclaw", "extensions", "aamp-openclaw-plugin", ".task-state.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)
+    if (!parsed.email || !parsed.mailboxToken || !parsed.smtpPassword)
       return null;
-    return parsed;
+    return {
+      email: parsed.email,
+      mailboxToken: parsed.mailboxToken,
+      smtpPassword: parsed.smtpPassword
+    };
   } catch {
     return null;
   }
@@ -21,7 +28,31 @@ function loadCachedIdentity(file) {
 function saveCachedIdentity(identity, file) {
   const resolved = file ?? defaultCredentialsPath();
   mkdirSync(dirname(resolved), { recursive: true });
-  writeFileSync(resolved, JSON.stringify(identity, null, 2), "utf-8");
+  writeFileSync(resolved, JSON.stringify({
+    email: identity.email,
+    mailboxToken: identity.mailboxToken,
+    smtpPassword: identity.smtpPassword
+  }, null, 2), "utf-8");
+}
+function loadTaskState(file) {
+  const resolved = file ?? defaultTaskStatePath();
+  if (!existsSync(resolved))
+    return { terminalTaskIds: [] };
+  try {
+    const parsed = JSON.parse(readFileSync(resolved, "utf-8"));
+    return {
+      terminalTaskIds: Array.isArray(parsed.terminalTaskIds) ? parsed.terminalTaskIds.filter(Boolean) : []
+    };
+  } catch {
+    return { terminalTaskIds: [] };
+  }
+}
+function saveTaskState(state, file) {
+  const resolved = file ?? defaultTaskStatePath();
+  mkdirSync(dirname(resolved), { recursive: true });
+  writeFileSync(resolved, JSON.stringify({
+    terminalTaskIds: state.terminalTaskIds ?? []
+  }, null, 2), "utf-8");
 }
 function ensureDir(dir) {
   mkdirSync(dir, { recursive: true });
@@ -35,10 +66,13 @@ function writeBinaryFile(path, content) {
 }
 export {
   defaultCredentialsPath,
+  defaultTaskStatePath,
   ensureDir,
   loadCachedIdentity,
+  loadTaskState,
   readBinaryFile,
   saveCachedIdentity,
+  saveTaskState,
   writeBinaryFile
 };
 //# sourceMappingURL=file-store.js.map

package/dist/file-store.js.map

@@ -1,7 +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;",
+  "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  mailboxToken: string\n  smtpPassword: string\n}\n\nexport interface CachedTaskState {\n  terminalTaskIds?: string[]\n}\n\nexport function defaultCredentialsPath(): string {\n  return join(homedir(), '.openclaw', 'extensions', 'aamp-openclaw-plugin', '.credentials.json')\n}\n\nexport function defaultTaskStatePath(): string {\n  return join(homedir(), '.openclaw', 'extensions', 'aamp-openclaw-plugin', '.task-state.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.mailboxToken || !parsed.smtpPassword) return null\n    return {\n      email: parsed.email,\n      mailboxToken: parsed.mailboxToken,\n      smtpPassword: parsed.smtpPassword,\n    }\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({\n    email: identity.email,\n    mailboxToken: identity.mailboxToken,\n    smtpPassword: identity.smtpPassword,\n  }, null, 2), 'utf-8')\n}\n\nexport function loadTaskState(file?: string): CachedTaskState {\n  const resolved = file ?? defaultTaskStatePath()\n  if (!existsSync(resolved)) return { terminalTaskIds: [] }\n  try {\n    const parsed = JSON.parse(readFileSync(resolved, 'utf-8')) as CachedTaskState\n    return {\n      terminalTaskIds: Array.isArray(parsed.terminalTaskIds) ? parsed.terminalTaskIds.filter(Boolean) : [],\n    }\n  } catch {\n    return { terminalTaskIds: [] }\n  }\n}\n\nexport function saveTaskState(state: CachedTaskState, file?: string): void {\n  const resolved = file ?? defaultTaskStatePath()\n  mkdirSync(dirname(resolved), { recursive: true })\n  writeFileSync(resolved, JSON.stringify({\n    terminalTaskIds: state.terminalTaskIds ?? [],\n  }, 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;AAYjB,SAAS,yBAAiC;AAC/C,SAAO,KAAK,QAAQ,GAAG,aAAa,cAAc,wBAAwB,mBAAmB;AAC/F;AAEO,SAAS,uBAA+B;AAC7C,SAAO,KAAK,QAAQ,GAAG,aAAa,cAAc,wBAAwB,kBAAkB;AAC9F;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,gBAAgB,CAAC,OAAO;AAAc,aAAO;AAC1E,WAAO;AAAA,MACL,OAAO,OAAO;AAAA,MACd,cAAc,OAAO;AAAA,MACrB,cAAc,OAAO;AAAA,IACvB;AAAA,EACF,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;AAAA,IACrC,OAAO,SAAS;AAAA,IAChB,cAAc,SAAS;AAAA,IACvB,cAAc,SAAS;AAAA,EACzB,GAAG,MAAM,CAAC,GAAG,OAAO;AACtB;AAEO,SAAS,cAAc,MAAgC;AAC5D,QAAM,WAAW,QAAQ,qBAAqB;AAC9C,MAAI,CAAC,WAAW,QAAQ;AAAG,WAAO,EAAE,iBAAiB,CAAC,EAAE;AACxD,MAAI;AACF,UAAM,SAAS,KAAK,MAAM,aAAa,UAAU,OAAO,CAAC;AACzD,WAAO;AAAA,MACL,iBAAiB,MAAM,QAAQ,OAAO,eAAe,IAAI,OAAO,gBAAgB,OAAO,OAAO,IAAI,CAAC;AAAA,IACrG;AAAA,EACF,QAAQ;AACN,WAAO,EAAE,iBAAiB,CAAC,EAAE;AAAA,EAC/B;AACF;AAEO,SAAS,cAAc,OAAwB,MAAqB;AACzE,QAAM,WAAW,QAAQ,qBAAqB;AAC9C,YAAU,QAAQ,QAAQ,GAAG,EAAE,WAAW,KAAK,CAAC;AAChD,gBAAc,UAAU,KAAK,UAAU;AAAA,IACrC,iBAAiB,MAAM,mBAAmB,CAAC;AAAA,EAC7C,GAAG,MAAM,CAAC,GAAG,OAAO;AACtB;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": []
 }