@junctionpanel/server 0.1.53 → 0.1.55

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

@@ -8,9 +8,10 @@ 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 { applyRuntimeSettingsToClaudeOptions, detectClaudeThinkingCompatibility, fetchClaudeSupportedModels, getClaudeThinkingCompatibilityCacheKey, } from "./claude-cli-capabilities.js";
 import { buildToolCallDisplayModel } from "../../../shared/tool-call-display.js";
 import { applyProviderEnv, isProviderCommandAvailable, } from "../provider-launch-config.js";
+import { getCachedProviderModels } from "../provider-model-cache.js";
 import { getOrchestratorModeInstructions } from "../orchestrator-instructions.js";
 const fsPromises = promises;
 const CLAUDE_SETTING_SOURCES = [
@@ -1017,21 +1018,44 @@ export class ClaudeAgentClient {
         });
     }
     async listModels(options) {
-        return this.discoverKnownModels(options?.cwd);
+        return this.discoverLiveKnownModels(options?.cwd);
     }
     async discoverKnownModels(cwd) {
         try {
-            const models = await fetchClaudeSupportedModels({
-                cwd,
+            return await this.discoverLiveKnownModels(cwd);
+        }
+        catch (error) {
+            this.logger.warn({ err: error }, "Failed to discover Claude models dynamically; using fallback catalog");
+            return getClaudeFallbackModels();
+        }
+    }
+    async discoverLiveKnownModels(cwd) {
+        const cacheKey = JSON.stringify({
+            provider: "claude",
+            cwd: cwd ?? null,
+            runtime: getClaudeThinkingCompatibilityCacheKey({
                 claudePath: this.claudePath,
                 runtimeSettings: this.runtimeSettings,
+            }),
+        });
+        try {
+            return await getCachedProviderModels({
+                cacheKey,
+                provider: "claude",
                 logger: this.logger,
+                load: async () => {
+                    const models = await fetchClaudeSupportedModels({
+                        cwd,
+                        claudePath: this.claudePath,
+                        runtimeSettings: this.runtimeSettings,
+                        logger: this.logger,
+                    });
+                    return buildClaudeModelDefinitions(models);
+                },
             });
-            return buildClaudeModelDefinitions(models);
         }
         catch (error) {
-            this.logger.warn({ err: error }, "Failed to discover Claude models dynamically; using fallback catalog");
-            return getClaudeFallbackModels();
+            throw error;
         }
     }
     async listPersistedAgents(options) {
@@ -1194,7 +1218,10 @@ class ClaudeAgentSession {
         this.defaults = options.defaults;
         this.claudePath = options.claudePath;
         this.runtimeSettings = options.runtimeSettings;
-        this.logger = options.logger;
+        this.logger = options.logger.child({
+            internal: config.internal ?? false,
+            ...(config.internal && config.title ? { internalTitle: config.title } : {}),
+        });
         const handle = options.handle;
         if (handle) {
             if (!handle.sessionId) {
@@ -2917,8 +2944,7 @@ class ClaudeAgentSession {
             this.logger.debug({ sessionId: newSessionId }, "Claude session ID set for the first time");
         }
         else if (existingSessionId === newSessionId) {
-            // Same session ID - no-op, but log for visibility
-            this.logger.debug({ sessionId: newSessionId }, "Claude session ID unchanged (same value)");
+            // Same session ID - expected on subsequent init payloads.
         }
         else {
             // CRITICAL: Session ID is being overwritten with a different value
@@ -2946,7 +2972,6 @@ class ClaudeAgentSession {
         this.persistence = null;
         // Capture actual model from SDK init message (not just the configured model)
         if (message.model) {
-            this.runtimeReportedModelId = message.model;
             const normalizedModel = normalizeClaudeRuntimeModelId({
                 runtimeModelId: message.model,
                 supportedModelIds: this.selectableModelIds,
@@ -2954,7 +2979,13 @@ class ClaudeAgentSession {
                 configuredModelId: this.config.model ?? null,
                 currentModelId: this.lastOptionsModel,
             });
-            this.logger.debug({ model: message.model, normalizedModel }, "Captured model from SDK init");
+            const previousRuntimeModelId = this.runtimeReportedModelId;
+            const previousNormalizedModel = this.lastOptionsModel;
+            this.runtimeReportedModelId = message.model;
+            if (previousRuntimeModelId !== message.model ||
+                previousNormalizedModel !== normalizedModel) {
+                this.logger.debug({ model: message.model, normalizedModel }, "Captured model from SDK init");
+            }
             this.lastOptionsModel = normalizedModel;
             // Invalidate cached runtime info so it picks up the new model
             this.cachedRuntimeInfo = null;