castle-web-cli 0.4.58 → 0.4.59

package/dist/agent.js

@@ -16,6 +16,7 @@
 // --force. Claude support can slot in later behind runAgentCli.
 import { execFileSync, spawn } from 'child_process';
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
 import { nanoid } from 'nanoid';
 import { WebSocketServer } from 'ws';
@@ -187,6 +188,56 @@ function toolActivityLabel(ev) {
         return 'running a command';
     return 'working';
 }
+// Castle's agent CLI keys, delivered to the sandbox as a file
+// (~/.castle/keys.json) rather than sandbox-wide env -- so an ambient key can't
+// override a user's own subscription login. Falls back to process.env for
+// older sandboxes that still inject the keys as env.
+const CASTLE_KEYS_PATH = path.join(os.homedir(), '.castle', 'keys.json');
+function castleKeys() {
+    try {
+        return JSON.parse(fs.readFileSync(CASTLE_KEYS_PATH, 'utf8'));
+    }
+    catch {
+        return {};
+    }
+}
+const BACKEND_KEY_ENV = {
+    claude: 'ANTHROPIC_API_KEY',
+    cursor: 'CURSOR_API_KEY',
+};
+// True when the user has their OWN saved auth for this backend -- a /login, or
+// (for cursor, which reuses one auth.json) any saved creds. When so we do NOT
+// inject Castle's key, so their auth is used and billed to them.
+function backendHasSavedAuth(backend) {
+    const home = os.homedir();
+    if (backend === 'claude') {
+        return fs.existsSync(path.join(home, '.claude', '.credentials.json'));
+    }
+    if (backend === 'cursor') {
+        return fs.existsSync(path.join(home, '.config', 'cursor', 'auth.json'));
+    }
+    return false;
+}
+// Env for an agent spawn: inject Castle's key ONLY when the backend has no saved
+// auth of the user's own. This is what lets internal testers run on their own
+// subscription (log in once in the terminal) instead of Castle's key.
+function envForAgentSpawn(backend) {
+    const env = { ...process.env };
+    const keyName = BACKEND_KEY_ENV[backend];
+    if (!keyName)
+        return env;
+    if (backendHasSavedAuth(backend)) {
+        delete env[keyName];
+    }
+    else {
+        const val = castleKeys()[keyName] ?? process.env[keyName];
+        if (val)
+            env[keyName] = val;
+        else
+            delete env[keyName];
+    }
+    return env;
+}
 // One headless agent CLI run (cursor or claude), normalized to the same
 // delta/activity/result hooks. Cursor: assistant events carrying timestamp_ms
 // are text deltas; the trailing assistant event without one repeats the whole
@@ -196,7 +247,7 @@ function runAgentCli(opts) {
     return new Promise((resolve) => {
         const child = spawn(opts.command, opts.args, {
             cwd: opts.cwd,
-            env: process.env,
+            env: envForAgentSpawn(opts.parser),
             stdio: ['ignore', 'pipe', 'pipe'],
         });
         opts.children.add(child);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.58",
+  "version": "0.4.59",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"