@dreb/coding-agent 2.70.1 → 2.72.0

package/dist/core/agent-session.js

@@ -15,7 +15,7 @@
 import { copyFileSync, existsSync, mkdirSync, realpathSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
-import { isContextOverflow, isOutputLimitExhaustion, modelsAreEqual, resetApiProviders, supportsMax, supportsXhigh, } from "@dreb/ai";
+import { clampThinkingLevel, getAvailableThinkingLevels, isContextOverflow, isOutputLimitExhaustion, modelsAreEqual, resetApiProviders, } from "@dreb/ai";
 import { getDocsPath, getSubagentSessionsDir } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { sleep } from "../utils/sleep.js";
@@ -67,12 +67,6 @@ export function parseSkillBlock(text) {
 // ============================================================================
 // Constants
 // ============================================================================
-/** Standard thinking levels */
-const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
-/** Thinking levels including xhigh (for supported models). */
-const THINKING_LEVELS_WITH_XHIGH = ["off", "minimal", "low", "medium", "high", "xhigh"];
-/** Complete ordered scale, including the native max tier for supported models. */
-const THINKING_LEVELS_WITH_MAX = [...THINKING_LEVELS_WITH_XHIGH, "max"];
 const MIN_PERFORMANCE_DURATION_MS = 10;
 // ============================================================================
 // AgentSession Class
@@ -1949,14 +1943,16 @@ export class AgentSession {
      * Saves to session and settings only if the level actually changes.
      */
     setThinkingLevel(level) {
-        const availableLevels = this.getAvailableThinkingLevels();
-        const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
+        const effectiveLevel = clampThinkingLevel(this.model, level);
         // Only persist if actually changing
         const isChanging = effectiveLevel !== this.agent.state.thinkingLevel;
         this.agent.setThinkingLevel(effectiveLevel);
         if (isChanging) {
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
-            if (this.supportsThinking() || effectiveLevel !== "off") {
+            // A capability clamp (non-reasoning model, `off` on an always-thinking model,
+            // unsupported xhigh/max) must not overwrite the saved preference, so the next
+            // capable model can honor it again.
+            if (this.supportsThinking() && effectiveLevel === level) {
                 this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
             }
         }
@@ -1976,25 +1972,12 @@ export class AgentSession {
         return nextLevel;
     }
     /**
-     * Get available thinking levels for current model.
-     * The provider will clamp to what the specific model supports internally.
+     * Get available thinking levels for current model, in ascending order.
+     * `off` is omitted for models whose thinking cannot be turned off (Claude Opus 5.5+),
+     * and `xhigh` / `max` are included independently per model capability.
      */
     getAvailableThinkingLevels() {
-        if (!this.supportsThinking())
-            return ["off"];
-        if (this.supportsMaxThinking())
-            return THINKING_LEVELS_WITH_MAX;
-        return this.supportsXhighThinking() ? THINKING_LEVELS_WITH_XHIGH : THINKING_LEVELS;
-    }
-    /**
-     * Check if current model supports xhigh thinking level.
-     */
-    supportsXhighThinking() {
-        return this.model ? supportsXhigh(this.model) : false;
-    }
-    /** Check if the current model supports the native max thinking level. */
-    supportsMaxThinking() {
-        return this.model ? supportsMax(this.model) : false;
+        return getAvailableThinkingLevels(this.model);
     }
     /**
      * Check if current model supports thinking/reasoning.
@@ -2006,29 +1989,17 @@ export class AgentSession {
         if (explicitLevel !== undefined) {
             return explicitLevel;
         }
+        const savedLevel = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
         if (!this.supportsThinking()) {
-            return this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+            return savedLevel;
         }
-        return this.thinkingLevel;
-    }
-    _clampThinkingLevel(level, availableLevels) {
-        const ordered = THINKING_LEVELS_WITH_MAX;
-        const available = new Set(availableLevels);
-        const requestedIndex = ordered.indexOf(level);
-        if (requestedIndex === -1) {
-            return availableLevels[0] ?? "off";
-        }
-        for (let i = requestedIndex; i < ordered.length; i++) {
-            const candidate = ordered[i];
-            if (available.has(candidate))
-                return candidate;
+        // When the current level is only the capability clamp of the saved preference
+        // (e.g. saved `off` shown as `minimal` on Opus 5.5), carry the saved preference
+        // to the next model instead of the clamped value.
+        if (clampThinkingLevel(this.model, savedLevel) === this.thinkingLevel) {
+            return savedLevel;
         }
-        for (let i = requestedIndex - 1; i >= 0; i--) {
-            const candidate = ordered[i];
-            if (available.has(candidate))
-                return candidate;
-        }
-        return availableLevels[0] ?? "off";
+        return this.thinkingLevel;
     }
     // =========================================================================
     // Queue Mode Management
@@ -3229,10 +3200,7 @@ export class AgentSession {
             this.setThinkingLevel(sessionContext.thinkingLevel);
         }
         else {
-            const availableLevels = this.getAvailableThinkingLevels();
-            const effectiveLevel = availableLevels.includes(defaultThinkingLevel)
-                ? defaultThinkingLevel
-                : this._clampThinkingLevel(defaultThinkingLevel, availableLevels);
+            const effectiveLevel = clampThinkingLevel(this.model, defaultThinkingLevel);
             this.agent.setThinkingLevel(effectiveLevel);
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
         }