xonecas.io
64875
Mc

mini-coder / commit 683a6e8

refactor: remove per-turn step limit

xonecas2026-03-18 683a6e8aa04414d20431ecef878e63690bb737b3 parent 0fa4292

10 files changed

src/agent/reporter.ts+0−1
@@ -7,7 +7,6 @@ export interface TurnResult {
77 contextTokens: number;
88 newMessages: CoreMessage[];
99 reasoningText: string;
10- hitMaxSteps: boolean;
1110 }
1211
1312 export interface StatusBarData {
src/agent/session-runner.ts+33−43
@@ -205,55 +205,45 @@ export class SessionRunner {
205205 let lastAssistantText = "";
206206
207207 try {
208- let continueLoop = true;
209- while (continueLoop) {
210- this.reporter.startSpinner("thinking");
211- const events = runTurn({
212- model: llm,
213- modelString: this.currentModel,
214- messages: this.coreHistory,
215- tools: this.tools,
216- ...(systemPrompt ? { systemPrompt } : {}),
217- signal: abortController.signal,
218- pruningMode: this.pruningMode,
219- toolResultPayloadCapBytes: this.toolResultPayloadCapBytes,
220- promptCachingEnabled: this.promptCachingEnabled,
221- openaiPromptCacheRetention: this.openaiPromptCacheRetention,
222- googleCachedContent: this.googleCachedContent,
223- ...(this.currentThinkingEffort
224- ? { thinkingEffort: this.currentThinkingEffort }
225- : {}),
226- });
208+ this.reporter.startSpinner("thinking");
209+ const events = runTurn({
210+ model: llm,
211+ modelString: this.currentModel,
212+ messages: this.coreHistory,
213+ tools: this.tools,
214+ ...(systemPrompt ? { systemPrompt } : {}),
215+ signal: abortController.signal,
216+ pruningMode: this.pruningMode,
217+ toolResultPayloadCapBytes: this.toolResultPayloadCapBytes,
218+ promptCachingEnabled: this.promptCachingEnabled,
219+ openaiPromptCacheRetention: this.openaiPromptCacheRetention,
220+ googleCachedContent: this.googleCachedContent,
221+ ...(this.currentThinkingEffort
222+ ? { thinkingEffort: this.currentThinkingEffort }
223+ : {}),
224+ });
227225
228- const {
229- inputTokens,
230- outputTokens,
231- contextTokens,
232- newMessages,
233- hitMaxSteps,
234- } = await this.reporter.renderTurn(events, {
226+ const { inputTokens, outputTokens, contextTokens, newMessages } =
227+ await this.reporter.renderTurn(events, {
235228 showReasoning: this.showReasoning,
236229 verboseOutput: this.verboseOutput,
237230 });
238- const historyMessages = sanitizeModelAuthoredMessages(
239- newMessages,
240- this.currentModel,
241- );
242-
243- if (historyMessages.length > 0) {
244- this.coreHistory.push(...historyMessages);
245- this.session.messages.push(...historyMessages);
246- saveMessages(this.session.id, historyMessages, thisTurn);
247- }
248-
249- lastAssistantText = extractAssistantText(historyMessages);
250- this.totalIn += inputTokens;
251- this.totalOut += outputTokens;
252- this.lastContextTokens = contextTokens;
253- touchActiveSession(this.session);
231+ const historyMessages = sanitizeModelAuthoredMessages(
232+ newMessages,
233+ this.currentModel,
234+ );
254235
255- continueLoop = hitMaxSteps && !abortController.signal.aborted;
236+ if (historyMessages.length > 0) {
237+ this.coreHistory.push(...historyMessages);
238+ this.session.messages.push(...historyMessages);
239+ saveMessages(this.session.id, historyMessages, thisTurn);
256240 }
241+
242+ lastAssistantText = extractAssistantText(historyMessages);
243+ this.totalIn += inputTokens;
244+ this.totalOut += outputTokens;
245+ this.lastContextTokens = contextTokens;
246+ touchActiveSession(this.session);
257247 } catch (err) {
258248 const stubMsg = makeInterruptMessage("error");
259249 this.coreHistory.push(stubMsg);
src/cli/stream-render.test.ts+0−1
@@ -50,7 +50,6 @@ describe("renderTurn", () => {
5050 contextTokens: 3,
5151 newMessages: [],
5252 reasoningText: "",
53- hitMaxSteps: false,
5453 });
5554 });
5655
src/cli/stream-render.ts+0−4
@@ -26,7 +26,6 @@ export async function renderTurn(
2626 contextTokens: number;
2727 newMessages: CoreMessage[];
2828 reasoningText: string;
29- hitMaxSteps: boolean;
3029 }> {
3130 const showReasoning = opts?.showReasoning ?? true;
3231 const verboseOutput = opts?.verboseOutput ?? false;
@@ -36,7 +35,6 @@ export async function renderTurn(
3635 let inputTokens = 0;
3736 let outputTokens = 0;
3837 let contextTokens = 0;
39- let hitMaxSteps = false;
4038 let newMessages: CoreMessage[] = [];
4139 const startedToolCalls = new Set<string>();
4240 const toolCallInfo = new Map<string, { toolName: string; label: string }>();
@@ -140,7 +138,6 @@ export async function renderTurn(
140138 inputTokens = event.inputTokens;
141139 outputTokens = event.outputTokens;
142140 contextTokens = event.contextTokens;
143- hitMaxSteps = event.hitMaxSteps;
144141 newMessages = event.messages;
145142 break;
146143 }
@@ -169,6 +166,5 @@ export async function renderTurn(
169166 contextTokens,
170167 newMessages,
171168 reasoningText: getReasoningText(),
172- hitMaxSteps,
173169 };
174170 }
src/cli/test-helpers.ts+0−1
@@ -128,7 +128,6 @@ export function turnDone(messages: CoreMessage[] = []): TurnEvent {
128128 inputTokens: 1,
129129 outputTokens: 2,
130130 contextTokens: 3,
131- hitMaxSteps: false,
132131 messages,
133132 };
134133 }
src/llm-api/turn-execution.ts+5−11
@@ -20,17 +20,16 @@ export type StreamTextResultFull = ReturnType<typeof streamText> & {
2020 response: Promise<{ messages?: CoreMessage[] }>;
2121 };
2222
23-interface TurnStepState {
24- stepCount: number;
23+interface TurnState {
2524 inputTokens: number;
2625 outputTokens: number;
2726 contextTokens: number;
2827 partialMessages: CoreMessage[];
2928 }
3029
31-interface TurnStepTracker {
30+interface TurnStateTracker {
3231 onStepFinish: (step: StepResult<ToolSet>) => void;
33- getState: () => TurnStepState;
32+ getState: () => TurnState;
3433 }
3534
3635 function isZodSchema(s: unknown): boolean {
@@ -62,14 +61,12 @@ export function buildToolSet(tools: ToolDef[]): ToolSet {
6261 return toolSet;
6362 }
6463
65-export function createTurnStepTracker(opts: {
64+export function createTurnStateTracker(opts: {
6665 onStepLog: (entry: {
67- stepNumber: number;
6866 finishReason: string | null | undefined;
6967 usage: unknown;
7068 }) => void;
71-}): TurnStepTracker {
72- let stepCount = 0;
69+}): TurnStateTracker {
7370 let inputTokens = 0;
7471 let outputTokens = 0;
7572 let contextTokens = 0;
@@ -78,14 +75,12 @@ export function createTurnStepTracker(opts: {
7875 return {
7976 onStepFinish: (step: StepResult<ToolSet>) => {
8077 opts.onStepLog({
81- stepNumber: stepCount + 1,
8278 finishReason: step.finishReason,
8379 usage: step.usage,
8480 });
8581 inputTokens += step.usage?.inputTokens ?? 0;
8682 outputTokens += step.usage?.outputTokens ?? 0;
8783 contextTokens = step.usage?.inputTokens ?? contextTokens;
88- stepCount += 1;
8984
9085 const s = step as unknown as {
9186 response?: { messages?: CoreMessage[] };
@@ -94,7 +89,6 @@ export function createTurnStepTracker(opts: {
9489 partialMessages = s.response?.messages ?? s.messages ?? partialMessages;
9590 },
9691 getState: () => ({
97- stepCount,
9892 inputTokens,
9993 outputTokens,
10094 contextTokens,
src/llm-api/turn-request.test.ts+0−1
@@ -19,7 +19,6 @@ describe("buildStreamTextRequest", () => {
1919 onStepFinish: () => {},
2020 signal: undefined,
2121 providerOptions: {},
22- maxSteps: 50,
2322 });
2423
2524 expect(request.onError?.({ error: new Error("boom") })).toBeUndefined();
src/llm-api/turn-request.ts+6−9
@@ -1,4 +1,4 @@
1-import { stepCountIs, type streamText } from "ai";
1+import type { streamText } from "ai";
22
33 import type { ThinkingEffort } from "./provider-options.ts";
44 import type { ContextPruningMode } from "./turn-context.ts";
@@ -10,6 +10,10 @@ type CoreMessage = NonNullable<StreamTextOptions["messages"]>[number];
1010 type CoreModel = StreamTextOptions["model"];
1111 type ToolSet = NonNullable<StreamTextOptions["tools"]>;
1212
13+const continueUntilModelStops: NonNullable<
14+ StreamTextOptions["stopWhen"]
15+> = () => false;
16+
1317 interface BuildTurnPreparationInput {
1418 modelString: string;
1519 messages: CoreMessage[];
@@ -57,7 +61,6 @@ interface BuildStreamTextRequestInput {
5761 onStepFinish: NonNullable<StreamTextOptions["onStepFinish"]>;
5862 signal: AbortSignal | undefined;
5963 providerOptions: Record<string, unknown>;
60- maxSteps: number;
6164 }
6265
6366 export function buildStreamTextRequest(
@@ -68,14 +71,8 @@ export function buildStreamTextRequest(
6871 maxOutputTokens: 16384,
6972 messages: input.prepared.messages,
7073 tools: input.toolSet,
71- stopWhen: stepCountIs(input.maxSteps),
74+ stopWhen: continueUntilModelStops,
7275 onStepFinish: input.onStepFinish,
73- prepareStep: ({ stepNumber }: { stepNumber: number }) => {
74- if (stepNumber >= input.maxSteps - 1) {
75- return { activeTools: [] as Array<keyof typeof input.toolSet> };
76- }
77- return undefined;
78- },
7976 ...(input.prepared.systemPrompt
8077 ? { system: input.prepared.systemPrompt }
8178 : {}),
src/llm-api/turn.ts+6−13
@@ -9,7 +9,7 @@ import {
99 } from "./turn-context.ts";
1010 import {
1111 buildToolSet,
12- createTurnStepTracker,
12+ createTurnStateTracker,
1313 mapFullStreamToTurnEvents,
1414 type StreamTextResultFull,
1515 } from "./turn-execution.ts";
@@ -26,8 +26,6 @@ type StreamTextOptions = Parameters<typeof streamText>[0];
2626 export type CoreMessage = NonNullable<StreamTextOptions["messages"]>[number];
2727 type CoreModel = StreamTextOptions["model"];
2828
29-const MAX_STEPS = 50;
30-
3129 // ─── runTurn ──────────────────────────────────────────────────────────────────
3230
3331 /**
@@ -66,10 +64,9 @@ export async function* runTurn(options: {
6664 } = options;
6765
6866 const toolSet = buildToolSet(tools);
69- const stepTracker = createTurnStepTracker({
70- onStepLog: ({ stepNumber, finishReason, usage }) => {
67+ const turnState = createTurnStateTracker({
68+ onStepLog: ({ finishReason, usage }) => {
7169 logApiEvent("step finish", {
72- stepNumber,
7370 finishReason,
7471 usage,
7572 });
@@ -128,10 +125,9 @@ export async function* runTurn(options: {
128125 model,
129126 prepared,
130127 toolSet,
131- onStepFinish: stepTracker.onStepFinish,
128+ onStepFinish: turnState.onStepFinish,
132129 signal,
133130 providerOptions: providerOptionsResult.providerOptions,
134- maxSteps: MAX_STEPS,
135131 }),
136132 ) as StreamTextResultFull;
137133 result.response.catch(() => {});
@@ -151,25 +147,22 @@ export async function* runTurn(options: {
151147 yield event;
152148 }
153149
154- const finalState = stepTracker.getState();
150+ const finalState = turnState.getState();
155151 logApiEvent("turn complete", {
156152 newMessagesCount: finalState.partialMessages.length,
157153 inputTokens: finalState.inputTokens,
158154 outputTokens: finalState.outputTokens,
159155 });
160156
161- const hitMaxSteps = finalState.stepCount >= MAX_STEPS;
162-
163157 yield {
164158 type: "turn-complete",
165159 inputTokens: finalState.inputTokens,
166160 outputTokens: finalState.outputTokens,
167161 contextTokens: finalState.contextTokens,
168- hitMaxSteps,
169162 messages: finalState.partialMessages,
170163 };
171164 } catch (err) {
172- const finalState = stepTracker.getState();
165+ const finalState = turnState.getState();
173166 const normalizedError = normalizeUnknownError(err);
174167 logApiEvent("turn error", normalizedError);
175168 yield {
src/llm-api/types.ts+0−2
@@ -44,8 +44,6 @@ export interface TurnCompleteEvent {
4444 outputTokens: number;
4545 /** Input tokens of the final step — equals the actual context window usage. */
4646 contextTokens: number;
47- /** True when the turn ended because it hit the max steps limit. */
48- hitMaxSteps: boolean;
4947 /**
5048 * Raw AI SDK ModelMessage objects generated this turn.
5149 * These are passed directly back to streamText on subsequent turns —