@@ -1,4 +1,4 @@
1-import { stepCountIs, streamText } from "ai";
1+import { streamText } from "ai";
22 import { isApiLogEnabled, logApiEvent } from "./api-log.ts";
33 import type { ThinkingEffort } from "./provider-options.ts";
44 import {
@@ -11,8 +11,10 @@ import {
1111 mapFullStreamToTurnEvents,
1212 type StreamTextResultFull,
1313 } from "./turn-execution.ts";
14-import { prepareTurnMessages } from "./turn-prepare-messages.ts";
15-import { buildTurnProviderOptions } from "./turn-provider-options.ts";
14+import {
15+ buildStreamTextRequest,
16+ buildTurnPreparation,
17+} from "./turn-request.ts";
1618
1719 export type { ContextPruningMode } from "./turn-context.ts";
1820
@@ -74,14 +76,17 @@ export async function* runTurn(options: {
7476
7577 try {
7678 const toolCount = Object.keys(toolSet).length;
77- const providerOptionsResult = buildTurnProviderOptions({
79+ const { providerOptionsResult, prepared } = buildTurnPreparation({
7880 modelString,
81+ messages,
7982 thinkingEffort,
8083 promptCachingEnabled,
8184 openaiPromptCacheRetention,
8285 googleCachedContent,
8386 toolCount,
84- hasSystemPrompt: Boolean(systemPrompt),
87+ systemPrompt,
88+ pruningMode,
89+ toolResultPayloadCapBytes,
8590 });
8691
8792 logApiEvent("turn start", {
@@ -93,17 +98,6 @@ export async function* runTurn(options: {
9398 toolResultPayloadCapBytes,
9499 });
95100
96- // Prepare messages: sanitize, prune, compact, annotate cache breakpoints
97- const prepared = prepareTurnMessages({
98- messages,
99- modelString,
100- toolCount,
101- systemPrompt,
102- pruningMode,
103- toolResultPayloadCapBytes,
104- promptCachingEnabled,
105- });
106-
107101 if (prepared.pruned) {
108102 yield {
109103 type: "context-pruned",
@@ -127,26 +121,17 @@ export async function* runTurn(options: {
127121 });
128122 }
129123
130- const result = streamText({
131- model,
132- messages: prepared.messages,
133- tools: toolSet,
134- stopWhen: stepCountIs(MAX_STEPS),
135- onStepFinish: stepTracker.onStepFinish,
136- prepareStep: ({ stepNumber }: { stepNumber: number }) => {
137- // On the last allowed step, disable tools so the model gives a final answer
138- if (stepNumber >= MAX_STEPS - 1) {
139- return { activeTools: [] as Array<keyof typeof toolSet> };
140- }
141- return undefined;
142- },
143- ...(prepared.systemPrompt ? { system: prepared.systemPrompt } : {}),
144- ...(Object.keys(providerOptionsResult.providerOptions).length > 0
145- ? { providerOptions: providerOptionsResult.providerOptions }
146- : {}),
147- ...(signal ? { abortSignal: signal } : {}),
148- timeout: { chunkMs: 120_000 },
149- } as StreamTextOptions) as StreamTextResultFull;
124+ const result = streamText(
125+ buildStreamTextRequest({
126+ model,
127+ prepared,
128+ toolSet,
129+ onStepFinish: stepTracker.onStepFinish,
130+ signal,
131+ providerOptions: providerOptionsResult.providerOptions,
132+ maxSteps: MAX_STEPS,
133+ }),
134+ ) as StreamTextResultFull;
150135 result.response.catch(() => {});
151136
152137 for await (const event of mapFullStreamToTurnEvents(result.fullStream, {