@@ -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);