aamp-openclaw-plugin 0.1.24 → 0.1.26

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) {
@@ -332,7 +436,12 @@ function restartGateway() {
 async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   const resolvedCreds = expandHome(credentialsFile)
   if (existsSync(resolvedCreds)) {
-    return { created: false, email: null, credentialsPath: resolvedCreds }
+    const cachedIdentity = readJsonFile(resolvedCreds)
+    return {
+      created: false,
+      email: cachedIdentity?.email ?? null,
+      credentialsPath: resolvedCreds,
+    }
   }
 
   const base = normalizeBaseUrl(aampHost)
@@ -545,7 +654,9 @@ async function runInit() {
       `  codingBaselineAdded: ${toolPolicyPlan.missingCodingTools.length > 0 && includeCodingBaseline ? 'yes' : 'no'}`,
       identityResult.created
         ? `  mailbox: ${identityResult.email} (registered and saved to ${identityResult.credentialsPath})`
-        : `  mailbox: existing credentials reused from ${identityResult.credentialsPath}`,
+        : identityResult.email
+          ? `  mailbox: ${identityResult.email} (existing credentials reused from ${identityResult.credentialsPath})`
+          : `  mailbox: existing credentials reused from ${identityResult.credentialsPath}`,
       '',
       restartResult.ok
         ? `Gateway restart: ${restartResult.message}`

package/package.json

@@ -7,7 +7,7 @@
     "skills"
   ],
   "license": "MIT",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "AAMP Agent Mail Protocol — OpenClaw plugin. Gives OpenClaw an AAMP mailbox identity and lets it receive, process and reply to AAMP tasks.",
   "type": "module",
   "main": "dist/index.js",