@seawork/server 1.0.16 → 1.0.17-rc.2

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

@@ -111,19 +111,23 @@ 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) {
+export function resolveClaudeAuthSpawnEnv(mergedEnv, authMode) {
+    if (authMode === "local") {
+        return {
+            spawnEnv: {
+                ...mergedEnv,
+                ANTHROPIC_API_KEY: undefined,
+                ANTHROPIC_BASE_URL: undefined,
+                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: false,
+        };
+    }
     const apiKey = mergedEnv.ANTHROPIC_API_KEY;
     const hasApiKey = typeof apiKey === "string" && apiKey.length > 0;
     if (!hasApiKey) {
@@ -156,7 +160,7 @@ function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings, launchEnv
             const { spawnEnv, hasApiKey } = resolveClaudeAuthSpawnEnv({
                 ...applyProviderEnv(spawnOptions.env, runtimeSettings),
                 ...(launchEnv ?? {}),
-            });
+            }, runtimeSettings?.authMode);
             if (!isDefaultRuntime) {
                 command = resolved.command;
             }
@@ -1824,7 +1828,8 @@ class ClaudeAgentSession {
         // The SDK `settings` option (flag settings layer) has the highest priority.
         const seaworkHome = process.env.SEAWORK_HOME ?? path.join(os.homedir(), ".seawork");
         const seaworkSettingsPath = path.join(seaworkHome, "claude-settings.json");
-        const hasSeaworkSettings = fs.existsSync(seaworkSettingsPath);
+        const useLocalClaudeConfig = this.runtimeSettings?.authMode === "local";
+        const hasSeaworkSettings = !useLocalClaudeConfig && fs.existsSync(seaworkSettingsPath);
         // Windows' CreateProcess returns ENOENT when the spawn cwd does not exist,
         // and the SDK mislabels that ENOENT as "Claude Code executable not found".
         // Fail early with a clear message instead.
@@ -1835,6 +1840,15 @@ class ClaudeAgentSession {
         // default resolution uses `import.meta.url`, which in packaged Electron
         // apps produces a virtual app.asar path that spawned children can't read.
         const cliExecutable = resolveClaudeCliExecutable();
+        const gatewayProxyEnv = useLocalClaudeConfig
+            ? {}
+            : {
+                // Clear proxy env vars to prevent interference with gateway requests.
+                http_proxy: "",
+                https_proxy: "",
+                HTTP_PROXY: "",
+                HTTPS_PROXY: "",
+            };
         const base = {
             cwd: this.config.cwd,
             ...(cliExecutable ? { pathToClaudeCodeExecutable: cliExecutable } : {}),
@@ -1861,11 +1875,7 @@ class ClaudeAgentSession {
             },
             env: {
                 ...process.env,
-                // Clear proxy env vars to prevent interference with gateway requests.
-                http_proxy: "",
-                https_proxy: "",
-                HTTP_PROXY: "",
-                HTTPS_PROXY: "",
+                ...gatewayProxyEnv,
                 // Increase MCP timeouts for long-running tool calls (10 minutes)
                 MCP_TIMEOUT: "600000",
                 MCP_TOOL_TIMEOUT: "600000",