@seawork/server 1.0.15 → 1.0.16

package/dist/server/server/agent/providers/claude-agent.d.ts

@@ -20,6 +20,22 @@ type ClaudeAgentClientOptions = {
     queryFactory?: typeof query;
 };
 export declare function resolveClaudeCliExecutable(): string | null;
+/**
+ * Resolves Claude CLI auth mode from the merged spawn env.
+ * - API-key mode (ANTHROPIC_API_KEY present): set CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1
+ *   to skip the OAuth client_data ping/metrics/autoupdater hits, and strip conflicting
+ *   Bedrock/Vertex/OAuth vars so the CLI routes to the API-key code path (avoids
+ *   403 invalid_api_key from picking a non-API-key path that ignores our key).
+ *   Note: do NOT use CLAUDE_CODE_SIMPLE=1 — despite the name it is a kill-switch that
+ *   also drops Skill/Glob/Grep/Write/Task tools, replaces the system prompt with a
+ *   4-line stub, and disables CLAUDE.md/agents/attachments.
+ * - Local-auth mode (no API key): leave env untouched so the CLI can use the user's
+ *   `claude login` OAuth credentials from keychain or ~/.claude/credentials.
+ */
+export declare function resolveClaudeAuthSpawnEnv(mergedEnv: Record<string, string | undefined>): {
+    spawnEnv: Record<string, string | undefined>;
+    hasApiKey: boolean;
+};
 export declare function extractUserMessageText(content: unknown): string | null;
 export declare function readEventIdentifiers(message: SDKMessage): EventIdentifiers;
 export declare class ClaudeAgentClient implements AgentClient {

package/dist/server/server/agent/providers/claude-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/claude-agent.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,eAAe,EAQpB,KAAK,EACL,KAAK,UAAU,EAOhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,kBAAkB,EAGlB,oBAAoB,EAMpB,sBAAsB,EAKtB,YAAY,EACZ,kBAAkB,EAGlB,iBAAiB,EAEjB,iBAAiB,EACjB,0BAA0B,EAE1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAoB,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA2B9F,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAkEF,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAItE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAAE,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC;CAC7B,CAAC;AAuBF,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,IAAI,CAoB1D;AAmYD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAyCtE;AAigBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,gBAAgB,CA8B1E;AAID,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAY;IACvC,QAAQ,CAAC,YAAY,uBAAuB;IAE5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA+C;IACzE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAA0B;IAC3D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,OAAO,EAAE,wBAAwB;IAOvC,aAAa,CACjB,MAAM,EAAE,kBAAkB,EAC1B,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAWlB,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACvC,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAkBlB,UAAU,CAAC,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAIzE,mBAAmB,CACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAuBhC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,aAAa,IAAI,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAmCtD,OAAO,CAAC,YAAY;CAMrB;AA2qFD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,GACzE,iBAAiB,EAAE,CAkFrB"}
+{"version":3,"file":"claude-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/claude-agent.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,eAAe,EAQpB,KAAK,EACL,KAAK,UAAU,EAOhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,kBAAkB,EAGlB,oBAAoB,EAMpB,sBAAsB,EAKtB,YAAY,EACZ,kBAAkB,EAGlB,iBAAiB,EAEjB,iBAAiB,EACjB,0BAA0B,EAE1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAoB,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AA2B9F,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAkEF,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC;AAItE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;KAAE,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC;CAC7B,CAAC;AAuBF,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,IAAI,CAoB1D;AA2BD;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG;IACxF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,SAAS,EAAE,OAAO,CAAC;CACpB,CAmBA;AAuVD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAyCtE;AAigBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,GAAG,gBAAgB,CA8B1E;AAID,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAY;IACvC,QAAQ,CAAC,YAAY,uBAAuB;IAE5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA+C;IACzE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAA0B;IAC3D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,OAAO,EAAE,wBAAwB;IAOvC,aAAa,CACjB,MAAM,EAAE,kBAAkB,EAC1B,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAWlB,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACvC,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAkBlB,UAAU,CAAC,QAAQ,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAIzE,mBAAmB,CACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAuBhC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,aAAa,IAAI,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAmCtD,OAAO,CAAC,YAAY;CAMrB;AA2qFD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,GACzE,iBAAiB,EAAE,CAkFrB"}

package/dist/server/server/agent/providers/claude-agent.js

@@ -111,6 +111,38 @@ function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
         args: [...commandConfig.argv.slice(1), ...spawnOptions.args],
     };
 }
+/**
+ * Resolves Claude CLI auth mode from the merged spawn env.
+ * - API-key mode (ANTHROPIC_API_KEY present): set CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1
+ *   to skip the OAuth client_data ping/metrics/autoupdater hits, and strip conflicting
+ *   Bedrock/Vertex/OAuth vars so the CLI routes to the API-key code path (avoids
+ *   403 invalid_api_key from picking a non-API-key path that ignores our key).
+ *   Note: do NOT use CLAUDE_CODE_SIMPLE=1 — despite the name it is a kill-switch that
+ *   also drops Skill/Glob/Grep/Write/Task tools, replaces the system prompt with a
+ *   4-line stub, and disables CLAUDE.md/agents/attachments.
+ * - Local-auth mode (no API key): leave env untouched so the CLI can use the user's
+ *   `claude login` OAuth credentials from keychain or ~/.claude/credentials.
+ */
+export function resolveClaudeAuthSpawnEnv(mergedEnv) {
+    const apiKey = mergedEnv.ANTHROPIC_API_KEY;
+    const hasApiKey = typeof apiKey === "string" && apiKey.length > 0;
+    if (!hasApiKey) {
+        return { spawnEnv: { ...mergedEnv }, hasApiKey };
+    }
+    return {
+        spawnEnv: {
+            ...mergedEnv,
+            CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
+            ANTHROPIC_AUTH_TOKEN: undefined,
+            ANTHROPIC_MODEL: undefined,
+            ANTHROPIC_SMALL_FAST_MODEL: undefined,
+            CLAUDE_CODE_USE_BEDROCK: undefined,
+            CLAUDE_CODE_USE_VERTEX: undefined,
+            AWS_BEARER_TOKEN_BEDROCK: undefined,
+        },
+        hasApiKey,
+    };
+}
 function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings, launchEnv, logger) {
     return {
         ...options,
@@ -121,30 +153,10 @@ function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings, launchEnv
             // unavailable, fall back to the Electron Helper binary (which has
             // LSUIElement=true in its Info.plist, so it won't create Dock icons).
             let command;
-            const spawnEnv = {
+            const { spawnEnv, hasApiKey } = resolveClaudeAuthSpawnEnv({
                 ...applyProviderEnv(spawnOptions.env, runtimeSettings),
                 ...(launchEnv ?? {}),
-                // Skip non-essential network traffic (OAuth client_data ping, metrics,
-                // autoupdater check) so the spawned claude CLI authenticates purely
-                // via ANTHROPIC_API_KEY env var without trying api.anthropic.com.
-                //
-                // Do NOT use CLAUDE_CODE_SIMPLE=1 for this — despite the name, it is a
-                // total kill-switch that also: drops Skill/Glob/Grep/Write/Task/...
-                // from the model's tool list, replaces the full system prompt with a
-                // 4-line stub, skips CLAUDE.md, and disables agents/attachments. That
-                // is why skills could not auto-invoke under any custom ANTHROPIC_BASE_URL.
-                CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: "1",
-                // Strip conflicting Anthropic/Bedrock/Vertex auth vars inherited from
-                // the user's shell. If these are set, claude CLI picks one of the
-                // non-API-key code paths (Bedrock/Vertex/OAuth) and ignores our
-                // ANTHROPIC_API_KEY, causing 403 invalid_api_key errors.
-                ANTHROPIC_AUTH_TOKEN: undefined,
-                ANTHROPIC_MODEL: undefined,
-                ANTHROPIC_SMALL_FAST_MODEL: undefined,
-                CLAUDE_CODE_USE_BEDROCK: undefined,
-                CLAUDE_CODE_USE_VERTEX: undefined,
-                AWS_BEARER_TOKEN_BEDROCK: undefined,
-            };
+            });
             if (!isDefaultRuntime) {
                 command = resolved.command;
             }
@@ -177,7 +189,8 @@ function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings, launchEnv
                 args: resolved.args,
                 cwd: spawnOptions.cwd,
                 isElectron: process.versions["electron"] != null,
-                hasAnthropicKey: !!spawnEnv.ANTHROPIC_API_KEY,
+                authMode: hasApiKey ? "api-key" : "local-oauth",
+                hasAnthropicKey: hasApiKey,
                 anthropicKeyPrefix: spawnEnv.ANTHROPIC_API_KEY?.slice(0, 10) ?? null,
                 anthropicBaseUrl: spawnEnv.ANTHROPIC_BASE_URL ?? null,
                 launchEnvKeys: Object.keys(launchEnv ?? {}),