koneck 2.25.45 → 2.25.47

package/dist/ask-queue.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Permission questions waiting for an answer, oldest first.
+ *
+ * Sub-agents run concurrently and can each need an answer at the same moment. Holding the current
+ * question in a single slot meant the second overwrote the first, whose promise then never
+ * settled: that agent waited forever, the pool waiting on it never finished, and the turn hung
+ * with nothing on screen to explain why.
+ *
+ * A queue rather than a set of simultaneous prompts, because a permission question is only
+ * answerable if you can read it, and two at once on a terminal is neither.
+ */
+export interface AskRequest<T> {
+    tool: string;
+    args: string;
+    prefix: string;
+    resolve: (answer: T) => void;
+}
+export declare class AskQueue<T> {
+    private readonly waiting;
+    /** Adds a question. Returns true when it is the one now on screen. */
+    add(request: AskRequest<T>): boolean;
+    /** The question that should be shown, or undefined when there are none. */
+    current(): AskRequest<T> | undefined;
+    /** How many are behind the current one. */
+    get pending(): number;
+    get size(): number;
+    /**
+     * Answers the current question and returns the next.
+     *
+     * Every exit from the panel goes through here, so no promise is left unsettled — one that is
+     * stalls the agent waiting on it, and anything waiting on that agent, indefinitely.
+     */
+    answer(value: T): AskRequest<T> | undefined;
+    /**
+     * Answers everything still waiting with the same value.
+     *
+     * For a cancelled turn: the agents are going away, and leaving their promises hanging would
+     * keep the pool alive after the work it was doing had been abandoned.
+     */
+    drain(value: T): number;
+}
+//# sourceMappingURL=ask-queue.d.ts.map

package/dist/ask-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-queue.d.ts","sourceRoot":"","sources":["../src/ask-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,UAAU,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;CAC9B;AAED,qBAAa,QAAQ,CAAC,CAAC;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,sEAAsE;IACtE,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;IAKpC,2EAA2E;IAC3E,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS;IAIpC,2CAA2C;IAC3C,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS;IAM3C;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM;CAKxB"}

package/dist/ask-queue.js

@@ -0,0 +1,54 @@
+/**
+ * Permission questions waiting for an answer, oldest first.
+ *
+ * Sub-agents run concurrently and can each need an answer at the same moment. Holding the current
+ * question in a single slot meant the second overwrote the first, whose promise then never
+ * settled: that agent waited forever, the pool waiting on it never finished, and the turn hung
+ * with nothing on screen to explain why.
+ *
+ * A queue rather than a set of simultaneous prompts, because a permission question is only
+ * answerable if you can read it, and two at once on a terminal is neither.
+ */
+export class AskQueue {
+    waiting = [];
+    /** Adds a question. Returns true when it is the one now on screen. */
+    add(request) {
+        this.waiting.push(request);
+        return this.waiting.length === 1;
+    }
+    /** The question that should be shown, or undefined when there are none. */
+    current() {
+        return this.waiting[0];
+    }
+    /** How many are behind the current one. */
+    get pending() {
+        return Math.max(0, this.waiting.length - 1);
+    }
+    get size() {
+        return this.waiting.length;
+    }
+    /**
+     * Answers the current question and returns the next.
+     *
+     * Every exit from the panel goes through here, so no promise is left unsettled — one that is
+     * stalls the agent waiting on it, and anything waiting on that agent, indefinitely.
+     */
+    answer(value) {
+        const current = this.waiting.shift();
+        current?.resolve(value);
+        return this.waiting[0];
+    }
+    /**
+     * Answers everything still waiting with the same value.
+     *
+     * For a cancelled turn: the agents are going away, and leaving their promises hanging would
+     * keep the pool alive after the work it was doing had been abandoned.
+     */
+    drain(value) {
+        const count = this.waiting.length;
+        while (this.waiting.length)
+            this.waiting.shift()?.resolve(value);
+        return count;
+    }
+}
+//# sourceMappingURL=ask-queue.js.map

package/dist/ask-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-queue.js","sourceRoot":"","sources":["../src/ask-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,MAAM,OAAO,QAAQ;IACF,OAAO,GAAyB,EAAE,CAAC;IAEpD,sEAAsE;IACtE,GAAG,CAAC,OAAsB;QACxB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,2EAA2E;IAC3E,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,2CAA2C;IAC3C,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAQ;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAQ;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACjE,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/dist/context-limit.d.ts

@@ -42,4 +42,17 @@ export declare function looksLikeContextOverflow(err: unknown): boolean;
  * repeating the same failure.
  */
 export declare function parseContextLimit(err: unknown): number | null;
+/**
+ * The context window as the provider itself reports it.
+ *
+ * A table of model names is a guess, and a gateway makes it a bad one: `auto/best-coding` is an
+ * alias that resolves to whatever is best today, has a 1,048,576-token window, and matches
+ * nothing in any table. Assuming 32,768 for it compacted a conversation with 97% of its room
+ * left — sixty-nine messages summarised away for nothing, on a real run.
+ *
+ * An OpenAI-compatible /models listing usually carries the real number, and asking costs one
+ * request per session. A provider that does not answer, or answers without it, leaves the table
+ * in charge.
+ */
+export declare function fetchModelContextLimit(baseURL: string, apiKey: string | undefined, model: string, timeoutMs?: number): Promise<number | null>;
 //# sourceMappingURL=context-limit.d.ts.map

package/dist/context-limit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-limit.d.ts","sourceRoot":"","sources":["../src/context-limit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA6BH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C,uCAAuC;AACvC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAS1E;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,OAAO,CAAC;AAE/B,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE1E;AAED,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAI9D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAgB7D"}
+{"version":3,"file":"context-limit.d.ts","sourceRoot":"","sources":["../src/context-limit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA6BH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C,uCAAuC;AACvC,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAS1E;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,OAAO,CAAC;AAE/B,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE1E;AAED,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAI9D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAgB7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,KAAK,EAAE,MAAM,EACb,SAAS,SAAQ,GAChB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsBxB"}

package/dist/context-limit.js

@@ -104,4 +104,41 @@ export function parseContextLimit(err) {
     }
     return null;
 }
+/**
+ * The context window as the provider itself reports it.
+ *
+ * A table of model names is a guess, and a gateway makes it a bad one: `auto/best-coding` is an
+ * alias that resolves to whatever is best today, has a 1,048,576-token window, and matches
+ * nothing in any table. Assuming 32,768 for it compacted a conversation with 97% of its room
+ * left — sixty-nine messages summarised away for nothing, on a real run.
+ *
+ * An OpenAI-compatible /models listing usually carries the real number, and asking costs one
+ * request per session. A provider that does not answer, or answers without it, leaves the table
+ * in charge.
+ */
+export async function fetchModelContextLimit(baseURL, apiKey, model, timeoutMs = 6_000) {
+    try {
+        const response = await fetch(`${baseURL.replace(/\/$/, '')}/models`, {
+            headers: apiKey ? { authorization: `Bearer ${apiKey}` } : {},
+            signal: AbortSignal.timeout(timeoutMs),
+        });
+        if (!response.ok)
+            return null;
+        const body = await response.json();
+        const entry = body.data?.find(m => m['id'] === model);
+        if (!entry)
+            return null;
+        // Different gateways name it differently; the input limit is the one that matters, since it
+        // is the prompt that has to fit.
+        for (const key of ['max_input_tokens', 'context_length', 'context_window', 'max_context_length']) {
+            const value = Number(entry[key]);
+            if (Number.isFinite(value) && value >= 1_000)
+                return Math.floor(value);
+        }
+        return null;
+    }
+    catch {
+        return null; // unreachable, slow, or not an OpenAI-shaped listing
+    }
+}
 //# sourceMappingURL=context-limit.js.map

package/dist/context-limit.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-limit.js","sourceRoot":"","sources":["../src/context-limit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context-limit.js","sourceRoot":"","sources":["../src/context-limit.ts"],"names":[],"mappings":"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"}

package/dist/engine.d.ts

@@ -1,4 +1,5 @@
 import OpenAI from 'openai';
+import type { Plan } from './plan.js';
 import { type PluginEntry } from './plugins.js';
 import { type MCPClientEntry } from './mcp.js';
 import { CheckpointRecorder } from './checkpoint.js';
@@ -161,12 +162,24 @@ export declare function mapWithLimit<T, R>(items: readonly T[], limit: number, f
  * in place would make every subsequent turn fail the same way.
  */
 export declare function stripImages(messages: Message[]): number;
-export declare function runReActLoop(messages: Message[], client: OpenAI, config: AgentConfig, effectiveCwd: string, stats: TokenStats, mcpClients: MCPClientEntry[], plugins: PluginEntry[], openaiTools: OpenAI.Chat.ChatCompletionTool[], turnOffset?: number, abortSignal?: AbortSignal, checkpoint?: CheckpointRecorder): Promise<boolean>;
+export declare function runReActLoop(messages: Message[], client: OpenAI, config: AgentConfig, effectiveCwd: string, stats: TokenStats, mcpClients: MCPClientEntry[], plugins: PluginEntry[], openaiTools: OpenAI.Chat.ChatCompletionTool[], turnOffset?: number, abortSignal?: AbortSignal, checkpoint?: CheckpointRecorder, 
+/**
+ * The plan, held by the session rather than by this loop.
+ *
+ * It used to be declared here, and this runs once per user message — so saying "continue" wiped
+ * the plan and the model wrote a new one from nothing. A run that had done five of eleven steps
+ * started again at one of five, having forgotten both what it had done and what was left.
+ */
+planRef?: {
+    current: Plan;
+}): Promise<boolean>;
 export interface AgentSession {
     readonly id: string;
     readonly messages: Message[];
     readonly stats: TokenStats;
     readonly completed: boolean;
+    /** The plan as it stands, for saving with the session. */
+    readonly plan: Plan;
     /** `imagePaths` sends pictures explicitly; paths written in the text are attached anyway. */
     send(userText: string, signal?: AbortSignal, imagePaths?: readonly string[]): Promise<boolean>;
 }
@@ -187,7 +200,9 @@ export declare function createAgentSession(config: AgentConfig, initialMessages?
  * record of itself shrank each time it was resumed. `turnOffset` already reads `stats.turns`,
  * so seeding it also keeps turn numbering continuous instead of restarting at 1.
  */
-initialStats?: Partial<TokenStats>): Promise<AgentSession>;
+initialStats?: Partial<TokenStats>, 
+/** A plan restored with a session, so resuming continues the work rather than re-planning it. */
+initialPlan?: Plan): Promise<AgentSession>;
 /**
  * The session being continued, when `runAgent` is resuming one.
  *

package/dist/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}

package/dist/engine.js

@@ -9,9 +9,9 @@ import { tui } from './tui.js';
 import { isGitRepo, createWorktree, mergeWorktree } from './worktree.js';
 import { resolveProvider, getApiKey } from './providers.js';
 import { compressIfNeeded } from './compressor.js';
-import { contextLimitFor, looksLikeContextOverflow, parseContextLimit } from './context-limit.js';
+import { contextLimitFor, looksLikeContextOverflow, parseContextLimit, fetchModelContextLimit, } from './context-limit.js';
 import { generateSessionId, saveSession } from './session.js';
-import { EMPTY_PLAN, parsePlan, planReminder, planAck } from './plan.js';
+import { EMPTY_PLAN, parsePlan, planReminder, planAck, noPlanReminder } from './plan.js';
 import { resolveSandbox, describeSandbox } from './sandbox.js';
 import { loadImages, buildUserContent, imageMime, looksLikeVisionUnsupported, visionUnsupportedNotice, } from './images.js';
 import { parseTextToolCalls, paramTypesFrom, looksLikeTextToolCall, stripTemplateTokens, splitEmittable } from './tool-call-text.js';
@@ -156,7 +156,18 @@ export function isRetryableProviderError(err) {
         // Network-level failures carry no status.
         // "Connection error." is the OpenAI SDK's APIConnectionError wording and carries no status,
         // which is exactly the transient case retrying exists for. It cost a four-turn run.
-        return /connection error|connection|timeout|timed out|socket|econnrese|epipe|enotfound|eai_again|fetch failed|stream idle|network|aborted/.test(text);
+        if (/connection error|connection|timeout|timed out|socket|econnrese|epipe|enotfound|eai_again|fetch failed|stream idle|network|aborted/.test(text)) {
+            return true;
+        }
+        // A stream that dies mid-flight, which a gateway reports in the body rather than the status.
+        // "Stream ended before producing a non-ping SSE event [model (502)] (bad_gateway)" arrived
+        // with no status at all and matched none of the above, so it was never retried — a run nine
+        // minutes in was ended by an upstream hiccup it should have shrugged off.
+        if (/stream ended|bad_gateway|bad gateway|service unavailable|overloaded|upstream|temporarily unavailable/.test(text)) {
+            return true;
+        }
+        // A 5xx named in the message rather than carried on the error.
+        return /\(5\d\d\)|\b5\d\d\b.*(gateway|server error|unavailable)/.test(text);
     }
     return false;
 }
@@ -514,6 +525,8 @@ export function resolveAgentConcurrency(requested) {
     return Math.max(1, Math.min(MAX_AGENT_CONCURRENCY, Math.floor(requested)));
 }
 /** Stagger between starts, so agents do not all issue their first request on the same tick. */
+/** How much of a sub-agent's answer comes back. Enough for its conclusions, not its transcript. */
+const SUBAGENT_REPORT_CHARS = 2_000;
 const AGENT_STAGGER_MS = 400;
 /**
  * Maps over items with at most `limit` running at once, preserving input order in the results.
@@ -535,7 +548,15 @@ export async function mapWithLimit(items, limit, fn) {
     await Promise.all(Array.from({ length: workers }, worker));
     return results;
 }
-async function handleSpawnAgents(args, config, cwd) {
+async function handleSpawnAgents(args, config, cwd, 
+/**
+ * The parent's counters, so delegated work is counted as work.
+ *
+ * Sub-agent usage went nowhere: eight agents could spend a hundred thousand tokens between
+ * them and the session still reported only what the parent had spent itself. That is the
+ * figure people budget against, and it was wrong by however much was delegated.
+ */
+parentStats) {
     const tasks = args.tasks.slice(0, 8);
     if (tasks.length === 0)
         return 'ERROR: tasks array is empty.';
@@ -555,6 +576,7 @@ async function handleSpawnAgents(args, config, cwd) {
     const concurrency = resolveAgentConcurrency(config.agentConcurrency);
     const results = await mapWithLimit(tasks, concurrency, async (task, i) => {
         const mine = progress[i];
+        let lastCounted = { prompt: 0, completion: 0, total: 0 };
         // Spread the opening requests over a moment. Three starting on the same tick is enough to
         // trip a per-second limit even when three concurrent is otherwise sustainable.
         if (i > 0)
@@ -587,6 +609,14 @@ async function handleSpawnAgents(args, config, cwd) {
             onToolResult: undefined,
             onAgentProgress: undefined,
             onTokens: (s) => {
+                // Reported cumulatively per agent, so the parent is given the difference.
+                if (parentStats) {
+                    parentStats.promptTokens += Math.max(0, s.promptTokens - lastCounted.prompt);
+                    parentStats.completionTokens += Math.max(0, s.completionTokens - lastCounted.completion);
+                    parentStats.totalTokens += Math.max(0, s.totalTokens - lastCounted.total);
+                    lastCounted = { prompt: s.promptTokens, completion: s.completionTokens, total: s.totalTokens };
+                    config.onTokens?.(parentStats);
+                }
                 mine.tokens = s.totalTokens;
                 mine.turns = s.turns;
                 publish();
@@ -603,8 +633,17 @@ async function handleSpawnAgents(args, config, cwd) {
         try {
             const session = await createAgentSession(subConfig);
             await session.send(task);
-            const last = [...session.messages].reverse().find(m => m.role === 'assistant');
-            const output = typeof last?.content === 'string' ? last.content.slice(0, 300) : '(completed)';
+            // The last assistant message with something in it — not merely the last, which after a
+            // tool call is often an empty shell — and enough of it to be worth having. Three hundred
+            // characters cut a sub-agent's conclusions mid-sentence, so the parent had to work out
+            // for itself what had been done, which is the opposite of delegating.
+            const said = [...session.messages].reverse().find(m => m.role === 'assistant' && typeof m.content === 'string' && m.content.trim().length > 0);
+            const full = typeof said?.content === 'string' ? said.content.trim() : '';
+            const output = full
+                ? (full.length > SUBAGENT_REPORT_CHARS
+                    ? full.slice(0, SUBAGENT_REPORT_CHARS) + `\n      … (${full.length - SUBAGENT_REPORT_CHARS} more characters)`
+                    : full)
+                : '(finished without saying anything)';
             settle('done');
             return { task, output, success: true, branch };
         }
@@ -666,7 +705,15 @@ export function stripImages(messages) {
     }
     return removed;
 }
-export async function runReActLoop(messages, client, config, effectiveCwd, stats, mcpClients, plugins, openaiTools, turnOffset = 0, abortSignal, checkpoint) {
+export async function runReActLoop(messages, client, config, effectiveCwd, stats, mcpClients, plugins, openaiTools, turnOffset = 0, abortSignal, checkpoint, 
+/**
+ * The plan, held by the session rather than by this loop.
+ *
+ * It used to be declared here, and this runs once per user message — so saying "continue" wiped
+ * the plan and the model wrote a new one from nothing. A run that had done five of eleven steps
+ * started again at one of five, having forgotten both what it had done and what was left.
+ */
+planRef = { current: EMPTY_PLAN }) {
     const policy = await loadPolicy(effectiveCwd);
     const silent = Boolean(config.silent);
     const seenSignatures = new Set();
@@ -722,7 +769,6 @@ export async function runReActLoop(messages, client, config, effectiveCwd, stats
      * failing to reconstruct: by turn twelve it had read a great deal and could no longer say what
      * it had set out to do.
      */
-    let plan = EMPTY_PLAN;
     /** True once tools have been taken away to force a final answer out of a looping run. */
     let forcedAnswer = false;
     let textToolsNoticed = false;
@@ -780,7 +826,11 @@ export async function runReActLoop(messages, client, config, effectiveCwd, stats
             // The plan travels with the request rather than being pushed into the history: appended to
             // the transcript it would scroll away behind the reading it is meant to survive, and a
             // dozen stale copies of it would be there competing with the current one.
-            const reminder = planReminder(plan);
+            // A plan when there is one; a request for one when there is not and the job needs it.
+            // Silence is what produced sixty-three turns and a million tokens with no plan at all.
+            const reminder = planRef.current.steps.length > 0
+                ? planReminder(planRef.current)
+                : (turn >= 1 && !toolsDisabled ? noPlanReminder() : '');
             const outbound = reminder
                 ? [...messages, { role: 'system', content: reminder }]
                 : messages;
@@ -1285,9 +1335,9 @@ export async function runReActLoop(messages, client, config, effectiveCwd, stats
                         result = next;
                     }
                     else {
-                        plan = next;
-                        config.onPlan?.(plan);
-                        result = planAck(plan);
+                        planRef.current = next;
+                        config.onPlan?.(next);
+                        result = planAck(next);
                     }
                 }
                 else if (tc.name === 'spawn_agents') {
@@ -1296,7 +1346,7 @@ export async function runReActLoop(messages, client, config, effectiveCwd, stats
                         parsed = JSON.parse(tc.arguments);
                     }
                     catch { /* use empty */ }
-                    result = await handleSpawnAgents(parsed, config, effectiveCwd);
+                    result = await handleSpawnAgents(parsed, config, effectiveCwd, stats);
                 }
                 else if (BUILTIN_NAMES.has(tc.name)) {
                     result = await dispatchTool(tc.name, tc.arguments, effectiveCwd, config.requireApproval || policyDecision.requireApproval, line => config.onToolOutput?.(tc.name, line), sandbox);
@@ -1408,7 +1458,9 @@ export async function createAgentSession(config, initialMessages,
  * record of itself shrank each time it was resumed. `turnOffset` already reads `stats.turns`,
  * so seeding it also keeps turn numbering continuous instead of restarting at 1.
  */
-initialStats) {
+initialStats, 
+/** A plan restored with a session, so resuming continues the work rather than re-planning it. */
+initialPlan) {
     const client = buildClient(config);
     const id = generateSessionId();
     const stats = {
@@ -1441,6 +1493,18 @@ initialStats) {
         webSearch: detectSearchKey(),
     };
     const openaiTools = buildToolList(mcpClients, plugins, config, available);
+    // Asked of the provider once, because a table of model names cannot know what a gateway alias
+    // resolves to — and guessing small there summarised away most of a conversation that had room.
+    // An explicit setting still wins; this only fills in what nobody has said.
+    if (!config.contextTokens) {
+        const reported = await fetchModelContextLimit(resolveProvider(config.provider, config.baseURL).baseURL, config.apiKey ?? getApiKey(resolveProvider(config.provider, config.baseURL)), config.model);
+        if (reported) {
+            config = { ...config, contextTokens: reported };
+            if (!config.silent) {
+                tui.printThinking(`${config.model} accepts ${reported.toLocaleString()} tokens of context.`);
+            }
+        }
+    }
     // Resolved once. The writable area is the workspace plus anything named with --add-dir, and it
     // does not change part-way through a run.
     const sandbox = resolveSandbox(config.sandbox, config.cwd, config.addDirs ?? []);
@@ -1448,6 +1512,14 @@ initialStats) {
         tui.printThinking('Sandbox: ' + describeSandbox(sandbox));
     }
     let _completed = true;
+    /**
+     * The plan, for the life of the session rather than one message.
+     *
+     * Held here because a plan that dies with the turn is not a plan: a run five steps into eleven
+     * was told "continue" and started again at one of five, having forgotten both what it had done
+     * and what remained.
+     */
+    const planRef = { current: initialPlan ?? EMPTY_PLAN };
     async function send(userText, signal, imagePaths) {
         // Images named in the prompt are sent as images. Naming a screenshot used to do nothing at
         // all: the model got the path, could not open a PNG, and answered about a file it had never
@@ -1466,7 +1538,7 @@ initialStats) {
         // One checkpoint per user message: /revert undoes the file edits made in response to it.
         const checkpoint = new CheckpointRecorder(config.cwd, userText);
         try {
-            _completed = await runReActLoop(messages, client, { ...config, auditSessionId: id }, config.cwd, stats, mcpClients, plugins, openaiTools, turnOffset, signal, checkpoint);
+            _completed = await runReActLoop(messages, client, { ...config, auditSessionId: id }, config.cwd, stats, mcpClients, plugins, openaiTools, turnOffset, signal, checkpoint, planRef);
         }
         finally {
             // Commit even when the turn threw or was interrupted — a partial edit is exactly
@@ -1480,6 +1552,7 @@ initialStats) {
         messages,
         stats,
         get completed() { return _completed; },
+        get plan() { return planRef.current; },
         send,
     };
 }