@qduc/term2 0.7.3 → 0.9.0

package/dist/services/session/turn-coordinator.test.js

@@ -0,0 +1,303 @@
+import { it, expect } from 'vitest';
+import { TurnCoordinator } from './turn-coordinator.js';
+import { TurnStatusMachine } from './turn-status-machine.js';
+const makeHarness = () => {
+    const statusMachine = new TurnStatusMachine();
+    let initialRunnerResults = [];
+    const initialRunnerCalls = [];
+    const initialTurnRunner = {
+        run: async function* (input, options) {
+            initialRunnerCalls.push({ input, options });
+            const result = initialRunnerResults.shift();
+            if (result?.events) {
+                for (const ev of result.events) {
+                    yield ev;
+                }
+            }
+            return result?.outcome ?? { kind: 'response', terminal: { type: 'response', finalText: 'done' } };
+        },
+        setNextResult: (outcome, events = []) => {
+            initialRunnerResults.push({ outcome, events });
+        },
+    };
+    let driveResults = [];
+    const continuationDriverCalls = [];
+    const continuationDriver = {
+        drive: async function* (init) {
+            continuationDriverCalls.push(init);
+            const result = driveResults.shift();
+            if (result?.events) {
+                for (const ev of result.events) {
+                    yield ev;
+                }
+            }
+            return result?.outcome ?? { kind: 'response', terminal: { type: 'response', finalText: 'done' } };
+        },
+        setNextResult: (outcome, events = []) => {
+            driveResults.push({ outcome, events });
+        },
+    };
+    let abortCalled = false;
+    let getPendingResult = null;
+    const approvalFlow = {
+        consumeAborted: () => null,
+        getAbortedStatus: () => ({ kind: 'none' }),
+        abort: () => {
+            abortCalled = true;
+            return { aborted: true, callId: 'call-1' };
+        },
+        getPending: () => getPendingResult,
+        setPending: (p) => {
+            getPendingResult = p;
+        },
+    };
+    const coordinator = new TurnCoordinator({
+        statusMachine,
+        initialTurnRunner,
+        continuationDriver,
+        approvalFlow,
+        shellAutoApproval: {},
+    });
+    return {
+        coordinator,
+        statusMachine,
+        initialTurnRunner,
+        initialRunnerCalls,
+        continuationDriver,
+        continuationDriverCalls,
+        approvalFlow,
+        getAbortCalled: () => abortCalled,
+    };
+};
+it('Foreground-turn admission: throws when already active', async () => {
+    const { coordinator, statusMachine } = makeHarness();
+    statusMachine.beginTurn(); // status becomes 'streaming'
+    await expect(async () => {
+        for await (const _ of coordinator.start('hello')) {
+        }
+    }).rejects.toThrow('Another foreground turn is already active.');
+});
+it('streaming -> awaiting_approval', async () => {
+    const { coordinator, statusMachine, initialTurnRunner } = makeHarness();
+    initialTurnRunner.setNextResult({
+        kind: 'approval_required',
+        terminal: { type: 'approval_required', approval: { toolName: 'shell', argumentsText: 'ls' } },
+    });
+    expect(statusMachine.current).toBe('idle');
+    const events = [];
+    for await (const ev of coordinator.start('run command')) {
+        events.push(ev);
+    }
+    expect(statusMachine.current).toBe('awaiting_approval');
+    expect(events.length).toBe(1);
+    expect(events[0].type).toBe('approval_required');
+});
+it('awaiting_approval -> continuing -> awaiting_approval', async () => {
+    const { coordinator, statusMachine, continuationDriver } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval(); // status becomes 'awaiting_approval'
+    continuationDriver.setNextResult({
+        kind: 'approval_required',
+        terminal: { type: 'approval_required', approval: { toolName: 'shell', argumentsText: 'ls' } },
+    });
+    expect(statusMachine.current).toBe('awaiting_approval');
+    const events = [];
+    for await (const ev of coordinator.continueAfterApproval({ answer: 'y' })) {
+        events.push(ev);
+    }
+    expect(statusMachine.current).toBe('awaiting_approval');
+    expect(events.length).toBe(1);
+    expect(events[0].type).toBe('approval_required');
+});
+it('Auto-approved initial continuations leave status streaming', async () => {
+    const { coordinator, statusMachine, initialTurnRunner } = makeHarness();
+    let checkedStatusInLoop = null;
+    initialTurnRunner.run = async function* () {
+        checkedStatusInLoop = statusMachine.current;
+        yield { type: 'text_delta', delta: 'Running...' };
+        return { kind: 'response', terminal: { type: 'response', finalText: 'done' } };
+    };
+    for await (const _ of coordinator.start('run command')) {
+    }
+    expect(checkedStatusInLoop).toBe('streaming');
+    expect(statusMachine.current).toBe('idle');
+});
+it('Auto-approved manual continuations leave status continuing', async () => {
+    const { coordinator, statusMachine, continuationDriver } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval(); // status becomes 'awaiting_approval'
+    let checkedStatusInLoop = null;
+    continuationDriver.drive = async function* () {
+        checkedStatusInLoop = statusMachine.current;
+        yield { type: 'text_delta', delta: 'Running...' };
+        return { kind: 'response', terminal: { type: 'response', finalText: 'done' } };
+    };
+    for await (const _ of coordinator.continueAfterApproval({ answer: 'y' })) {
+    }
+    expect(checkedStatusInLoop).toBe('continuing');
+    expect(statusMachine.current).toBe('idle');
+});
+it('Terminal completion to idle', async () => {
+    const { coordinator, statusMachine, initialTurnRunner } = makeHarness();
+    initialTurnRunner.setNextResult({
+        kind: 'response',
+        terminal: { type: 'response', finalText: 'complete' },
+    });
+    expect(statusMachine.current).toBe('idle');
+    for await (const _ of coordinator.start('run command')) {
+    }
+    expect(statusMachine.current).toBe('idle');
+});
+it('failed completes the status because the runner already emitted terminal events', async () => {
+    const { coordinator, statusMachine, initialTurnRunner } = makeHarness();
+    initialTurnRunner.setNextResult({
+        kind: 'failed',
+    });
+    expect(statusMachine.current).toBe('idle');
+    for await (const _ of coordinator.start('run command')) {
+    }
+    expect(statusMachine.current).toBe('idle');
+});
+it('stale leaves status untouched because lifecycle operation resolved it', async () => {
+    const { coordinator, statusMachine, initialTurnRunner } = makeHarness();
+    initialTurnRunner.run = async function* () {
+        // during the run, concurrent operation invalidates and starts new turn
+        statusMachine.complete(); // back to idle
+        statusMachine.beginTurn(); // new turn streaming
+        return { kind: 'stale' };
+    };
+    expect(statusMachine.current).toBe('idle');
+    for await (const _ of coordinator.start('run command')) {
+    }
+    expect(statusMachine.current).toBe('streaming'); // remains streaming
+});
+it('stale initial outcome does not emit a terminal event', async () => {
+    const { coordinator, initialTurnRunner } = makeHarness();
+    initialTurnRunner.setNextResult({
+        kind: 'stale',
+        terminal: { type: 'response', finalText: 'stale response' },
+    });
+    const events = [];
+    for await (const event of coordinator.start('run command')) {
+        events.push(event);
+    }
+    expect(events).toEqual([]);
+});
+it('stale continuation leaves a newer turn status untouched', async () => {
+    const { coordinator, statusMachine, continuationDriver } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval();
+    continuationDriver.drive = async function* () {
+        statusMachine.abort();
+        statusMachine.beginTurn();
+        return { kind: 'stale' };
+    };
+    for await (const _ of coordinator.continueAfterApproval({ answer: 'y' })) {
+    }
+    expect(statusMachine.current).toBe('streaming');
+});
+it('fresh-start continuation forwards recovery instructions to the initial runner', async () => {
+    const { coordinator, statusMachine, continuationDriver, initialTurnRunner, initialRunnerCalls, approvalFlow } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval();
+    approvalFlow.setPending({ token: 7 });
+    continuationDriver.setNextResult({
+        kind: 'fresh_start_required',
+        retryCounts: {
+            transientRetryCount: 1,
+            serviceTierFallbackCount: 1,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+        delayMs: 125,
+        useStandardServiceTier: true,
+    });
+    initialTurnRunner.setNextResult({
+        kind: 'response',
+        terminal: { type: 'response', finalText: 'recovered' },
+    });
+    for await (const _ of coordinator.continueAfterApproval({ answer: 'y' })) {
+    }
+    expect(initialRunnerCalls[0]?.options).toMatchObject({
+        token: 7,
+        delayMs: 125,
+        useStandardServiceTier: true,
+    });
+    expect(statusMachine.current).toBe('idle');
+});
+it('fresh-start completion releases the turn for the next user message', async () => {
+    const { coordinator, statusMachine, continuationDriver, initialTurnRunner, approvalFlow } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval();
+    approvalFlow.setPending({ token: 7 });
+    continuationDriver.setNextResult({
+        kind: 'fresh_start_required',
+        retryCounts: {
+            transientRetryCount: 1,
+            serviceTierFallbackCount: 0,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+    });
+    initialTurnRunner.setNextResult({
+        kind: 'response',
+        terminal: { type: 'response', finalText: 'recovered' },
+    });
+    for await (const _ of coordinator.continueAfterApproval({ answer: 'y' })) {
+    }
+    expect(statusMachine.current).toBe('idle');
+    initialTurnRunner.setNextResult({
+        kind: 'response',
+        terminal: { type: 'response', finalText: 'next turn' },
+    });
+    // Should not throw - this verifies the turn is released
+    for await (const _ of coordinator.start('next message')) {
+    }
+});
+it('fresh-start auto-approval is driven before the recovered turn completes', async () => {
+    const { coordinator, statusMachine, continuationDriver, continuationDriverCalls, initialTurnRunner, approvalFlow } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval();
+    approvalFlow.setPending({ token: 7 });
+    continuationDriver.setNextResult({
+        kind: 'fresh_start_required',
+        retryCounts: {
+            transientRetryCount: 1,
+            serviceTierFallbackCount: 0,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+    });
+    initialTurnRunner.setNextResult({
+        kind: 'auto_approval_required',
+        generation: 7,
+        callId: 'call-recovered',
+        command: 'echo recovered',
+    });
+    continuationDriver.setNextResult({
+        kind: 'response',
+        terminal: { type: 'response', finalText: 'recovered after approval' },
+    });
+    const events = [];
+    for await (const event of coordinator.continueAfterApproval({ answer: 'y' })) {
+        events.push(event);
+    }
+    expect(continuationDriverCalls.length).toBe(2);
+    expect(continuationDriverCalls[1]).toEqual({
+        kind: 'approval_decision',
+        answer: 'y',
+        generation: 7,
+    });
+    expect(events.at(-1)?.type).toBe('final');
+    expect(events.at(-1)?.finalText).toBe('recovered after approval');
+    expect(statusMachine.current).toBe('idle');
+});
+it('Abort to idle with pending approval reconciliation', async () => {
+    const { coordinator, statusMachine, getAbortCalled } = makeHarness();
+    statusMachine.beginTurn();
+    statusMachine.requestApproval(); // awaiting_approval
+    coordinator.abort();
+    expect(getAbortCalled()).toBe(true);
+    expect(statusMachine.current).toBe('idle');
+});
+//# sourceMappingURL=turn-coordinator.test.js.map

package/dist/services/session/turn-coordinator.test.js.map

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

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

@@ -0,0 +1,28 @@
+import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { InitialTurnRunOptions } from './turn-attempt-factory.js';
+import type { InitialTurnRunner } from './initial-turn-runner.js';
+import type { ContinuationDriver } from './continuation-driver.js';
+import { type TurnOutcome } from './turn-transition.js';
+export interface ApprovalContinuationInput {
+    answer: string;
+    rejectionReason?: string;
+    generation: number;
+}
+export interface TurnExecutor {
+    executeInitial(input: string | UserTurn, options: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    executeContinuation(input: ApprovalContinuationInput): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+}
+export interface DefaultTurnExecutorDeps {
+    initialTurnRunner: InitialTurnRunner;
+    continuationDriver: ContinuationDriver;
+    shellAutoApproval: ShellAutoApprovalResolver;
+}
+export declare class DefaultTurnExecutor implements TurnExecutor {
+    private readonly deps;
+    constructor(deps: DefaultTurnExecutorDeps);
+    executeInitial(input: string | UserTurn, options?: InitialTurnRunOptions): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+    executeContinuation({ answer, rejectionReason, generation, }: ApprovalContinuationInput): AsyncGenerator<ConversationEvent, TurnOutcome, void>;
+}
+//# sourceMappingURL=turn-executor.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"turn-executor.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAE7F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAwB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,CACZ,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,EAAE,qBAAqB,GAC7B,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAExD,mBAAmB,CAAC,KAAK,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;CAC7G;AAED,MAAM,WAAW,uBAAuB;IACtC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,yBAAyB,CAAC;CAC9C;AAED,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,uBAAuB;IAEnD,cAAc,CACnB,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,OAAO,GAAE,qBAA0B,GAClC,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC;IAkDhD,mBAAmB,CAAC,EACzB,MAAM,EACN,eAAe,EACf,UAAU,GACX,EAAE,yBAAyB,GAAG,cAAc,CAAC,iBAAiB,EAAE,WAAW,EAAE,IAAI,CAAC;CAyBpF"}

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

@@ -0,0 +1,67 @@
+import { ShellAutoApprovalDecisionPolicy } from '../approval/approval-decision-policy.js';
+import { decideTurnTransition } from './turn-transition.js';
+export class DefaultTurnExecutor {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async *executeInitial(input, options = {}) {
+        let currentInput = input;
+        let currentOptions = options;
+        while (true) {
+            const initialOutcome = yield* this.deps.initialTurnRunner.run(currentInput, currentOptions);
+            if (initialOutcome.kind !== 'abort_resolution_required' && initialOutcome.kind !== 'auto_approval_required') {
+                return initialOutcome;
+            }
+            const generation = initialOutcome.generation;
+            let driveResult;
+            if (initialOutcome.kind === 'abort_resolution_required') {
+                driveResult = yield* this.deps.continuationDriver.drive({
+                    kind: 'abort_resolution',
+                    abortedContext: initialOutcome.abortedContext,
+                    userText: initialOutcome.userText,
+                    generation,
+                }, new ShellAutoApprovalDecisionPolicy(this.deps.shellAutoApproval));
+            }
+            else {
+                driveResult = yield* this.deps.continuationDriver.drive({
+                    kind: 'approval_decision',
+                    answer: 'y',
+                    generation,
+                }, new ShellAutoApprovalDecisionPolicy(this.deps.shellAutoApproval));
+            }
+            if (driveResult.kind !== 'fresh_start_required') {
+                return driveResult;
+            }
+            const transition = decideTurnTransition('continuing', driveResult);
+            if (transition.command.kind !== 're_drive') {
+                throw new Error(`Expected re_drive command, received ${transition.command.kind}`);
+            }
+            currentInput = { text: '' };
+            currentOptions = {
+                ...transition.command.options,
+                token: generation,
+            };
+        }
+    }
+    async *executeContinuation({ answer, rejectionReason, generation, }) {
+        const driveResult = yield* this.deps.continuationDriver.drive({
+            kind: 'approval_decision',
+            answer,
+            rejectionReason,
+            generation,
+        });
+        if (driveResult.kind !== 'fresh_start_required') {
+            return driveResult;
+        }
+        const transition = decideTurnTransition('continuing', driveResult);
+        if (transition.command.kind !== 're_drive') {
+            throw new Error(`Expected re_drive command, received ${transition.command.kind}`);
+        }
+        return yield* this.executeInitial({ text: '' }, {
+            ...transition.command.options,
+            token: generation,
+        });
+    }
+}
+//# sourceMappingURL=turn-executor.js.map

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

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

package/dist/services/session/turn-item-accumulator.d.ts

@@ -0,0 +1,21 @@
+import type { NormalizedUsage } from '../../utils/ai/token-usage.js';
+import type { PersistedAssistantTurnItem } from '../conversation/conversation-persistence-types.js';
+export declare class TurnItemAccumulator {
+    private items;
+    private reasoningBuffer;
+    private assistantTextBuffer;
+    private displayUsage;
+    flushReasoningItem(): void;
+    flushAssistantTextItem(): void;
+    recordToolCallItem(callId: string, toolName: string, args: unknown): void;
+    recordToolResultItem(callId: string, toolName: string, status: 'completed' | 'failed' | 'aborted', output: unknown): void;
+    resetPersistedTurnState(): void;
+    getTurnItems(): PersistedAssistantTurnItem[];
+    getDisplayUsage(): NormalizedUsage | undefined;
+    setDisplayUsage(usage: NormalizedUsage): void;
+    appendTextDelta(delta: string): void;
+    appendReasoningDelta(delta: string): void;
+    hasReasoningBuffer(): boolean;
+    hasTextBuffer(): boolean;
+}
+//# sourceMappingURL=turn-item-accumulator.d.ts.map

package/dist/services/session/turn-item-accumulator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-item-accumulator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-item-accumulator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAEpG,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,CAAoC;IACjD,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,mBAAmB,CAAM;IACjC,OAAO,CAAC,YAAY,CAA8B;IAElD,kBAAkB,IAAI,IAAI;IAO1B,sBAAsB,IAAI,IAAI;IAO9B,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;IAMzE,oBAAoB,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,EAC1C,MAAM,EAAE,OAAO,GACd,IAAI;IAMP,uBAAuB,IAAI,IAAI;IAO/B,YAAY,IAAI,0BAA0B,EAAE;IAI5C,eAAe,IAAI,eAAe,GAAG,SAAS;IAI9C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAI7C,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIpC,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIzC,kBAAkB,IAAI,OAAO;IAI7B,aAAa,IAAI,OAAO;CAGzB"}

package/dist/services/session/turn-item-accumulator.js

@@ -0,0 +1,56 @@
+export class TurnItemAccumulator {
+    items = [];
+    reasoningBuffer = '';
+    assistantTextBuffer = '';
+    displayUsage;
+    flushReasoningItem() {
+        if (this.reasoningBuffer) {
+            this.items.push({ type: 'reasoning', text: this.reasoningBuffer });
+            this.reasoningBuffer = '';
+        }
+    }
+    flushAssistantTextItem() {
+        if (this.assistantTextBuffer) {
+            this.items.push({ type: 'assistant_text', text: this.assistantTextBuffer });
+            this.assistantTextBuffer = '';
+        }
+    }
+    recordToolCallItem(callId, toolName, args) {
+        this.flushReasoningItem();
+        this.flushAssistantTextItem();
+        this.items.push({ type: 'tool_call', callId, toolName, arguments: args });
+    }
+    recordToolResultItem(callId, toolName, status, output) {
+        this.flushReasoningItem();
+        this.flushAssistantTextItem();
+        this.items.push({ type: 'tool_result', callId, toolName, status, output });
+    }
+    resetPersistedTurnState() {
+        this.items = [];
+        this.reasoningBuffer = '';
+        this.assistantTextBuffer = '';
+        this.displayUsage = undefined;
+    }
+    getTurnItems() {
+        return this.items;
+    }
+    getDisplayUsage() {
+        return this.displayUsage;
+    }
+    setDisplayUsage(usage) {
+        this.displayUsage = usage;
+    }
+    appendTextDelta(delta) {
+        this.assistantTextBuffer += delta;
+    }
+    appendReasoningDelta(delta) {
+        this.reasoningBuffer += delta;
+    }
+    hasReasoningBuffer() {
+        return this.reasoningBuffer.length > 0;
+    }
+    hasTextBuffer() {
+        return this.assistantTextBuffer.length > 0;
+    }
+}
+//# sourceMappingURL=turn-item-accumulator.js.map

package/dist/services/session/turn-item-accumulator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-item-accumulator.js","sourceRoot":"","sources":["../../../source/services/session/turn-item-accumulator.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,mBAAmB;IACtB,KAAK,GAAiC,EAAE,CAAC;IACzC,eAAe,GAAG,EAAE,CAAC;IACrB,mBAAmB,GAAG,EAAE,CAAC;IACzB,YAAY,CAA8B;IAElD,kBAAkB;QAChB,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,sBAAsB;QACpB,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,QAAgB,EAAE,IAAa;QAChE,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,oBAAoB,CAClB,MAAc,EACd,QAAgB,EAChB,MAA0C,EAC1C,MAAe;QAEf,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,eAAe,CAAC,KAAsB;QACpC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED,eAAe,CAAC,KAAa;QAC3B,IAAI,CAAC,mBAAmB,IAAI,KAAK,CAAC;IACpC,CAAC;IAED,oBAAoB,CAAC,KAAa;QAChC,IAAI,CAAC,eAAe,IAAI,KAAK,CAAC;IAChC,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7C,CAAC;CACF"}

package/dist/services/session/turn-item-accumulator.test.d.ts

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

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

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

package/dist/services/session/turn-item-accumulator.test.js

@@ -0,0 +1,75 @@
+import { it, expect } from 'vitest';
+import { TurnItemAccumulator } from './turn-item-accumulator.js';
+it('flushReasoningItem flushes non-empty buffer and is a no-op when empty', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.flushReasoningItem();
+    expect(accumulator.getTurnItems()).toEqual([]);
+    accumulator.appendReasoningDelta('thinking');
+    accumulator.flushReasoningItem();
+    expect(accumulator.getTurnItems()).toEqual([{ type: 'reasoning', text: 'thinking' }]);
+});
+it('flushAssistantTextItem flushes non-empty buffer and is a no-op when empty', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.flushAssistantTextItem();
+    expect(accumulator.getTurnItems()).toEqual([]);
+    accumulator.appendTextDelta('hello');
+    accumulator.flushAssistantTextItem();
+    expect(accumulator.getTurnItems()).toEqual([{ type: 'assistant_text', text: 'hello' }]);
+});
+it('recordToolCallItem flushes both buffers before recording the tool call', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.appendReasoningDelta('reason');
+    accumulator.appendTextDelta('text');
+    accumulator.recordToolCallItem('call-1', 'search', { query: 'term2' });
+    expect(accumulator.getTurnItems()).toEqual([
+        { type: 'reasoning', text: 'reason' },
+        { type: 'assistant_text', text: 'text' },
+        { type: 'tool_call', callId: 'call-1', toolName: 'search', arguments: { query: 'term2' } },
+    ]);
+});
+it('recordToolResultItem flushes both buffers before recording the tool result', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.appendReasoningDelta('reason');
+    accumulator.appendTextDelta('text');
+    accumulator.recordToolResultItem('call-1', 'search', 'completed', { answer: 'done' });
+    expect(accumulator.getTurnItems()).toEqual([
+        { type: 'reasoning', text: 'reason' },
+        { type: 'assistant_text', text: 'text' },
+        { type: 'tool_result', callId: 'call-1', toolName: 'search', status: 'completed', output: { answer: 'done' } },
+    ]);
+});
+it('resetPersistedTurnState clears all state', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.appendReasoningDelta('reason');
+    accumulator.appendTextDelta('text');
+    accumulator.setDisplayUsage({ prompt_tokens: 1 });
+    accumulator.recordToolCallItem('call-1', 'search', {});
+    accumulator.resetPersistedTurnState();
+    expect(accumulator.getTurnItems()).toEqual([]);
+    expect(accumulator.getDisplayUsage()).toBe(undefined);
+    expect(accumulator.hasReasoningBuffer()).toBe(false);
+    expect(accumulator.hasTextBuffer()).toBe(false);
+});
+it('appendTextDelta and appendReasoningDelta accumulate deltas', () => {
+    const accumulator = new TurnItemAccumulator();
+    accumulator.appendTextDelta('hel');
+    accumulator.appendTextDelta('lo');
+    accumulator.appendReasoningDelta('th');
+    accumulator.appendReasoningDelta('ink');
+    expect(accumulator.hasTextBuffer()).toBe(true);
+    expect(accumulator.hasReasoningBuffer()).toBe(true);
+    accumulator.flushAssistantTextItem();
+    accumulator.flushReasoningItem();
+    expect(accumulator.getTurnItems()).toEqual([
+        { type: 'assistant_text', text: 'hello' },
+        { type: 'reasoning', text: 'think' },
+    ]);
+});
+it('getDisplayUsage and setDisplayUsage track display usage', () => {
+    const accumulator = new TurnItemAccumulator();
+    const usage = { prompt_tokens: 12, completion_tokens: 34 };
+    expect(accumulator.getDisplayUsage()).toBe(undefined);
+    accumulator.setDisplayUsage(usage);
+    expect(accumulator.getDisplayUsage()).toEqual(usage);
+});
+//# sourceMappingURL=turn-item-accumulator.test.js.map

package/dist/services/session/turn-item-accumulator.test.js.map

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

package/dist/services/session/turn-outcome-adapters.d.ts

@@ -0,0 +1,26 @@
+import type { InitialTurnOutcome } from './initial-turn-runner.js';
+import type { ContinuationDriveResult } from './continuation-driver.js';
+import type { ContinuingTurnOutcome, StreamingTurnOutcome } from './turn-transition.js';
+export type DirectInitialTurnOutcome = Exclude<InitialTurnOutcome, {
+    kind: 'abort_resolution_required' | 'auto_approval_required';
+}>;
+/**
+ * Convert an InitialTurnOutcome (from initial-turn-runner.ts) to the
+ * canonical TurnOutcome type used by the transition engine.
+ *
+ * The mapping is nearly 1:1 — both types share the same field names
+ * for `response` and `approval_required`, and the `failed` / `stale`
+ * variants translate directly.
+ */
+export declare function fromInitialOutcome(outcome: DirectInitialTurnOutcome): StreamingTurnOutcome;
+/**
+ * Convert a ContinuationDriveResult (from continuation-driver.ts) to the
+ * canonical TurnOutcome type.
+ *
+ * Field names now match directly (`terminal` in both), so `response`,
+ * `approval_required`, and `stale` pass through unchanged.
+ * `fresh_start_required` spreads `RecoveryInstructions` fields
+ * (`delayMs`, `useStandardServiceTier`) alongside `retryCounts`.
+ */
+export declare function fromDriveResult(result: ContinuationDriveResult): ContinuingTurnOutcome;
+//# sourceMappingURL=turn-outcome-adapters.d.ts.map

package/dist/services/session/turn-outcome-adapters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-outcome-adapters.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-outcome-adapters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIxF,MAAM,MAAM,wBAAwB,GAAG,OAAO,CAC5C,kBAAkB,EAClB;IAAE,IAAI,EAAE,2BAA2B,GAAG,wBAAwB,CAAA;CAAE,CACjE,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,GAAG,oBAAoB,CAc1F;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,uBAAuB,GAAG,qBAAqB,CAetF"}