@qduc/term2 0.7.2 → 0.8.0

package/dist/services/session/initial-input-preparer.test.js

@@ -0,0 +1,113 @@
+import { it, expect } from 'vitest';
+import { InitialInputPreparer } from './initial-input-preparer.js';
+import { TurnAttempt } from './turn-attempt.js';
+function createAttempt() {
+    return new TurnAttempt({
+        turn: {
+            text: 'hello',
+            images: [{ id: 'image-1', mimeType: 'image/png', data: 'abc', byteSize: 3, displayNumber: 1 }],
+        },
+        token: 4,
+        initialRetryCounts: {
+            transientRetryCount: 0,
+            serviceTierFallbackCount: 0,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+        initialLedgerSnapshot: [],
+        maxTransientRetries: 2,
+    });
+}
+it('adds the user turn once and attaches the planned input', () => {
+    const added = [];
+    const attempt = createAttempt();
+    const preparer = new InitialInputPreparer({
+        conversationStore: {
+            addUserTurn: (turn) => added.push(turn),
+        },
+        generationGuard: { isCurrent: () => true },
+        inputPlanner: {
+            build: () => ({
+                streamInput: ['history'],
+                inputSurgeKind: 'full_history',
+                effectiveTurn: attempt.turn,
+            }),
+            inspectForSurge: () => ({ action: 'allow' }),
+        },
+        logger: { warn: () => { }, getCorrelationId: () => undefined },
+        sessionId: 'session-1',
+        state: { pendingModeNotice: 'notice' },
+    });
+    expect(preparer.prepare(attempt, false)).toEqual({ kind: 'ready' });
+    expect(preparer.prepare(attempt, false)).toEqual({ kind: 'ready' });
+    expect(added.length).toBe(1);
+    expect(attempt.streamInput).toEqual(['history']);
+    expect(attempt.inputMode).toBe('full_history');
+});
+it('rolls back an inserted user turn when the surge guard blocks', () => {
+    let removed = 0;
+    const attempt = createAttempt();
+    const preparer = new InitialInputPreparer({
+        conversationStore: {
+            addUserTurn: () => { },
+            removeLastUserMessage: () => {
+                removed++;
+            },
+        },
+        generationGuard: { isCurrent: () => true },
+        inputPlanner: {
+            build: () => ({
+                streamInput: 'input',
+                inputSurgeKind: 'delta',
+                effectiveTurn: attempt.turn,
+            }),
+            inspectForSurge: () => ({
+                action: 'block',
+                reason: 'Too large',
+                stats: {},
+                previousStats: {},
+            }),
+        },
+        logger: { warn: () => { }, getCorrelationId: () => 'trace-1' },
+        sessionId: 'session-1',
+        state: { pendingModeNotice: null },
+    });
+    const result = preparer.prepare(attempt, false);
+    expect(result.kind).toBe('blocked');
+    if (result.kind !== 'blocked')
+        return;
+    expect(removed).toBe(1);
+    expect(result.event.droppedUserMessage).toEqual({ text: 'hello', imageCount: 1 });
+});
+it('does not roll back a user turn after the generation becomes stale', () => {
+    let removed = 0;
+    const attempt = createAttempt();
+    const preparer = new InitialInputPreparer({
+        conversationStore: {
+            addUserTurn: () => { },
+            removeLastUserMessage: () => {
+                removed++;
+            },
+        },
+        generationGuard: { isCurrent: () => false },
+        inputPlanner: {
+            build: () => ({
+                streamInput: 'input',
+                inputSurgeKind: 'delta',
+                effectiveTurn: attempt.turn,
+            }),
+            inspectForSurge: () => ({
+                action: 'block',
+                reason: 'Too large',
+                stats: {},
+                previousStats: {},
+            }),
+        },
+        logger: { warn: () => { }, getCorrelationId: () => undefined },
+        sessionId: 'session-1',
+        state: { pendingModeNotice: null },
+    });
+    preparer.prepare(attempt, false);
+    expect(removed).toBe(0);
+});
+//# sourceMappingURL=initial-input-preparer.test.js.map

package/dist/services/session/initial-input-preparer.test.js.map

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

package/dist/services/session/initial-stream-cycle.d.ts

@@ -0,0 +1,44 @@
+import type { RunState } from '@openai/agents';
+import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { BuildResultOutcome } from '../conversation/conversation-result-builder.js';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { ILoggingService } from '../service-interfaces.js';
+import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
+import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import type { ConversationStore } from '../conversation/conversation-store.js';
+import type { ProviderContinuity } from '../provider-continuity.js';
+import type { SessionInputPlanner } from './session-input-planner.js';
+import type { SessionStreamProcessor } from './session-stream-processor.js';
+import type { SessionToolTracker } from './session-tool-tracker.js';
+import type { TurnAttempt } from './turn-attempt.js';
+import type { TurnItemAccumulator } from './turn-item-accumulator.js';
+export type InitialStreamCycleOptions = {
+    resumeState?: RunState<any, any>;
+    resumePreviousResponseId?: string | null;
+};
+export type InitialStreamCycleResult = {
+    kind: 'completed';
+    outcome: BuildResultOutcome;
+} | {
+    kind: 'stale';
+};
+export type InitialStreamCycleDeps = {
+    agentClient: ConversationAgentClient;
+    approvalFlow: ApprovalFlowCoordinator;
+    conversationStore: ConversationStore;
+    inputPlanner: SessionInputPlanner;
+    logger: ILoggingService;
+    providerContinuity: ProviderContinuity;
+    sessionId: string;
+    shellAutoApproval: ShellAutoApprovalResolver;
+    streamProcessor: SessionStreamProcessor;
+    toolTracker: SessionToolTracker;
+    turnAccumulator: TurnItemAccumulator;
+};
+export declare class InitialStreamCycle {
+    #private;
+    private readonly deps;
+    constructor(deps: InitialStreamCycleDeps);
+    execute(attempt: TurnAttempt, options: InitialStreamCycleOptions): AsyncGenerator<ConversationEvent, InitialStreamCycleResult, void>;
+}
+//# sourceMappingURL=initial-stream-cycle.d.ts.map

package/dist/services/session/initial-stream-cycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initial-stream-cycle.d.ts","sourceRoot":"","sources":["../../../source/services/session/initial-stream-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAC7F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAE9G,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,eAAe,EAAE,sBAAsB,CAAC;IACxC,WAAW,EAAE,kBAAkB,CAAC;IAChC,eAAe,EAAE,mBAAmB,CAAC;CACtC,CAAC;AAEF,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,sBAAsB;IAElD,OAAO,CACZ,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,yBAAyB,GACjC,cAAc,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,IAAI,CAAC;CA0DrE"}

package/dist/services/session/initial-stream-cycle.js

@@ -0,0 +1,53 @@
+import { buildConversationResult } from '../conversation/conversation-result-builder.js';
+export class InitialStreamCycle {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async *execute(attempt, options) {
+        const stream = await this.#startStream(attempt, options);
+        attempt.attachStream(stream);
+        const accumulated = yield* this.deps.streamProcessor.process(stream, {
+            gen: attempt.token,
+            source: 'startStream',
+            preserveExistingToolArgs: false,
+        });
+        const finalized = this.deps.streamProcessor.finalize(stream, attempt.token, attempt.inputMode, 'startStream');
+        if (finalized.kind === 'stale') {
+            return { kind: 'stale' };
+        }
+        const outcome = await buildConversationResult({
+            result: stream,
+            finalOutputOverride: accumulated.finalOutput || undefined,
+            reasoningOutputOverride: accumulated.reasoningOutput || undefined,
+            emittedCommandIds: accumulated.emittedCommandIds,
+            usage: accumulated.latestUsage,
+            toolCallArgumentsById: this.deps.toolTracker.argumentsById,
+            turnItems: this.deps.turnAccumulator.getTurnItems(),
+            token: attempt.token,
+            inputMode: attempt.inputMode,
+        }, {
+            approvalFlow: this.deps.approvalFlow,
+            shellAutoApproval: this.deps.shellAutoApproval,
+            logger: this.deps.logger,
+            sessionId: this.deps.sessionId,
+        });
+        this.deps.inputPlanner.recordSuccess(attempt.inputMode === 'delta' ? attempt.streamInput : this.deps.conversationStore.getHistory(), attempt.inputMode === 'delta'
+            ? { kind: attempt.inputMode }
+            : { kind: attempt.inputMode, previousInput: attempt.streamInput });
+        return { kind: 'completed', outcome };
+    }
+    async #startStream(attempt, options) {
+        if (options.resumeState && typeof this.deps.agentClient.continueRunStream === 'function') {
+            return (await this.deps.agentClient.continueRunStream(options.resumeState, {
+                previousResponseId: options.resumePreviousResponseId ?? this.deps.providerContinuity.previousResponseId,
+                sessionId: this.deps.sessionId,
+            }));
+        }
+        return (await this.deps.agentClient.startStream(attempt.streamInput, {
+            previousResponseId: attempt.inputMode === 'delta' ? this.deps.providerContinuity.previousResponseId : null,
+            sessionId: this.deps.sessionId,
+        }));
+    }
+}
+//# sourceMappingURL=initial-stream-cycle.js.map

package/dist/services/session/initial-stream-cycle.js.map

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

package/dist/services/session/initial-stream-cycle.test.d.ts

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

package/dist/services/session/initial-stream-cycle.test.d.ts.map

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

package/dist/services/session/initial-stream-cycle.test.js

@@ -0,0 +1,105 @@
+import { it, expect } from 'vitest';
+import { InitialStreamCycle } from './initial-stream-cycle.js';
+import { TurnAttempt } from './turn-attempt.js';
+import { MockStream } from '../test-helpers/mock-stream.js';
+function createAttempt() {
+    const attempt = new TurnAttempt({
+        turn: { text: 'hello' },
+        token: 3,
+        initialRetryCounts: {
+            transientRetryCount: 0,
+            serviceTierFallbackCount: 0,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+        initialLedgerSnapshot: [],
+        maxTransientRetries: 2,
+    });
+    attempt.attachInput({
+        streamInput: 'hello',
+        inputSurgeKind: 'delta',
+        effectiveTurn: attempt.turn,
+    });
+    return attempt;
+}
+it('starts and processes a stream, then returns the built response', async () => {
+    const stream = new MockStream([]);
+    stream.finalOutput = 'done';
+    const recorded = [];
+    const cycle = new InitialStreamCycle({
+        agentClient: {
+            startStream: async () => stream,
+        },
+        approvalFlow: { clearPending: () => { } },
+        conversationStore: { getHistory: () => [] },
+        inputPlanner: {
+            recordSuccess: (...args) => recorded.push(args),
+        },
+        logger: { debug: () => { }, getCorrelationId: () => undefined },
+        providerContinuity: { previousResponseId: 'response-1' },
+        sessionId: 'session-1',
+        shellAutoApproval: { clearCache: () => { } },
+        streamProcessor: {
+            async *process() {
+                yield { type: 'text_delta', delta: 'done' };
+                return {
+                    finalOutput: 'done',
+                    reasoningOutput: '',
+                    emittedCommandIds: new Set(),
+                    latestUsage: undefined,
+                };
+            },
+            finalize: () => ({ kind: 'finalized' }),
+        },
+        toolTracker: { argumentsById: new Map() },
+        turnAccumulator: { getTurnItems: () => [] },
+    });
+    const events = [];
+    const iterator = cycle.execute(createAttempt(), {});
+    let next = await iterator.next();
+    while (!next.done) {
+        events.push(next.value);
+        next = await iterator.next();
+    }
+    expect(events).toEqual([{ type: 'text_delta', delta: 'done' }]);
+    expect(next.value.kind).toBe('completed');
+    if (next.value.kind !== 'completed')
+        return;
+    expect(next.value.outcome.kind).toBe('response');
+    if (next.value.outcome.kind === 'response') {
+        expect(next.value.outcome.result.finalText).toBe('done');
+    }
+    expect(recorded.length).toBe(1);
+});
+it('returns stale without building a result when finalization is stale', async () => {
+    const stream = new MockStream([]);
+    const cycle = new InitialStreamCycle({
+        agentClient: { startStream: async () => stream },
+        approvalFlow: {},
+        conversationStore: { getHistory: () => [] },
+        inputPlanner: { recordSuccess: () => expect(true).toBe(false) },
+        logger: {},
+        providerContinuity: { previousResponseId: null },
+        sessionId: 'session-1',
+        shellAutoApproval: {},
+        streamProcessor: {
+            async *process() {
+                return {
+                    finalOutput: '',
+                    reasoningOutput: '',
+                    emittedCommandIds: new Set(),
+                    latestUsage: undefined,
+                };
+            },
+            finalize: () => ({ kind: 'stale' }),
+        },
+        toolTracker: { argumentsById: new Map() },
+        turnAccumulator: { getTurnItems: () => [] },
+    });
+    const iterator = cycle.execute(createAttempt(), {});
+    let next = await iterator.next();
+    while (!next.done)
+        next = await iterator.next();
+    expect(next.value).toEqual({ kind: 'stale' });
+});
+//# sourceMappingURL=initial-stream-cycle.test.js.map

package/dist/services/session/initial-stream-cycle.test.js.map

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

package/dist/services/session/initial-turn-recovery-handler.d.ts

@@ -0,0 +1,45 @@
+import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { ILoggingService } from '../service-interfaces.js';
+import type { ConversationStore } from '../conversation/conversation-store.js';
+import type { AgentStream } from '../agent-stream.js';
+import type { GenerationGuard } from '../generation-guard.js';
+import type { DefaultConversationRecoveryPolicy } from '../retry/recovery-policy.js';
+import type { DefaultRecoveryExecutor } from '../retry/recovery-executor.js';
+import type { DefaultRetryClassifier } from '../retry/retry-classifier.js';
+import type { RetryEventPresenter } from '../retry/retry-event-presenter.js';
+import type { NextRunInstruction } from '../retry/retry-contracts.js';
+import type { SessionInputPlanner } from './session-input-planner.js';
+import type { TurnAttempt } from './turn-attempt.js';
+export type InitialTurnRecoveryResult = {
+    kind: 'run';
+    instruction: NextRunInstruction;
+    delayMs?: number;
+    useStandardServiceTier?: boolean;
+} | {
+    kind: 'terminated';
+} | {
+    kind: 'stale';
+};
+export type InitialTurnRecoveryHandlerDeps = {
+    conversationStore: ConversationStore;
+    freshStartRetriesAllowed: boolean;
+    generationGuard: GenerationGuard;
+    inputPlanner: SessionInputPlanner;
+    logger: ILoggingService;
+    recoveryExecutor: DefaultRecoveryExecutor;
+    recoveryPolicy: DefaultConversationRecoveryPolicy;
+    retryClassifier: DefaultRetryClassifier;
+    retryEventPresenter: RetryEventPresenter;
+    sessionId: string;
+};
+export declare class InitialTurnRecoveryHandler {
+    #private;
+    private readonly deps;
+    constructor(deps: InitialTurnRecoveryHandlerDeps);
+    handle(ctx: {
+        error: unknown;
+        attempt: TurnAttempt;
+        stream: AgentStream | null;
+    }): AsyncGenerator<ConversationEvent, InitialTurnRecoveryResult, void>;
+}
+//# sourceMappingURL=initial-turn-recovery-handler.d.ts.map

package/dist/services/session/initial-turn-recovery-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initial-turn-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/initial-turn-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAiB,MAAM,6BAA6B,CAAC;AAErF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,MAAM,yBAAyB,GACjC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,WAAW,EAAE,kBAAkB,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAE,GACpG;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,cAAc,EAAE,iCAAiC,CAAC;IAClD,eAAe,EAAE,sBAAsB,CAAC;IACxC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,0BAA0B;;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,8BAA8B;IAE1D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,OAAO,EAAE,WAAW,CAAC;QACrB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;KAC5B,GAAG,cAAc,CAAC,iBAAiB,EAAE,yBAAyB,EAAE,IAAI,CAAC;CA6IvE"}

package/dist/services/session/initial-turn-recovery-handler.js

@@ -0,0 +1,136 @@
+import { describeError } from '../../utils/error-helpers.js';
+export class InitialTurnRecoveryHandler {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async *handle(ctx) {
+        const { error, attempt, stream } = ctx;
+        if (!this.deps.generationGuard.isCurrent(attempt.token)) {
+            return { kind: 'stale' };
+        }
+        let classified = this.deps.retryClassifier.classify({
+            error,
+            retryCounts: attempt.retryCounts,
+            stream,
+            maxTransientRetries: attempt.maxTransientRetries,
+            maxModelRetries: attempt.maxModelRetries,
+        });
+        if (!this.deps.freshStartRetriesAllowed && !stream && classified.kind !== 'unrecoverable') {
+            this.deps.logger.warn('Retry requires fresh start but fresh-start retries are disabled for this session', {
+                eventType: 'retry.fresh_start_blocked',
+                category: 'retry',
+                phase: 'retry',
+                sessionId: this.deps.sessionId,
+                traceId: this.deps.logger.getCorrelationId(),
+                retryKind: classified.kind,
+                errorMessage: error instanceof Error ? error.message : String(error),
+            });
+            classified = { kind: 'unrecoverable' };
+        }
+        if (classified.kind === 'unrecoverable') {
+            const droppedUserMessage = attempt.addedUserMessage && !stream
+                ? { text: attempt.turn.text, imageCount: attempt.turn.images?.length ?? 0 }
+                : undefined;
+            const plan = this.deps.recoveryPolicy.plan({
+                failure: classified,
+                gen: attempt.token,
+                stream,
+                retryCounts: attempt.retryCounts,
+                maxModelRetries: attempt.maxModelRetries,
+                freshStartRetriesAllowed: this.deps.freshStartRetriesAllowed,
+            });
+            const recoveryResult = this.deps.recoveryExecutor.apply({
+                plan,
+                state: {
+                    ledgerSnapshot: attempt.initialLedgerSnapshot,
+                    addedUserMessage: attempt.addedUserMessage,
+                    stream,
+                },
+                retryCounts: attempt.retryCounts,
+                maxModelRetries: attempt.maxModelRetries,
+            });
+            this.deps.inputPlanner.recordSuccess(this.deps.conversationStore.getHistory(), {
+                kind: 'full_history',
+                previousInput: attempt.streamInput,
+            });
+            for (const event of recoveryResult.events) {
+                yield event;
+            }
+            yield {
+                type: 'error',
+                message: describeError(error),
+                ...(error instanceof Error && error.stack ? { stack: error.stack } : {}),
+                ...(droppedUserMessage ? { droppedUserMessage } : {}),
+            };
+            this.#logFailure(error);
+            return { kind: 'terminated' };
+        }
+        const presentation = this.deps.retryEventPresenter.present({
+            failure: classified,
+            maxTransientRetries: attempt.maxTransientRetries,
+            maxModelRetries: attempt.maxModelRetries,
+            source: 'initial',
+            error,
+        });
+        yield presentation.event;
+        this.deps.logger.warn(presentation.logMessage, {
+            ...presentation.logFields,
+            sessionId: this.deps.sessionId,
+            traceId: this.deps.logger.getCorrelationId(),
+        });
+        if (!this.deps.generationGuard.isCurrent(attempt.token)) {
+            return { kind: 'stale' };
+        }
+        attempt.advanceRetry(this.deps.recoveryPolicy.nextRetryCounts(attempt.retryCounts, classified));
+        const plan = this.deps.recoveryPolicy.plan({
+            failure: classified,
+            gen: attempt.token,
+            stream,
+            retryCounts: attempt.retryCounts,
+            maxModelRetries: attempt.maxModelRetries,
+            freshStartRetriesAllowed: this.deps.freshStartRetriesAllowed,
+        });
+        const recoveryState = {
+            ledgerSnapshot: attempt.initialLedgerSnapshot,
+            addedUserMessage: attempt.addedUserMessage,
+            stream,
+        };
+        const result = this.deps.recoveryExecutor.apply({
+            plan,
+            state: recoveryState,
+            retryCounts: attempt.retryCounts,
+            maxModelRetries: attempt.maxModelRetries,
+        });
+        if (result.kind === 'terminated') {
+            for (const event of result.events) {
+                yield event;
+            }
+            yield {
+                type: 'error',
+                message: describeError(error),
+                ...(error instanceof Error && error.stack ? { stack: error.stack } : {}),
+            };
+            this.#logFailure(error);
+            return { kind: 'terminated' };
+        }
+        return {
+            kind: 'run',
+            instruction: result.instruction,
+            delayMs: classified.kind === 'transient' ? classified.delayMs : undefined,
+            useStandardServiceTier: result.useStandardServiceTier,
+        };
+    }
+    #logFailure(error) {
+        this.deps.logger.error('Conversation stream error', {
+            eventType: 'stream.failed',
+            category: 'stream',
+            phase: 'abort',
+            sessionId: this.deps.sessionId,
+            traceId: this.deps.logger.getCorrelationId(),
+            errorMessage: describeError(error),
+            stack: error instanceof Error ? error.stack : undefined,
+        });
+    }
+}
+//# sourceMappingURL=initial-turn-recovery-handler.js.map

package/dist/services/session/initial-turn-recovery-handler.js.map

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

package/dist/services/session/initial-turn-recovery-handler.test.d.ts

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

package/dist/services/session/initial-turn-recovery-handler.test.d.ts.map

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

package/dist/services/session/initial-turn-recovery-handler.test.js

@@ -0,0 +1,91 @@
+import { it, expect } from 'vitest';
+import { InitialTurnRecoveryHandler } from './initial-turn-recovery-handler.js';
+import { TurnAttempt } from './turn-attempt.js';
+function createAttempt() {
+    return new TurnAttempt({
+        turn: { text: 'retry me' },
+        token: 2,
+        initialRetryCounts: {
+            transientRetryCount: 0,
+            serviceTierFallbackCount: 0,
+            modelRetryCount: 0,
+            transportDowngradeCount: 0,
+        },
+        initialLedgerSnapshot: [],
+        maxTransientRetries: 3,
+    });
+}
+it('presents and applies a recoverable retry decision', async () => {
+    const nextCounts = {
+        transientRetryCount: 1,
+        serviceTierFallbackCount: 0,
+        modelRetryCount: 0,
+        transportDowngradeCount: 0,
+    };
+    const handler = new InitialTurnRecoveryHandler({
+        conversationStore: { getHistory: () => [] },
+        freshStartRetriesAllowed: true,
+        generationGuard: { isCurrent: () => true },
+        inputPlanner: { recordSuccess: () => { } },
+        logger: {
+            warn: () => { },
+            error: () => { },
+            getCorrelationId: () => undefined,
+        },
+        recoveryExecutor: {
+            apply: () => ({
+                kind: 'run',
+                instruction: { skipUserMessage: true, retryCounts: nextCounts },
+                events: [],
+            }),
+        },
+        recoveryPolicy: {
+            nextRetryCounts: () => nextCounts,
+            plan: () => ({ kind: 'retry_fresh', inputMode: 'full_history' }),
+        },
+        retryClassifier: {
+            classify: () => ({ kind: 'transient', attempt: 1, delayMs: 25 }),
+        },
+        retryEventPresenter: {
+            present: () => ({
+                event: { type: 'retry', attempt: 1, maxAttempts: 3, delayMs: 25 },
+                logMessage: 'Retrying',
+                logFields: {},
+            }),
+        },
+        sessionId: 'session-1',
+    });
+    const attempt = createAttempt();
+    const events = [];
+    const iterator = handler.handle({ error: new Error('temporary'), attempt, stream: null });
+    let next = await iterator.next();
+    while (!next.done) {
+        events.push(next.value);
+        next = await iterator.next();
+    }
+    expect(events).toEqual([{ type: 'retry', attempt: 1, maxAttempts: 3, delayMs: 25 }]);
+    expect(next.value.kind).toBe('run');
+    if (next.value.kind === 'run') {
+        expect(next.value.delayMs).toBe(25);
+    }
+    expect(attempt.retryCounts).toEqual(nextCounts);
+});
+it('returns stale before classifying when the generation is outdated', async () => {
+    const handler = new InitialTurnRecoveryHandler({
+        conversationStore: {},
+        freshStartRetriesAllowed: true,
+        generationGuard: { isCurrent: () => false },
+        inputPlanner: {},
+        logger: {},
+        recoveryExecutor: {},
+        recoveryPolicy: {},
+        retryClassifier: { classify: () => expect(true).toBe(false) },
+        retryEventPresenter: {},
+        sessionId: 'session-1',
+    });
+    const iterator = handler.handle({ error: new Error('stale'), attempt: createAttempt(), stream: null });
+    const result = await iterator.next();
+    expect(result.done).toBe(true);
+    expect(result.value).toEqual({ kind: 'stale' });
+});
+//# sourceMappingURL=initial-turn-recovery-handler.test.js.map