factory-factory 0.4.6 → 0.4.7

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.js

@@ -1,9 +1,10 @@
 import { createLogger } from '../../../../../../../backend/services/logger.service.js';
 import { agentSessionAccessor } from '../../../../../../../backend/services/session/resources/agent-session.accessor.js';
 import { buildAcceptedMessageStateChange, buildQueuedMessage, } from '../../../../../../../backend/services/session/service/chat/chat-message-handlers/utils.js';
+import { sessionConfigService, sessionLifecycleEventService, sessionLifecycleService, } from '../../../../../../../backend/services/session/service/lifecycle/session-core-services.js';
 import { hydrateProviderHistoryIfNeeded } from '../../../../../../../backend/services/session/service/lifecycle/session-provider-history-hydrator.js';
-import { sessionConfigService, sessionLifecycleEventService, sessionLifecycleService, } from '../../../../../../../backend/services/session/service/lifecycle/session-services.js';
 import { sessionDomainService } from '../../../../../../../backend/services/session/service/session-domain.service.js';
+import { finalizeInterruptedTranscriptToolCalls } from '../../../../../../../backend/services/session/service/store/session-tool-call-recovery.js';
 import { slashCommandCacheService } from '../../../../../../../backend/services/session/service/store/slash-command-cache.service.js';
 import { commandNameKey, scanClaudeGlobalCommandsFromDisk, scanClaudeWorkspaceCommandsFromDisk, } from '../../../../../../../backend/services/session/service/store/slash-command-disk-scanner.js';
 const logger = createLogger('load-session-handler');
@@ -17,6 +18,13 @@ export function createLoadSessionHandler(deps) {
         await hydrateProviderHistoryIfNeeded(sessionId, dbSession);
         await sessionLifecycleEventService.hydrate(sessionId);
         const sessionRuntime = sessionLifecycleService.getRuntimeSnapshot(sessionId);
+        if (sessionRuntime.processState === 'stopped') {
+            const transcript = sessionDomainService.getTranscriptSnapshot(sessionId);
+            const recoveredTranscript = finalizeInterruptedTranscriptToolCalls(transcript, sessionRuntime.updatedAt);
+            if (recoveredTranscript !== transcript) {
+                sessionDomainService.replaceTranscript(sessionId, recoveredTranscript);
+            }
+        }
         await sessionDomainService.subscribe({
             sessionId,
             sessionRuntime,

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-session.handler.js","sourceRoot":"","sources":["../../../../../../../../../src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"load-session.handler.js","sourceRoot":"","sources":["../../../../../../../../../src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.d.ts

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

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-session.handler.recovery.test.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.ts"],"names":[],"mappings":""}

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.js

@@ -0,0 +1,195 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const mocks = vi.hoisted(() => ({
+    findById: vi.fn(),
+    hydrateLifecycleEvents: vi.fn(),
+    getRuntimeSnapshot: vi.fn(),
+    getChatBarCapabilities: vi.fn(),
+    getSessionConfigOptionsWithFallback: vi.fn(),
+    subscribe: vi.fn(),
+    emitDelta: vi.fn(),
+    getTranscriptSnapshot: vi.fn(),
+    isHistoryHydrated: vi.fn(),
+    getHistoryHydrationSource: vi.fn(),
+    canAttemptHistoryHydration: vi.fn(),
+    setHistoryRetryAt: vi.fn(),
+    clearHistoryRetryCooldown: vi.fn(),
+    markHistoryHydrated: vi.fn(),
+    replaceTranscript: vi.fn(),
+    consumeInitialMessage: vi.fn(),
+    enqueue: vi.fn(),
+    getCachedCommands: vi.fn(),
+    loadClaudeSessionHistory: vi.fn(),
+    loadCodexSessionHistory: vi.fn(),
+    tryDispatchNextMessage: vi.fn(),
+}));
+vi.mock('@/backend/services/session/resources/agent-session.accessor', () => ({
+    agentSessionAccessor: { findById: mocks.findById },
+}));
+vi.mock('@/backend/services/session/service/data/session-history-loader.service', () => ({
+    claudeSessionHistoryLoaderService: { loadSessionHistory: mocks.loadClaudeSessionHistory },
+}));
+vi.mock('@/backend/services/session/service/data/codex-session-history-loader.service', () => ({
+    codexSessionHistoryLoaderService: { loadSessionHistory: mocks.loadCodexSessionHistory },
+}));
+vi.mock('@/backend/services/session/service/lifecycle/session-core-services', () => ({
+    sessionLifecycleService: { getRuntimeSnapshot: mocks.getRuntimeSnapshot },
+    sessionLifecycleEventService: { hydrate: mocks.hydrateLifecycleEvents },
+    sessionConfigService: {
+        getChatBarCapabilities: mocks.getChatBarCapabilities,
+        getSessionConfigOptionsWithFallback: mocks.getSessionConfigOptionsWithFallback,
+    },
+}));
+vi.mock('@/backend/services/session/service/session-domain.service', () => ({
+    sessionDomainService: {
+        subscribe: mocks.subscribe,
+        emitDelta: mocks.emitDelta,
+        getTranscriptSnapshot: mocks.getTranscriptSnapshot,
+        isHistoryHydrated: mocks.isHistoryHydrated,
+        getHistoryHydrationSource: mocks.getHistoryHydrationSource,
+        canAttemptHistoryHydration: mocks.canAttemptHistoryHydration,
+        setHistoryRetryAt: mocks.setHistoryRetryAt,
+        clearHistoryRetryCooldown: mocks.clearHistoryRetryCooldown,
+        markHistoryHydrated: mocks.markHistoryHydrated,
+        replaceTranscript: mocks.replaceTranscript,
+        consumeInitialMessage: mocks.consumeInitialMessage,
+        enqueue: mocks.enqueue,
+    },
+}));
+vi.mock('@/backend/services/session/service/store/slash-command-cache.service', () => ({
+    slashCommandCacheService: { getCachedCommands: mocks.getCachedCommands },
+}));
+vi.mock('@/backend/services/logger.service', () => ({
+    createLogger: () => ({
+        debug: vi.fn(),
+        info: vi.fn(),
+        warn: vi.fn(),
+        error: vi.fn(),
+    }),
+}));
+import { createLoadSessionHandler } from './load-session.handler.js';
+function unmatchedToolCall() {
+    return {
+        id: 'history-tool-1',
+        source: 'agent',
+        timestamp: '2026-08-20T10:00:00.000Z',
+        order: 0,
+        message: {
+            type: 'stream_event',
+            event: {
+                type: 'content_block_start',
+                index: 0,
+                content_block: {
+                    type: 'tool_use',
+                    id: 'call-interrupted',
+                    name: 'exec_command',
+                    input: { cmd: 'pnpm test' },
+                },
+            },
+        },
+    };
+}
+function matchingToolResult() {
+    return {
+        id: 'history-tool-result-1',
+        source: 'agent',
+        timestamp: '2026-08-20T10:00:01.000Z',
+        order: 1,
+        message: {
+            type: 'user',
+            message: {
+                role: 'user',
+                content: [
+                    {
+                        type: 'tool_result',
+                        tool_use_id: 'call-interrupted',
+                        content: 'tests passed',
+                    },
+                ],
+            },
+        },
+    };
+}
+async function loadSession() {
+    const handler = createLoadSessionHandler({
+        tryDispatchNextMessage: mocks.tryDispatchNextMessage,
+        setManualDispatchResume: vi.fn(),
+    });
+    await handler({
+        ws: { send: vi.fn() },
+        sessionId: 'session-crashed',
+        workingDir: '/tmp/worktree',
+        message: { type: 'load_session' },
+    });
+}
+describe('load session tool-call recovery', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mocks.findById.mockResolvedValue({
+            provider: 'CODEX',
+            status: 'IDLE',
+            model: 'gpt-5.3-codex',
+            providerSessionId: 'provider-session-1',
+            providerMetadata: null,
+            workspace: { status: 'READY', worktreePath: '/tmp/worktree' },
+        });
+        mocks.isHistoryHydrated.mockReturnValue(true);
+        mocks.getHistoryHydrationSource.mockReturnValue('jsonl');
+        mocks.getTranscriptSnapshot.mockReturnValue([unmatchedToolCall()]);
+        mocks.getRuntimeSnapshot.mockReturnValue({
+            phase: 'idle',
+            processState: 'stopped',
+            activity: 'IDLE',
+            updatedAt: '2026-08-20T10:01:00.000Z',
+        });
+        mocks.getChatBarCapabilities.mockResolvedValue({
+            provider: 'CODEX',
+            model: { enabled: false, options: [] },
+            reasoning: { enabled: false, options: [] },
+            thinking: { enabled: false },
+            planMode: { enabled: true },
+            attachments: { enabled: true, kinds: ['image', 'text'] },
+            slashCommands: { enabled: false },
+            usageStats: { enabled: false, contextWindow: false },
+            rewind: { enabled: false },
+        });
+        mocks.getSessionConfigOptionsWithFallback.mockResolvedValue([]);
+        mocks.getCachedCommands.mockResolvedValue([]);
+        mocks.consumeInitialMessage.mockReturnValue(null);
+    });
+    it('finalizes an unmatched historical tool call when loading a stopped session', async () => {
+        await loadSession();
+        expect(mocks.replaceTranscript).toHaveBeenCalledWith('session-crashed', expect.arrayContaining([
+            expect.objectContaining({
+                source: 'agent',
+                message: expect.objectContaining({
+                    type: 'user',
+                    message: expect.objectContaining({
+                        content: [
+                            expect.objectContaining({
+                                type: 'tool_result',
+                                tool_use_id: 'call-interrupted',
+                                is_error: true,
+                            }),
+                        ],
+                    }),
+                }),
+            }),
+        ]));
+    });
+    it('keeps an unmatched tool call pending while the session is running', async () => {
+        mocks.getRuntimeSnapshot.mockReturnValue({
+            phase: 'running',
+            processState: 'alive',
+            activity: 'WORKING',
+            updatedAt: '2026-08-20T10:01:00.000Z',
+        });
+        await loadSession();
+        expect(mocks.replaceTranscript).not.toHaveBeenCalled();
+    });
+    it('does not alter a stopped transcript whose tool call already completed', async () => {
+        mocks.getTranscriptSnapshot.mockReturnValue([unmatchedToolCall(), matchingToolResult()]);
+        await loadSession();
+        expect(mocks.replaceTranscript).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=load-session.handler.recovery.test.js.map

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-session.handler.recovery.test.js","sourceRoot":"","sources":["../../../../../../../../../src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.recovery.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/chat/chat-message-handlers/handlers/load-session.handler.test.js

@@ -40,7 +40,7 @@ vi.mock('@/backend/services/session/service/data/codex-session-history-loader.se
         loadSessionHistory: mocks.loadCodexSessionHistory,
     },
 }));
-vi.mock('@/backend/services/session/service/lifecycle/session-services', () => ({
+vi.mock('@/backend/services/session/service/lifecycle/session-core-services', () => ({
     sessionLifecycleService: {
         getRuntimeSnapshot: mocks.getRuntimeSnapshot,
     },
@@ -181,7 +181,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -217,7 +216,6 @@ describe('createLoadSessionHandler', () => {
         });
         mocks.isHistoryHydrated.mockReturnValue(false);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -249,7 +247,6 @@ describe('createLoadSessionHandler', () => {
         });
         mocks.loadClaudeSessionHistory.mockReturnValue(historyLoadPromise);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -299,7 +296,6 @@ describe('createLoadSessionHandler', () => {
         mocks.isHistoryHydrated.mockReturnValue(false);
         mocks.loadClaudeSessionHistory.mockResolvedValue({ status: 'not_found' });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -328,7 +324,6 @@ describe('createLoadSessionHandler', () => {
             filePath: '/tmp/.claude/projects/-tmp-worktree/provider-session-1.jsonl',
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -399,7 +394,6 @@ describe('createLoadSessionHandler', () => {
                 ],
             });
             const handler = createLoadSessionHandler({
-                getClientCreator: () => null,
                 tryDispatchNextMessage: mocks.tryDispatchNextMessage,
                 setManualDispatchResume: vi.fn(),
             });
@@ -442,7 +436,6 @@ describe('createLoadSessionHandler', () => {
             filePath: '/tmp/.claude/projects/-tmp-worktree/provider-session-1.jsonl',
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -478,7 +471,6 @@ describe('createLoadSessionHandler', () => {
             filePath: '/tmp/.claude/projects/-tmp-worktree/provider-session.jsonl',
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -517,7 +509,6 @@ describe('createLoadSessionHandler', () => {
                 filePath: '/tmp/.claude/projects/-tmp-worktree/provider-session.jsonl',
             });
             const handler = createLoadSessionHandler({
-                getClientCreator: () => null,
                 tryDispatchNextMessage: mocks.tryDispatchNextMessage,
                 setManualDispatchResume: vi.fn(),
             });
@@ -565,7 +556,6 @@ describe('createLoadSessionHandler', () => {
             providerProjectPath: null,
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -609,7 +599,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -651,7 +640,6 @@ describe('createLoadSessionHandler', () => {
         mocks.isHistoryHydrated.mockReturnValue(false);
         mocks.loadCodexSessionHistory.mockResolvedValue({ status: 'not_found' });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -686,7 +674,6 @@ describe('createLoadSessionHandler', () => {
         mocks.isHistoryHydrated.mockReturnValue(false);
         mocks.loadCodexSessionHistory.mockResolvedValue({ status: 'not_found' });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -720,7 +707,6 @@ describe('createLoadSessionHandler', () => {
         });
         mocks.isHistoryHydrated.mockReturnValue(false);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -755,7 +741,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -868,7 +853,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1001,7 +985,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1105,7 +1088,6 @@ describe('createLoadSessionHandler', () => {
         });
         mocks.loadCodexSessionHistory.mockReturnValueOnce(firstLoad).mockReturnValueOnce(secondLoad);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1237,7 +1219,6 @@ describe('createLoadSessionHandler', () => {
             ],
         });
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1318,7 +1299,6 @@ describe('createLoadSessionHandler', () => {
             },
         ]);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1363,7 +1343,6 @@ describe('createLoadSessionHandler', () => {
             { name: '/duplicate', description: 'Cached global duplicate' },
         ]);
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });
@@ -1394,7 +1373,6 @@ describe('createLoadSessionHandler', () => {
         });
         mocks.consumeInitialMessage.mockReturnValue('Take a screenshot of the app');
         const handler = createLoadSessionHandler({
-            getClientCreator: () => null,
             tryDispatchNextMessage: mocks.tryDispatchNextMessage,
             setManualDispatchResume: vi.fn(),
         });