@@ -218,45 +218,55 @@ export class SessionRunner {
218218 let lastAssistantText = "";
219219
220220 try {
221- this.reporter.startSpinner("thinking");
222- const events = runTurn({
223- model: llm,
224- modelString: this.currentModel,
225- messages: this.coreHistory,
226- tools: this.tools,
227- ...(systemPrompt ? { systemPrompt } : {}),
228- signal: abortController.signal,
229- pruningMode: this.pruningMode,
230- toolResultPayloadCapBytes: this.toolResultPayloadCapBytes,
231- promptCachingEnabled: this.promptCachingEnabled,
232- openaiPromptCacheRetention: this.openaiPromptCacheRetention,
233- googleCachedContent: this.googleCachedContent,
234- ...(this.currentThinkingEffort
235- ? { thinkingEffort: this.currentThinkingEffort }
236- : {}),
237- });
221+ let continueLoop = true;
222+ while (continueLoop) {
223+ this.reporter.startSpinner("thinking");
224+ const events = runTurn({
225+ model: llm,
226+ modelString: this.currentModel,
227+ messages: this.coreHistory,
228+ tools: this.tools,
229+ ...(systemPrompt ? { systemPrompt } : {}),
230+ signal: abortController.signal,
231+ pruningMode: this.pruningMode,
232+ toolResultPayloadCapBytes: this.toolResultPayloadCapBytes,
233+ promptCachingEnabled: this.promptCachingEnabled,
234+ openaiPromptCacheRetention: this.openaiPromptCacheRetention,
235+ googleCachedContent: this.googleCachedContent,
236+ ...(this.currentThinkingEffort
237+ ? { thinkingEffort: this.currentThinkingEffort }
238+ : {}),
239+ });
238240
239- const { inputTokens, outputTokens, contextTokens, newMessages } =
240- await this.reporter.renderTurn(events, {
241+ const {
242+ inputTokens,
243+ outputTokens,
244+ contextTokens,
245+ newMessages,
246+ hitMaxSteps,
247+ } = await this.reporter.renderTurn(events, {
241248 showReasoning: this.showReasoning,
242249 verboseOutput: this.verboseOutput,
243250 });
244- const historyMessages = sanitizeModelAuthoredMessages(
245- newMessages,
246- this.currentModel,
247- );
251+ const historyMessages = sanitizeModelAuthoredMessages(
252+ newMessages,
253+ this.currentModel,
254+ );
248255
249- if (historyMessages.length > 0) {
250- this.coreHistory.push(...historyMessages);
251- this.session.messages.push(...historyMessages);
252- saveMessages(this.session.id, historyMessages, thisTurn);
253- }
256+ if (historyMessages.length > 0) {
257+ this.coreHistory.push(...historyMessages);
258+ this.session.messages.push(...historyMessages);
259+ saveMessages(this.session.id, historyMessages, thisTurn);
260+ }
261+
262+ lastAssistantText = extractAssistantText(historyMessages);
263+ this.totalIn += inputTokens;
264+ this.totalOut += outputTokens;
265+ this.lastContextTokens = contextTokens;
266+ touchActiveSession(this.session);
254267
255- lastAssistantText = extractAssistantText(historyMessages);
256- this.totalIn += inputTokens;
257- this.totalOut += outputTokens;
258- this.lastContextTokens = contextTokens;
259- touchActiveSession(this.session);
268+ continueLoop = hitMaxSteps && !abortController.signal.aborted;
269+ }
260270 } catch (err) {
261271 const stubMsg = makeInterruptMessage("error");
262272 this.coreHistory.push(stubMsg);