@qduc/term2 0.9.2 → 0.9.3

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

@@ -0,0 +1,440 @@
+import { describeError, isAbortLikeError } from '../../utils/error-helpers.js';
+import { ASK_USER_DECLINE_RESULT } from '../../tools/agent/ask-user-constants.js';
+import { createMessageIdFactory } from '../../utils/message-id-factory.js';
+import { isUserMessage } from '../../types/message.js';
+import { isDeniedReadApproveAnswer } from '../../contracts/conversation.js';
+import { createStreamingSession } from '../../utils/streaming/streaming-session-factory.js';
+import { enhanceApiKeyError, isMaxTurnsError } from '../../utils/conversation/conversation-utils.js';
+import { clearStreamingBotMessage, computeNextMessages } from '../../utils/conversation/apply-conversation-result.js';
+import { countUndoableUserTurnsFrom, findLastUndoableUserMessage, trimTrailingAssistantMessages, } from '../../utils/conversation/message-utils.js';
+import { annotateApprovedCommandMessage, filterPendingCommandMessagesForApproval, } from '../approval/approval-presentation-policy.js';
+import { formatUserTurnForDisplay, hasUserTurnContent, injectSkillIntoTurn, normalizeUserTurn, } from '../../types/user-turn.js';
+const REASONING_RESPONSE_THROTTLE_MS = 200;
+export class ConversationOrchestrator {
+    config;
+    pendingApproval = null;
+    askUserAnswers = [];
+    currentAskUserQuestionIndex = 0;
+    createMessageId;
+    constructor(config) {
+        this.config = config;
+        this.createMessageId = config.createMessageId ?? createMessageIdFactory(config.now);
+    }
+    updateCallbacks({ onRestoreInput, onClear, }) {
+        this.config.onRestoreInput = onRestoreInput;
+        this.config.onClear = onClear;
+    }
+    getSubagentUsage() {
+        return this.config.subagentUsageAccumulator?.get() ?? null;
+    }
+    goToPreviousQuestion() {
+        if (this.currentAskUserQuestionIndex <= 0) {
+            return;
+        }
+        this.currentAskUserQuestionIndex -= 1;
+        this.askUserAnswers.pop();
+        this.config.ui.onAskUserGoBack(this.currentAskUserQuestionIndex, this.askUserAnswers.slice());
+    }
+    goToNextQuestion() {
+        this.currentAskUserQuestionIndex += 1;
+        this.config.ui.onAskUserAdvanceToNext(this.currentAskUserQuestionIndex);
+    }
+    async clearConversation() {
+        if (this.config.onClear) {
+            await this.config.onClear();
+        }
+        else {
+            this.config.conversationService.resetWithNewId(crypto.randomUUID());
+        }
+        this.config.messages.setMessages(() => []);
+        this.config.approvedContext.current = null;
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        this.config.ui.onResetAll();
+        this.config.usageAccumulator?.reset();
+        this.config.subagentUsageAccumulator?.reset();
+    }
+    stopProcessing() {
+        this.config.conversationService.abort();
+        this.config.approvedContext.current = null;
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        this.config.ui.onResetTransient();
+    }
+    undoLastUserMessage() {
+        const messages = this.config.messages.getMessages();
+        const lastUserIndex = findLastUndoableUserMessage(messages);
+        if (lastUserIndex === -1) {
+            return null;
+        }
+        const lastUserMessage = messages[lastUserIndex];
+        const uiText = isUserMessage(lastUserMessage) ? lastUserMessage.text : '';
+        this.config.conversationService.abort();
+        const removed = this.config.conversationService.undoLastUserTurn();
+        const restored = removed ?? { text: uiText };
+        this.config.messages.setMessages((prev) => prev.slice(0, lastUserIndex));
+        this.config.approvedContext.current = null;
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        this.config.ui.onResetTransient();
+        return restored;
+    }
+    async retryLastToolOutput() {
+        this.config.conversationService.abort();
+        this.config.approvedContext.current = null;
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        this.config.ui.onResetTransient();
+        if (!this.config.conversationService.peekLastToolOutput()) {
+            return false;
+        }
+        this.config.messages.setMessages((prev) => trimTrailingAssistantMessages(prev));
+        this.config.ui.onTurnStart();
+        const { botResponseUpdater, reasoningUpdater, applyConversationEvent, streamingState } = this.createTurnSession('retryLastToolOutput');
+        try {
+            const result = await this.config.conversationService.retryLastToolOutput({
+                onEvent: this.createOnEventHandler(applyConversationEvent),
+            });
+            if (!result) {
+                return false;
+            }
+            applyConversationEvent({ type: 'final', finalText: '' });
+            botResponseUpdater.flush();
+            this.applyServiceResult(result, streamingState, streamingState.latestUsage);
+            return true;
+        }
+        catch (error) {
+            this.logError('Error in retryLastToolOutput', error);
+            if (isAbortLikeError(error)) {
+                this.config.loggingService.debug('Suppressing abort error in retryLastToolOutput');
+                return true;
+            }
+            const errorMessage = enhanceApiKeyError(describeError(error));
+            this.appendBotError(errorMessage);
+            this.config.ui.onApprovalResolved();
+            return true;
+        }
+        finally {
+            this.config.loggingService.debug('retryLastToolOutput finally block - resetting state');
+            reasoningUpdater.flush();
+            botResponseUpdater.cancel();
+            this.config.ui.onTurnEnd();
+        }
+    }
+    undoToUserMessage(uiIndex) {
+        const messages = this.config.messages.getMessages();
+        const undoCount = countUndoableUserTurnsFrom(messages, uiIndex);
+        if (undoCount === 0) {
+            return null;
+        }
+        const selectedMessage = messages[uiIndex];
+        const uiText = isUserMessage(selectedMessage) ? selectedMessage.text : '';
+        this.config.conversationService.abort();
+        const removed = this.config.conversationService.undoNUserTurns(undoCount);
+        const restored = removed?.text ?? uiText;
+        this.config.messages.setMessages((prev) => prev.slice(0, uiIndex));
+        this.config.approvedContext.current = null;
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        this.config.ui.onResetTransient();
+        return restored;
+    }
+    async sendUserMessage(input, options) {
+        const turn = normalizeUserTurn(input);
+        if (!hasUserTurnContent(turn)) {
+            return;
+        }
+        const userMessage = {
+            id: this.createMessageId(),
+            sender: 'user',
+            text: formatUserTurnForDisplay(turn),
+            ...(turn.skill ? { skill: turn.skill } : {}),
+        };
+        this.config.messages.appendMessages([userMessage]);
+        this.config.logWriter?.append({ type: 'user_message', message: userMessage });
+        this.config.ui.onTurnStart();
+        const { botResponseUpdater, reasoningUpdater, applyConversationEvent, streamingState } = this.createTurnSession('sendUserMessage');
+        try {
+            const turnToSend = turn.skill ? injectSkillIntoTurn(turn) : turn;
+            const result = await this.config.conversationService.sendMessage(turnToSend, {
+                onEvent: this.createOnEventHandler(applyConversationEvent),
+                bypassInputSurgeGuard: options?.bypassInputSurgeGuard,
+            });
+            applyConversationEvent({ type: 'final', finalText: '' });
+            botResponseUpdater.flush();
+            this.applyServiceResult(result, streamingState, streamingState.latestUsage);
+        }
+        catch (error) {
+            this.logError('Error in sendUserMessage', error);
+            if (isAbortLikeError(error)) {
+                this.config.loggingService.debug('Suppressing abort error in sendUserMessage');
+                return;
+            }
+            const rawErrorMessage = describeError(error);
+            const errorMessage = enhanceApiKeyError(rawErrorMessage);
+            const dropped = error?.rawEvent?.droppedUserMessage;
+            if (dropped) {
+                this.config.messages.setMessages((prev) => {
+                    for (let i = prev.length - 1; i >= 0; i--) {
+                        if (prev[i].sender === 'user') {
+                            return prev.slice(0, i);
+                        }
+                    }
+                    return prev;
+                });
+                this.config.onRestoreInput?.(dropped.text);
+            }
+            if (isMaxTurnsError(errorMessage)) {
+                const pendingApproval = {
+                    agentName: 'System',
+                    toolName: 'max_turns_exceeded',
+                    argumentsText: errorMessage,
+                    rawInterruption: null,
+                    isMaxTurnsPrompt: true,
+                };
+                this.pendingApproval = pendingApproval;
+                this.config.ui.onApprovalRequested(pendingApproval);
+            }
+            else {
+                this.appendBotError(errorMessage);
+                this.config.ui.onApprovalResolved();
+            }
+        }
+        finally {
+            this.config.loggingService.debug('sendUserMessage finally block - resetting state');
+            reasoningUpdater.flush();
+            botResponseUpdater.cancel();
+            this.config.ui.onTurnEnd();
+        }
+    }
+    async handleApprovalDecision(answer, rejectionReason, approvalAnswer) {
+        const pendingApproval = this.pendingApproval;
+        if (!pendingApproval) {
+            return;
+        }
+        const isMaxTurnsPrompt = pendingApproval.isMaxTurnsPrompt;
+        const isAskUser = pendingApproval.toolName === 'ask_user';
+        if (isAskUser && answer === 'y' && approvalAnswer !== ASK_USER_DECLINE_RESULT) {
+            let questions = [];
+            try {
+                const parsed = JSON.parse(pendingApproval.argumentsText);
+                questions = parsed.questions || [];
+            }
+            catch {
+                // noop
+            }
+            let parsedAns = approvalAnswer ?? '';
+            const currentQuestion = questions[this.askUserAnswers.length];
+            if (currentQuestion?.is_multi_select) {
+                try {
+                    const maybeArray = JSON.parse(approvalAnswer ?? '');
+                    if (Array.isArray(maybeArray)) {
+                        parsedAns = maybeArray;
+                    }
+                }
+                catch {
+                    // keep plain string
+                }
+            }
+            const nextAnswers = [...this.askUserAnswers, parsedAns];
+            this.config.ui.onAskUserAnswerSubmitted(parsedAns);
+            if (nextAnswers.length < questions.length) {
+                this.askUserAnswers = nextAnswers;
+                this.currentAskUserQuestionIndex = nextAnswers.length;
+                this.config.ui.onAskUserAdvanceToNext(nextAnswers.length);
+                return;
+            }
+            this.askUserAnswers = nextAnswers;
+            this.currentAskUserQuestionIndex = nextAnswers.length;
+            approvalAnswer = JSON.stringify(nextAnswers);
+        }
+        if (answer === 'y' || isDeniedReadApproveAnswer(answer)) {
+            this.config.approvedContext.current = {
+                callId: pendingApproval.callId,
+                toolName: pendingApproval.toolName,
+            };
+        }
+        this.config.ui.onApprovalResolved();
+        this.pendingApproval = null;
+        this.resetAskUserState();
+        if (isMaxTurnsPrompt && answer === 'n') {
+            this.config.ui.onTurnEnd();
+            return;
+        }
+        if (isMaxTurnsPrompt && answer === 'y') {
+            this.config.ui.onTurnStart();
+            const { botResponseUpdater, reasoningUpdater, applyConversationEvent, streamingState } = this.createTurnSession('maxTurnsContinuation');
+            try {
+                const result = await this.config.conversationService.sendMessage('Please continue with your previous task.', {
+                    onEvent: this.createOnEventHandler(applyConversationEvent),
+                });
+                applyConversationEvent({ type: 'final', finalText: '' });
+                this.applyServiceResult(result, streamingState, streamingState.latestUsage);
+            }
+            catch (error) {
+                this.logError('Error in continuation after max turns', error);
+                if (isAbortLikeError(error)) {
+                    this.config.loggingService.debug('Suppressing abort error in max turns continuation');
+                    return;
+                }
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                this.appendBotError(errorMessage);
+                this.config.ui.onApprovalResolved();
+            }
+            finally {
+                reasoningUpdater.flush();
+                botResponseUpdater.cancel();
+                this.config.ui.onTurnEnd();
+            }
+            return;
+        }
+        this.config.ui.onTurnStart();
+        const { botResponseUpdater, reasoningUpdater, applyConversationEvent, streamingState } = this.createTurnSession('approvalDecision');
+        try {
+            const result = await this.config.conversationService.handleApprovalDecision(answer, rejectionReason, {
+                onEvent: this.createOnEventHandler(applyConversationEvent),
+                approvalAnswer,
+            });
+            applyConversationEvent({ type: 'final', finalText: '' });
+            botResponseUpdater.flush();
+            this.applyServiceResult(result, streamingState, streamingState.latestUsage);
+        }
+        catch (error) {
+            this.logError('Error in handleApprovalDecision', error);
+            if (isAbortLikeError(error)) {
+                this.config.loggingService.debug('Suppressing abort error in handleApprovalDecision');
+                return;
+            }
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            this.appendBotError(errorMessage);
+            this.config.ui.onApprovalResolved();
+        }
+        finally {
+            this.config.loggingService.debug('handleApprovalDecision finally block - resetting state');
+            reasoningUpdater.flush();
+            botResponseUpdater.cancel();
+            this.config.ui.onTurnEnd();
+        }
+    }
+    createTurnSession(label) {
+        return createStreamingSession({
+            appendMessages: this.config.messages.appendMessages,
+            setMessages: this.config.messages.setMessages,
+            trimMessages: this.config.messages.trimMessages,
+            annotateCommandMessage: (msg) => this.annotateCommandMessage(msg),
+            loggingService: this.config.loggingService,
+            setLastUsage: (usage) => this.config.ui.onUsageUpdate(usage),
+            setCodexRateLimit: (rateLimit) => this.config.ui.onRateLimitUpdate(rateLimit),
+            reasoningThrottleMs: REASONING_RESPONSE_THROTTLE_MS,
+            now: this.config.now,
+        }, label);
+    }
+    createOnEventHandler(baseOnEvent) {
+        return (event) => {
+            const eventType = typeof event?.type === 'string' ? event.type : undefined;
+            if (eventType === 'reasoning_delta') {
+                this.config.ui.onStreamingThinkingStarted((this.config.now ?? Date.now)());
+            }
+            else if (eventType && this.clearsThinkingIndicator(eventType)) {
+                this.config.ui.onStreamingThinkingCleared();
+            }
+            if (eventType === 'tool_call_streaming_delta') {
+                this.config.ui.onStreamingToolInfo({ toolName: event.toolName, argumentCharCount: event.argumentCharCount });
+            }
+            else if (eventType === 'tool_started' || eventType === 'text_delta' || eventType === 'final') {
+                this.config.ui.onStreamingToolInfo(null);
+            }
+            if (event?.type === 'user_message_consumed_for_abort') {
+                this.config.messages.setMessages((prev) => {
+                    for (let i = prev.length - 1; i >= 0; i--) {
+                        const msg = prev[i];
+                        if (isUserMessage(msg)) {
+                            if (msg.consumedForAbort)
+                                return prev;
+                            const next = prev.slice();
+                            next[i] = { ...msg, consumedForAbort: true };
+                            return next;
+                        }
+                    }
+                    return prev;
+                });
+                return;
+            }
+            baseOnEvent(event);
+            if (event?.type === 'subagent_completed' && event?.result?.usage) {
+                this.config.subagentUsageAccumulator?.add(event.result.usage);
+            }
+        };
+    }
+    applyServiceResult(result, streamingState, latestStreamedUsage) {
+        if (!result) {
+            return;
+        }
+        if (result.type === 'approval_required') {
+            if (result.usage) {
+                this.config.ui.onUsageUpdate(latestStreamedUsage ?? result.usage);
+            }
+            this.pendingApproval = result.approval;
+            this.config.messages.setMessages((prev) => this.config.messages.trimMessages(filterPendingCommandMessagesForApproval(prev, result.approval)));
+            this.config.ui.onApprovalRequested({ ...result.approval, llmAdvisory: result.approval.llmAdvisory });
+            this.config.notifier?.approvalNeeded();
+            return;
+        }
+        this.pendingApproval = null;
+        this.config.messages.setMessages((prev) => computeNextMessages({
+            prev,
+            result,
+            streamingState,
+            createMessageId: this.createMessageId,
+            trimMessages: this.config.messages.trimMessages,
+            annotateCommandMessage: (msg) => this.annotateCommandMessage(msg),
+        }).next);
+        if (result.type === 'response' && streamingState.currentBotMessageId !== null) {
+            clearStreamingBotMessage(streamingState);
+        }
+        this.config.ui.onApprovalResolved();
+        this.config.notifier?.turnComplete();
+        if (result.usage) {
+            this.config.usageAccumulator?.add(result.usage);
+            this.config.ui.onUsageUpdate(latestStreamedUsage ?? result.usage);
+        }
+    }
+    annotateCommandMessage(cmdMsg) {
+        const approvedMessage = annotateApprovedCommandMessage(cmdMsg, this.config.approvedContext.current);
+        const matchedByToolName = approvedMessage !== cmdMsg &&
+            !this.config.approvedContext.current?.callId &&
+            Boolean(this.config.approvedContext.current?.toolName) &&
+            this.config.approvedContext.current?.toolName === cmdMsg.toolName;
+        if (matchedByToolName) {
+            this.config.approvedContext.current = null;
+        }
+        return approvedMessage;
+    }
+    clearsThinkingIndicator(eventType) {
+        return (eventType === 'text_delta' ||
+            eventType === 'tool_started' ||
+            eventType === 'tool_call_streaming_delta' ||
+            eventType === 'final');
+    }
+    resetAskUserState() {
+        this.askUserAnswers = [];
+        this.currentAskUserQuestionIndex = 0;
+    }
+    appendBotError(errorMessage) {
+        const botErrorMessage = {
+            id: this.createMessageId(),
+            sender: 'bot',
+            status: 'finalized',
+            text: `Error: ${errorMessage}`,
+        };
+        this.config.messages.appendMessages([botErrorMessage]);
+    }
+    logError(message, error) {
+        this.config.loggingService.error(message, {
+            error: error instanceof Error ? error.message : String(error),
+            stack: error instanceof Error ? error.stack : undefined,
+            ...(error instanceof Error && error.eventKind ? { eventKind: error.eventKind } : {}),
+        });
+    }
+}
+//# sourceMappingURL=conversation-orchestrator.js.map

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

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

package/dist/services/conversation/conversation-orchestrator.types.d.ts

@@ -0,0 +1,58 @@
+import type { ConversationService } from './conversation-service.js';
+import type { ILoggingService } from '../service-interfaces.js';
+import type { ApprovedToolContext } from '../approval/approval-presentation-policy.js';
+import type { PendingApproval } from '../../contracts/conversation.js';
+import type { Message } from '../../types/message.js';
+import type { NormalizedUsage, UsageAccumulator } from '../../utils/ai/token-usage.js';
+import type { CodexRateLimitInfo } from './conversation-events.js';
+export type AskUserAnswer = string | string[];
+export interface ConversationNotifier {
+    approvalNeeded(): void;
+    turnComplete(): void;
+}
+export interface MessagePort {
+    getMessages(): readonly Message[];
+    setMessages(updater: (prev: Message[]) => Message[]): void;
+    appendMessages(additions: readonly Message[]): void;
+    trimMessages(msgs: Message[]): Message[];
+}
+export interface UIPort {
+    onTurnStart(): void;
+    onTurnEnd(): void;
+    onApprovalRequested(approval: PendingApproval): void;
+    onApprovalResolved(): void;
+    onUsageUpdate(usage: NormalizedUsage): void;
+    onRateLimitUpdate(rateLimit: CodexRateLimitInfo): void;
+    onRateLimitClear(): void;
+    onResetTransient(): void;
+    onResetAll(): void;
+    onStreamingThinkingStarted(timestamp: number): void;
+    onStreamingThinkingCleared(): void;
+    onStreamingToolInfo(info: {
+        toolName?: string;
+        argumentCharCount: number;
+    } | null): void;
+    onAskUserAnswerSubmitted(answer: AskUserAnswer): void;
+    onAskUserAdvanceToNext(nextIndex: number): void;
+    onAskUserGoBack(currentIndex: number, answers: readonly AskUserAnswer[]): void;
+}
+export interface ConversationOrchestratorConfig {
+    conversationService: ConversationService;
+    loggingService: ILoggingService;
+    messages: MessagePort;
+    ui: UIPort;
+    approvedContext: {
+        current: ApprovedToolContext | null;
+    };
+    usageAccumulator?: UsageAccumulator;
+    subagentUsageAccumulator?: UsageAccumulator;
+    notifier?: ConversationNotifier;
+    onRestoreInput?: (text: string) => void;
+    onClear?: () => void | Promise<void>;
+    now?: () => number;
+    createMessageId?: () => string;
+    logWriter?: {
+        append: (event: any) => void;
+    };
+}
+//# sourceMappingURL=conversation-orchestrator.types.d.ts.map

package/dist/services/conversation/conversation-orchestrator.types.d.ts.map

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

package/dist/services/conversation/conversation-orchestrator.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conversation-orchestrator.types.js.map

package/dist/services/conversation/conversation-orchestrator.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-orchestrator.types.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-orchestrator.types.ts"],"names":[],"mappings":""}

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-replay.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-replay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAsB,WAAW,EAA2B,MAAM,uCAAuC,CAAC;AACtH,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,qCAAqC,CAAC;AAI7C,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA2/BD,wBAAgB,YAAY,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,aAAa,CA4GpE"}
+{"version":3,"file":"conversation-replay.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-replay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAAY,KAAK,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEhF,OAAO,KAAK,EAAsB,WAAW,EAA2B,MAAM,uCAAuC,CAAC;AACtH,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EAGb,MAAM,qCAAqC,CAAC;AAK7C,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAiiCD,wBAAgB,YAAY,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,aAAa,CAmGpE"}

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

@@ -1,8 +1,9 @@
 import { createUsageAccumulator } from '../../utils/ai/token-usage.js';
-import { ToolExecutionLedger, callIdOf, reconcileHistoryWithToolLedger, } from '../tool-execution-ledger.js';
+import { callIdOf } from '../tool-execution-ledger.js';
 import { repairConversationHistory } from './conversation-history-repair.js';
 import { synthesizeHistoryFromAssistantTurn } from './conversation-turn-items.js';
 import { formatPatchOutputItems, coerceToText } from '../../tools/format-helpers.js';
+import { projectProviderHistory } from './conversation-state-projector.js';
 const INTERRUPTED_SYSTEM_MESSAGE = 'Previous turn was interrupted — send a message to continue.';
 const cloneSnapshot = (snap) => {
     try {
@@ -787,6 +788,42 @@ function applyInterruptedTurnJournals(state) {
         }
     }
 }
+const journalBackedToolCallIds = (state) => {
+    const callIds = new Set();
+    for (const journal of state.pendingJournals.values()) {
+        if (journal.sawFinalTurn) {
+            continue;
+        }
+        for (const item of journal.items) {
+            if (item.type === 'tool_call' || item.type === 'tool_result') {
+                callIds.add(item.callId);
+            }
+        }
+    }
+    return callIds;
+};
+const markLegacyInFlightCallsAborted = (state, legacyInFlightCalls) => {
+    const abortedAt = new Date(0).toISOString();
+    for (const tc of legacyInFlightCalls) {
+        let entry = state.toolLedger.find((e) => e.callId === tc.callId);
+        if (!entry) {
+            entry = {
+                turnId: 'turn-interrupted',
+                callId: tc.callId,
+                toolName: tc.toolName,
+                status: 'started',
+                startedAt: abortedAt,
+            };
+            state.toolLedger.push(entry);
+        }
+        if (entry.status === 'started') {
+            entry.status = 'aborted';
+            entry.failureReason = 'Session ended unexpectedly';
+            entry.completedAt = abortedAt;
+            delete entry.historyItems;
+        }
+    }
+};
 /**
  * Builds the SavedMessage list for a single journal turn. Mirrors the
  * rendering used by `replayAssistantTurn` so the UI sees the same shapes.
@@ -928,27 +965,15 @@ export function replayEvents(envelopes) {
     // and crash-after-partial-text cases called out in the plan.
     applyInterruptedTurnJournals(state);
     // Mid-turn crash handling
-    if (state.trailingUserMessage || state.inFlightToolCalls.size > 0) {
-        // Synthesize ledger entries for in-flight tool calls that started after the last snapshot.
-        const ledgerWithInFlight = [...state.toolLedger];
-        const existingCallIds = new Set(ledgerWithInFlight.map((e) => e.callId));
-        for (const tc of state.inFlightToolCalls.values()) {
-            if (existingCallIds.has(tc.callId))
-                continue;
-            ledgerWithInFlight.push({
-                turnId: 'turn-interrupted',
-                callId: tc.callId,
-                toolName: tc.toolName,
-                status: 'started',
-                startedAt: new Date(0).toISOString(),
-            });
+    const journalBackedCallIds = journalBackedToolCallIds(state);
+    const legacyInFlightCalls = [...state.inFlightToolCalls.values()].filter((tc) => !journalBackedCallIds.has(tc.callId));
+    if (state.trailingUserMessage || legacyInFlightCalls.length > 0) {
+        if (legacyInFlightCalls.length > 0) {
+            markLegacyInFlightCallsAborted(state, legacyInFlightCalls);
+        }
+        if (state.toolLedger.some((entry) => entry.status !== 'started' && entry.status !== 'approval_required')) {
+            state.history = projectProviderHistory({ history: state.history, toolLedger: state.toolLedger }).history;
         }
-        const ledger = new ToolExecutionLedger();
-        ledger.import(ledgerWithInFlight);
-        ledger.markOpenCallsAborted('Session ended unexpectedly');
-        state.toolLedger = ledger.export();
-        const reconciled = reconcileHistoryWithToolLedger(state.history, state.toolLedger);
-        state.history = reconciled.history;
         if (state.trailingUserMessage) {
             state.warnings.push('Previous turn was interrupted.');
             state.messages.push({