@ouispec/agent-worker 0.10.1 → 0.12.0

package/README.md

@@ -19,6 +19,7 @@ Optional tuning, with its defaults:
 - `maxRounds`: 12
 - `maxTokens`: 32,000 per model response, thinking included. A step cut off there before it says or calls anything runs once more, told to plan less; if that is cut off too, the person is told and the turn ends with `stopReason: 'output_limit'`.
 - `temperature`: 0.3
+- `forcedToolChoice`: true. Set `false` for a model that refuses a forced tool choice (Claude Sonnet 5.5 answers 400 to one): a step the turn policy forces to a tool is given only that tool and told to call it.
 - `toolTimeoutMs`: 30 s
 - `turnDeadlineMs`: 14 min (keep it below your host's own limit)
 - `retries`: 3

package/dist/index.d.ts

@@ -54,6 +54,7 @@ export type { UISequence } from './ui/ui-sequence.js';
 export type { AgentApiSurface, EntityInstance, EntityFilter, EntityMutation, IntentResult, ViewAnnotationState, NavigationState, SessionApiSurface, LearningApiSurface, } from '@ouispec/agent-core';
 export { runAgentTurn } from './orchestrator.js';
 export { PROMPT_CACHE_BREAKPOINTS, describeModel } from './model.js';
+export { answerWithoutState } from './ui/page-state-at-end.js';
 export type { LanguageModel, ProviderOptions } from './model.js';
 export type { TurnPolicy, StepTool } from './turn-policy.js';
 export { defaultTurnPolicy } from './turn-policy.js';
@@ -62,7 +63,7 @@ export type { HttpEmitAdapterConfig } from './emit/http-adapter.js';
 export { createAgentTurnRunner, categorizeError, payloadRefusal, TURN_DEADLINE_EXCEEDED } from './runtime/turn-runner.js';
 export type { AgentTurnRunner, TurnOutcome, CategorizedError } from './runtime/turn-runner.js';
 export { assertAgentRuntimeConfig } from './runtime/config.js';
-export type { AgentRuntimeConfig, LambdaAgentConfig, AgentTurnPayload, HistoryRequest } from './runtime/types.js';
+export type { AgentRuntimeConfig, LambdaAgentConfig, AgentTurnPayload, HistoryRequest, TurnHistory } from './runtime/types.js';
 export { createLambdaAgentHandler } from './lambda/handler.js';
 export { startContainerAgentWorker } from './container/server.js';
 export type { ContainerAgentConfig, ContainerAgentWorker } from './container/server.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,YAAY,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAE,WAAW,EAAE,kBAAkB,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACxJ,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChH,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACzE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,YAAY,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAI3F,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC/F,YAAY,EACV,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,KAAK,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,UAAU,GACX,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAInF,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AACtE,YAAY,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrF,YAAY,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC1H,YAAY,EAAE,cAAc,EAAE,wBAAwB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,YAAY,EAAE,eAAe,EAAE,0BAA0B,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACxK,OAAO,EAAE,eAAe,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACrH,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAClG,OAAO,EACL,SAAS,IAAI,oBAAoB,EACjC,SAAS,IAAI,oBAAoB,EACjC,SAAS,IAAI,oBAAoB,EACjC,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,gBAAgB,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIpE,YAAY,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvJ,OAAO,EACL,mBAAmB,EACnB,SAAS,EACT,SAAS,EACT,SAAS,EACT,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,WAAW,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClI,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAChJ,OAAO,EAAE,0BAA0B,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACpJ,YAAY,EAAE,SAAS,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,YAAY,EACV,eAAe,EACf,cAAc,EACd,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACjE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGpE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1H,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC/H,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAGxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,YAAY,EACV,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/index.js

@@ -44,6 +44,8 @@ export { createUISequence } from './ui/ui-sequence.js';
 export { runAgentTurn } from './orchestrator.js';
 // The model seam: any `ai` library model; the worker imports no provider.
 export { PROMPT_CACHE_BREAKPOINTS, describeModel } from './model.js';
+// An answer as the model is sent it and as it is stored, for a host that fits answers stored before 0.11 (ADR-0263 §2.2).
+export { answerWithoutState } from './ui/page-state-at-end.js';
 export { defaultTurnPolicy } from './turn-policy.js';
 export { createHttpEmitAdapter } from './emit/http-adapter.js';
 // The runtime: one core, two host adapters (Lambda + SQS, container)

package/dist/index.js.map

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

package/dist/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAmC,MAAM,YAAY,CAAC;AAqGtH;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC,CA2xD1B"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAmC,MAAM,YAAY,CAAC;AAqGtH;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC,CAw2D1B"}

package/dist/orchestrator.js

@@ -28,10 +28,10 @@ import { evaluateToolPolicySafe } from './authz/tool-policy.js';
 import { createToolInputValidator } from './tools/input-validation.js';
 import { readClientPage, withoutClientUI } from './ui/snapshot.js';
 import { KNOWLEDGE_TOOL, knowledgeTool, readClientKnowledge, withClientKnowledge } from './ui/knowledge.js';
-import { withNewestPageStateOnly } from './ui/newest-page-state.js';
-import { withClock } from './prompt/clock.js';
-import { withSpokenInput } from './prompt/spoken-input.js';
-import { withUserText } from './prompt/user-text.js';
+import { answerWithoutState, withStatesAtEnd } from './ui/page-state-at-end.js';
+import { stepMessages as forStep, STEP_NOTE_CLOSE, STEP_NOTE_OPEN } from './step-messages.js';
+import { clockText, readClientTimeZone } from './prompt/clock.js';
+import { readClientMessageInput, spokenInputText } from './prompt/spoken-input.js';
 import { AttachmentGuard } from './attachments/guard.js';
 import { ATTACHMENT_DATA_NOTE, turnAttachmentParts, withReferenceLines, withTurnAttachments, withoutLeftOut } from './attachments/content.js';
 import { attachmentTools } from './attachments/tools.js';
@@ -139,8 +139,8 @@ export async function runAgentTurn(config, input) {
     // Whether the page can be seen (ADR-0245 §2.5): nothing that changes it runs while it cannot.
     const sight = createPageSight();
     const uiCounts = { describes: 0, reads: 0, acts: 0, guides: 0 };
-    // Earlier answers' page states replaced, summed over the turn's steps.
-    let pageStatesNotRepeated = 0;
+    // Answers whose page state was moved to the end of what the model reads, summed over the turn's steps.
+    let pageStatesMoved = 0;
     // The knowledge the client sent for its page goes after the host's prompt.
     const knowledge = readClientKnowledge(input.context ?? null);
     // ─── Files (ADR-0252 §2.11, §2.12) ─────────────────────────────────────────
@@ -797,6 +797,7 @@ export async function runAgentTurn(config, input) {
             channel: config.ui.channel,
             resultTimeoutMs: uiResultTimeoutMs,
             maxObservationChars: config.ui.maxObservationChars,
+            maxAnswerDataChars: config.ui.maxAnswerDataChars,
             waitDeadline: uiWaitDeadline,
             jobWaitMs: uiJobWaitMs,
             currentPage: () => currentPage,
@@ -1093,11 +1094,18 @@ export async function runAgentTurn(config, input) {
         // The system prompt has to travel as a message rather than the top-level
         // `system` field, because only a message carries `providerOptions`.
         //
-        // Two breakpoints, both on content that is append-only:
+        // Three breakpoints, each on content that is append-only:
         //   1. system (+ tools) — identical for every round of a segment, and for
         //      every turn on the same page.
         //   2. the end of the incoming history — stable across the rounds that follow
         //      it, since a round appends rather than rewrites.
+        //   3. the end of the conversation as each step sends it, moved forward every
+        //      step, so the next step reads this one's calls and answers from the
+        //      cache. With only the first two, everything after the user's message
+        //      went uncached at every step: on dev a turn's UI answers (up to tens of
+        //      thousands of tokens each) were paid in full again on every later step.
+        // What a step alone is told (its notes) goes after the third, so it never
+        // changes a prefix (step-messages.ts).
         //
         // Caching is a PREFIX match: one byte earlier in the prefix invalidates
         // everything after it. Nothing volatile may move ahead of these points — no
@@ -1186,27 +1194,25 @@ export async function runAgentTurn(config, input) {
         const stoppedBeforeModel = stopOf(abortController.signal);
         if (stoppedBeforeModel)
             return await finishStopped(stoppedBeforeModel, { expired, continued });
-        // Convert history to AI SDK CoreMessage format. The page the user is on
-        // travels with their message, not in the system prompt: it changes on every
-        // page, and in the system prompt it would invalidate the cached prefix. An
-        // approved call that ran is the result of the call the model made (see
+        // Convert history to AI SDK CoreMessage format. Everything before the end
+        // of the conversation is sent exactly as it was sent before, so the prompt
+        // cache reads it (step-messages.ts). What is true only now — the page's
+        // index and values, the user's clock, a note on calls whose approval
+        // expired, the host's step context — is not added to the user's message,
+        // where the next turn would send that message without it and write the
+        // conversation from there to the cache again: the index goes after the
+        // system prompt, the rest after the conversation (`stepTail`). An approved
+        // call that ran is the result of the call the model made (see
         // continueApproval).
-        // The date and time on the user's clock travel with their message too: a
-        // model has no clock, and the changing minute must stay out of the cached
-        // system prompt (prompt/clock.ts).
-        // A message the person spoke says so straight after their words: it may hold a mis-heard word
-        // (prompt/spoken-input.ts). A click on an approval card is not a message, so it says nothing.
         const turnFilesGiven = !!fileArea && (input.attachments?.length ?? 0) > 0;
         const messages = [
-            ...withClock(withPageState(withNote(withSpokenInput(convertHistoryToCoreMessages(
+            ...convertHistoryToCoreMessages(
             // An approved call's outcome, and an expired one's, is a later result of the call already in the
             // history: it takes that call's place.
             [...(input.history ?? []), ...expired.outcomes, ...(continued?.outcome ? [continued.outcome] : [])], [input.content, continued?.note].filter(Boolean).join('\n\n'), 
             // The turn's own message, when the history already holds it: its files are given below,
             // each with its line, so the history's copy of the message does not name them again.
-            turnFilesGiven && input.history?.at(-1)?.role === 'user' ? input.history.length - 1 : null), input.approval ? null : (input.context ?? null)), 
-            // Said on the user's message whether or not the host's history already holds that message.
-            expired.outcomes.length > 0 ? expiredNote(expired) : null), client, config.ui?.maxObservationChars ?? DEFAULT_PAGE_STATE_CHARS, config.ui?.maxIndexChars ?? DEFAULT_INDEX_CHARS), input.context ?? null),
+            turnFilesGiven && input.history?.at(-1)?.role === 'user' ? input.history.length - 1 : null),
             ...(continued?.messages ?? []),
         ];
         // The turn's files go with its message, after everything said about it (ADR-0252 §2.11).
@@ -1248,11 +1254,69 @@ export async function runAgentTurn(config, input) {
         // `instructions` takes `string | SystemModelMessage | SystemModelMessage[]`,
         // and the message form carries `providerOptions`, so the breakpoint travels
         // with it. (`system` is the deprecated alias for the same type.)
-        const instructions = {
+        const systemMessage = {
             role: 'system',
             content: systemPrompt,
             ...(cachePoint ? { providerOptions: cachePoint } : {}),
         };
+        // What the page offers, after the system prompt with a breakpoint of its own:
+        // it is the same for every step and every turn on the same page, so it is
+        // read from the cache, and when the page changes only it and what follows are
+        // written again. A change during the turn reaches the model in the answer
+        // that made it (ui-tools.ts `forModel`).
+        const pageIndex = client && client.page.length > 0
+            ? {
+                role: 'system',
+                content: [
+                    '<page_index>',
+                    `The user's screen offers these surfaces and actions. Run an action with ${UI_ACT_TOOL}; ${UI_DESCRIBE_TOOL} says what one takes.`,
+                    indexText(client.page, config.ui?.maxIndexChars ?? DEFAULT_INDEX_CHARS),
+                    '</page_index>',
+                ].join('\n'),
+                ...(cachePoint ? { providerOptions: cachePoint } : {}),
+            }
+            : null;
+        const instructions = pageIndex ? [systemMessage, pageIndex] : systemMessage;
+        // ─── What is true now, after the conversation (step-messages.ts) ───────────
+        // The turn's own message: answers after it are this turn's, and only those
+        // are newer than the page the turn began on.
+        const turnMessageAt = messages.map((m) => m.role).lastIndexOf('user');
+        const turnClock = clockText(new Date(), readClientTimeZone(input.context ?? null));
+        const turnSpoken = input.approval ? null : readClientMessageInput(input.context ?? null);
+        const turnPageValues = client && client.page.length > 0
+            ? [
+                observationsText(client.observations, config.ui?.maxObservationChars ?? DEFAULT_PAGE_STATE_CHARS, {
+                    schemas: observationSchemas(client.page),
+                }),
+                client.fit?.observations?.length ? `Not shown: ${fitNotes(client.fit.observations).join(' ')}` : null,
+            ]
+            : null;
+        /** The page's state from this turn's newest answer that carried one; until then, as the user's screen sent it. */
+        let newestAnswerState;
+        const stepTail = (notes) => [
+            ...(turnPageValues
+                ? [
+                    [
+                        '<page_state>',
+                        sight.blind()
+                            ? `Not current: an answer came without the page's state (${sight.blind()}). These values are from before it, so read the page before you change anything.`
+                            : newestAnswerState !== undefined
+                                ? 'The page as it is now, from the newest answer that carried its state.'
+                                : 'The page as it was when the user sent their message.',
+                        `Current values: ${newestAnswerState !== undefined ? JSON.stringify(newestAnswerState) : turnPageValues[0]}`,
+                        ...(newestAnswerState === undefined && turnPageValues[1] ? [turnPageValues[1]] : []),
+                        '</page_state>',
+                    ].join('\n'),
+                ]
+                : []),
+            turnClock,
+            // A message the person spoke may hold a mis-heard word (prompt/spoken-input.ts). A click on an
+            // approval card is not a message, so it says nothing.
+            ...(turnSpoken ? [spokenInputText(turnSpoken)] : []),
+            ...(expired.outcomes.length > 0 ? [expiredNote(expired)] : []),
+            ...(input.stepContext?.trim() ? [input.stepContext.trim()] : []),
+            ...(notes.length > 0 ? [[STEP_NOTE_OPEN, ...notes, STEP_NOTE_CLOSE].join('\n')] : []),
+        ];
         const withCachePoint = (msgs) => !cachePoint ? msgs : [
             ...msgs.slice(0, -1),
             ...msgs.slice(-1).map((m) => ({
@@ -1329,26 +1393,47 @@ export async function runAgentTurn(config, input) {
                         forced,
                         only: allowed && allowed.length < actionIds.length ? new Set(allowed) : null,
                     };
+                    // The tool the policy forces, as the model knows it: an action is run through `ui_act`.
+                    const forcedTool = forced ? UI_ACT_TOOL : typeof policy.toolChoice === 'object' ? policy.toolChoice.toolName : null;
+                    const mustCall = forcedTool !== null || policy.toolChoice === 'required';
+                    // A model that refuses a forced choice (Claude Sonnet 5.5 answers 400 to `tool` and
+                    // `required`) is held to the step another way: it is given only the forced tool, and
+                    // told to call it. It can still answer in words instead, which a forced choice cannot.
+                    const held = mustCall && config.forcedToolChoice === false;
                     const constraints = {
-                        ...(policy.toolChoice ? { toolChoice: forced ? { type: 'tool', toolName: UI_ACT_TOOL } : policy.toolChoice } : {}),
-                        ...(policy.activeTools
-                            ? {
-                                activeTools: [
-                                    ...policy.activeTools.filter((n) => !isAction(n)),
-                                    ...(allowed && allowed.length > 0 && !policy.activeTools.includes(UI_ACT_TOOL) ? [UI_ACT_TOOL] : []),
-                                ],
-                            }
-                            : {}),
+                        ...(policy.toolChoice && !held ? { toolChoice: forced ? { type: 'tool', toolName: UI_ACT_TOOL } : policy.toolChoice } : {}),
+                        ...(held && forcedTool
+                            ? { activeTools: [forcedTool] }
+                            : policy.activeTools
+                                ? {
+                                    activeTools: [
+                                        ...policy.activeTools.filter((n) => !isAction(n)),
+                                        ...(allowed && allowed.length > 0 && !policy.activeTools.includes(UI_ACT_TOOL) ? [UI_ACT_TOOL] : []),
+                                    ],
+                                }
+                                : {}),
                     };
-                    // The policy's note goes after the system prompt, for this step only.
-                    // ai carries an instructions override forward to later steps, so a step
-                    // without a note sets the plain instructions back.
-                    // So does the turn's record, once a call has not succeeded.
-                    const notes = [note, forced ? `This step: call ${UI_ACT_TOOL} with action "${forced}".` : null, ledger.note(), outputLimitNote].filter((n) => !!n);
-                    // The page's state on the newest answer only: an earlier page is not the page now.
-                    const trimmed = messages ? withNewestPageStateOnly(messages) : null;
-                    if (trimmed)
-                        pageStatesNotRepeated += trimmed.replaced;
+                    // The policy's note, the forced action and the turn's record (once a call
+                    // has not succeeded) are for this step only. They go at the end of what
+                    // the model reads, after the moving cache breakpoint, never in the system
+                    // prompt: a note there changed the prefix of the whole conversation, so
+                    // the step that carried one, and the step after it, wrote the conversation
+                    // to the cache again instead of reading it.
+                    const stepCall = forced
+                        ? `This step: call ${UI_ACT_TOOL} with action "${forced}".`
+                        : held
+                            ? forcedTool
+                                ? `This step: call ${forcedTool}. It is the only tool this step has.`
+                                : 'This step: call a tool.'
+                            : null;
+                    const notes = [note, stepCall, ledger.note(), outputLimitNote].filter((n) => !!n);
+                    // Every answer gives its page state up the same way; the newest of this turn's is read at the end.
+                    const trimmed = messages ? withStatesAtEnd(messages, turnMessageAt) : null;
+                    if (trimmed) {
+                        pageStatesMoved += trimmed.moved;
+                        if (trimmed.newest !== undefined)
+                            newestAnswerState = trimmed.newest;
+                    }
                     // The files this step would carry, within the turn's and the conversation's caps (ADR-0252 §2.11).
                     const leftOutNow = fileGuard.beforeStep();
                     if (leftOutNow.length > 0) {
@@ -1358,13 +1443,11 @@ export async function runAgentTurn(config, input) {
                         });
                     }
                     const leftOut = fileGuard.leftOutParts();
-                    const stepMessages = leftOut.length > 0 && messages ? withoutLeftOut(trimmed?.messages ?? messages, leftOut) : trimmed?.messages;
+                    const stepMessages = leftOut.length > 0 && messages ? withoutLeftOut(trimmed?.messages ?? messages, leftOut) : trimmed?.messages ?? messages;
                     return {
                         ...constraints,
-                        ...(stepMessages ? { messages: stepMessages } : {}),
-                        instructions: notes.length
-                            ? [instructions, ...notes.map((content) => ({ role: 'system', content }))]
-                            : instructions,
+                        ...(stepMessages ? { messages: forStep(stepMessages, stepTail(notes), cachePoint) } : {}),
+                        instructions,
                     };
                 },
                 onStepEnd: async ({ text, toolCalls, usage: stepUsage, finishReason }) => {
@@ -1388,6 +1471,10 @@ export async function runAgentTurn(config, input) {
                         totalTextEmitted,
                         finishReason,
                         outputTokens: stepUsage?.outputTokens ?? 0,
+                        // How this step's input was billed: read from the cache, written to it, or neither.
+                        inputTokens: stepUsage?.inputTokens ?? 0,
+                        cacheReadTokens: stepUsage?.inputTokenDetails?.cacheReadTokens ?? 0,
+                        cacheWriteTokens: stepUsage?.inputTokenDetails?.cacheWriteTokens ?? 0,
                     });
                 },
             });
@@ -1546,7 +1633,7 @@ export async function runAgentTurn(config, input) {
                         // What bounds the model: the page's index as it reads it, against the most it is given
                         // before the furthest surfaces are listed by id only.
                         indexChars: indexText(client.page, Infinity).length,
-                        pageStatesNotRepeated,
+                        pageStatesMoved,
                         maxIndexChars: config.ui?.maxIndexChars ?? DEFAULT_INDEX_CHARS,
                     },
                 }
@@ -1762,37 +1849,6 @@ export async function runAgentTurn(config, input) {
         };
     }
 }
-/** Put a note for the model on the turn's user message, after what the user said. */
-function withNote(messages, note) {
-    const last = messages[messages.length - 1];
-    if (!note || !last || last.role !== 'user')
-        return messages;
-    return [...messages.slice(0, -1), withUserText(last, note)];
-}
-/**
- * Put the client's page on the user's message: what it offers, as an index of
- * its actions, and its latest observations. The model reads it as part of what
- * the user said, where it is true for this message only. The index has its own
- * budget, so it never crowds the page's state out (ADR-0245 §2.2).
- */
-function withPageState(messages, client, maxChars, maxIndexChars) {
-    if (!client || client.page.length === 0)
-        return messages;
-    const last = messages[messages.length - 1];
-    if (!last || last.role !== 'user')
-        return messages;
-    const observations = observationsText(client.observations, maxChars, { schemas: observationSchemas(client.page) });
-    const notShown = client.fit?.observations?.length ? fitNotes(client.fit.observations) : [];
-    const pageState = [
-        '<page_state>',
-        `The user's screen offers these surfaces and actions. Run an action with ${UI_ACT_TOOL}; ${UI_DESCRIBE_TOOL} says what one takes.`,
-        indexText(client.page, maxIndexChars),
-        `Current values: ${observations}`,
-        ...(notShown.length ? [`Not shown: ${notShown.join(' ')}`] : []),
-        '</page_state>',
-    ].join('\n');
-    return [...messages.slice(0, -1), withUserText(last, pageState)];
-}
 /**
  * Convert our TurnHistoryMessage[] to AI SDK CoreMessage[].
  * The AI SDK handles each provider's message format internally.
@@ -2009,7 +2065,8 @@ function convertResponseToTurnMessages(result, executedToolResults) {
                 const tracked = executedToolResults[resultIdx++];
                 turnMessages.push({
                     role: 'tool',
-                    content: tracked.result,
+                    // Stored as the model is sent it, so the history sends it the same way every turn.
+                    content: answerWithoutState(tracked.result),
                     toolCallId: tracked.toolCallId,
                     name: tracked.toolName,
                 });