@qduc/term2 0.20.0 → 0.22.0

package/dist/providers/responses-websocket-sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"responses-websocket-sessions.d.ts","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAcF;;;;;GAKG;AACH,qBAAa,0BAA0B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB;;IAGnF,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAzC,YAA6B,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAI;IAEtF,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAsC3C;IAED,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,yBAAyB,GAAG,IAAI,CAgB3D;IAED,KAAK,IAAI,IAAI,CAOZ;CASF;AAED,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAGrF"}
+{"version":3,"file":"responses-websocket-sessions.d.ts","sourceRoot":"","sources":["../../source/providers/responses-websocket-sessions.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,IAAI,IAAI,CAAC;IACd,MAAM,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,IAAI;IACrG,MAAM,EAAE,CAAC,CAAC;IACV,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAeF;;;;;GAKG;AACH,qBAAa,0BAA0B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB;;IAGnF,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAzC,YAA6B,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAI;IAEtF,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAE3C;IAED,mBAAmB,CACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,OAAO,GAAE,gCAAqC,GAC7C,6BAA6B,CAAC,CAAC,CAAC,CAuClC;IAED,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,yBAAyB,GAAG,IAAI,CAgB3D;IAED,KAAK,IAAI,IAAI,CAOZ;CASF;AAED,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAGrF"}

package/dist/providers/responses-websocket-sessions.js

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 const WEBSOCKET_CONNECTING = 0;
 const WEBSOCKET_OPEN = 1;
 const WEBSOCKET_CLOSING = 2;
@@ -19,7 +20,10 @@ export class ResponsesWebSocketSessions {
         this.createSocket = createSocket;
     }
     acquire(headers) {
-        const key = responsesWebSocketSessionKey(headers);
+        return this.acquireWithMetadata(headers).socket;
+    }
+    acquireWithMetadata(headers, options = {}) {
+        const key = options.affinityKey ?? responsesWebSocketSessionKey(headers);
         const fingerprint = connectionFingerprint(headers);
         const retained = [];
         for (const slot of this.#slots.get(key) ?? []) {
@@ -41,7 +45,7 @@ export class ResponsesWebSocketSessions {
         if (reusable) {
             reusable.inFlight += 1;
             this.#slots.set(key, retained);
-            return reusable.socket;
+            return { socket: reusable.socket, connectionId: reusable.connectionId, reused: true };
         }
         const socket = this.createSocket(headers);
         // The SDK turns an unlistened socket error into a bare `Promise.reject`,
@@ -49,9 +53,10 @@ export class ResponsesWebSocketSessions {
         // the server (e.g. its 60-minute lifetime cap). Active streams attach
         // their own listener and still receive the same emitted event.
         socket.on?.('error', () => { });
-        retained.push({ socket, fingerprint, inFlight: 1, openedAt: Date.now() });
+        const connectionId = randomUUID();
+        retained.push({ socket, connectionId, fingerprint, inFlight: 1, openedAt: Date.now() });
         this.#slots.set(key, retained);
-        return socket;
+        return { socket, connectionId, reused: false };
     }
     release(socket, options) {
         for (const [key, list] of this.#slots) {

package/dist/providers/responses-websocket-sessions.js.map

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

package/dist/providers/retrying-model.d.ts

@@ -1,4 +1,4 @@
-import type { StreamedModelTurn, StreamedModelTurnEvent, StreamedModelTurnRequest } from '../contracts/streamed-model-turn.js';
+import type { StreamedModelConversationResetOptions, StreamedModelTurn, StreamedModelTurnEvent, StreamedModelTurnRequest } from '../contracts/streamed-model-turn.js';
 import type { ILoggingService } from '../services/service-interfaces.js';
 type RetryingModelOptions = {
     retryAttempts: number;
@@ -18,6 +18,7 @@ export declare class RetryingModel implements StreamedModelTurn {
     private readonly options;
     constructor(model: StreamedModelTurn, options: RetryingModelOptions);
     get wrappedModel(): StreamedModelTurn;
+    resetConversationState(options?: StreamedModelConversationResetOptions): void;
     /** Rebind the request-scoped retry observer when a cached provider is reused. */
     setRetryCallback(callback?: () => void): void;
     stream(request: StreamedModelTurnRequest): AsyncIterable<StreamedModelTurnEvent>;

package/dist/providers/retrying-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retrying-model.d.ts","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAYzE,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CACjF,CAAC;AAsCF,4EAA4E;AAC5E,qBAAa,aAAc,YAAW,iBAAiB;;IAIzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAqB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAA/E,YAA6B,KAAK,EAAE,iBAAiB,EAAmB,OAAO,EAAE,oBAAoB,EAQpG;IAED,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,iFAAiF;IACjF,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAE5C;IAEM,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CAAC,CA8BtF;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAED,cAAc,CACZ,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAK9D;CAiDF"}
+{"version":3,"file":"retrying-model.d.ts","sourceRoot":"","sources":["../../source/providers/retrying-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qCAAqC,EACrC,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACzB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAgBzE,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACxD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;CACjF,CAAC;AAsCF,4EAA4E;AAC5E,qBAAa,aAAc,YAAW,iBAAiB;;IAIzC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAqB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAA/E,YAA6B,KAAK,EAAE,iBAAiB,EAAmB,OAAO,EAAE,oBAAoB,EAQpG;IAED,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,sBAAsB,CAAC,OAAO,CAAC,EAAE,qCAAqC,GAAG,IAAI,CAE5E;IAED,iFAAiF;IACjF,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAE5C;IAEM,MAAM,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CAAC,CA8BtF;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAED,cAAc,CACZ,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACvE,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAK9D;CA4DF"}

package/dist/providers/retrying-model.js

@@ -1,5 +1,5 @@
 import { describeError, isAbortLikeError } from '../utils/error-helpers.js';
-import { isNetworkProtocolError } from '../services/retry/retry-error-classification.js';
+import { isNetworkProtocolError, isTerminatedError, isTransientRetryableError, } from '../services/retry/retry-error-classification.js';
 import { classifyUpstreamRetryableError, computeUpstreamRetryDelayMs, } from '../services/retry/upstream-retry-policy.js';
 import { RetryRecoveryBudgetExhaustedError, } from '../services/retry/retry-recovery-budget.js';
 /** Watches a signal and rejects with an AbortError when it fires. */
@@ -49,6 +49,9 @@ export class RetryingModel {
     get wrappedModel() {
         return this.model;
     }
+    resetConversationState(options) {
+        this.model.resetConversationState?.(options);
+    }
     /** Rebind the request-scoped retry observer when a cached provider is reused. */
     setRetryCallback(callback) {
         this.options.onRetry = callback;
@@ -133,7 +136,16 @@ export class RetryingModel {
         });
     }
     #isRetryable(error) {
-        return isNetworkProtocolError(error) || classifyUpstreamRetryableError(error).retryable;
+        // AI-SDK/undici can surface a mid-body socket reset as the
+        // otherwise-uninformative `TypeError: terminated`. The existing network
+        // classifier handles coded causes; the explicit terminated shape covers
+        // wrappers that lose those codes. Do not reuse the whole transient policy
+        // here: incomplete-stream and parse failures have separate session-level
+        // recovery semantics. `committed` is checked by stream() before this
+        // method, so this cannot replay visible model output.
+        return (isNetworkProtocolError(error) ||
+            (isTerminatedError(error) && isTransientRetryableError(error)) ||
+            classifyUpstreamRetryableError(error).retryable);
     }
 }
 //# sourceMappingURL=retrying-model.js.map

package/dist/providers/retrying-model.js.map

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

package/dist/services/agent-runtime/application-run-loop.d.ts

@@ -59,10 +59,12 @@ export interface ApplicationBoundaryCompaction {
     readonly compact: (input: {
         history: readonly ProviderInputItem[];
         automaticCompactionsThisRun: number;
+        lastCompletedInputTokens?: number;
         signal?: AbortSignal;
         onStarted: (provider: string) => void;
     }) => Promise<{
         kind: 'unchanged';
+        notice?: string;
     } | {
         kind: 'failed';
         provider: string;
@@ -115,7 +117,9 @@ export interface ApplicationRunLoopOptions {
     /** Application-owned local compaction evaluated at each request boundary. */
     readonly boundaryCompaction?: ApplicationBoundaryCompaction;
     /** Synchronous request-boundary policy, before any optional compaction await. */
-    readonly onRequestBoundary?: (history: readonly ProviderInputItem[], onReminder: (text: string) => void) => {
+    readonly onRequestBoundary?: (history: readonly ProviderInputItem[], onReminder: (text: string) => void, observation: {
+        readonly lastCompletedInputTokens?: number;
+    }) => {
         deferCompaction?: boolean;
     } | void;
     /** Per-request output and deadline guard; model settings provide the normal runtime defaults. */
@@ -160,11 +164,16 @@ export interface ApplicationRunLoopDeps {
      * one. Used to report the fate of steers, which is otherwise invisible: a
      * turn spans several runs, and a steer only survives the run it was handed to.
      */
-    readonly logDiagnostic?: (message: string, meta: Record<string, unknown>) => void;
+    readonly logDiagnostic?: (message: string, meta: Record<string, unknown>, options?: ApplicationRunLoopDiagnosticOptions) => void;
     readonly contextCompactionSessionState?: ContextCompactionSessionState;
     /** Injectable wait boundary so retry behavior can be tested without real timers. */
     readonly waitBeforeModelRetry?: (delayMs: number, signal?: AbortSignal) => Promise<void>;
 }
+/** Explicit routing metadata for diagnostics emitted by the run loop. */
+export type ApplicationRunLoopDiagnosticOptions = {
+    readonly severity?: 'debug' | 'info';
+    readonly eventType?: string;
+};
 /**
  * The fate of a message handed to `steer`/`retractSteer`/`editSteer`.
  *

package/dist/services/agent-runtime/application-run-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application-run-loop.d.ts","sourceRoot":"","sources":["../../../source/services/agent-runtime/application-run-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"application-run-loop.d.ts","sourceRoot":"","sources":["../../../source/services/agent-runtime/application-run-loop.ts"],"names":[],"mappings":"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"}

package/dist/services/agent-runtime/application-run-loop.js

@@ -10,8 +10,20 @@ import { addTokenUsage, normalizeUsage } from '../../utils/ai/token-usage.js';
 import { extractAiSdkUpstreamProvider } from '../../providers/ai-sdk-streamed-model.js';
 import { computeModelCost } from '../../services/cost/model-cost.js';
 import { getCatalogPricingVersion, getModelPricing } from '../../services/cost/pricing.js';
-import { GenerationGuard, GenerationGuardError, GenerationStreamDeadlines, } from './generation-guard.js';
+import { DEFAULT_TOOL_ARGUMENT_RUNAWAY_SIGNATURE, GenerationGuard, GenerationGuardError, GenerationStreamDeadlines, ToolArgumentRunawayGuard, } from './generation-guard.js';
 import { classifyInLoopModelRetry, sleepWithAbort } from '../retry/in-loop-model-retry.js';
+/**
+ * Tool results may carry provider-neutral content parts (for example the
+ * image returned by read_file). Preserve only the known multimodal shape;
+ * arbitrary structured tool values retain their historical JSON text form.
+ */
+const isToolResultContentParts = (value) => Array.isArray(value) &&
+    value.length > 0 &&
+    value.every((part) => typeof part === 'object' &&
+        part !== null &&
+        (('type' in part && part.type === 'text') ||
+            ('type' in part && part.type === 'image' && 'image' in part) ||
+            ('type' in part && part.type === 'file' && 'file' in part)));
 /**
  * Compatibility error for legacy callers without a staged run budget. The loop
  * owns turn counting — the SDK-era `callModelInputFilter` hook is deliberately
@@ -609,12 +621,17 @@ export class ApplicationRunLoop {
                 this.#evaluateRunBudget(state, stream, queue);
                 if (state.pendingRunBudgetInteraction)
                     return this.#pauseForRunBudgetInteraction(state, stream, queue);
-                const boundaryDecision = options.onRequestBoundary?.(state.history, (text) => this.#queuePendingSystemNotice(text));
+                const boundaryDecision = options.onRequestBoundary?.(state.history, (text) => this.#queuePendingSystemNotice(text), {
+                    ...(state.lastCompletedInputTokens !== undefined
+                        ? { lastCompletedInputTokens: state.lastCompletedInputTokens }
+                        : {}),
+                });
                 if (options.boundaryCompaction && !boundaryDecision?.deferCompaction) {
                     const compactionStartedAt = Date.now();
                     const compaction = await options.boundaryCompaction.compact({
                         history: state.history,
                         automaticCompactionsThisRun: state.automaticCompactionsThisRun ?? 0,
+                        lastCompletedInputTokens: state.lastCompletedInputTokens,
                         signal: options.signal,
                         onStarted: (provider) => outputPush(stream, queue, { type: 'context_compaction_started', provider, strategy: 'local' }),
                     });
@@ -643,6 +660,10 @@ export class ApplicationRunLoop {
                             durationMs: Math.max(0, Date.now() - compactionStartedAt),
                         });
                     }
+                    else if (compaction.notice && compaction.notice !== state.compactionNotice) {
+                        state.compactionNotice = compaction.notice;
+                        this.#queuePendingSystemNotice(compaction.notice);
+                    }
                     // Summarization is an asynchronous part of this same request
                     // boundary. Admit anything that arrived while it was in flight after
                     // applying a replacement, so the steer cannot be overwritten by the
@@ -753,12 +774,19 @@ export class ApplicationRunLoop {
                 });
                 const consume = async () => {
                     const deadline = new GenerationStreamDeadlines({ totalMs: generationGuard.requestDeadlineMs, idleMs: generationGuard.maxStreamIdleMs }, () => requestAbortController.abort(), () => generationGuard.progress);
+                    const toolArgumentRunaway = isLunaChainedRequest(state, request)
+                        ? new ToolArgumentRunawayGuard({
+                            ...DEFAULT_TOOL_ARGUMENT_RUNAWAY_SIGNATURE,
+                            timeoutMs: generationGuard.toolArgumentRunawayMs,
+                        }, () => requestAbortController.abort())
+                        : undefined;
                     let iterator;
                     let iteratorFinished = false;
                     try {
                         iterator = model.stream(request)[Symbol.asyncIterator]();
                         while (true) {
-                            const next = await deadline.wait(iterator.next());
+                            const nextOperation = iterator.next();
+                            const next = await deadline.wait(toolArgumentRunaway ? toolArgumentRunaway.wait(nextOperation) : nextOperation);
                             if (next.done) {
                                 iteratorFinished = true;
                                 return;
@@ -768,11 +796,13 @@ export class ApplicationRunLoop {
                             deadline.recordActivity();
                             const event = next.value;
                             if (event.type === 'completion') {
+                                toolArgumentRunaway?.observeToolCallCompleted();
                                 generationGuard.observeCompletion(event.output);
                                 completion = event;
                                 continue;
                             }
                             if (event.type === 'text_delta') {
+                                toolArgumentRunaway?.observeText();
                                 generationGuard.observeText(event.text);
                                 provisionalTextCharacters += event.text.length;
                                 provisionalTextDeltas++;
@@ -795,6 +825,7 @@ export class ApplicationRunLoop {
                                 continue;
                             }
                             if (event.type === 'tool_call_streaming_delta') {
+                                toolArgumentRunaway?.observeToolArgumentProgress(event.argumentCharCount);
                                 generationGuard.observeToolArgumentProgress(event.argumentCharCount);
                                 outputPush(stream, queue, event);
                                 continue;
@@ -804,6 +835,7 @@ export class ApplicationRunLoop {
                                 continue;
                             }
                             if (event.type === 'tool_call') {
+                                toolArgumentRunaway?.observeToolCallCompleted();
                                 generationGuard.observeToolCall(event.arguments);
                                 pendingNativeReasoning = commitPendingNativeReasoning(state, stream, queue, pendingNativeReasoning);
                                 sawToolCall = true;
@@ -813,6 +845,7 @@ export class ApplicationRunLoop {
                     }
                     finally {
                         deadline.dispose();
+                        toolArgumentRunaway?.dispose();
                         if (iterator && !iteratorFinished)
                             void iterator.return?.().catch(() => undefined);
                     }
@@ -916,6 +949,9 @@ export class ApplicationRunLoop {
                 continue;
             }
             const finalCompletion = completion;
+            // A terminal response ends recovery, unlike partial tokens or tool
+            // activity. Later failures must not inherit an old episode's deadline.
+            state.recoveryBudget?.noteModelResponseCompleted();
             // Commit the authoritative terminal state before handling terminal-only
             // tool calls. Approval may pause immediately after this point, and the
             // continuation must still carry the response that produced the calls.
@@ -944,6 +980,9 @@ export class ApplicationRunLoop {
                     }
                 }
                 if (normalizedCompletionUsage) {
+                    if (normalizedCompletionUsage.prompt_tokens !== undefined) {
+                        state.lastCompletedInputTokens = normalizedCompletionUsage.prompt_tokens;
+                    }
                     const accumulated = addTokenUsage(normalizeModelUsage(state.usage), normalizedCompletionUsage);
                     state.usage = {
                         ...(accumulated.prompt_tokens !== undefined ? { inputTokens: accumulated.prompt_tokens } : {}),
@@ -1091,13 +1130,19 @@ export class ApplicationRunLoop {
         const plan = events.map((event) => {
             const definition = state.agent.tools.find((tool) => tool.name === event.name);
             const callItem = {
-                type: 'function_call',
+                type: event.toolType === 'custom' ? 'custom_tool_call' : 'function_call',
                 callId: event.id,
                 name: event.name,
-                arguments: event.arguments,
+                ...(event.toolType === 'custom' ? { input: event.arguments } : { arguments: event.arguments }),
             };
             state.history.push(callItem);
-            state.input.push({ type: 'tool_call', id: event.id, name: event.name, arguments: event.arguments });
+            state.input.push({
+                type: 'tool_call',
+                id: event.id,
+                name: event.name,
+                arguments: event.arguments,
+                ...(event.toolType ? { toolType: event.toolType } : {}),
+            });
             outputPush(stream, queue, { type: 'item', item: callItem });
             return {
                 event,
@@ -1117,7 +1162,16 @@ export class ApplicationRunLoop {
             // accepted object shape but intentionally does not Zod-parse it, which
             // would apply schema defaults before execute. web_fetch relies on its
             // executor fallbacks on the strict JSON-schema path.
-            entry.params = normalizeToolParameters(parseArguments(event.arguments), definition.parameters);
+            try {
+                const parsedArguments = definition.parseModelArguments
+                    ? definition.parseModelArguments(event.arguments)
+                    : parseArguments(event.arguments);
+                entry.params = normalizeToolParameters(parsedArguments, definition.parameters);
+            }
+            catch (error) {
+                entry.output = `Error: Invalid patch: ${error instanceof Error ? error.message : String(error)}`;
+                continue;
+            }
             const stallEvent = state.runBudget?.observeToolCall({
                 name: event.name,
                 argumentsText: event.arguments,
@@ -1166,7 +1220,7 @@ export class ApplicationRunLoop {
                 parallelSafe: entry.parallelSafe,
                 approvalPending: entry.status === 'approval_pending',
             })),
-        });
+        }, { severity: 'debug', eventType: 'tool.parallel.eligibility' });
         // A main-agent budget escalation is a real boundary: retain the planned
         // calls, but do not execute one more tool while human judgement is pending.
         if (!state.pendingRunBudgetInteraction) {
@@ -1205,7 +1259,7 @@ export class ApplicationRunLoop {
                 parallel: group.length > 1,
                 maxParallelToolCalls,
                 dispatchOrder: group.map((entry) => entry.event.id),
-            });
+            }, { severity: 'debug', eventType: 'tool.batch.dispatched' });
             for (const entry of group) {
                 outputPush(stream, queue, {
                     type: 'tool_call_dispatched',
@@ -1219,18 +1273,21 @@ export class ApplicationRunLoop {
                 if (rejected)
                     throw rejected.reason;
                 for (const [index, result] of results.entries()) {
-                    this.#appendToolResult(state, stream, queue, group[index], result.value);
+                    const value = result.value;
+                    group[index].result = value;
+                    this.#appendToolResult(state, stream, queue, group[index], value);
                 }
             }
             else {
                 const result = await this.#invokePlannedTool(group[0], toolContext, state);
+                group[0].result = result;
                 this.#appendToolResult(state, stream, queue, group[0], result);
             }
             this.#deps.logDiagnostic?.('tool batch settled', {
                 batchId,
                 settlementOrder: group.map((entry) => entry.event.id),
-            });
-            if (group.some((entry) => entry.definition?.terminateAfterExecution)) {
+            }, { severity: 'debug', eventType: 'tool.batch.settled' });
+            if (group.some((entry) => shouldTerminateAfterExecution(entry.definition, entry.result))) {
                 state.terminateAfterToolExecution = true;
                 state.toolPlan = undefined;
                 return;
@@ -1244,15 +1301,24 @@ export class ApplicationRunLoop {
         return this.#invokeTool(entry.definition, entry.params, toolContext, entry.event.id, state);
     }
     #appendToolResult(state, stream, queue, entry, result) {
-        const output = typeof result === 'string' ? result : JSON.stringify(result);
+        const modelOutput = typeof result === 'string'
+            ? result
+            : isToolResultContentParts(result)
+                ? result
+                : JSON.stringify(result) ?? String(result ?? '');
         const resultItem = {
-            type: 'function_call_result',
+            type: entry.event.toolType === 'custom' ? 'custom_tool_call_output' : 'function_call_result',
             callId: entry.event.id,
             name: entry.event.name,
-            output,
+            output: modelOutput,
         };
         state.history.push(resultItem);
-        state.input.push({ type: 'tool_result', id: entry.event.id, output });
+        state.input.push({
+            type: 'tool_result',
+            id: entry.event.id,
+            output: modelOutput,
+            ...(entry.event.toolType ? { toolType: entry.event.toolType } : {}),
+        });
         outputPush(stream, queue, { type: 'item', item: resultItem });
         this.#evaluateRunBudget(state, stream, queue);
     }
@@ -1385,6 +1451,27 @@ export class ApplicationRunLoop {
         }
     }
 }
+function shouldTerminateAfterExecution(definition, result) {
+    const policy = definition?.terminateAfterExecution;
+    if (typeof policy === 'boolean')
+        return policy;
+    if (!policy)
+        return false;
+    try {
+        return policy(result);
+    }
+    catch {
+        return false;
+    }
+}
+function isLunaChainedRequest(state, request) {
+    return (state.currentProviderId === 'codex' &&
+        state.agent.model === 'gpt-5.6-luna' &&
+        typeof request.previousResponseId === 'string' &&
+        request.previousResponseId.length > 0 &&
+        request.input.length === 1 &&
+        request.input[0]?.type === 'tool_result');
+}
 function outputPush(stream, queue, item) {
     stream.output.push(item);
     if (stream.newItems !== stream.output)
@@ -1394,6 +1481,7 @@ function outputPush(stream, queue, item) {
 function finish(stream, state, queue) {
     stream.history = state.history;
     stream.terminalCause = state.terminalCause;
+    stream.latestProviderInputTokens = state.lastCompletedInputTokens;
     if (state.supportsConversationChaining &&
         state.responseId &&
         state.responseProviderId !== undefined &&
@@ -1488,6 +1576,10 @@ function normalizeModelUsage(usage) {
         ...rawUsage,
         cacheReadTokens: rawUsage.cachedInputTokens ?? rawUsage.cacheReadTokens,
         cacheCreationTokens: rawUsage.cacheWriteTokens ?? rawUsage.cacheCreationTokens,
+        // AI SDK v3 `outputTokens.reasoning` (incl. OpenRouter) has no
+        // snake_case twin in `normalizeUsage`; forward it explicitly so hidden
+        // reasoning is subtracted from settled tok/s.
+        reasoningTokens: rawUsage.outputTokens?.reasoning ?? rawUsage.reasoningTokens,
     });
 }
 function parseArguments(value) {
@@ -1516,11 +1608,19 @@ function getInterruptionCallId(value) {
     return typeof callId === 'string' ? callId : undefined;
 }
 function toModelTools(tools) {
-    return tools.map((tool) => ({
-        name: tool.name,
-        description: tool.description,
-        parameters: isJsonSchema(tool.parameters) ? tool.parameters : z.toJSONSchema(tool.parameters),
-    }));
+    return tools.map((tool) => tool.modelTool
+        ? {
+            type: tool.modelTool.type,
+            name: tool.name,
+            description: tool.description,
+            format: tool.modelTool.format,
+        }
+        : {
+            type: 'function',
+            name: tool.name,
+            description: tool.description,
+            parameters: isJsonSchema(tool.parameters) ? tool.parameters : z.toJSONSchema(tool.parameters),
+        });
 }
 function isJsonSchema(value) {
     return typeof value === 'object' && value !== null && !isZodToolParameterSchema(value);
@@ -1675,22 +1775,26 @@ function normalizeInputItem(item) {
         const { providerOpaque: _marker, ...providerItem } = item;
         return [{ type: 'provider_opaque', provider: item.providerOpaque.provider, item: providerItem }];
     }
-    if (item.type === 'function_call') {
+    if (item.type === 'function_call' || item.type === 'custom_tool_call') {
         return [
             {
                 type: 'tool_call',
                 id: String(item.callId ?? item.call_id ?? ''),
                 name: String(item.name ?? ''),
-                arguments: String(item.arguments ?? '{}'),
+                arguments: String(item.type === 'custom_tool_call' ? item.input ?? '' : item.arguments ?? '{}'),
+                ...(item.type === 'custom_tool_call' ? { toolType: 'custom' } : {}),
             },
         ];
     }
-    if (item.type === 'function_call_result' || item.type === 'function_call_output') {
+    if (item.type === 'function_call_result' ||
+        item.type === 'function_call_output' ||
+        item.type === 'custom_tool_call_output') {
         return [
             {
                 type: 'tool_result',
                 id: String(item.callId ?? item.call_id ?? item.tool_call_id ?? ''),
                 output: normalizeToolResultOutput(item.output),
+                ...(item.type === 'custom_tool_call_output' ? { toolType: 'custom' } : {}),
             },
         ];
     }