@qduc/term2 0.7.2 → 0.8.0

package/dist/services/session/terminal-result-collector.test.js

@@ -0,0 +1,240 @@
+import { it, expect } from 'vitest';
+import { collectTerminalResult } from './terminal-result-collector.js';
+const asAsyncIterable = async function* (events) {
+    for (const event of events) {
+        yield event;
+    }
+};
+it('collectTerminalResult returns approval_required with raw interruption from callback', async () => {
+    const seenEvents = [];
+    const textChunks = [];
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'text_delta', delta: 'Hello', fullText: 'Hello' },
+        {
+            type: 'approval_required',
+            approval: {
+                agentName: 'CLI Agent',
+                toolName: 'shell',
+                argumentsText: 'ls source',
+                callId: 'call-approval',
+            },
+        },
+    ]), {
+        onEvent: (event) => seenEvents.push(event.type),
+        onTextChunk: (full, chunk) => textChunks.push(`${full}:${chunk}`),
+        getRawInterruption: () => ({ id: 'raw-interruption' }),
+    });
+    expect(seenEvents).toEqual(['text_delta', 'approval_required']);
+    expect(textChunks).toEqual(['Hello:Hello']);
+    expect(result.type).toBe('approval_required');
+    if (result.type === 'approval_required') {
+        expect(result.approval.callId).toBe('call-approval');
+        expect(result.approval.rawInterruption).toEqual({ id: 'raw-interruption' });
+    }
+});
+it('collectTerminalResult preserves usage on approval_required', async () => {
+    const result = await collectTerminalResult(asAsyncIterable([
+        {
+            type: 'final',
+            finalText: '',
+            usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 },
+        },
+        {
+            type: 'approval_required',
+            usage: { prompt_tokens: 120, completion_tokens: 12, total_tokens: 132 },
+            approval: {
+                agentName: 'CLI Agent',
+                toolName: 'shell',
+                argumentsText: 'ls source',
+            },
+        },
+    ]));
+    expect(result.type).toBe('approval_required');
+    if (result.type === 'approval_required') {
+        expect(result.usage).toEqual({ prompt_tokens: 120, completion_tokens: 12, total_tokens: 132 });
+    }
+});
+it('collectTerminalResult carries usage_update usage into approval_required result', async () => {
+    const result = await collectTerminalResult(asAsyncIterable([
+        {
+            type: 'usage_update',
+            usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 },
+        },
+        {
+            type: 'approval_required',
+            approval: {
+                agentName: 'CLI Agent',
+                toolName: 'shell',
+                argumentsText: 'ls source',
+            },
+        },
+    ]));
+    expect(result.type).toBe('approval_required');
+    if (result.type === 'approval_required') {
+        expect(result.usage).toEqual({ prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 });
+    }
+});
+it('collectTerminalResult trusts the final run-cumulative usage and does not re-sum per-turn snapshots', async () => {
+    // Long-horizon regression: a multi-turn run streams a per-turn `usage_update`
+    // before each tool call. The terminal `final` event carries the authoritative
+    // run-cumulative usage from the SDK. The collector must report that cumulative
+    // verbatim - NOT the cumulative plus its own re-summed per-turn snapshots
+    // (the old behavior, which doubled the count and got worse with each turn).
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'usage_update', usage: { prompt_tokens: 1000, completion_tokens: 50, total_tokens: 1050 } },
+        { type: 'tool_started', toolCallId: 'call-1', toolName: 'shell', arguments: { command: 'ls' } },
+        { type: 'usage_update', usage: { prompt_tokens: 2000, completion_tokens: 90, total_tokens: 2090 } },
+        { type: 'tool_started', toolCallId: 'call-2', toolName: 'shell', arguments: { command: 'cat a' } },
+        { type: 'usage_update', usage: { prompt_tokens: 3000, completion_tokens: 120, total_tokens: 3120 } },
+        { type: 'tool_started', toolCallId: 'call-3', toolName: 'shell', arguments: { command: 'cat b' } },
+        {
+            type: 'final',
+            finalText: 'Done.',
+            // SDK run-state accumulator: cumulative across all turns, including
+            // cache details streamed snapshots didn't carry.
+            usage: {
+                prompt_tokens: 6000,
+                completion_tokens: 280,
+                total_tokens: 6280,
+                cache_read_tokens: 1500,
+            },
+        },
+    ]));
+    expect(result.type, 'response');
+    if (result.type === 'response') {
+        expect(result.usage).toEqual({
+            prompt_tokens: 6000,
+            completion_tokens: 280,
+            total_tokens: 6280,
+            cache_read_tokens: 1500,
+        });
+    }
+});
+it('collectTerminalResult lets a later final supersede an earlier one (auto-approved continuation)', async () => {
+    // The auto-approve path emits a `final` for the first turn, then another
+    // `final` after the continuation. Because the SDK accumulator keeps growing
+    // on the same run state, the later `final` is the whole-run cumulative and
+    // must replace - not add to - the earlier one.
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'final', finalText: 'partial', usage: { prompt_tokens: 200, completion_tokens: 20, total_tokens: 220 } },
+        { type: 'final', finalText: 'Done.', usage: { prompt_tokens: 500, completion_tokens: 60, total_tokens: 560 } },
+    ]));
+    expect(result.type, 'response');
+    if (result.type === 'response') {
+        expect(result.usage).toEqual({ prompt_tokens: 500, completion_tokens: 60, total_tokens: 560 });
+    }
+});
+it('collectTerminalResult falls back to the latest streamed usage when no final usage is present', async () => {
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'usage_update', usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 } },
+        { type: 'usage_update', usage: { prompt_tokens: 175, completion_tokens: 18, total_tokens: 193 } },
+        { type: 'final', finalText: 'Done.' },
+    ]));
+    expect(result.type, 'response');
+    if (result.type === 'response') {
+        expect(result.usage).toEqual({ prompt_tokens: 175, completion_tokens: 18, total_tokens: 193 });
+    }
+});
+it('collectTerminalResult accumulates streamed callbacks and returns final response payload', async () => {
+    const seenText = [];
+    const seenReasoning = [];
+    const seenCommands = [];
+    const seenEvents = [];
+    let sawFinal = false;
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'text_delta', delta: 'Hello', fullText: 'Hello' },
+        { type: 'reasoning_delta', delta: 'Think', fullText: 'Think' },
+        {
+            type: 'command_message',
+            message: {
+                id: 'cmd-1',
+                sender: 'command',
+                status: 'completed',
+                command: 'ls source',
+                output: 'source',
+                success: true,
+            },
+        },
+        {
+            type: 'final',
+            finalText: 'Done.',
+            reasoningText: 'Finished reasoning',
+            usage: { prompt_tokens: 1, completion_tokens: 2, total_tokens: 3 },
+            commandMessages: [
+                {
+                    id: 'cmd-2',
+                    sender: 'command',
+                    status: 'completed',
+                    command: 'pwd',
+                    output: '/tmp',
+                    success: true,
+                },
+            ],
+        },
+    ]), {
+        onTextChunk: (full, chunk) => seenText.push(`${full}:${chunk}`),
+        onReasoningChunk: (full, chunk) => seenReasoning.push(`${full}:${chunk}`),
+        onCommandMessage: (message) => seenCommands.push(message.id),
+        onEvent: (event) => seenEvents.push(event.type),
+        onFinalEvent: () => {
+            sawFinal = true;
+        },
+    });
+    expect(sawFinal).toBe(true);
+    expect(seenText).toEqual(['Hello:Hello']);
+    expect(seenReasoning).toEqual(['Think:Think']);
+    expect(seenCommands).toEqual(['cmd-1']);
+    expect(seenEvents).toEqual(['text_delta', 'reasoning_delta', 'command_message', 'final']);
+    expect(result.type).toBe('response');
+    if (result.type === 'response') {
+        expect(result.finalText).toBe('Done.');
+        expect(result.reasoningText).toBe('Finished reasoning');
+        expect(result.usage).toEqual({ prompt_tokens: 1, completion_tokens: 2, total_tokens: 3 });
+        expect(result.commandMessages.map((m) => m.id)).toEqual(['cmd-2']);
+    }
+});
+it('collectTerminalResult preserves multiple reasoning and text segments in turnItems in order', async () => {
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'reasoning_delta', delta: 'Think 1' },
+        { type: 'text_delta', delta: 'Hello' },
+        { type: 'reasoning_delta', delta: 'Think 2' },
+        { type: 'text_delta', delta: ' World' },
+        { type: 'final', finalText: 'Hello World' },
+    ]));
+    expect(result.type).toBe('response');
+    if (result.type === 'response') {
+        expect(result.finalText).toBe('Hello World');
+        expect(result.turnItems).toEqual([
+            { type: 'reasoning', text: 'Think 1' },
+            { type: 'assistant_text', text: 'Hello' },
+            { type: 'reasoning', text: 'Think 2' },
+            { type: 'assistant_text', text: ' World' },
+        ]);
+    }
+});
+it('collectTerminalResult trusts event.turnItems if provided on final event', async () => {
+    const result = await collectTerminalResult(asAsyncIterable([
+        { type: 'reasoning_delta', delta: 'Ignored delta' },
+        {
+            type: 'final',
+            finalText: 'Final text',
+            turnItems: [
+                { type: 'reasoning', text: 'Authoritative reasoning' },
+                { type: 'assistant_text', text: 'Authoritative text' },
+                { type: 'tool_call', callId: 'call-1', toolName: 'shell', arguments: 'ls' },
+                { type: 'tool_result', callId: 'call-1', toolName: 'shell', status: 'completed', output: 'ok' },
+            ],
+        },
+    ]));
+    expect(result.type).toBe('response');
+    if (result.type === 'response') {
+        expect(result.finalText).toBe('Final text');
+        expect(result.turnItems).toEqual([
+            { type: 'reasoning', text: 'Authoritative reasoning' },
+            { type: 'assistant_text', text: 'Authoritative text' },
+            { type: 'tool_call', callId: 'call-1', toolName: 'shell', arguments: 'ls' },
+            { type: 'tool_result', callId: 'call-1', toolName: 'shell', status: 'completed', output: 'ok' },
+        ]);
+    }
+});
+//# sourceMappingURL=terminal-result-collector.test.js.map

package/dist/services/session/terminal-result-collector.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-result-collector.test.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.test.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-attempt-factory.d.ts

@@ -0,0 +1,43 @@
+import type { RunState } from '@openai/agents';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { AbortedApprovalContext } from '../approval/approval-state.js';
+import type { GenerationGuard } from '../generation-guard.js';
+import type { ConversationStore } from '../conversation/conversation-store.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { SessionLifecycle } from './session-lifecycle.js';
+import type { SessionToolTracker } from './session-tool-tracker.js';
+import { TurnAttempt } from './turn-attempt.js';
+export type InitialTurnRunOptions = {
+    skipUserMessage?: boolean;
+    resumeState?: RunState<any, any>;
+    resumePreviousResponseId?: string | null;
+    abortedContext?: AbortedApprovalContext | null;
+    token?: number;
+    retries?: any;
+    maxModelRetries?: number;
+    signal?: AbortSignal;
+    delayMs?: number;
+    useStandardServiceTier?: boolean;
+    bypassInputSurgeGuard?: boolean;
+};
+export type TurnAttemptFactoryDeps = {
+    agentClient: ConversationAgentClient;
+    conversationStore: ConversationStore;
+    generationGuard: GenerationGuard;
+    toolTracker: SessionToolTracker;
+    state: SessionLifecycle;
+    resolveRetryLimit: () => number;
+};
+export type TurnAttemptCreationResult = {
+    kind: 'created';
+    attempt: TurnAttempt;
+} | {
+    kind: 'stale';
+};
+export declare class TurnAttemptFactory {
+    #private;
+    private readonly deps;
+    constructor(deps: TurnAttemptFactoryDeps);
+    create(input: string | UserTurn, options?: InitialTurnRunOptions): TurnAttemptCreationResult;
+}
+//# sourceMappingURL=turn-attempt-factory.d.ts.map

package/dist/services/session/turn-attempt-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,gBAAgB,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtG,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAEzD,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,qBAA0B,GAAG,yBAAyB;CAsDjG"}

package/dist/services/session/turn-attempt-factory.js

@@ -0,0 +1,58 @@
+import { normalizeUserTurn } from '../../types/user-turn.js';
+import { TurnAttempt } from './turn-attempt.js';
+export class TurnAttemptFactory {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    create(input, options = {}) {
+        const normalized = normalizeUserTurn(input);
+        let turn = this.deps.state.pendingModeNotice?.trim()
+            ? { ...normalized, text: `${this.deps.state.pendingModeNotice}\n\n${normalized.text}` }
+            : normalized;
+        if (!turn.text && options.skipUserMessage) {
+            try {
+                turn = { ...turn, text: this.deps.conversationStore.getLastUserMessage() };
+            }
+            catch {
+                // A fresh-start retry can legitimately have no previous user message.
+            }
+        }
+        const token = this.#resolveToken(options);
+        if (token === null) {
+            return { kind: 'stale' };
+        }
+        return {
+            kind: 'created',
+            attempt: new TurnAttempt({
+                turn,
+                token,
+                initialRetryCounts: this.#normalizeRetryCounts(options.retries),
+                initialLedgerSnapshot: this.deps.toolTracker.export(),
+                maxTransientRetries: this.deps.resolveRetryLimit(),
+                maxModelRetries: options.maxModelRetries,
+                signal: options.signal,
+                onAbort: () => {
+                    this.deps.agentClient.abort();
+                },
+            }),
+        };
+    }
+    #resolveToken(options) {
+        if (!options.abortedContext) {
+            return options.token ?? this.deps.generationGuard.capture();
+        }
+        const token = options.abortedContext.token ?? 0;
+        return this.deps.generationGuard.isCurrent(token) ? token : null;
+    }
+    #normalizeRetryCounts(retries) {
+        const raw = retries ?? {};
+        return {
+            transientRetryCount: raw.transientRetryCount ?? 0,
+            serviceTierFallbackCount: raw.serviceTierFallbackCount ?? raw.flexServiceTierFallbackCount ?? 0,
+            modelRetryCount: raw.modelRetryCount ?? raw.hallucinationRetryCount ?? 0,
+            transportDowngradeCount: raw.transportDowngradeCount ?? raw.transportFallbackRetryCount ?? 0,
+        };
+    }
+}
+//# sourceMappingURL=turn-attempt-factory.js.map

package/dist/services/session/turn-attempt-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt-factory.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA2BhD,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,IAA4B;QAA5B,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE7D,MAAM,CAAC,KAAwB,EAAE,UAAiC,EAAE;QAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,IAAI,GAAa,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE;YAC5D,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,OAAO,UAAU,CAAC,IAAI,EAAE,EAAE;YACvF,CAAC,CAAC,UAAU,CAAC;QAEf,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACH,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC7E,CAAC;YAAC,MAAM,CAAC;gBACP,sEAAsE;YACxE,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,IAAI,WAAW,CAAC;gBACvB,IAAI;gBACJ,KAAK;gBACL,kBAAkB,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/D,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;gBACrD,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAClD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;gBAChC,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAA8B;QAC1C,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC9D,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,CAAC;IAED,qBAAqB,CAAC,OAAY;QAChC,MAAM,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;QAC1B,OAAO;YACL,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,IAAI,CAAC;YACjD,wBAAwB,EAAE,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC,4BAA4B,IAAI,CAAC;YAC/F,eAAe,EAAE,GAAG,CAAC,eAAe,IAAI,GAAG,CAAC,uBAAuB,IAAI,CAAC;YACxE,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC,2BAA2B,IAAI,CAAC;SAC7F,CAAC;IACJ,CAAC;CACF"}

package/dist/services/session/turn-attempt-factory.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=turn-attempt-factory.test.d.ts.map

package/dist/services/session/turn-attempt-factory.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt-factory.test.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.test.ts"],"names":[],"mappings":""}

package/dist/services/session/turn-attempt-factory.test.js

@@ -0,0 +1,83 @@
+import { it, expect } from 'vitest';
+import { TurnAttemptFactory } from './turn-attempt-factory.js';
+function setup(options = {}) {
+    let aborted = false;
+    const factory = new TurnAttemptFactory({
+        agentClient: {
+            abort() {
+                aborted = true;
+            },
+        },
+        conversationStore: {
+            getLastUserMessage() {
+                if (options.lastUserMessage === undefined) {
+                    throw new Error('No user message');
+                }
+                return options.lastUserMessage;
+            },
+        },
+        generationGuard: {
+            capture: () => 7,
+            isCurrent: (token) => token === 7,
+        },
+        toolTracker: {
+            export: () => [{ callId: 'call-1' }],
+        },
+        state: {
+            pendingModeNotice: options.pendingModeNotice ?? null,
+        },
+        resolveRetryLimit: () => 3,
+    });
+    return { factory, wasAborted: () => aborted };
+}
+it('creates an attempt with normalized legacy retry counts and pending mode notice', () => {
+    const { factory } = setup({ pendingModeNotice: 'Plan mode enabled' });
+    const result = factory.create('Do the work', {
+        retries: {
+            transientRetryCount: 1,
+            flexServiceTierFallbackCount: 2,
+            hallucinationRetryCount: 3,
+            transportFallbackRetryCount: 4,
+        },
+        maxModelRetries: 5,
+    });
+    expect(result.kind).toBe('created');
+    if (result.kind !== 'created')
+        return;
+    expect(result.attempt.turn.text).toBe('Plan mode enabled\n\nDo the work');
+    expect(result.attempt.retryCounts).toEqual({
+        transientRetryCount: 1,
+        serviceTierFallbackCount: 2,
+        modelRetryCount: 3,
+        transportDowngradeCount: 4,
+    });
+    expect(result.attempt.maxTransientRetries).toBe(3);
+    expect(result.attempt.maxModelRetries).toBe(5);
+    expect(result.attempt.initialLedgerSnapshot).toEqual([{ callId: 'call-1' }]);
+});
+it('recovers the last user message for a skipped empty turn', () => {
+    const { factory } = setup({ lastUserMessage: 'Previous request' });
+    const result = factory.create({ text: '' }, { skipUserMessage: true });
+    expect(result.kind).toBe('created');
+    if (result.kind !== 'created')
+        return;
+    expect(result.attempt.turn.text).toBe('Previous request');
+});
+it('returns stale for an outdated aborted approval context', () => {
+    const { factory } = setup();
+    const result = factory.create('Resume', {
+        abortedContext: { token: 6 },
+    });
+    expect(result).toEqual({ kind: 'stale' });
+});
+it('wires the attempt abort signal to the agent client', () => {
+    const controller = new AbortController();
+    const { factory, wasAborted } = setup();
+    const result = factory.create('Run', { signal: controller.signal });
+    expect(result.kind).toBe('created');
+    controller.abort();
+    expect(wasAborted()).toBe(true);
+    if (result.kind === 'created')
+        result.attempt.close();
+});
+//# sourceMappingURL=turn-attempt-factory.test.js.map

package/dist/services/session/turn-attempt-factory.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt-factory.test.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.test.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-attempt.d.ts

@@ -0,0 +1,38 @@
+import type { AgentInputItem } from '@openai/agents';
+import type { AgentStream } from '../agent-stream.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { RetryCounts } from '../retry/retry-contracts.js';
+import type { SavedToolExecution } from '../tool-execution-ledger.js';
+import type { SessionInputPlan } from './session-input-planner.js';
+import type { GenerationToken } from '../generation-guard.js';
+export declare class TurnAttempt {
+    #private;
+    constructor(options: {
+        turn: UserTurn;
+        token: GenerationToken;
+        initialRetryCounts: RetryCounts;
+        initialLedgerSnapshot: SavedToolExecution[];
+        maxTransientRetries: number;
+        maxModelRetries?: number;
+        signal?: AbortSignal;
+        onAbort?: () => void;
+    });
+    get turn(): UserTurn;
+    get token(): GenerationToken;
+    get initialRetryCounts(): RetryCounts;
+    get initialLedgerSnapshot(): SavedToolExecution[];
+    get maxTransientRetries(): number;
+    get maxModelRetries(): number | undefined;
+    get retryCounts(): RetryCounts;
+    get stream(): AgentStream | null;
+    get streamInput(): string | AgentInputItem | AgentInputItem[] | undefined;
+    get inputMode(): 'delta' | 'full_history' | undefined;
+    get addedUserMessage(): boolean;
+    get closed(): boolean;
+    markUserMessageAdded(): void;
+    attachInput(plan: SessionInputPlan): void;
+    attachStream(stream: AgentStream | null): void;
+    advanceRetry(nextCounts: RetryCounts): void;
+    close(): void;
+}
+//# sourceMappingURL=turn-attempt.d.ts.map

package/dist/services/session/turn-attempt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,WAAW;;gBAkBV,OAAO,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,kBAAkB,EAAE,WAAW,CAAC;QAChC,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;QAC5C,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;KACtB;IA0BD,IAAI,IAAI,IAAI,QAAQ,CAEnB;IAED,IAAI,KAAK,IAAI,eAAe,CAE3B;IAED,IAAI,kBAAkB,IAAI,WAAW,CAEpC;IAED,IAAI,qBAAqB,IAAI,kBAAkB,EAAE,CAEhD;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,IAAI,CAE/B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,SAAS,CAExE;IAED,IAAI,SAAS,IAAI,OAAO,GAAG,cAAc,GAAG,SAAS,CAEpD;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,oBAAoB,IAAI,IAAI;IAI5B,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAKzC,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI;IAI9C,YAAY,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI;IAI3C,KAAK,IAAI,IAAI;CAQd"}

package/dist/services/session/turn-attempt.js

@@ -0,0 +1,99 @@
+export class TurnAttempt {
+    #turn;
+    #token;
+    #initialRetryCounts;
+    #initialLedgerSnapshot;
+    #maxTransientRetries;
+    #maxModelRetries;
+    #retryCounts;
+    #stream = null;
+    #streamInput = undefined;
+    #inputMode = undefined;
+    #addedUserMessage = false;
+    #closed = false;
+    #signal;
+    #abortListener;
+    constructor(options) {
+        this.#turn = options.turn;
+        this.#token = options.token;
+        this.#initialRetryCounts = options.initialRetryCounts;
+        this.#initialLedgerSnapshot = options.initialLedgerSnapshot;
+        this.#maxTransientRetries = options.maxTransientRetries;
+        this.#maxModelRetries = options.maxModelRetries;
+        this.#retryCounts = { ...options.initialRetryCounts };
+        this.#signal = options.signal;
+        if (this.#signal) {
+            if (this.#signal.aborted) {
+                if (options.onAbort) {
+                    options.onAbort();
+                }
+                throw Object.assign(new Error('Operation aborted'), { name: 'AbortError' });
+            }
+            if (options.onAbort) {
+                this.#abortListener = () => {
+                    options.onAbort?.();
+                };
+                this.#signal.addEventListener('abort', this.#abortListener);
+            }
+        }
+    }
+    get turn() {
+        return this.#turn;
+    }
+    get token() {
+        return this.#token;
+    }
+    get initialRetryCounts() {
+        return this.#initialRetryCounts;
+    }
+    get initialLedgerSnapshot() {
+        return this.#initialLedgerSnapshot;
+    }
+    get maxTransientRetries() {
+        return this.#maxTransientRetries;
+    }
+    get maxModelRetries() {
+        return this.#maxModelRetries;
+    }
+    get retryCounts() {
+        return this.#retryCounts;
+    }
+    get stream() {
+        return this.#stream;
+    }
+    get streamInput() {
+        return this.#streamInput;
+    }
+    get inputMode() {
+        return this.#inputMode;
+    }
+    get addedUserMessage() {
+        return this.#addedUserMessage;
+    }
+    get closed() {
+        return this.#closed;
+    }
+    markUserMessageAdded() {
+        this.#addedUserMessage = true;
+    }
+    attachInput(plan) {
+        this.#streamInput = plan.streamInput;
+        this.#inputMode = plan.inputSurgeKind;
+    }
+    attachStream(stream) {
+        this.#stream = stream;
+    }
+    advanceRetry(nextCounts) {
+        this.#retryCounts = { ...nextCounts };
+    }
+    close() {
+        if (this.#closed)
+            return;
+        this.#closed = true;
+        if (this.#signal && this.#abortListener) {
+            this.#signal.removeEventListener('abort', this.#abortListener);
+            this.#abortListener = undefined;
+        }
+    }
+}
+//# sourceMappingURL=turn-attempt.js.map

package/dist/services/session/turn-attempt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-attempt.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=turn-attempt.test.d.ts.map

package/dist/services/session/turn-attempt.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-attempt.test.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.test.ts"],"names":[],"mappings":""}