@bastani/atomic 0.8.31-alpha.1 → 0.8.31-alpha.3

package/dist/core/agent-session.js

@@ -23,7 +23,7 @@ import { ATOMIC_GUIDE_COMMAND_NAME, ATOMIC_GUIDE_HELP_CHOICES, atomicGuideModeFo
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage, formatUnresolvedModelMessage, } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, contextCompact as runContextCompact, estimateContextTokens, generateBranchSummary, prepareContextCompaction, shouldCompact, validateContextDeletionRequest, } from "./compaction/index.js";
-import { getModelDefaultContextWindow, getSupportedContextWindows, selectContextWindow } from "./context-window.js";
+import { getEffectiveInputBudget, getModelDefaultContextWindow, getSupportedContextWindows, selectContextWindow } from "./context-window.js";
 import { formatCopilotProviderError, parseCopilotPromptLimitError } from "./copilot-errors.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
@@ -84,6 +84,7 @@ export function parseSkillBlock(text) {
         userMessage: afterClosing ? afterClosing.slice(2).trim() || undefined : undefined,
     };
 }
+const COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS = { allowCopilotLongContextFallback: true };
 function drainAgentMessageQueue(queue) {
     if (!queue)
         return [];
@@ -1536,7 +1537,7 @@ export class AgentSession {
         if (!this.model) {
             throw new Error("No model selected");
         }
-        const selected = selectContextWindow(this.model, contextWindow);
+        const selected = selectContextWindow(this.model, contextWindow, COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS);
         if ("error" in selected) {
             throw new Error(selected.error);
         }
@@ -1548,13 +1549,13 @@ export class AgentSession {
             this._emit({ type: "context_window_changed", contextWindow: selected.contextWindow });
         }
         if (options.persistDefault === true) {
-            this.settingsManager.setDefaultContextWindow(selected.contextWindow);
+            this.settingsManager.setDefaultContextWindowForModel(selected.model.provider, selected.model.id, selected.contextWindow);
         }
     }
     _withContextWindowForModelSwitch(model) {
         // A source model's scalar contextWindow can be its natural default (for example a 1m-default
         // model). Do not treat that alone as an opt-in to larger windows on a 400k-default target.
-        const settingsDefaultContextWindow = this.settingsManager.getDefaultContextWindow();
+        const settingsDefaultContextWindow = this._getSettingsContextWindowRequestForModel(model)?.contextWindow;
         const candidates = [];
         const targetDefaultContextWindow = getModelDefaultContextWindow(model);
         if (model.contextWindow !== targetDefaultContextWindow) {
@@ -1570,12 +1571,12 @@ export class AgentSession {
             candidates.push(settingsDefaultContextWindow);
         }
         candidates.push(targetDefaultContextWindow);
-        const availableContextWindows = getSupportedContextWindows(model);
-        const contextWindow = candidates.find((candidate) => availableContextWindows.includes(candidate));
-        if (contextWindow === undefined)
-            return model;
-        const selected = selectContextWindow(model, contextWindow);
-        return "error" in selected ? model : selected.model;
+        for (const candidate of candidates) {
+            const selected = selectContextWindow(model, candidate, COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS);
+            if (!("error" in selected))
+                return selected.model;
+        }
+        return model;
     }
     _shouldCarryCurrentContextWindowForModelSwitch(currentModel, settingsDefaultContextWindow) {
         if (currentModel.contextWindow !== getModelDefaultContextWindow(currentModel)) {
@@ -1588,19 +1589,29 @@ export class AgentSession {
             currentModel.contextWindow === settingsDefaultContextWindow &&
             getSupportedContextWindows(currentModel).includes(settingsDefaultContextWindow));
     }
-    _getContextWindowReplayForModel(model, requestedContextWindow) {
+    _getSettingsContextWindowRequestForModel(model) {
+        const modelContextWindow = this.settingsManager.getDefaultContextWindowForModel(model.provider, model.id);
+        if (modelContextWindow !== undefined) {
+            return { contextWindow: modelContextWindow, source: "model-settings" };
+        }
+        const globalContextWindow = this.settingsManager.getDefaultContextWindow();
+        return globalContextWindow === undefined
+            ? undefined
+            : { contextWindow: globalContextWindow, source: "global-settings" };
+    }
+    _getContextWindowReplayForModel(model, requestedContextWindow, source) {
         if (requestedContextWindow !== undefined) {
-            const selected = selectContextWindow(model, requestedContextWindow);
+            const selected = selectContextWindow(model, requestedContextWindow, COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS);
             if (!("error" in selected)) {
                 return { model: selected.model, contextWindow: selected.contextWindow, wouldWarn: false };
             }
-            return this._getDefaultContextWindowReplayForModel(model, true);
+            return this._getDefaultContextWindowReplayForModel(model, source !== "global-settings");
         }
         return this._getDefaultContextWindowReplayForModel(model, false);
     }
     _getDefaultContextWindowReplayForModel(model, wouldWarn) {
         const defaultContextWindow = getModelDefaultContextWindow(model);
-        const selected = selectContextWindow(model, defaultContextWindow);
+        const selected = selectContextWindow(model, defaultContextWindow, COPILOT_CONTEXT_WINDOW_SELECTION_OPTIONS);
         if (!("error" in selected)) {
             return { model: selected.model, contextWindow: selected.contextWindow, wouldWarn };
         }
@@ -1612,15 +1623,20 @@ export class AgentSession {
     }
     _getResumeContextWindowReplayForModel(model) {
         const sessionContext = this.sessionManager.buildSessionContext();
-        const requestedContextWindow = sessionContext.contextWindow ?? this.settingsManager.getDefaultContextWindow();
-        return this._getContextWindowReplayForModel(model, requestedContextWindow);
+        if (sessionContext.contextWindow !== undefined) {
+            return this._getContextWindowReplayForModel(model, sessionContext.contextWindow, "session");
+        }
+        const settingsContextWindow = this._getSettingsContextWindowRequestForModel(model);
+        return this._getContextWindowReplayForModel(model, settingsContextWindow?.contextWindow, settingsContextWindow?.source);
     }
     _applyContextWindowReplay(contextWindow) {
         if (!this.model)
             return;
         const previousContextWindow = this.model.contextWindow;
-        const requestedContextWindow = contextWindow ?? this.settingsManager.getDefaultContextWindow();
-        const replay = this._getContextWindowReplayForModel(this.model, requestedContextWindow);
+        const settingsContextWindow = this._getSettingsContextWindowRequestForModel(this.model);
+        const requestedContextWindow = contextWindow ?? settingsContextWindow?.contextWindow;
+        const source = contextWindow !== undefined ? "session" : settingsContextWindow?.source;
+        const replay = this._getContextWindowReplayForModel(this.model, requestedContextWindow, source);
         this.agent.state.model = replay.model;
         if (previousContextWindow !== replay.contextWindow) {
             this._emit({ type: "context_window_changed", contextWindow: replay.contextWindow });
@@ -1993,7 +2009,11 @@ export class AgentSession {
         else {
             contextTokens = calculateContextTokens(assistantMessage.usage);
         }
-        if (shouldCompact(contextTokens, contextWindow, settings)) {
+        // Compact against the effective input budget (the hard prompt cap for providers like Copilot
+        // that advertise a larger total window) so we compact before overrunning the server-side limit
+        // rather than relying on reactive overflow recovery near the cap.
+        const compactionBudget = this.model ? getEffectiveInputBudget(this.model) : contextWindow;
+        if (shouldCompact(contextTokens, compactionBudget, settings)) {
             await this._runAutoCompaction("threshold", false);
         }
     }
@@ -2001,7 +2021,11 @@ export class AgentSession {
         if (!this.model || this.model.provider !== "github-copilot" || !assistantMessage.errorMessage)
             return false;
         const promptLimitError = parseCopilotPromptLimitError(assistantMessage.errorMessage);
-        return promptLimitError !== undefined && this.model.contextWindow > promptLimitError.limitTokens;
+        // Compare against the effective input budget (the model's real prompt cap), not the displayed
+        // total window. A rejection at the prompt cap is a normal overflow we should compact-and-retry;
+        // only a rejection *below* the cap (e.g. a missing long-context entitlement dropping the account
+        // to a lower server tier) keeps the friendly error visible instead of silently compacting down.
+        return promptLimitError !== undefined && getEffectiveInputBudget(this.model) > promptLimitError.limitTokens;
     }
     /**
      * Internal: remove the trailing overflow error from retry context if it is still present.
@@ -2195,7 +2219,11 @@ export class AgentSession {
         if (!refreshedModel || refreshedModel === currentModel) {
             return;
         }
-        this.agent.state.model = refreshedModel;
+        const replay = this._getResumeContextWindowReplayForModel(refreshedModel);
+        this.agent.state.model = replay.model;
+        if (currentModel.contextWindow !== replay.contextWindow) {
+            this._emit({ type: "context_window_changed", contextWindow: replay.contextWindow });
+        }
         this._refreshBaseSystemPromptFromActiveTools();
     }
     _bindExtensionCore(runner) {