longer-agent 0.1.1 → 0.1.3

package/dist/session.js

@@ -16,7 +16,7 @@ import { Agent, isNoReply, NO_REPLY_MARKER } from "./agents/agent.js";
 import { createEphemeralLogState } from "./ephemeral-log.js";
 import { allocateContextId, stripContextTags, ContextTagStripBuffer } from "./context-rendering.js";
 import { generateShowContext } from "./show-context.js";
-import { getThinkingLevels, getModelMaxOutputTokens } from "./config.js";
+import { getThinkingLevels } from "./config.js";
 import { ToolResult } from "./providers/base.js";
 import { SPAWN_AGENT_TOOL, KILL_AGENT_TOOL, CHECK_STATUS_TOOL, WAIT_TOOL, SHOW_CONTEXT_TOOL, SUMMARIZE_CONTEXT_TOOL, ASK_TOOL, PLAN_TOOL, } from "./tools/comm.js";
 import { buildBashEnv, executeTool, } from "./tools/basic.js";
@@ -30,7 +30,7 @@ import { LogIdAllocator, createSystemPrompt, createTurnStart, createUserMessage
 import { projectToApiMessages } from "./log-projection.js";
 import { archiveWindow, createGlobalTuiPreferences, createLogSessionMeta, } from "./persistence.js";
 import { resolvePersistedModelSelection, } from "./model-selection.js";
-import { DEFAULT_THRESHOLDS, computeHysteresisThresholds, } from "./settings.js";
+import { DEFAULT_THRESHOLDS, } from "./settings.js";
 // ------------------------------------------------------------------
 // Constants
 // ------------------------------------------------------------------
@@ -43,13 +43,13 @@ const COMPACT_PROMPT_OUTPUT = `Distill this conversation into a continuation pro
 
 **Before writing the continuation prompt**, update your important log with any key discoveries, decisions, or insights from this session that aren't already recorded there. The important log survives compaction and will be visible to the new instance — this is your last chance to persist valuable knowledge.
 
-**What the new instance will already have:** your system prompt, the important log, AGENTS.md persistent memory, and the active plan file (if any) are automatically re-injected after compact. Do not duplicate their contents in the continuation prompt — focus on what they don't cover: current progress, session-specific context, and in-flight work state. If you've discovered stable, long-term knowledge during this session, consider persisting it to the project AGENTS.md before compaction.
+**What the new instance will already have:** your system prompt, the important log, AGENTS.md persistent memory, and the active plan (if any) are automatically re-injected after compact. Do not duplicate their contents in the continuation prompt — focus on what they don't cover: current progress, session-specific context, and in-flight work state. If you've discovered stable, long-term knowledge during this session, consider persisting it to the project AGENTS.md before compaction.
 
 Your summary should capture everything that matters and nothing that doesn't. Use whatever structure best fits the actual content — there is no fixed template. But as you write, pressure-test yourself against these questions:
 
 - **What are we trying to do?** The user's intent, goals, and any constraints or preferences they've expressed — stated or implied.
 - **What do we know now that we didn't at the start?** Key discoveries, failed approaches, edge cases encountered, decisions made and *why*. (Skip anything already in your important log.)
-- **Where exactly are we?** What's done, what's in progress, what's next. Be specific enough that work won't be repeated or skipped. (Skip anything already in your plan file.)
+- **Where exactly are we?** What's done, what's in progress, what's next. Be specific enough that work won't be repeated or skipped. (Skip anything already tracked in your plan.)
 - **What artifacts exist?** Files read, created, or modified — with enough context about each to be actionable (not just a path list).
 - **What tone/style/working relationship has been established?** If the user has shown preferences for how they like to collaborate, note them.
 - **What explicit rules has the user stated?** Direct instructions about how to work, what not to do, approval requirements, or behavioral constraints the user has explicitly communicated (e.g., "don't modify code until I approve", "always run tests before committing"). Preserve these verbatim — they are binding rules, not suggestions.
@@ -64,14 +64,14 @@ You just made a tool call and received its result above. That result is real and
 
 **Before writing the continuation prompt**, update your important log with any key discoveries, decisions, or insights from this session that aren't already recorded there. The important log survives compaction and will be visible to the new instance — this is your last chance to persist valuable knowledge.
 
-**What the new instance will already have:** your system prompt, the important log, AGENTS.md persistent memory, and the active plan file (if any) are automatically re-injected after compact. Do not duplicate their contents in the continuation prompt — focus on what they don't cover: current progress, session-specific context, and in-flight work state. If you've discovered stable, long-term knowledge during this session, consider persisting it to the project AGENTS.md before compaction.
+**What the new instance will already have:** your system prompt, the important log, AGENTS.md persistent memory, and the active plan (if any) are automatically re-injected after compact. Do not duplicate their contents in the continuation prompt — focus on what they don't cover: current progress, session-specific context, and in-flight work state. If you've discovered stable, long-term knowledge during this session, consider persisting it to the project AGENTS.md before compaction.
 
 Write in natural prose. Use structure where it aids clarity, not for its own sake. As you write, pressure-test yourself against these questions:
 
 - **What are we trying to do?** The user's intent, goals, constraints, and preferences — stated or implied.
 - **What do we know now that we didn't at the start?** Key discoveries, failed approaches, edge cases encountered, decisions made and why. (Skip anything already in your important log.)
 - **Where exactly did we stop?** Be precise: what was the last tool call, what did it return, and what was supposed to happen next? The new instance must be able to pick up mid-step without repeating or skipping anything.
-- **What's done, what's in progress, what remains?** Give a clear picture of overall progress, not just the interrupted step. (Skip anything already in your plan file.)
+- **What's done, what's in progress, what remains?** Give a clear picture of overall progress, not just the interrupted step. (Skip anything already tracked in your plan.)
 - **What artifacts exist?** Files read, created, or modified — with enough context about each to be actionable.
 - **What working style has the user shown?** Communication preferences, collaboration patterns, or explicit instructions about how they like to work.
 - **What explicit rules has the user stated?** Direct instructions about how to work, what not to do, approval requirements, or behavioral constraints (e.g., "don't modify code until I approve", "always run tests before committing"). Preserve these verbatim — they are binding rules, not suggestions.
@@ -211,15 +211,14 @@ export class Session {
     _thresholds = { ...DEFAULT_THRESHOLDS };
     _hintResetNone = DEFAULT_THRESHOLDS.summarize_hint_level1 / 100 - 0.20;
     _hintResetLevel1 = (DEFAULT_THRESHOLDS.summarize_hint_level1 + DEFAULT_THRESHOLDS.summarize_hint_level2) / 200;
-    // Global max_output_tokens override from settings.json
-    _settingsMaxOutputTokens;
+    // Context window multiplier (0.0–1.0). Effective context = contextLength × _contextRatio.
+    _contextRatio = 1.0;
     // Hint compression (two-tier state machine)
     _hintState = "none";
     // show_context: number of remaining rounds where annotations are active
     _showContextRoundsRemaining = 0;
     _showContextAnnotations = null;
-    // Plan tracking
-    _activePlanFile = null;
+    // Plan tracking (inline-only, no plan file)
     _activePlanCheckpoints = [];
     _activePlanChecked = [];
     // Skills
@@ -275,19 +274,18 @@ export class Session {
         this._progress = opts.progress;
         this._mcpManager = opts.mcpManager;
         this._promptsDirs = opts.promptsDirs;
-        // Apply user settings (thresholds + max_output_tokens)
-        if (opts.settings) {
-            this._applySettings(opts.settings);
+        // Apply context ratio
+        if (opts.contextRatio !== undefined) {
+            this._contextRatio = Math.max(0.01, Math.min(1.0, opts.contextRatio));
         }
         // Attach store if provided (must be set before _initConversation)
         if (opts.store) {
             this._store = opts.store;
         }
         // Resolve path variables
-        const pathOverrides = opts.config.pathOverrides;
-        this._projectRoot = pathOverrides.projectRoot ?? process.cwd();
-        this._sessionArtifactsOverride = pathOverrides.sessionArtifacts ?? "";
-        this._systemData = pathOverrides.systemData ?? "";
+        this._projectRoot = process.cwd();
+        this._sessionArtifactsOverride = "";
+        this._systemData = "";
         this._createdAt = new Date().toISOString();
         this._initConversation();
         this._toolExecutors = this._buildToolExecutors();
@@ -318,26 +316,10 @@ export class Session {
         this._appendEntry(createSystemPrompt(this._nextLogId("system_prompt"), systemPrompt), false);
     }
     /**
-     * Apply resolved user settings (thresholds + max_output_tokens).
+     * Effective context length for a given ModelConfig, scaled by context ratio.
      */
-    _applySettings(s) {
-        this._thresholds = { ...s.thresholds };
-        const hysteresis = computeHysteresisThresholds(s.thresholds);
-        this._hintResetNone = hysteresis.hintResetNone / 100;
-        this._hintResetLevel1 = hysteresis.hintResetLevel1 / 100;
-        this._settingsMaxOutputTokens = s.maxOutputTokens;
-        // Apply to current primary agent's model config
-        this._applyMaxOutputTokensOverride(this.primaryAgent.modelConfig);
-    }
-    /**
-     * Effective maxTokens for a given ModelConfig, taking settings override into account.
-     * Clamps to [4096, modelMaxOutputTokens].
-     */
-    _effectiveMaxTokens(mc) {
-        if (this._settingsMaxOutputTokens === undefined)
-            return mc.maxTokens;
-        const modelMax = getModelMaxOutputTokens(mc.model);
-        return Math.max(4096, Math.min(this._settingsMaxOutputTokens, modelMax ?? mc.maxTokens));
+    _effectiveContextLength(mc) {
+        return Math.round(mc.contextLength * this._contextRatio);
     }
     // ==================================================================
     // Message infrastructure
@@ -760,7 +742,6 @@ export class Session {
         this._shellCounter = 0;
         this._showContextRoundsRemaining = 0;
         this._showContextAnnotations = null;
-        this._activePlanFile = null;
         this._activePlanCheckpoints = [];
         this._activePlanChecked = [];
     }
@@ -790,7 +771,6 @@ export class Session {
         const restoredThinkingPreference = meta.thinkingLevel ?? "default";
         const restoredCachePreference = meta.cacheHitEnabled ?? true;
         this._resetTransientState();
-        this._applyMaxOutputTokensOverride(restoredModelConfig);
         this.primaryAgent.replaceModelConfig(restoredModelConfig);
         this._persistedModelSelection = this._buildPersistedModelSelection({
             modelConfigName: restoredSelection.selectedConfigName,
@@ -828,19 +808,9 @@ export class Session {
         // Restore ask state from log: find unclosed ask_request
         this._restoreAskStateFromLog(entries);
         // Restore active plan from meta
-        if (meta.activePlanFile) {
-            try {
-                const content = readFileSync(meta.activePlanFile, "utf-8");
-                const { checkpoints, checked } = this._parsePlanCheckpoints(content);
-                if (checkpoints.length > 0) {
-                    this._activePlanFile = meta.activePlanFile;
-                    this._activePlanCheckpoints = checkpoints;
-                    this._activePlanChecked = checked;
-                }
-            }
-            catch {
-                // Plan file no longer exists — skip restoration
-            }
+        if (meta.activePlanCheckpoints && meta.activePlanCheckpoints.length > 0) {
+            this._activePlanCheckpoints = meta.activePlanCheckpoints;
+            this._activePlanChecked = meta.activePlanChecked ?? meta.activePlanCheckpoints.map(() => false);
         }
         // Rebuild ask history from ask_resolution entries
         this._askHistory = [];
@@ -877,7 +847,8 @@ export class Session {
                 thinkingLevel: this._thinkingLevel,
                 cacheHitEnabled: this._cacheHitEnabled,
                 summary: this._generateSummary(),
-                activePlanFile: this._activePlanFile ?? undefined,
+                activePlanCheckpoints: this._activePlanCheckpoints.length > 0 ? this._activePlanCheckpoints : undefined,
+                activePlanChecked: this._activePlanChecked.length > 0 ? this._activePlanChecked : undefined,
             }),
             entries: this._log,
         };
@@ -969,6 +940,12 @@ export class Session {
     get skills() {
         return this._skills;
     }
+    get mcpManager() {
+        return this._mcpManager;
+    }
+    async ensureMcpReady() {
+        await this._ensureMcp();
+    }
     /** Read-only access to disabled skill names. */
     get disabledSkills() {
         return this._disabledSkills;
@@ -1145,7 +1122,6 @@ export class Session {
      */
     switchModel(modelConfigName) {
         const newModelConfig = this.config.getModel(modelConfigName);
-        this._applyMaxOutputTokensOverride(newModelConfig);
         this.primaryAgent.replaceModelConfig(newModelConfig);
         this._persistedModelSelection = this._buildPersistedModelSelection({
             modelConfigName,
@@ -1156,16 +1132,6 @@ export class Session {
         this._thinkingLevel = this._resolveThinkingLevelForModel(newModelConfig.model, this._preferredThinkingLevel);
         this._cacheHitEnabled = this._preferredCacheHitEnabled;
     }
-    /**
-     * If settings.json specifies max_output_tokens, clamp the ModelConfig.maxTokens
-     * to [4096, modelMaxOutputTokens]. This mutates the ModelConfig in place.
-     */
-    _applyMaxOutputTokensOverride(mc) {
-        if (this._settingsMaxOutputTokens === undefined)
-            return;
-        const modelMax = getModelMaxOutputTokens(mc.model) ?? mc.maxTokens;
-        mc.maxTokens = Math.max(4096, Math.min(this._settingsMaxOutputTokens, modelMax));
-    }
     applyGlobalPreferences(preferences) {
         const prefs = createGlobalTuiPreferences(preferences);
         this._preferredThinkingLevel = prefs.thinkingLevel;
@@ -1258,10 +1224,10 @@ export class Session {
     _armShowContextAnnotations() {
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         const result = generateShowContext(this._log, this._lastInputTokens, budget);
         this._showContextRoundsRemaining = 1;
         this._showContextAnnotations = result.annotations;
@@ -2007,26 +1973,10 @@ export class Session {
                 ? this._showContextAnnotations ?? undefined
                 : undefined;
             let importantLog = this._readImportantLog();
-            // Inject active plan content alongside important log
-            if (this._activePlanFile) {
-                try {
-                    const planContent = readFileSync(this._activePlanFile, "utf-8");
-                    if (planContent) {
-                        importantLog += `\n\n---\n## Active Plan\n${planContent}`;
-                        // Detect checkpoint changes from file edits and emit update
-                        const { checkpoints, checked } = this._parsePlanCheckpoints(planContent);
-                        if (checkpoints.length !== this._activePlanCheckpoints.length ||
-                            checkpoints.some((t, i) => t !== this._activePlanCheckpoints[i]) ||
-                            checked.some((c, i) => c !== this._activePlanChecked[i])) {
-                            this._activePlanCheckpoints = checkpoints;
-                            this._activePlanChecked = checked;
-                            this._emitPlanProgress("plan_update");
-                        }
-                    }
-                }
-                catch {
-                    // Plan file may have been deleted externally — ignore
-                }
+            // Inject active plan alongside important log
+            if (this._activePlanCheckpoints.length > 0) {
+                const lines = this._activePlanCheckpoints.map((text, i) => `- [${this._activePlanChecked[i] ? "x" : " "}] ${text}`);
+                importantLog += `\n\n---\n## Active Plan\n${lines.join("\n")}`;
             }
             const agentsMd = this._readAgentsMd();
             return projectToApiMessages(this._log, {
@@ -2269,9 +2219,9 @@ export class Session {
         }
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         const result = generateShowContext(this._log, this._lastInputTokens, budget);
         this._showContextRoundsRemaining = 1;
         this._showContextAnnotations = result.annotations;
@@ -2346,149 +2296,68 @@ export class Session {
     // ==================================================================
     _execPlan(args) {
         const action = args["action"];
-        if (typeof action !== "string" || !["submit", "check", "finish"].includes(action)) {
-            return this._toolArgError("plan", "'action' must be one of: submit, check, finish.");
+        if (typeof action !== "string" || !["submit", "check", "dismiss"].includes(action)) {
+            return this._toolArgError("plan", "'action' must be one of: submit, check, dismiss.");
         }
         if (action === "submit") {
-            const fileArg = this._argRequiredString("plan", args, "file", { nonEmpty: true });
-            if (fileArg instanceof ToolResult)
-                return fileArg;
-            const fileRel = fileArg.trim();
-            const artifactsDir = this._resolveSessionArtifacts();
-            let filePath;
-            try {
-                filePath = safePath({
-                    baseDir: artifactsDir,
-                    requestedPath: fileRel,
-                    cwd: artifactsDir,
-                    mustExist: true,
-                    expectFile: true,
-                    accessKind: "read",
-                }).safePath;
-            }
-            catch (e) {
-                if (e instanceof SafePathError) {
-                    if (e.code === "PATH_NOT_FOUND" || e.code === "PATH_NOT_FILE") {
-                        const candidatePath = e.details.resolvedPath || join(artifactsDir, fileRel);
-                        return new ToolResult({
-                            content: `Error: plan file not found at ${candidatePath}\n` +
-                                `The 'file' parameter is resolved relative to SESSION_ARTIFACTS (${artifactsDir}).\n` +
-                                `Make sure you wrote the plan file to this directory using write_file(path="${join(artifactsDir, fileRel)}").`,
-                        });
-                    }
-                    return new ToolResult({ content: `Error: invalid plan file path: ${e.message}` });
-                }
-                throw e;
-            }
-            let content;
-            try {
-                content = readFileSync(filePath, "utf-8");
-            }
-            catch (e) {
-                return new ToolResult({
-                    content: `Error: could not read plan file: ${e instanceof Error ? e.message : String(e)}`,
-                });
+            const raw = args["checkpoints"];
+            if (!Array.isArray(raw) || raw.length === 0) {
+                return this._toolArgError("plan", "'checkpoints' must be a non-empty array of strings.");
             }
-            const { checkpoints, checked } = this._parsePlanCheckpoints(content);
+            const checkpoints = raw.map((c) => String(c).trim()).filter(Boolean);
             if (checkpoints.length === 0) {
-                return new ToolResult({
-                    content: "Error: no checkpoints found in plan file. " +
-                        "Expected a '## Checkpoints' section with items like '- [ ] Do something'.",
-                });
+                return this._toolArgError("plan", "'checkpoints' items must not be empty.");
             }
-            this._activePlanFile = filePath;
             this._activePlanCheckpoints = checkpoints;
-            this._activePlanChecked = checked;
+            this._activePlanChecked = checkpoints.map(() => false);
             this._emitPlanProgress("plan_submit");
             return new ToolResult({
                 content: `Plan submitted with ${checkpoints.length} checkpoints.`,
             });
         }
         if (action === "check") {
-            if (!this._activePlanFile) {
+            if (this._activePlanCheckpoints.length === 0) {
                 return new ToolResult({ content: "Error: no active plan. Use action='submit' first." });
             }
             const item = args["item"];
             if (typeof item !== "number" || !Number.isInteger(item)) {
-                return this._toolArgError("plan", "'item' must be an integer index.");
+                return this._toolArgError("plan", "'item' must be an integer index (1-based).");
             }
-            // Re-parse checkpoints from file to handle edits since submit
-            let currentContent;
-            try {
-                currentContent = readFileSync(this._activePlanFile, "utf-8");
-            }
-            catch {
-                return new ToolResult({ content: "Error: could not read plan file." });
-            }
-            const { checkpoints, checked } = this._parsePlanCheckpoints(currentContent);
-            if (checkpoints.length === 0) {
-                return new ToolResult({ content: "Error: no checkpoints found in plan file." });
-            }
-            this._activePlanCheckpoints = checkpoints;
-            this._activePlanChecked = checked;
-            if (item < 0 || item >= checkpoints.length) {
+            // Convert 1-based user index to 0-based internal index
+            const idx = item - 1;
+            if (idx < 0 || idx >= this._activePlanCheckpoints.length) {
                 return new ToolResult({
-                    content: `Error: 'item' index ${item} is out of range (0..${checkpoints.length - 1}).`,
+                    content: `Error: 'item' ${item} is out of range (1..${this._activePlanCheckpoints.length}).`,
                 });
             }
-            this._activePlanChecked[item] = true;
-            // Update the file on disk: replace the matching unchecked item with checked
-            try {
-                const lines = currentContent.split("\n");
-                let checkpointIndex = 0;
-                let inCheckpointsSection = false;
-                for (let i = 0; i < lines.length; i++) {
-                    if (/^## Checkpoints\b/.test(lines[i])) {
-                        inCheckpointsSection = true;
-                        continue;
-                    }
-                    if (inCheckpointsSection && /^## /.test(lines[i]))
-                        break;
-                    if (inCheckpointsSection && /^- \[[ x]\] .+$/.test(lines[i])) {
-                        if (checkpointIndex === item) {
-                            lines[i] = lines[i].replace(/^- \[ \]/, "- [x]");
-                            break;
-                        }
-                        checkpointIndex++;
-                    }
-                }
-                writeFileSync(this._activePlanFile, lines.join("\n"), "utf-8");
-            }
-            catch {
-                // File write failure is non-fatal — in-memory state is still updated
+            const checkpointText = this._activePlanCheckpoints[idx];
+            this._activePlanChecked[idx] = true;
+            // Check if all checkpoints are now complete → auto-finish
+            const allDone = this._activePlanChecked.every(Boolean);
+            if (allDone) {
+                // Clear state immediately (so persistence sees no plan on interrupt)
+                // but delay TUI panel dismissal so the user sees the all-checked state
+                this._emitPlanProgress("plan_update");
+                this._activePlanCheckpoints = [];
+                this._activePlanChecked = [];
+                setTimeout(() => {
+                    this._emitPlanProgress("plan_finish");
+                }, 5000);
+                return new ToolResult({
+                    content: `✓ Checkpoint ${item} done: ${checkpointText}\n` +
+                        `All checkpoints complete. Plan closed.`,
+                });
             }
             this._emitPlanProgress("plan_update");
             return new ToolResult({
-                content: `Checkpoint ${item} marked as done: ${checkpoints[item]}`,
+                content: `✓ Checkpoint ${item} done: ${checkpointText}`,
             });
         }
-        // action === "finish"
-        this._activePlanFile = null;
+        // action === "dismiss"
         this._activePlanCheckpoints = [];
         this._activePlanChecked = [];
         this._emitPlanProgress("plan_finish");
-        return new ToolResult({ content: "Plan finished and dismissed." });
-    }
-    _parsePlanCheckpoints(content) {
-        const checkpoints = [];
-        const checked = [];
-        let inCheckpointsSection = false;
-        for (const line of content.split("\n")) {
-            if (/^## Checkpoints\b/.test(line)) {
-                inCheckpointsSection = true;
-                continue;
-            }
-            if (inCheckpointsSection && /^## /.test(line))
-                break;
-            if (inCheckpointsSection) {
-                const match = line.match(/^- \[([x ])\] (.+)$/);
-                if (match) {
-                    checkpoints.push(match[2]);
-                    checked.push(match[1] === "x");
-                }
-            }
-        }
-        return { checkpoints, checked };
+        return new ToolResult({ content: "Plan dismissed." });
     }
     _emitPlanProgress(action) {
         if (!this._progress)
@@ -2875,10 +2744,10 @@ export class Session {
             return undefined;
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return undefined;
         const compactOutputRatio = this._thresholds.compact_output / 100;
@@ -2992,9 +2861,9 @@ export class Session {
             return;
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return;
         const ratio = this._lastInputTokens / budget;
@@ -3018,9 +2887,9 @@ export class Session {
     _updateHintStateAfterApiCall() {
         const mc = this.primaryAgent.modelConfig;
         const provider = this.primaryAgent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc) : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return;
         const ratio = this._lastInputTokens / budget;
@@ -3914,9 +3783,6 @@ export class Session {
                 "and conclusions.";
     }
     _getSubAgentModelConfig() {
-        const name = this.config.subAgentModelName;
-        if (name)
-            return this.config.getModel(name);
         return this.primaryAgent.modelConfig;
     }
     _buildSubAgentContext(includeImportantLog) {
@@ -4203,10 +4069,10 @@ export class Session {
     _buildSubAgentCompactCheck(agent) {
         const mc = agent.modelConfig;
         const provider = agent._provider;
-        const effectiveMax = this._effectiveMaxTokens(mc);
+        const effectiveMax = mc.maxTokens;
         const budget = provider.budgetCalcMode === "full_context"
-            ? mc.contextLength
-            : mc.contextLength - effectiveMax;
+            ? this._effectiveContextLength(mc)
+            : this._effectiveContextLength(mc) - effectiveMax;
         if (budget <= 0)
             return undefined;
         const compactOutputRatio = this._thresholds.compact_output / 100;