@qduc/term2 0.32.2 → 0.34.0

package/dist/services/conversation/conversation-record.d.ts

@@ -0,0 +1,160 @@
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { ILoggingService } from '../service-interfaces.js';
+import { type RewindTargetId } from './conversation-store.js';
+import { ToolExecutionLedger, type SavedToolExecution } from '../tool-execution-ledger.js';
+import type { LogEvent } from '../logging/conversation-log-events.js';
+import type { AgentStream } from '../agent-stream.js';
+import type { SessionIdSource } from '../session/session-identity.js';
+import type { ProviderContinuity } from '../provider-continuity.js';
+import type { OpenAIRootCheckpointLifecycleObserver } from '../openai-root-checkpoint-lifecycle-observer.js';
+import type { RecoveryPlan, RecoveryState, CommittedToolContinuation } from '../retry/retry-contracts.js';
+export type RecordAcceptanceReceipt = {
+    accepted: 'memory';
+    /** A void sink returning is acknowledgement of delivery, never proof of fsync. */
+    persistence: 'not_requested' | 'unconfigured' | 'acknowledged' | 'failed';
+};
+/**
+ * Sole acceptance authority for provider history, tool evidence and assistant journal.
+ * Physical execution and recovery policy remain with their existing owners. All
+ * reconstruction, rewind and import transitions keep these representations together.
+ */
+export declare class ConversationRecord {
+    #private;
+    constructor(options?: {
+        logger?: ILoggingService;
+        providerContext?: ProviderContinuity;
+        checkpointObserver?: OpenAIRootCheckpointLifecycleObserver;
+    });
+    setJournalSink(sink: ((event: LogEvent) => void) | null): void;
+    /** Preserve the pre-attempt recovery baseline without exporting journal state. */
+    beginAttempt(): void;
+    /** A decision changes the segment view, never the execution position. */
+    beginDecisionResolution(source?: 'continueRunStream' | 'abortResolution'): void;
+    beginTurn(): void;
+    getCurrentTurnId(): string;
+    getHistory(): ProviderInputItem[];
+    getProviderHistorySnapshot(): import("./conversation-store.js").ProviderHistorySnapshot;
+    getProviderHistoryIdentity(): {
+        revision: number;
+        identity: string;
+        origin: string;
+    };
+    getLastUserMessage(): string;
+    listUserTurns(): {
+        index: number;
+        text: string;
+        imageCount: number;
+    }[];
+    listRewindTargets(): import("./conversation-store.js").RewindTarget[];
+    getCurrentTurnItems(): import("../../contracts/conversation-items.js").Item[];
+    recordTextDelta(delta: string): void;
+    recordReasoningDelta(delta: string): void;
+    rollbackReasoning(characters: number): void;
+    exportToolEvidence(): SavedToolExecution[];
+    activeCallIdsForCurrentTurn(): string[];
+    completedResultCallIdsForCurrentTurn(): string[];
+    unsettledToolCallIdsForCurrentTurn(): string[];
+    inspectCommittedToolContinuation(): CommittedToolContinuation;
+    acceptInput(turn: string | UserTurn): RecordAcceptanceReceipt;
+    addUserTurn(turn: string | UserTurn): RecordAcceptanceReceipt;
+    removeLastUserMessage(): void;
+    addShellContext(text: string): void;
+    markDispatched(callId: string): void;
+    recordFunctionCall(item: unknown): void;
+    recordFunctionResult(item: unknown): void;
+    recordAbortedApproval(output: string, error: string, callId?: string): void;
+    markOpenCallsAborted(error: string, callId?: string): void;
+    getRecoverySummary(): import("../tool-execution-ledger.js").ToolLedgerRecoverySummary | null;
+    /** A segment is a wire view over the same record, not another acceptance owner. */
+    beginSegment(): void;
+    /** Accept one observed provider item into both evidence representations before publication. */
+    acceptObservedItem(item: unknown): RecordAcceptanceReceipt;
+    /** Accept a completed or interrupted execution view, independent of rendering. */
+    acceptSegment(stream: AgentStream, inputMode: 'delta' | 'full_history', diagnostics: {
+        logger: ILoggingService;
+        sessionId: SessionIdSource;
+    }): {
+        kind: "committed" | "partial";
+        snapshot: import("./conversation-store.js").ProviderHistorySnapshot;
+        historyCommitted: boolean;
+        lastResponseId: string | null;
+        unsettledToolCallIds: string[];
+    };
+    snapshot(metadata: {
+        previousResponseId: string | null;
+        model?: string;
+        provider?: string;
+    }): import("../logging/conversation-log-events.js").StateSnapshot;
+    exportState(previousResponseId: string | null): {
+        history: ProviderInputItem[];
+        previousResponseId: string | null;
+        toolLedger: SavedToolExecution[];
+    };
+    getReconciledHistory(): ProviderInputItem[];
+    /** Conditional compaction acceptance preserves the existing transcript revision guard. */
+    replaceHistoryAtRevision(revision: number, history: readonly ProviderInputItem[]): boolean;
+    /** Apply a policy-selected recovery transition without exposing representation precedence. */
+    recover(plan: RecoveryPlan, state: RecoveryState): ReturnType<ToolExecutionLedger['getRecoverySummary']>;
+    reset(): void;
+    importState(state: {
+        history: unknown[];
+        previousResponseId: string | null;
+        toolLedger?: SavedToolExecution[];
+        updatedAt?: string;
+    }): {
+        validated: {
+            [x: string]: unknown;
+            history: unknown[];
+            previousResponseId: string | null;
+            toolLedger?: {
+                [x: string]: unknown;
+                turnId: string;
+                callId: string;
+                toolName: string;
+                arguments?: unknown;
+                status: "aborted" | "approval_required" | "completed" | "failed" | "started" | "unknown";
+                output?: unknown;
+                failureReason?: string | undefined;
+                startedAt: string;
+                dispatchedAt?: string | undefined;
+                completedAt?: string | undefined;
+                historyItems?: unknown[] | undefined;
+            }[] | undefined;
+            updatedAt?: string | undefined;
+        };
+        projected: import("./conversation-state-projector.js").ImportedStateProjection;
+    };
+    removeLastUserTurn(): {
+        text: string;
+        imageCount: number;
+        images?: UserTurn['images'];
+    } | null;
+    retryLastUserTurn(): false | {
+        discardedSnapshot: {
+            history: ProviderInputItem[];
+            toolLedger: SavedToolExecution[];
+        };
+    };
+    removeNLastUserTurns(n: number): {
+        text: string;
+        imageCount: number;
+        images?: UserTurn['images'];
+    } | null;
+    rewindToTarget(target: RewindTargetId): import("./conversation-store.js").RewoundTarget | null;
+    peekLastToolOutput(): {
+        index: number;
+        callId?: string;
+        toolName?: string;
+        output?: unknown;
+        itemType: string;
+    } | null;
+    removeAfterLastToolOutput(): {
+        index: number;
+        callId?: string;
+        toolName?: string;
+        output?: unknown;
+        itemType: string;
+    } | null;
+}
+//# sourceMappingURL=conversation-record.d.ts.map

package/dist/services/conversation/conversation-record.d.ts.map

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

package/dist/services/conversation/conversation-record.js

@@ -0,0 +1,371 @@
+import { ConversationStore } from './conversation-store.js';
+import { ToolExecutionLedger, callIdOf } from '../tool-execution-ledger.js';
+import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
+import { normalizeRunItem } from './run-item-normalizer.js';
+import { selectAcceptedStreamHistory } from './conversation-record-stream.js';
+import { projectProviderHistory, projectImportedState, projectSnapshot } from './conversation-state-projector.js';
+import { buildToolLedgerFromJournalEvents } from './journal-to-ledger.js';
+import { ImportedConversationStateSchema } from './conversation-state-schema.js';
+/**
+ * Sole acceptance authority for provider history, tool evidence and assistant journal.
+ * Physical execution and recovery policy remain with their existing owners. All
+ * reconstruction, rewind and import transitions keep these representations together.
+ */
+export class ConversationRecord {
+    #store = new ConversationStore();
+    #ledger = new ToolExecutionLedger();
+    #journal;
+    #logger;
+    #journalSink = null;
+    #segmentBaseline;
+    #lastPersistence = 'unconfigured';
+    #pendingReasoningText = '';
+    #segmentSource = 'startStream';
+    #recoveryBaselines = { initial: [], decision: [] };
+    #providerContext;
+    #checkpointObserver;
+    constructor(options = {}) {
+        this.#logger = options.logger;
+        this.#providerContext = options.providerContext;
+        this.#checkpointObserver = options.checkpointObserver;
+        this.#attachUserTurnCount();
+        this.#journal = new AssistantTurnJournal({ getCurrentTurnId: () => this.getCurrentTurnId() });
+    }
+    #attachUserTurnCount() {
+        this.#ledger.setUserTurnCountSource(() => this.#store.listUserTurns().length);
+    }
+    setJournalSink(sink) {
+        if (this.#journalSink === sink)
+            return;
+        this.#journalSink = sink;
+        this.#journal.setSink(sink ? (event) => this.#deliverJournalEvent(event) : null);
+        if (!sink)
+            this.#lastPersistence = 'unconfigured';
+    }
+    /** Preserve the pre-attempt recovery baseline without exporting journal state. */
+    beginAttempt() {
+        this.#recoveryBaselines.initial = this.#snapshotJournal();
+        this.#segmentSource = 'startStream';
+    }
+    /** A decision changes the segment view, never the execution position. */
+    beginDecisionResolution(source = 'continueRunStream') {
+        this.#recoveryBaselines.decision = this.#snapshotJournal();
+        this.#segmentSource = source;
+    }
+    beginTurn() {
+        this.#pendingReasoningText = '';
+        this.#ledger.beginTurn();
+        this.#journal.resetForNewTurn();
+    }
+    getCurrentTurnId() {
+        return this.#ledger.getCurrentTurnId();
+    }
+    getHistory() {
+        return this.#store.getHistory();
+    }
+    getProviderHistorySnapshot() {
+        return this.#store.getProviderHistorySnapshot();
+    }
+    getProviderHistoryIdentity() {
+        return this.#store.getProviderHistoryIdentity();
+    }
+    getLastUserMessage() {
+        return this.#store.getLastUserMessage();
+    }
+    listUserTurns() {
+        return this.#store.listUserTurns();
+    }
+    listRewindTargets() {
+        return this.#store.listRewindTargets();
+    }
+    #snapshotJournal() {
+        return structuredClone(this.#journal.getEvents());
+    }
+    getCurrentTurnItems() {
+        return structuredClone(this.#journal.getCurrentTurnItems());
+    }
+    recordTextDelta(delta) {
+        this.#journal.recordTextDelta(delta);
+    }
+    recordReasoningDelta(delta) {
+        this.#pendingReasoningText += delta;
+        this.#journal.recordReasoningDelta(delta);
+    }
+    rollbackReasoning(characters) {
+        this.#pendingReasoningText = this.#pendingReasoningText.slice(0, Math.max(0, this.#pendingReasoningText.length - characters));
+    }
+    exportToolEvidence() {
+        return structuredClone(this.#ledger.export());
+    }
+    activeCallIdsForCurrentTurn() {
+        return this.#ledger.activeCallIdsForTurn();
+    }
+    completedResultCallIdsForCurrentTurn() {
+        return this.#ledger.completedResultCallIdsForCurrentTurn();
+    }
+    unsettledToolCallIdsForCurrentTurn() {
+        const completed = new Set(this.completedResultCallIdsForCurrentTurn());
+        return this.activeCallIdsForCurrentTurn().filter((id) => !completed.has(id));
+    }
+    inspectCommittedToolContinuation() {
+        const live = this.#ledger.export().filter((entry) => entry.turnId === this.getCurrentTurnId());
+        const completed = live.filter((entry) => entry.status === 'completed');
+        const historyIds = new Set(this.getReconciledHistory().map(callIdOf).filter(Boolean));
+        return {
+            completedToolCount: completed.length,
+            allToolsCompleted: live.length > 0 && live.every((entry) => entry.status === 'completed'),
+            completedPairsPresentInHistory: completed.every((entry) => historyIds.has(entry.callId)),
+        };
+    }
+    acceptInput(turn) {
+        this.#store.addUserTurn(turn);
+        return { accepted: 'memory', persistence: 'not_requested' };
+    }
+    addUserTurn(turn) {
+        return this.acceptInput(turn);
+    }
+    removeLastUserMessage() {
+        this.#store.removeLastUserMessage();
+    }
+    addShellContext(text) {
+        this.#store.addShellContext(text);
+    }
+    markDispatched(callId) {
+        this.#ledger.markDispatched(callId);
+    }
+    recordFunctionCall(item) {
+        this.#ledger.recordFunctionCall(item);
+    }
+    recordFunctionResult(item) {
+        this.#ledger.recordFunctionResult(item);
+    }
+    recordAbortedApproval(output, error, callId) {
+        this.#ledger.recordAbortedApproval(output, error, callId);
+    }
+    markOpenCallsAborted(error, callId) {
+        this.#ledger.markOpenCallsAborted(error, callId);
+    }
+    getRecoverySummary() {
+        return this.#ledger.getRecoverySummary();
+    }
+    /** A segment is a wire view over the same record, not another acceptance owner. */
+    beginSegment() {
+        this.#segmentBaseline = this.#store.getProviderHistorySnapshot();
+        this.#pendingReasoningText = '';
+    }
+    /** Accept one observed provider item into both evidence representations before publication. */
+    acceptObservedItem(item) {
+        this.#lastPersistence = this.#journalSink ? 'not_requested' : 'unconfigured';
+        // Journal deduplication is independent of execution occurrence: a real new
+        // invocation may reuse a provider call id within this logical turn.
+        for (const normalized of normalizeRunItem(item)) {
+            if (normalized.type === 'tool_call') {
+                if (this.#pendingReasoningText)
+                    this.#ledger.recordReasoningText(this.#pendingReasoningText);
+                this.#pendingReasoningText = '';
+                this.#ledger.recordFunctionCall(item);
+            }
+            else if (normalized.type === 'tool_result') {
+                this.#ledger.recordFunctionResult(item);
+                if (this.#segmentSource !== 'startStream' && this.#journalSink) {
+                    const entry = this.#ledger.export().find((candidate) => candidate.callId === normalized.callId);
+                    this.#deliverJournalEvent({
+                        type: 'tool_result',
+                        callId: normalized.callId,
+                        toolName: entry?.toolName ?? normalized.toolName,
+                        status: entry?.status === 'failed' || entry?.status === 'aborted' || entry?.status === 'unknown'
+                            ? entry.status
+                            : 'completed',
+                        output: entry?.output ?? normalized.output,
+                        ...(entry?.historyItems ? { historyItems: entry.historyItems } : {}),
+                    });
+                }
+            }
+        }
+        // The transcript is immediately readable by preparation/recovery. Segment
+        // selection later reconciles the provider's terminal representation against
+        // the baseline, rather than appending these same observations twice.
+        this.#store.appendOutput([item]);
+        this.#journal.recordRunItem(item);
+        return this.#receipt();
+    }
+    /** Accept a completed or interrupted execution view, independent of rendering. */
+    acceptSegment(stream, inputMode, diagnostics) {
+        const selected = selectAcceptedStreamHistory({
+            stream,
+            history: this.#segmentBaseline ? [...this.#segmentBaseline.history] : this.#store.getHistory(),
+            inputMode,
+            source: this.#segmentSource,
+            ...diagnostics,
+        });
+        const before = this.#segmentBaseline?.revision ?? this.#store.getProviderHistoryIdentity().revision;
+        if (selected.history)
+            this.#store.replaceHistory(selected.history);
+        const snapshot = this.#store.getProviderHistorySnapshot();
+        const accepted = {
+            kind: selected.terminal ? 'committed' : 'partial',
+            snapshot,
+            historyCommitted: snapshot.revision !== before,
+            lastResponseId: selected.lastResponseId,
+            unsettledToolCallIds: this.unsettledToolCallIdsForCurrentTurn(),
+        };
+        this.#providerContext?.acceptSegment(accepted, this.#checkpointObserver);
+        return accepted;
+    }
+    snapshot(metadata) {
+        return projectSnapshot({ ...metadata, history: this.#store.getHistory(), toolLedger: this.#ledger.export() });
+    }
+    exportState(previousResponseId) {
+        return { history: this.getReconciledHistory(), previousResponseId, toolLedger: this.#ledger.export() };
+    }
+    getReconciledHistory() {
+        return projectProviderHistory({ history: this.#store.getHistory(), toolLedger: this.#ledger.export() }).history;
+    }
+    #reconcileAndUpdateHistory() {
+        const projected = projectProviderHistory({ history: this.#store.getHistory(), toolLedger: this.#ledger.export() });
+        if (!projected.warnings.length)
+            return false;
+        this.#store.replaceHistory(projected.history);
+        return true;
+    }
+    /** Conditional compaction acceptance preserves the existing transcript revision guard. */
+    replaceHistoryAtRevision(revision, history) {
+        return this.#store.replaceHistoryAtRevision(revision, history);
+    }
+    /** Apply a policy-selected recovery transition without exposing representation precedence. */
+    recover(plan, state) {
+        const snapshot = buildToolLedgerFromJournalEvents(this.#recoveryBaselines[state.baseline], new Date().toISOString());
+        if (plan.kind === 'replay_turn') {
+            this.#ledger.import(snapshot);
+            if (plan.rollbackUserMessage)
+                this.#store.removeLastUserMessage();
+            if (plan.errorContext)
+                this.#store.addErrorContext(plan.errorContext);
+        }
+        else if (plan.kind === 'retry_fresh') {
+            if (state.stream)
+                this.#ledger.settleOpenCallsOnStreamFailure('Stream failed');
+            this.#restoreSettledEntries(snapshot);
+            if (state.stream)
+                this.#reconcileAndUpdateHistory();
+        }
+        else {
+            if (state.addedUserMessage && !state.stream)
+                this.#store.removeLastUserMessage();
+            if (state.stream) {
+                this.#ledger.settleOpenCallsOnStreamFailure('Stream failed');
+                this.#ledger.markOpenCallsAborted('Stream failed');
+                this.#reconcileAndUpdateHistory();
+            }
+        }
+        return this.#ledger.getRecoverySummary();
+    }
+    #restoreSettledEntries(snapshot) {
+        const merged = [...snapshot];
+        const indices = new Map(merged.map((entry, index) => [entry.callId, index]));
+        for (const entry of this.#ledger.export()) {
+            if (!['completed', 'aborted', 'unknown'].includes(entry.status))
+                continue;
+            const index = indices.get(entry.callId);
+            if (index !== undefined)
+                merged[index] = entry;
+            else {
+                indices.set(entry.callId, merged.length);
+                merged.push(entry);
+            }
+        }
+        this.#ledger.import(merged);
+    }
+    reset() {
+        this.#store.clear();
+        this.#segmentBaseline = undefined;
+        this.#pendingReasoningText = '';
+        this.#ledger = new ToolExecutionLedger();
+        this.#recoveryBaselines = { initial: [], decision: [] };
+        this.#segmentSource = 'startStream';
+        this.#attachUserTurnCount();
+        this.#journal.clear();
+    }
+    importState(state) {
+        const validated = ImportedConversationStateSchema.parse(state);
+        const projected = projectImportedState(validated);
+        this.reset();
+        this.#ledger.import(validated.toolLedger);
+        for (const item of projected.history)
+            this.#store.addImportedItem(item);
+        return { validated, projected };
+    }
+    removeLastUserTurn() {
+        const removed = this.#store.removeLastUserTurn();
+        if (removed)
+            this.#pruneToHistory(true);
+        return removed;
+    }
+    retryLastUserTurn() {
+        const turn = this.#store.listUserTurns().at(-1);
+        if (!turn)
+            return false;
+        const original = this.#store.getHistory()[turn.index];
+        this.#store.removeLastUserTurn();
+        this.#pruneToHistory(true);
+        const discardedSnapshot = { history: this.#store.getHistory(), toolLedger: this.#ledger.export() };
+        this.#store.addImportedItem(original);
+        return { discardedSnapshot };
+    }
+    removeNLastUserTurns(n) {
+        const removed = this.#store.removeNLastUserTurns(n);
+        if (removed)
+            this.#pruneToHistory(true);
+        return removed;
+    }
+    rewindToTarget(target) {
+        const removed = this.#store.rewindToTarget(target);
+        if (removed)
+            this.#pruneToHistory(true);
+        return removed;
+    }
+    peekLastToolOutput() {
+        this.#reconcileAndUpdateHistory();
+        return this.#store.peekLastToolOutput();
+    }
+    removeAfterLastToolOutput() {
+        this.#reconcileAndUpdateHistory();
+        const removed = this.#store.removeAfterLastToolOutput();
+        if (removed)
+            this.#pruneToHistory(false);
+        return removed;
+    }
+    #pruneToHistory(pruneJournal) {
+        const userCount = this.#store.listUserTurns().length;
+        const ids = new Set(this.#store.getHistory().map(callIdOf).filter(Boolean));
+        this.#ledger.import(this.#ledger.export().filter((entry) => {
+            if (entry.userTurnCount !== undefined)
+                return entry.userTurnCount <= userCount;
+            const match = /^turn-(\d+)$/.exec(entry.turnId);
+            return match ? Number.parseInt(match[1], 10) <= userCount : ids.has(entry.callId);
+        }));
+        if (pruneJournal)
+            this.#journal.pruneToUserTurnCount(userCount);
+    }
+    #deliverJournalEvent(event) {
+        if (!this.#journalSink)
+            return;
+        try {
+            this.#journalSink(event);
+            if (this.#lastPersistence !== 'failed')
+                this.#lastPersistence = 'acknowledged';
+        }
+        catch (error) {
+            this.#lastPersistence = 'failed';
+            this.#logger?.warn('Journal sink threw', {
+                eventType: 'conversation_log.sink_failed',
+                category: 'persistence',
+                errorMessage: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    #receipt() {
+        return { accepted: 'memory', persistence: this.#lastPersistence };
+    }
+}
+//# sourceMappingURL=conversation-record.js.map

package/dist/services/conversation/conversation-record.js.map

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

package/dist/services/conversation/conversation-result-builder.d.ts

@@ -9,7 +9,6 @@ import type { ApprovalFlowCoordinator } from '../approval/approval-flow-coordina
 import { type ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
 import type { PersistedAssistantTurnItem } from './conversation-persistence-types.js';
 import { type GenerationToken } from '../generation-guard.js';
-import { type CommandMessage } from '../../tools/types.js';
 import type { ToolApprovalPolicyRegistry } from '../approval/tool-approval-policy-registry.js';
 import type { DeniedReadMetadata, PostExecuteApprovalToken } from '../../contracts/conversation.js';
 import type { SessionAccessState } from '../session/session-access-state.js';
@@ -53,9 +52,6 @@ export interface ResultBuilderInput {
     turnItems?: PersistedAssistantTurnItem[];
     token?: GenerationToken;
     inputMode?: 'delta' | 'full_history';
-    cumulativeUsage?: NormalizedUsage;
-    cumulativeCommandMessages?: CommandMessage[];
-    cumulativeTurnItems?: PersistedAssistantTurnItem[];
 }
 export declare function createApprovalRequiredTerminal(options: {
     agentName: string;

package/dist/services/conversation/conversation-result-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-result-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-result-builder.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation/conversation-result-builder.js

@@ -56,14 +56,9 @@ export async function buildConversationResult(input, deps) {
             interruption: runBudgetInteraction,
             interruptions: result.interruptions,
             decisionsByCallId: new Map(),
-            emittedCommandIds: emittedCommandIds ?? new Set(),
-            toolCallArgumentsById: new Map(toolCallArgumentsById),
             owner: approvalFlow.resolveOwner(runBudgetInteraction),
             token: input.token,
             inputMode: input.inputMode,
-            cumulativeUsage: input.cumulativeUsage ?? usage ?? extractUsage(result),
-            cumulativeCommandMessages: input.cumulativeCommandMessages,
-            cumulativeTurnItems: input.cumulativeTurnItems,
         });
         return {
             kind: 'approval_required',
@@ -127,14 +122,9 @@ export async function buildConversationResult(input, deps) {
             interruptions: result.interruptions,
             decisionsByCallId: new Map(),
             promptedCallId: callId,
-            emittedCommandIds: emittedCommandIds ?? new Set(),
-            toolCallArgumentsById: new Map(toolCallArgumentsById),
             owner: approvalFlow.resolveOwner(interruption),
             token: input.token,
             inputMode: input.inputMode,
-            cumulativeUsage: input.cumulativeUsage ?? usage ?? extractUsage(result),
-            cumulativeCommandMessages: input.cumulativeCommandMessages,
-            cumulativeTurnItems: input.cumulativeTurnItems,
         });
         const agent = asRecord(interruptionRecord?.agent);
         const runContext = asRecord(asRecord(result.state)?._context);