@addai/node 0.30.11 → 0.30.12

package/dist/codex-spawn.d.ts

@@ -25,14 +25,30 @@ export interface CodexInput {
      *  Mirrors the claude --strict-mcp-config behavior. */
     mcpServers?: CodexMcpServer[];
 }
+export interface CodexHomeOptions {
+    /** Forward a remote server's credentials as headers via env_http_headers.
+     *  spawnCodex passes codexSupportsEnvHttpHeaders(bin), so a codex too old to
+     *  know the key keeps exactly the config it had before. Default true. */
+    envHttpHeaders?: boolean;
+}
 /** Build a config.toml that declares only the supplied MCP servers and
  *  return the CODEX_HOME directory plus any env vars the child needs
- *  (bearer tokens for remote servers). Caller is responsible for cleanup
- *  (we drop it under os.tmpdir() so it gets reaped). */
-export declare function writeCodexHome(servers: CodexMcpServer[], workingDirectory: string): {
+ *  (bearer tokens and header values for remote servers). Caller is
+ *  responsible for cleanup (we drop it under os.tmpdir() so it gets reaped). */
+export declare function writeCodexHome(servers: CodexMcpServer[], workingDirectory: string, opts?: CodexHomeOptions): {
     home: string;
     extraEnv: Record<string, string>;
 };
+/**
+ * Does this codex know env_http_headers? Asked by having it parse a throwaway
+ * config (`codex mcp list --json`, which reads config and contacts nothing)
+ * and checking that the header survived. Remembered per binary. Any failure
+ * answers "no", which keeps the bearer-only config every install ran before.
+ */
+export declare function codexSupportsEnvHttpHeaders(bin: string, probe?: (bin: string, codexHome: string) => string): boolean;
+/** Read `codex mcp list --json` output: did the probe server's header survive?
+ *  Exported for tests. */
+export declare function codexListShowsEnvHeaders(stdout: string): boolean;
 /** First line of an AGENTS.md this daemon wrote. A project's own AGENTS.md
  *  never carries it and is never touched. */
 export declare const AGENTS_MD_MARKER = "<!-- ainode: entity system prompt \u2014 rewritten before every turn; edits here do not persist -->";

package/dist/codex-spawn.js

@@ -42,6 +42,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AGENTS_MD_MARKER = void 0;
 exports.writeCodexHome = writeCodexHome;
+exports.codexSupportsEnvHttpHeaders = codexSupportsEnvHttpHeaders;
+exports.codexListShowsEnvHeaders = codexListShowsEnvHeaders;
 exports.writeCodexAgentsMd = writeCodexAgentsMd;
 exports.codexEffort = codexEffort;
 exports.spawnCodex = spawnCodex;
@@ -55,6 +57,7 @@ const diskguard_1 = require("./diskguard");
 const win_1 = require("./win");
 const events_1 = require("./events");
 const prompt_transport_1 = require("./prompt-transport");
+const mcp_headers_1 = require("./mcp-headers");
 /** Quote a string as a TOML basic string (double-quoted, escape backslash + quote). */
 function tomlString(s) {
     return '"' + String(s).replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n') + '"';
@@ -63,11 +66,17 @@ function tomlString(s) {
  *  Only the NAME goes in config.toml — the value rides on the child env, so
  *  the token never lands on disk. */
 const bearerEnvVar = (slug) => `AINODE_MCP_${slug.replace(/[^A-Za-z0-9]+/g, '_').toUpperCase()}_TOKEN`;
+/** Env var name carrying one HTTP header's value into the codex process.
+ *  config.toml references it by name via env_http_headers, so the value never
+ *  lands on disk either. */
+const headerEnvVar = (slug, header) => `AINODE_MCP_${slug.replace(/[^A-Za-z0-9]+/g, '_').toUpperCase()}` +
+    `_H_${header.replace(/[^A-Za-z0-9]+/g, '_').toUpperCase()}`;
 /** Build a config.toml that declares only the supplied MCP servers and
  *  return the CODEX_HOME directory plus any env vars the child needs
- *  (bearer tokens for remote servers). Caller is responsible for cleanup
- *  (we drop it under os.tmpdir() so it gets reaped). */
-function writeCodexHome(servers, workingDirectory) {
+ *  (bearer tokens and header values for remote servers). Caller is
+ *  responsible for cleanup (we drop it under os.tmpdir() so it gets reaped). */
+function writeCodexHome(servers, workingDirectory, opts = {}) {
+    const envHttpHeaders = opts.envHttpHeaders !== false;
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'entities-codex-'));
     const extraEnv = {};
     let toml = '# Generated by ainode — sandboxes codex against host config\n\n';
@@ -92,6 +101,8 @@ function writeCodexHome(servers, workingDirectory) {
             toml += `url = ${tomlString(url)}\n`;
             // codex reads the bearer from its OWN environment (--env is stdio-only),
             // so the value goes on the child env and only the var name in the file.
+            // The bearer is exactly what this adapter always sent, kept so anything
+            // that works on codex today keeps working.
             const creds = Object.entries(s.env || {})
                 .filter(([k, v]) => typeof v === 'string' && v.length > 0 && !k.startsWith('OAUTH_REFRESH'));
             const bearer = creds.find(([k]) => k === 'OAUTH_ACCESS_TOKEN') ?? creds[0];
@@ -99,15 +110,34 @@ function writeCodexHome(servers, workingDirectory) {
                 const varName = bearerEnvVar(s.slug);
                 extraEnv[varName] = String(bearer[1]);
                 toml += `bearer_token_env_var = ${tomlString(varName)}\n`;
-                if (creds.length > 1) {
-                    // codex carries one bearer and no arbitrary headers. Anything that
-                    // authenticates with several custom headers is only partly wired,
-                    // and saying so beats a server that 401s for no visible reason.
-                    console.error(`[codex] MCP ${s.slug}: only ${bearer[0]} is forwarded as a bearer token; ` +
-                        `codex cannot send custom headers, so ${creds.length - 1} other credential ` +
-                        `field(s) were dropped`);
+            }
+            // The bearer alone was never enough. The servers read each credential
+            // from its own header (the claude path sends them all, see
+            // remoteMcpHeaders) and fall back to the bearer for any that is missing,
+            // so +Ai Drive, which carries three, used its API key as its workspace
+            // id and answered "Access denied to workspace" on every codex run.
+            // codex does send custom headers: env_http_headers maps a header name to
+            // the NAME of an env var, so the values stay off disk like the bearer.
+            const headers = (0, mcp_headers_1.remoteMcpHeaders)(s.env);
+            // An OAuth access token is already the bearer above.
+            delete headers.Authorization;
+            const entries = Object.entries(headers);
+            if (entries.length > 0 && envHttpHeaders) {
+                // A sub-table must follow the parent table's scalar keys.
+                toml += `[mcp_servers.${name}.env_http_headers]\n`;
+                for (const [header, value] of entries) {
+                    const varName = headerEnvVar(s.slug, header);
+                    extraEnv[varName] = value;
+                    toml += `${tomlString(header)} = ${tomlString(varName)}\n`;
                 }
             }
+            else if (creds.length > 1) {
+                // A codex too old to know env_http_headers carries the bearer only.
+                // Saying so beats a server that refuses for no visible reason.
+                console.error(`[codex] MCP ${s.slug}: this codex cannot send custom headers, so only ` +
+                    `${bearer?.[0]} is forwarded and ${creds.length - 1} other credential ` +
+                    `field(s) were dropped`);
+            }
             toml += '\n';
             continue;
         }
@@ -159,6 +189,76 @@ function writeCodexHome(servers, workingDirectory) {
     }
     return { home: dir, extraEnv };
 }
+const PROBE_SERVER = 'ainode_probe';
+const PROBE_HEADER = 'X-Ainode-Probe';
+// A real answer holds until the binary might have been updated; a probe that
+// could not run at all is retried sooner.
+const PROBE_TTL_MS = 6 * 60 * 60 * 1000;
+const PROBE_FAILED_TTL_MS = 10 * 60 * 1000;
+const envHeaderSupport = new Map();
+/**
+ * Does this codex know env_http_headers? Asked by having it parse a throwaway
+ * config (`codex mcp list --json`, which reads config and contacts nothing)
+ * and checking that the header survived. Remembered per binary. Any failure
+ * answers "no", which keeps the bearer-only config every install ran before.
+ */
+function codexSupportsEnvHttpHeaders(bin, probe = codexMcpListJson) {
+    const hit = envHeaderSupport.get(bin);
+    if (hit && hit.until > Date.now())
+        return hit.ok;
+    let ok = false;
+    let failed = false;
+    let home = null;
+    try {
+        home = fs.mkdtempSync(path.join(os.tmpdir(), 'ainode-codex-probe-'));
+        fs.writeFileSync(path.join(home, 'config.toml'), `[mcp_servers.${PROBE_SERVER}]\n` +
+            `url = "http://127.0.0.1:9/mcp"\n` +
+            // A bearer keeps codex from looking for stored OAuth credentials.
+            `bearer_token_env_var = "AINODE_PROBE_TOKEN"\n` +
+            `[mcp_servers.${PROBE_SERVER}.env_http_headers]\n` +
+            `"${PROBE_HEADER}" = "AINODE_PROBE_HEADER"\n`, { mode: 0o600 });
+        ok = codexListShowsEnvHeaders(probe(bin, home));
+    }
+    catch {
+        ok = false;
+        failed = true;
+    }
+    finally {
+        if (home) {
+            try {
+                fs.rmSync(home, { recursive: true, force: true });
+            }
+            catch { /* reaped from tmp */ }
+        }
+    }
+    envHeaderSupport.set(bin, { ok, until: Date.now() + (failed ? PROBE_FAILED_TTL_MS : PROBE_TTL_MS) });
+    return ok;
+}
+/** Read `codex mcp list --json` output: did the probe server's header survive?
+ *  Exported for tests. */
+function codexListShowsEnvHeaders(stdout) {
+    const start = stdout.search(/^\s*\[/m);
+    if (start < 0)
+        return false;
+    let list;
+    try {
+        list = JSON.parse(stdout.slice(start));
+    }
+    catch {
+        return false;
+    }
+    if (!Array.isArray(list))
+        return false;
+    const entry = list.find((e) => e && e.name === PROBE_SERVER);
+    return entry?.transport?.env_http_headers?.[PROBE_HEADER] === 'AINODE_PROBE_HEADER';
+}
+function codexMcpListJson(bin, codexHome) {
+    const inv = (0, win_1.resolveCliInvocation)(bin, ['mcp', 'list', '--json']);
+    return (0, child_process_1.execFileSync)(inv.file, inv.args, {
+        encoding: 'utf8', timeout: 20_000, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'],
+        env: { ...process.env, CODEX_HOME: codexHome },
+    });
+}
 /** First line of an AGENTS.md this daemon wrote. A project's own AGENTS.md
  *  never carries it and is never touched. */
 exports.AGENTS_MD_MARKER = '<!-- ainode: entity system prompt — rewritten before every turn; edits here do not persist -->';
@@ -270,10 +370,19 @@ function spawnCodex(input) {
     const args = input.resumeThreadId
         ? ['exec', ...baseFlags, 'resume', input.resumeThreadId, input.prompt]
         : ['exec', ...baseFlags, input.prompt];
+    // Resolve binary path before spawn. Previously called spawn('codex', ...)
+    // bare, which threw ENOENT under launchd / desktop-app PATH inheritance
+    // and rejected `done` before any session_end event fired → request
+    // stuck at 'running' on the DB. Resolved first now, because the config
+    // below depends on what this codex understands.
+    const bin = (0, codex_binary_1.findCodexBinary)();
     // Sandbox codex against an isolated CODEX_HOME so the host's
     // ~/.codex/config.toml mcp_servers don't leak in. TERM=dumb keeps
     // codex's TTY heuristics happy (no fancy terminal output).
-    const { home: codexHome, extraEnv: mcpBearerEnv } = writeCodexHome(input.mcpServers ?? [], input.workingDirectory);
+    const servers = input.mcpServers ?? [];
+    // Only a remote server that carries credentials needs the header probe.
+    const wantsHeaders = servers.some((s) => (0, mcp_headers_1.isRemoteMcp)(s.command) && Object.keys(s.env ?? {}).length > 0);
+    const { home: codexHome, extraEnv: mcpBearerEnv } = writeCodexHome(servers, input.workingDirectory, { envHttpHeaders: wantsHeaders && bin ? codexSupportsEnvHttpHeaders(bin) : false });
     // Register the scratch dir with DiskGuard: marks it active (so a
     // concurrent sweep won't evict a live run) and writes a PID lock so a
     // different runtime process can tell it's still owned. dispose(true)
@@ -284,15 +393,11 @@ function spawnCodex(input) {
         ...process.env,
         TERM: 'dumb',
         CODEX_HOME: codexHome,
-        // Bearer tokens for remote (http/sse) MCP servers. config.toml names these
-        // vars via bearer_token_env_var; the values only ever live here.
+        // Bearer tokens and header values for remote (http/sse) MCP servers.
+        // config.toml names these vars via bearer_token_env_var and
+        // env_http_headers; the values only ever live here.
         ...mcpBearerEnv,
     };
-    // Resolve binary path before spawn. Previously called spawn('codex', ...)
-    // bare, which threw ENOENT under launchd / desktop-app PATH inheritance
-    // and rejected `done` before any session_end event fired → request
-    // stuck at 'running' on the DB.
-    const bin = (0, codex_binary_1.findCodexBinary)();
     const listeners = [];
     const emit = (e) => { for (const l of listeners)
         try {

package/package.json

@@ -1,62 +1,62 @@
-{
-  "name": "@addai/node",
-  "version": "0.30.11",
-  "description": "Daemon that pairs a machine with your +Ai account and runs Claude / Codex / Kimi / Gemini agents on its behalf. Reachable via Supabase from Vault, Entity Studio, or any other +Ai surface.",
-  "license": "MIT",
-  "keywords": [
-    "addai",
-    "entity-studio",
-    "claude",
-    "codex",
-    "kimi",
-    "gemini",
-    "agent",
-    "daemon",
-    "supabase",
-    "mcp"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/just-AddAi/addai-entity-runtime.git"
-  },
-  "homepage": "https://github.com/just-AddAi/addai-entity-runtime#readme",
-  "bugs": {
-    "url": "https://github.com/just-AddAi/addai-entity-runtime/issues"
-  },
-  "type": "commonjs",
-  "main": "dist/index.js",
-  "bin": {
-    "ainode": "dist/cli.js"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "dist",
-    "scripts",
-    "README.md",
-    "assets"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-assets.js",
-    "start": "node dist/cli.js",
-    "dev": "tsc -p tsconfig.json && node dist/cli.js",
-    "test": "npm run build && node --test test/*.test.mjs",
-    "clean": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\"",
-    "postinstall": "node scripts/fix-pty-helper.js",
-    "prepublishOnly": "npm run build"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "dependencies": {
-    "@addai/node-flows": "^1.0.0",
-    "node-pty": "^1.1.0",
-    "ws": "^8.21.3"
-  },
-  "devDependencies": {
-    "@types/node": "^20.0.0",
-    "@types/ws": "^8.18.1",
-    "typescript": "^5.6.0"
-  }
-}
+{
+  "name": "@addai/node",
+  "version": "0.30.12",
+  "description": "Daemon that pairs a machine with your +Ai account and runs Claude / Codex / Kimi / Gemini agents on its behalf. Reachable via Supabase from Vault, Entity Studio, or any other +Ai surface.",
+  "license": "MIT",
+  "keywords": [
+    "addai",
+    "entity-studio",
+    "claude",
+    "codex",
+    "kimi",
+    "gemini",
+    "agent",
+    "daemon",
+    "supabase",
+    "mcp"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/just-AddAi/addai-entity-runtime.git"
+  },
+  "homepage": "https://github.com/just-AddAi/addai-entity-runtime#readme",
+  "bugs": {
+    "url": "https://github.com/just-AddAi/addai-entity-runtime/issues"
+  },
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "bin": {
+    "ainode": "dist/cli.js"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist",
+    "scripts",
+    "README.md",
+    "assets"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json && node scripts/copy-assets.js",
+    "start": "node dist/cli.js",
+    "dev": "tsc -p tsconfig.json && node dist/cli.js",
+    "test": "npm run build && node --test test/*.test.mjs",
+    "clean": "node -e \"fs.rmSync('dist',{recursive:true,force:true})\"",
+    "postinstall": "node scripts/fix-pty-helper.js",
+    "prepublishOnly": "npm run build"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "dependencies": {
+    "@addai/node-flows": "^1.0.0",
+    "node-pty": "^1.1.0",
+    "ws": "^8.21.3"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/ws": "^8.18.1",
+    "typescript": "^5.6.0"
+  }
+}