@junctionpanel/server 0.1.94 → 0.1.96

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

@@ -1054,14 +1054,14 @@ export class ClaudeAgentClient {
         this.defaults = options.defaults;
         this.logger = options.logger.child({ module: "agent", provider: "claude" });
         this.runtimeSettings = options.runtimeSettings;
-        this.claudePath = resolveClaudeExecutablePath(this.runtimeSettings);
     }
     async createSession(config) {
         const claudeConfig = this.assertConfig(config);
+        const claudePath = this.resolveCurrentClaudePath();
         const knownModels = await this.discoverKnownModels(claudeConfig.cwd);
         return new ClaudeAgentSession(claudeConfig, {
             defaults: this.defaults,
-            claudePath: this.claudePath,
+            claudePath,
             runtimeSettings: this.runtimeSettings,
             logger: this.logger,
             knownModels,
@@ -1075,10 +1075,11 @@ export class ClaudeAgentClient {
         }
         const mergedConfig = { ...merged, provider: "claude", cwd: merged.cwd };
         const claudeConfig = this.assertConfig(mergedConfig);
+        const claudePath = this.resolveCurrentClaudePath();
         const knownModels = await this.discoverKnownModels(claudeConfig.cwd);
         return new ClaudeAgentSession(claudeConfig, {
             defaults: this.defaults,
-            claudePath: this.claudePath,
+            claudePath,
             runtimeSettings: this.runtimeSettings,
             handle,
             logger: this.logger,
@@ -1098,11 +1099,12 @@ export class ClaudeAgentClient {
         }
     }
     async discoverLiveKnownModels(cwd) {
+        const claudePath = this.resolveCurrentClaudePath();
         const cacheKey = JSON.stringify({
             provider: "claude",
             cwd: cwd ?? null,
             runtime: getClaudeThinkingCompatibilityCacheKey({
-                claudePath: this.claudePath,
+                claudePath,
                 runtimeSettings: this.runtimeSettings,
             }),
         });
@@ -1114,7 +1116,7 @@ export class ClaudeAgentClient {
                 load: async () => {
                     const models = await fetchClaudeSupportedModels({
                         cwd,
-                        claudePath: this.claudePath,
+                        claudePath,
                         runtimeSettings: this.runtimeSettings,
                         logger: this.logger,
                     });
@@ -1147,11 +1149,8 @@ export class ClaudeAgentClient {
         return descriptors;
     }
     async isAvailable() {
-        const commandConfig = this.runtimeSettings?.command;
-        if (commandConfig?.mode === "replace") {
-            return isProviderCommandAvailable(commandConfig, resolveClaudeBinary, applyProviderEnv(process.env, this.runtimeSettings));
-        }
-        return this.claudePath !== null;
+        const env = applyProviderEnv(process.env, this.runtimeSettings);
+        return isProviderCommandAvailable(this.runtimeSettings?.command, () => resolveClaudeExecutablePath(this.runtimeSettings) ?? "claude", env);
     }
     assertConfig(config) {
         if (config.provider !== "claude") {
@@ -1159,6 +1158,17 @@ export class ClaudeAgentClient {
         }
         return { ...config, provider: "claude" };
     }
+    resolveCurrentClaudePath() {
+        const commandConfig = this.runtimeSettings?.command;
+        if (commandConfig?.mode === "replace") {
+            const env = applyProviderEnv(process.env, this.runtimeSettings);
+            const available = isProviderCommandAvailable(commandConfig, resolveClaudeBinary, env);
+            if (!available) {
+                return null;
+            }
+        }
+        return resolveClaudeExecutablePath(this.runtimeSettings);
+    }
 }
 class ClaudeAgentSession {
     constructor(config, options) {