factory-factory 0.4.3 → 0.4.5

package/dist/src/backend/services/session/service/lifecycle/session.service.js

@@ -1,15 +1,39 @@
 import pLimit from 'p-limit';
 import { createLogger } from '../../../../../backend/services/logger.service.js';
-import { toErrorMessage } from './session.error-message.js';
+import { PromptTimeoutError } from '../../../../../backend/services/session/service/acp/index.js';
+import { SessionLifecycleEventKind, SessionLifecycleEventReason } from '../../../../../shared/core/index.js';
+import { toErrorMessage, toProviderFailureChatMessage } from './session.error-message.js';
 const logger = createLogger('session');
-const DEFAULT_USER_PROMPT_TIMEOUT_MS = 60 * 60 * 1000;
+const DEFAULT_USER_PROMPT_TIMEOUT_MS = 4 * 60 * 60 * 1000;
 const TURN_ALREADY_IN_PROGRESS_REASON = 'A turn is already in progress for this session';
+function formatTimeoutDuration(timeoutMs) {
+    const units = [
+        { milliseconds: 60 * 60 * 1000, label: 'hour' },
+        { milliseconds: 60 * 1000, label: 'minute' },
+        { milliseconds: 1000, label: 'second' },
+    ];
+    for (const unit of units) {
+        if (timeoutMs >= unit.milliseconds && timeoutMs % unit.milliseconds === 0) {
+            const value = timeoutMs / unit.milliseconds;
+            return `${value}-${unit.label}`;
+        }
+    }
+    return `${timeoutMs}-millisecond`;
+}
+function timeoutMessage(timeoutMs, timeoutKind) {
+    if (timeoutKind === 'standard_user_turn' && timeoutMs === DEFAULT_USER_PROMPT_TIMEOUT_MS) {
+        return 'Turn stopped: reached the 4-hour limit.';
+    }
+    return `Turn stopped: reached the configured ${formatTimeoutDuration(timeoutMs)} limit.`;
+}
 export class SessionService {
     runtimeManager;
     sessionDomainService;
     acpEventProcessor;
     promptTurnCompletionService;
+    lifecycleEventService;
     getStopGeneration;
+    isStopGenerationCurrent;
     isSessionStopping;
     acpPromptLimiters = new Map();
     workspaceBridge = null;
@@ -18,7 +42,9 @@ export class SessionService {
         this.sessionDomainService = options.sessionDomainService;
         this.acpEventProcessor = options.acpEventProcessor;
         this.promptTurnCompletionService = options.promptTurnCompletionService;
+        this.lifecycleEventService = options.lifecycleEventService;
         this.getStopGeneration = options.getStopGeneration;
+        this.isStopGenerationCurrent = options.isStopGenerationCurrent;
         this.isSessionStopping = options.isSessionStopping;
     }
     configure(bridges) {
@@ -30,7 +56,9 @@ export class SessionService {
             const prompt = typeof content === 'string'
                 ? [{ type: 'text', text: content }]
                 : this.toContentBlocks(content, acpClient.supportsImages());
-            return this.sendAcpMessage(sessionId, prompt, DEFAULT_USER_PROMPT_TIMEOUT_MS)
+            return this.sendAcpMessage(sessionId, prompt, DEFAULT_USER_PROMPT_TIMEOUT_MS, {
+                timeoutKind: 'standard_user_turn',
+            })
                 .then(() => undefined)
                 .catch((error) => {
                 const errorMessage = toErrorMessage(error);
@@ -89,8 +117,8 @@ export class SessionService {
         }
         return blocks;
     }
-    sendAcpMessage(sessionId, prompt, timeoutMs) {
-        return this.withSerializedAcpPrompt(sessionId, () => this.executeAcpMessage(sessionId, prompt, timeoutMs));
+    sendAcpMessage(sessionId, prompt, timeoutMs, options) {
+        return this.withSerializedAcpPrompt(sessionId, () => this.executeAcpMessage(sessionId, prompt, timeoutMs, options?.timeoutKind ?? 'configured'));
     }
     withSerializedAcpPrompt(sessionId, task) {
         const limiter = this.getAcpPromptLimiter(sessionId);
@@ -123,14 +151,14 @@ export class SessionService {
         this.acpPromptLimiters.set(sessionId, limiter);
         return limiter;
     }
-    async executeAcpMessage(sessionId, prompt, timeoutMs) {
+    async executeAcpMessage(sessionId, prompt, timeoutMs, timeoutKind) {
         const stopGeneration = this.getStopGeneration(sessionId);
         const workspaceId = this.acpEventProcessor.getWorkspaceId(sessionId);
         let workspaceActivityGeneration;
         let promptCompleted = false;
         let promptError;
         let promptErrorSet = false;
-        this.acpEventProcessor.beginPromptTurn(sessionId);
+        const attemptKey = this.acpEventProcessor.beginPromptTurn(sessionId);
         this.sessionDomainService.setRuntimeSnapshot(sessionId, {
             phase: 'running',
             processState: 'alive',
@@ -143,17 +171,25 @@ export class SessionService {
         try {
             const result = await this.runtimeManager.sendPrompt(sessionId, prompt, timeoutMs);
             promptCompleted = true;
-            this.completePromptTurnIfCurrent(sessionId, stopGeneration, `stop_reason:${result.stopReason}`, {
-                phase: 'idle',
-                processState: 'alive',
-                activity: 'IDLE',
-                updatedAt: new Date().toISOString(),
+            this.completeSuccessfulPromptTurn({
+                sessionId,
+                stopGeneration,
+                stopReason: result.stopReason,
             });
             return result.stopReason;
         }
         catch (error) {
             promptError = error;
             promptErrorSet = true;
+            if (this.shouldRecordPromptFailure(sessionId, stopGeneration, error)) {
+                await this.recordPromptFailure({
+                    sessionId,
+                    workspaceId,
+                    attemptKey,
+                    error,
+                    timeoutKind,
+                });
+            }
             this.completePromptTurnIfCurrent(sessionId, stopGeneration, 'prompt_error', {
                 phase: 'error',
                 processState: 'alive',
@@ -174,13 +210,50 @@ export class SessionService {
             }
             if ((promptCompleted || (promptErrorSet && !this.isTurnAlreadyInProgressError(promptError))) &&
                 !this.isSessionStopping(sessionId) &&
-                this.getStopGeneration(sessionId) === stopGeneration) {
+                this.isStopGenerationCurrent(sessionId, stopGeneration)) {
                 this.promptTurnCompletionService.schedule(sessionId);
             }
         }
     }
+    completeSuccessfulPromptTurn({ sessionId, stopGeneration, stopReason, }) {
+        this.completePromptTurnIfCurrent(sessionId, stopGeneration, `stop_reason:${stopReason}`, {
+            phase: 'idle',
+            processState: 'alive',
+            activity: 'IDLE',
+            updatedAt: new Date().toISOString(),
+        });
+    }
+    async recordPromptFailure({ sessionId, workspaceId, attemptKey, error, timeoutKind, }) {
+        const reason = error instanceof PromptTimeoutError
+            ? SessionLifecycleEventReason.PROMPT_TIMEOUT
+            : SessionLifecycleEventReason.PROVIDER_ERROR;
+        if (!workspaceId) {
+            logger.warn('Skipped prompt failure lifecycle event without workspace owner', {
+                sessionId,
+                attemptKey,
+                reason,
+            });
+            return;
+        }
+        await this.lifecycleEventService.record({
+            workspaceId,
+            sessionId,
+            kind: SessionLifecycleEventKind.TURN_INTERRUPTED,
+            reason,
+            message: error instanceof PromptTimeoutError
+                ? timeoutMessage(error.timeoutMs, timeoutKind)
+                : toProviderFailureChatMessage(this.acpEventProcessor.getProvider(sessionId), error),
+            dedupeKey: `turn:${attemptKey}:stop`,
+        });
+    }
+    shouldRecordPromptFailure(sessionId, stopGeneration, error) {
+        if (this.isTurnAlreadyInProgressError(error) || this.isSessionStopping(sessionId)) {
+            return false;
+        }
+        return this.getStopGeneration(sessionId) === stopGeneration;
+    }
     completePromptTurnIfCurrent(sessionId, stopGeneration, orphanedToolCallReason, runtime) {
-        if (this.getStopGeneration(sessionId) !== stopGeneration) {
+        if (!this.isStopGenerationCurrent(sessionId, stopGeneration)) {
             return;
         }
         this.acpEventProcessor.finishPromptTurn(sessionId);

package/dist/src/backend/services/session/service/lifecycle/session.service.js.map

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

package/dist/src/backend/services/session/service/lifecycle/session.service.test.js

@@ -33,6 +33,7 @@ vi.mock('@/backend/services/session/service/acp', async (importOriginal) => {
             getClient: vi.fn().mockReturnValue(undefined),
             getOrCreateClient: vi.fn(),
             stopClient: vi.fn(),
+            beginShutdown: vi.fn().mockReturnValue([]),
             stopAllClients: vi.fn(),
             sendPrompt: vi.fn(),
             cancelPrompt: vi.fn(),
@@ -1005,7 +1006,9 @@ describe('SessionService', () => {
         vi.mocked(sessionRepository.updateSession).mockResolvedValue({});
         const clearSessionSpy = vi.spyOn(sessionDomainService, 'clearSession');
         await sessionLifecycleService.stopSession('session-clear');
-        expect(clearSessionSpy).toHaveBeenCalledWith('session-clear');
+        expect(clearSessionSpy).toHaveBeenCalledWith('session-clear', {
+            preserveRejections: true,
+        });
     });
     it('keeps in-memory session state after manual stop when clients are connected', async () => {
         vi.mocked(acpRuntimeManager.isStopInProgress).mockReturnValue(false);
@@ -1156,6 +1159,7 @@ describe('SessionService', () => {
         const transcriptSpy = vi
             .spyOn(sessionDomainService, 'getTranscriptSnapshot')
             .mockReturnValue(transcript);
+        const clearSessionSpy = vi.spyOn(sessionDomainService, 'clearSession');
         vi.mocked(acpRuntimeManager.isStopInProgress).mockReturnValue(false);
         vi.mocked(acpRuntimeManager.stopClient).mockResolvedValue();
         vi.mocked(sessionRepository.getSessionById).mockResolvedValue(unsafeCoerce({
@@ -1184,7 +1188,11 @@ describe('SessionService', () => {
                 messages: transcript,
             });
             expect(sessionRepository.deleteSession).toHaveBeenCalledWith('session-1');
+            expect(clearSessionSpy).toHaveBeenCalledWith('session-1');
+            const destructiveClearCallIndex = clearSessionSpy.mock.calls.findIndex(([sessionId, options]) => sessionId === 'session-1' && options === undefined);
+            expect(destructiveClearCallIndex).toBeGreaterThanOrEqual(0);
             expect(vi.mocked(closedSessionPersistenceService.persistClosedSession).mock.invocationCallOrder[0]).toBeLessThan(vi.mocked(sessionRepository.deleteSession).mock.invocationCallOrder[0]);
+            expect(vi.mocked(sessionRepository.deleteSession).mock.invocationCallOrder[0]).toBeLessThan(clearSessionSpy.mock.invocationCallOrder[destructiveClearCallIndex]);
         }
         finally {
             transcriptSpy.mockRestore();
@@ -1340,6 +1348,7 @@ describe('SessionService', () => {
         });
         mockCreatedAcpClient(acpHandle);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
+        const clearSessionSpy = vi.spyOn(sessionDomainService, 'clearSession');
         await sessionLifecycleService.startSession('session-1');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
         await acpHandlers.onExit('session-1', 0);
@@ -1348,6 +1357,10 @@ describe('SessionService', () => {
         });
         expect(mockRecordRatchetSessionEnd).toHaveBeenCalledWith('workspace-1', 'session-1', 'COMPLETED');
         expect(sessionRepository.deleteSession).toHaveBeenCalledWith('session-1');
+        expect(clearSessionSpy).toHaveBeenCalledWith('session-1');
+        const destructiveClearCallIndex = clearSessionSpy.mock.calls.findIndex(([sessionId, options]) => sessionId === 'session-1' && options === undefined);
+        expect(destructiveClearCallIndex).toBeGreaterThanOrEqual(0);
+        expect(vi.mocked(sessionRepository.deleteSession).mock.invocationCallOrder[0]).toBeLessThan(clearSessionSpy.mock.invocationCallOrder[destructiveClearCallIndex]);
     });
     it('does not delete ratchet session when closed-session persistence fails', async () => {
         const session = unsafeCoerce({
@@ -1445,6 +1458,97 @@ describe('SessionService', () => {
         });
         expect(sessionRepository.deleteSession).not.toHaveBeenCalled();
     });
+    it('preserves a failed draft recorded while runtime-exit persistence is in flight', async () => {
+        const sessionId = 'session-runtime-exit-failed-draft';
+        const session = unsafeCoerce({
+            id: sessionId,
+            workspaceId: 'workspace-1',
+            status: SessionStatus.RUNNING,
+            workflow: 'default',
+            model: 'sonnet',
+            provider: 'CLAUDE',
+            providerSessionId: null,
+        });
+        const workspace = unsafeCoerce({
+            id: 'workspace-1',
+            worktreePath: '/tmp/work',
+            branchName: 'fix-branch',
+            isAutoGeneratedBranch: false,
+            name: 'Workspace A',
+            description: null,
+            projectId: 'project-1',
+        });
+        const acpHandle = unsafeCoerce({
+            getPid: vi.fn().mockReturnValue(790),
+            isPromptInFlight: true,
+            configOptions: [],
+        });
+        const exitUpdate = createDeferred();
+        sessionDomainService.clearSession(sessionId);
+        vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
+        vi.mocked(sessionRepository.markWorkspaceHasHadSessions).mockResolvedValue();
+        vi.mocked(sessionRepository.updateSession).mockResolvedValue(session);
+        vi.mocked(sessionPromptBuilder.shouldInjectBranchRename).mockReturnValue(false);
+        vi.mocked(sessionPromptBuilder.buildSystemPrompt).mockReturnValue({
+            workflowPrompt: undefined,
+            systemPrompt: undefined,
+            injectedBranchRename: false,
+        });
+        mockCreatedAcpClient(acpHandle);
+        await sessionLifecycleService.getOrCreateSessionClientFromRecord(session);
+        const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
+        vi.mocked(sessionRepository.updateSession).mockReset();
+        vi.mocked(sessionRepository.updateSession).mockReturnValueOnce(exitUpdate.promise);
+        const exitPromise = acpHandlers.onExit(sessionId, 1);
+        await vi.waitFor(() => {
+            expect(sessionRepository.updateSession).toHaveBeenCalledWith(sessionId, {
+                status: SessionStatus.FAILED,
+            });
+        });
+        sessionDomainService.failMessage(sessionId, {
+            id: 'failed-during-exit',
+            text: 'recover after crash',
+            timestamp: '2026-07-29T12:00:00.000Z',
+            settings: {
+                selectedModel: null,
+                reasoningEffort: null,
+                thinkingEnabled: false,
+                planModeEnabled: false,
+            },
+        }, 'ACP runtime crashed');
+        exitUpdate.resolve(session);
+        await exitPromise;
+        const publishToSessionSpy = vi.spyOn(sessionEventBus, 'publishToSession');
+        sessionDomainService.subscribe({
+            sessionId,
+            sessionRuntime: {
+                phase: 'error',
+                processState: 'stopped',
+                activity: 'IDLE',
+                errorMessage: 'ACP runtime crashed',
+                updatedAt: '2026-07-29T12:00:01.000Z',
+            },
+        });
+        const replayBatch = publishToSessionSpy.mock.calls
+            .map(([, payload]) => payload)
+            .find((payload) => payload.type === 'session_replay_batch');
+        expect(replayBatch).toMatchObject({
+            replayEvents: expect.arrayContaining([
+                {
+                    type: 'message_state_changed',
+                    id: 'failed-during-exit',
+                    newState: 'FAILED',
+                    errorMessage: 'ACP runtime crashed',
+                    userMessage: {
+                        text: 'recover after crash',
+                        timestamp: '2026-07-29T12:00:00.000Z',
+                        attachments: undefined,
+                        sessionId,
+                    },
+                },
+            ]),
+        });
+    });
     it.each([
         { exitCode: 1, expectedStatus: SessionStatus.FAILED },
         { exitCode: null, expectedStatus: SessionStatus.FAILED },