@junctionpanel/server 0.1.34 → 0.1.35

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

@@ -1,4 +1,4 @@
-import { execSync, spawn } from "node:child_process";
+import { execSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import { promises } from "node:fs";
@@ -8,6 +8,7 @@ import { query, } from "@anthropic-ai/claude-agent-sdk";
 import { mapClaudeCanceledToolCall, mapClaudeCompletedToolCall, mapClaudeFailedToolCall, mapClaudeRunningToolCall, } from "./claude/tool-call-mapper.js";
 import { isTaskNotificationUserContent, mapTaskNotificationSystemRecordToToolCall, mapTaskNotificationUserContentToToolCall, } from "./claude/task-notification-tool-call.js";
 import { buildClaudeModelDefinitions, buildClaudeModelFamilyAliases, buildClaudeSelectableModelIds, getClaudeFallbackModels, normalizeClaudeThinkingOptionId, resolveClaudeThinkingPreset, } from "./claude/model-catalog.js";
+import { applyRuntimeSettingsToClaudeOptions, detectClaudeThinkingCompatibility, fetchClaudeSupportedModels, } from "./claude-cli-capabilities.js";
 import { buildToolCallDisplayModel } from "../../../shared/tool-call-display.js";
 import { applyProviderEnv, isProviderCommandAvailable, } from "../provider-launch-config.js";
 import { getOrchestratorModeInstructions } from "../orchestrator-instructions.js";
@@ -226,91 +227,6 @@ function resolveClaudeBinary() {
     }
     throw new Error("Claude CLI not found. Install claude or configure agents.providers.claude.command.mode='replace'.");
 }
-function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
-    const commandConfig = runtimeSettings?.command;
-    if (!commandConfig || commandConfig.mode === "default") {
-        return {
-            command: spawnOptions.command,
-            args: [...spawnOptions.args],
-        };
-    }
-    if (commandConfig.mode === "append") {
-        return {
-            command: spawnOptions.command,
-            args: [...(commandConfig.args ?? []), ...spawnOptions.args],
-        };
-    }
-    return {
-        command: commandConfig.argv[0],
-        args: [...commandConfig.argv.slice(1), ...spawnOptions.args],
-    };
-}
-function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings) {
-    const hasEnvOverrides = Object.keys(runtimeSettings?.env ?? {}).length > 0;
-    const commandMode = runtimeSettings?.command?.mode;
-    const needsCustomSpawn = hasEnvOverrides || commandMode === "append" || commandMode === "replace";
-    if (!needsCustomSpawn) {
-        return options;
-    }
-    return {
-        ...options,
-        spawnClaudeCodeProcess: (spawnOptions) => {
-            const resolved = resolveClaudeSpawnCommand(spawnOptions, runtimeSettings);
-            return spawn(resolved.command, resolved.args, {
-                cwd: spawnOptions.cwd,
-                env: applyProviderEnv(spawnOptions.env, runtimeSettings),
-                signal: spawnOptions.signal,
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-        },
-    };
-}
-function buildClaudeControlOptions(params) {
-    const baseOptions = {
-        ...(params.cwd ? { cwd: params.cwd } : {}),
-        ...(params.claudePath
-            ? { pathToClaudeCodeExecutable: params.claudePath }
-            : {}),
-        settingSources: CLAUDE_SETTING_SOURCES,
-        includePartialMessages: false,
-        stderr: (data) => {
-            params.logger.warn({ stderr: data.trim() }, "Claude Agent SDK stderr");
-        },
-        env: {
-            ...process.env,
-            MCP_TIMEOUT: "600000",
-            MCP_TOOL_TIMEOUT: "600000",
-        },
-    };
-    return applyRuntimeSettingsToClaudeOptions(baseOptions, params.runtimeSettings);
-}
-async function fetchClaudeSupportedModels(params) {
-    const abortController = new AbortController();
-    const controlQuery = query({
-        prompt: "",
-        options: {
-            ...buildClaudeControlOptions(params),
-            abortController,
-        },
-    });
-    try {
-        return await controlQuery.supportedModels();
-    }
-    finally {
-        abortController.abort();
-        try {
-            await Promise.race([
-                controlQuery.interrupt(),
-                new Promise((resolve) => {
-                    setTimeout(resolve, 1000);
-                }),
-            ]);
-        }
-        catch {
-            // Ignore teardown errors for short-lived control queries.
-        }
-    }
-}
 function summarizeClaudeOptionsForLog(options) {
     const systemPromptRaw = options.systemPrompt;
     const systemPromptSummary = (() => {
@@ -1188,6 +1104,8 @@ class ClaudeAgentSession {
         this.userMessageIds = [];
         this.localUserMessageIds = new Set();
         this.suppressLocalReplayActivity = false;
+        this.thinkingCompatibility = null;
+        this.loggedThinkingCompatibilityFallback = false;
         this.closed = false;
         this.handlePermissionRequest = async (toolName, input, options) => {
             const requestId = `permission-${randomUUID()}`;
@@ -1319,7 +1237,9 @@ class ClaudeAgentSession {
         if (this.cachedRuntimeInfo) {
             return { ...this.cachedRuntimeInfo };
         }
-        const thinkingOptionId = normalizeClaudeThinkingOptionId(this.config.thinkingOptionId) ?? "off";
+        const thinkingOptionId = this.shouldDisableThinkingControls()
+            ? "off"
+            : normalizeClaudeThinkingOptionId(this.config.thinkingOptionId) ?? "off";
         const info = {
             provider: "claude",
             sessionId: this.claudeSessionId,
@@ -1328,6 +1248,9 @@ class ClaudeAgentSession {
             modeId: this.currentMode ?? null,
             extra: {
                 preferredModeId: this.lastNonPlanMode,
+                ...(this.thinkingCompatibility
+                    ? { thinkingCompatibility: this.thinkingCompatibility.status }
+                    : {}),
                 ...(this.runtimeReportedModelId
                     ? { reportedModelId: this.runtimeReportedModelId }
                     : {}),
@@ -1372,10 +1295,15 @@ class ClaudeAgentSession {
             provider: "claude",
             sessionId: this.claudeSessionId,
             model: this.lastOptionsModel,
-            thinkingOptionId: normalizeClaudeThinkingOptionId(this.config.thinkingOptionId) ?? "off",
+            thinkingOptionId: this.shouldDisableThinkingControls()
+                ? "off"
+                : normalizeClaudeThinkingOptionId(this.config.thinkingOptionId) ?? "off",
             modeId: this.currentMode ?? null,
             extra: {
                 preferredModeId: this.lastNonPlanMode,
+                ...(this.thinkingCompatibility
+                    ? { thinkingCompatibility: this.thinkingCompatibility.status }
+                    : {}),
                 ...(this.runtimeReportedModelId
                     ? { reportedModelId: this.runtimeReportedModelId }
                     : {}),
@@ -1919,6 +1847,7 @@ class ClaudeAgentSession {
             this.queryRestartNeeded = false;
         }
         const input = new Pushable();
+        await this.ensureThinkingCompatibility();
         const options = this.buildOptions();
         this.logger.debug({ options: summarizeClaudeOptionsForLog(options) }, "claude query");
         this.input = input;
@@ -1949,9 +1878,24 @@ class ClaudeAgentSession {
             this.logger.warn({ err: error, label }, "Claude query operation did not settle cleanly");
         }
     }
+    async ensureThinkingCompatibility() {
+        if (this.thinkingCompatibility) {
+            return;
+        }
+        this.thinkingCompatibility = await detectClaudeThinkingCompatibility({
+            claudePath: this.claudePath,
+            runtimeSettings: this.runtimeSettings,
+            logger: this.logger,
+        });
+    }
+    shouldDisableThinkingControls() {
+        return this.thinkingCompatibility?.status === "unsupported";
+    }
     buildOptions() {
-        const thinkingPreset = resolveClaudeThinkingPreset(this.config.thinkingOptionId) ??
-            resolveClaudeThinkingPreset("off");
+        const thinkingPreset = this.shouldDisableThinkingControls()
+            ? null
+            : resolveClaudeThinkingPreset(this.config.thinkingOptionId) ??
+                resolveClaudeThinkingPreset("off");
         const appendedSystemPrompt = [
             getOrchestratorModeInstructions(),
             this.config.systemPrompt?.trim(),
@@ -1995,6 +1939,10 @@ class ClaudeAgentSession {
             ...(thinkingPreset?.effort ? { effort: thinkingPreset.effort } : {}),
             ...getClaudeSdkExtraOptions(this.config.extra),
         };
+        if (this.shouldDisableThinkingControls() && !this.loggedThinkingCompatibilityFallback) {
+            this.loggedThinkingCompatibilityFallback = true;
+            this.logger.warn({ compatibility: this.thinkingCompatibility }, "Claude CLI does not support Junction thinking controls; continuing with thinking disabled");
+        }
         if (this.config.mcpServers) {
             base.mcpServers = this.normalizeMcpServers(this.config.mcpServers);
         }