mercury-agent 0.8.5 → 0.8.7

package/examples/extensions/napkin/index.ts

@@ -11,7 +11,10 @@ import {
 import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
 import { delimiter, dirname, join } from "node:path";
-import { getPiAuthCredential } from "mercury-agent/storage/pi-auth";
+import {
+  getPiAuthCredential,
+  parseOAuthTokenEnv,
+} from "mercury-agent/storage/pi-auth";
 
 const KNOWLEDGE_DIR = "knowledge";
 const VAULT_DIRS = ["people", "projects", "references", "daily", "episodes", "weekly", "monthly", "templates"];
@@ -422,10 +425,25 @@ export default function (mercury: {
     if (process.env.MERCURY_ANTHROPIC_API_KEY) {
       env.ANTHROPIC_API_KEY = process.env.MERCURY_ANTHROPIC_API_KEY;
     }
+    // Console-provisioned agents carry a JSON credential blob here, not a bare
+    // token — same handling as container-runner, via the shared parser.
+    let oauthBlobCorrupt = false;
     if (process.env.MERCURY_ANTHROPIC_OAUTH_TOKEN) {
-      env.ANTHROPIC_API_KEY = process.env.MERCURY_ANTHROPIC_OAUTH_TOKEN;
+      const parsed = parseOAuthTokenEnv(
+        process.env.MERCURY_ANTHROPIC_OAUTH_TOKEN,
+      );
+      if (parsed.status === "token") {
+        env.ANTHROPIC_API_KEY = parsed.token;
+      } else if (parsed.status === "blob") {
+        env.ANTHROPIC_OAUTH_TOKEN = parsed.access;
+      } else if (parsed.status === "corrupt-blob") {
+        oauthBlobCorrupt = true;
+      }
+      // "empty" — whitespace-only value, treat as unset and fall through
+    }
+    if (env.ANTHROPIC_API_KEY || env.ANTHROPIC_OAUTH_TOKEN) {
+      return { ok: true, env };
     }
-    if (env.ANTHROPIC_API_KEY) return { ok: true, env };
 
     // Spawned pi inherits process.env, so an unprefixed host key also works.
     if (process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_OAUTH_TOKEN) {
@@ -450,8 +468,9 @@ export default function (mercury: {
 
     // Fail fast, mirroring the container-runner guard: without a credential
     // every pi spawn exits 1, one per space per pending date, every run.
-    const reason =
-      cred.status === "refresh-failed"
+    const reason = oauthBlobCorrupt
+      ? "MERCURY_ANTHROPIC_OAUTH_TOKEN holds a corrupt credential blob — re-provision it or set MERCURY_ANTHROPIC_API_KEY"
+      : cred.status === "refresh-failed"
         ? `Anthropic OAuth refresh failed for ${authPath} — re-authenticate on the host (run mercury auth login from the project directory that owns that file) or set MERCURY_ANTHROPIC_API_KEY`
         : `no Anthropic credential configured (checked ${authPath}) — run mercury auth login or set MERCURY_ANTHROPIC_API_KEY / MERCURY_ANTHROPIC_OAUTH_TOKEN`;
     return { ok: false, reason };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "Personal AI assistant for chat platforms (WhatsApp, Slack, Discord, Telegram)",
   "license": "MIT",
   "author": "Avishai Tsabari",

package/src/storage/pi-auth.ts

@@ -33,6 +33,34 @@ function writeAuthFile(authPath: string, auth: AuthFile): void {
   fs.chmodSync(authPath, 0o600);
 }
 
+export type OAuthTokenEnvValue =
+  | { status: "token"; token: string }
+  | { status: "blob"; access: string }
+  | { status: "corrupt-blob" }
+  /** Whitespace-only value — treat the variable as unset. */
+  | { status: "empty" };
+
+/**
+ * Interpret the raw value of MERCURY_ANTHROPIC_OAUTH_TOKEN. Console-provisioned
+ * agents receive a full credential blob ({"access":"...","refresh":"...",
+ * "expires":...}) rather than a bare token, so any code spawning pi on the host
+ * must extract the access token instead of passing the value through verbatim.
+ */
+export function parseOAuthTokenEnv(raw: string): OAuthTokenEnvValue {
+  const trimmed = raw.trim();
+  if (!trimmed) return { status: "empty" };
+  if (!trimmed.startsWith("{")) return { status: "token", token: trimmed };
+  try {
+    const blob = JSON.parse(trimmed) as { access?: unknown };
+    if (typeof blob.access === "string" && blob.access) {
+      return { status: "blob", access: blob.access };
+    }
+  } catch {
+    // fall through to corrupt-blob
+  }
+  return { status: "corrupt-blob" };
+}
+
 export type PiAuthCredential =
   | { status: "ok"; apiKey: string }
   /** No usable oauth entry (or an env override takes precedence). */
@@ -40,6 +68,10 @@ export type PiAuthCredential =
   /** An oauth entry exists but could not be turned into a usable key. */
   | { status: "refresh-failed"; error?: Error };
 
+// Deduplicate concurrent OAuth refreshes — refresh tokens are single-use, so
+// two parallel calls with the same token race and one always fails.
+const inflightRefresh = new Map<string, Promise<PiAuthCredential>>();
+
 export async function getPiAuthCredential(options: {
   provider: string;
   authPath: string;
@@ -55,6 +87,25 @@ export async function getPiAuthCredential(options: {
     return { status: "none" };
   }
 
+  // Coalesce concurrent refreshes for the same auth file so only one
+  // token-endpoint call is made; the rest share its result.
+  const key = options.authPath;
+  const existing = inflightRefresh.get(key);
+  if (existing) return existing;
+
+  const promise = doGetPiAuthCredential(options);
+  inflightRefresh.set(key, promise);
+  try {
+    return await promise;
+  } finally {
+    inflightRefresh.delete(key);
+  }
+}
+
+async function doGetPiAuthCredential(options: {
+  provider: string;
+  authPath: string;
+}): Promise<PiAuthCredential> {
   const authPath = options.authPath;
   const auth = readAuthFile(authPath);