factory-factory 0.4.7 → 0.4.9

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

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { sessionDomainService } from '../../../../../backend/services/session/service/session-domain.service.js';
-import { sessionEventBus } from '../../../../../backend/services/session/service/session-event-bus.js';
+import { sessionDomainService } from '../session-domain.service.js';
+import { sessionEventBus } from '../session-event-bus.js';
 import { SessionStatus } from '../../../../../shared/core/index.js';
 import { unsafeCoerce } from '../../../../../test-utils/unsafe-coerce.js';
 const mockNotifyToolStart = vi.fn();
@@ -71,7 +71,6 @@ vi.mock('./session.repository', () => ({
         getSessionById: vi.fn(),
         getSessionsByWorkspaceId: vi.fn(),
         getWorkspaceById: vi.fn(),
-        getProjectById: vi.fn(),
         markWorkspaceHasHadSessions: vi.fn(),
         updateSession: vi.fn(),
         updateSessionIfStatus: vi.fn(),
@@ -79,27 +78,23 @@ vi.mock('./session.repository', () => ({
         recoverStaleRunningSessions: vi.fn(),
     },
 }));
-vi.mock('./session.prompt-builder', () => ({
-    SessionPromptBuilder: class {
-    },
-    sessionPromptBuilder: {
-        shouldInjectBranchRename: vi.fn(),
-        buildSystemPrompt: vi.fn(),
-    },
-}));
 vi.mock('@/backend/services/session/service/logging/acp-trace-logger.service', () => ({
     acpTraceLogger: {
         log: vi.fn(),
         closeSession: (...args) => mockAcpTraceLoggerCloseSession(...args),
     },
 }));
-import { acpRuntimeManager } from '../../../../../backend/services/session/service/acp/index.js';
-import { workspaceDataService } from '../../../../../backend/services/workspace/index.js';
+import { acpRuntimeManager } from '../acp/index.js';
+import { workspaceDataService } from '../../../workspace/index.js';
 import { closedSessionPersistenceService } from './closed-session-persistence.service.js';
-import { sessionPromptBuilder } from './session.prompt-builder.js';
 import { sessionRepository } from './session.repository.js';
 import { createDeferred } from './session-lifecycle.test-helpers.js';
 import { acpEventProcessor, sessionLifecycleService, sessionPromptTurnCompletionService, sessionService, } from './session-services.js';
+const activeRuntime = {
+    incarnationId: '11111111-1111-4111-8111-111111111111',
+    purpose: 'active',
+    managed: false,
+};
 const getAcpProcessorState = () => acpEventProcessor;
 function mockCreatedAcpClient(acpHandle) {
     vi.mocked(acpRuntimeManager.getOrCreateClient).mockImplementation(() => {
@@ -173,10 +168,6 @@ describe('SessionService', () => {
             description: null,
             projectId: 'project-1',
         });
-        const project = unsafeCoerce({
-            id: 'project-1',
-            githubOwner: 'owner',
-        });
         const acpHandle = unsafeCoerce({
             getPid: vi.fn().mockReturnValue(123),
             isPromptInFlight: false,
@@ -184,27 +175,14 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getSessionById).mockResolvedValue(session);
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
-        vi.mocked(sessionRepository.getProjectById).mockResolvedValue(project);
         vi.mocked(sessionRepository.markWorkspaceHasHadSessions).mockResolvedValue();
         vi.mocked(sessionRepository.updateSession).mockResolvedValue(session);
-        vi.mocked(sessionPromptBuilder.shouldInjectBranchRename).mockReturnValue(true);
-        vi.mocked(sessionPromptBuilder.buildSystemPrompt).mockReturnValue({
-            workflowPrompt: 'workflow',
-            systemPrompt: 'system',
-            injectedBranchRename: true,
-        });
         mockCreatedAcpClient(acpHandle);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-1', { initialPrompt: 'Hello' });
-        expect(sessionPromptBuilder.shouldInjectBranchRename).toHaveBeenCalledWith({
-            branchName: 'auto-branch',
-            isAutoGeneratedBranch: true,
-            hasHadSessions: false,
-        });
         expect(sessionRepository.markWorkspaceHasHadSessions).toHaveBeenCalledWith('workspace-1');
         expect(acpRuntimeManager.getOrCreateClient).toHaveBeenCalledWith('session-1', expect.objectContaining({
             workingDir: '/tmp/work',
-            systemPrompt: 'system',
             model: 'sonnet',
             sessionId: 'session-1',
         }), expect.any(Object), { workspaceId: 'workspace-1', workingDir: '/tmp/work' });
@@ -232,10 +210,6 @@ describe('SessionService', () => {
             description: null,
             projectId: 'project-1',
         });
-        const project = unsafeCoerce({
-            id: 'project-1',
-            githubOwner: 'owner',
-        });
         const acpHandle = unsafeCoerce({
             getPid: vi.fn().mockReturnValue(123),
             isPromptInFlight: false,
@@ -243,15 +217,8 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getSessionById).mockResolvedValue(session);
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
-        vi.mocked(sessionRepository.getProjectById).mockResolvedValue(project);
         vi.mocked(sessionRepository.markWorkspaceHasHadSessions).mockResolvedValue();
         vi.mocked(sessionRepository.updateSession).mockResolvedValue(session);
-        vi.mocked(sessionPromptBuilder.shouldInjectBranchRename).mockReturnValue(true);
-        vi.mocked(sessionPromptBuilder.buildSystemPrompt).mockReturnValue({
-            workflowPrompt: 'workflow',
-            systemPrompt: 'system',
-            injectedBranchRename: true,
-        });
         mockCreatedAcpClient(acpHandle);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-1', { initialPrompt: '' });
@@ -288,12 +255,6 @@ describe('SessionService', () => {
         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);
         const result = await sessionLifecycleService.getOrCreateSessionClient('session-1');
         expect(result).toBe(acpHandle);
@@ -336,12 +297,6 @@ describe('SessionService', () => {
         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);
         const injectUserMessageSpy = vi.spyOn(sessionDomainService, 'injectCommittedUserMessage');
         await sessionLifecycleService.getOrCreateSessionClient('session-1');
@@ -383,12 +338,6 @@ describe('SessionService', () => {
         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);
         const injectUserMessageSpy = vi.spyOn(sessionDomainService, 'injectCommittedUserMessage');
         await sessionLifecycleService.getOrCreateSessionClient('session-1');
@@ -429,12 +378,6 @@ describe('SessionService', () => {
         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);
         const historyHydratedSpy = vi
             .spyOn(sessionDomainService, 'isHistoryHydrated')
@@ -494,12 +437,6 @@ describe('SessionService', () => {
         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);
         const injectUserMessageSpy = vi.spyOn(sessionDomainService, 'injectCommittedUserMessage');
         await sessionLifecycleService.getOrCreateSessionClient('session-1');
@@ -611,12 +548,6 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
         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);
         const result = await sessionLifecycleService.getOrCreateSessionClientFromRecord(session);
         expect(result).toBe(acpHandle);
@@ -629,7 +560,7 @@ describe('SessionService', () => {
             workingDir: '/tmp/work',
         }));
     });
-    it('does not overwrite COMPLETED status when process exits during stopSession', async () => {
+    it('preserves the stop-owned IDLE transition when the process exits cleanly during stopSession', async () => {
         const session = unsafeCoerce({
             id: 'session-race-test',
             workspaceId: 'workspace-1',
@@ -656,12 +587,6 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
         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 stopLoad = createDeferred();
@@ -673,15 +598,17 @@ describe('SessionService', () => {
         const stopPromise = sessionLifecycleService.stopSession('session-race-test');
         await Promise.resolve();
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-race-test', 0);
-        expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-race-test', {
-            status: SessionStatus.COMPLETED,
+        await acpHandlers.onRuntimeExit({
+            ...activeRuntime,
+            sessionId: 'session-race-test',
+            exitCode: 0,
+            managed: true,
         });
+        expect(sessionRepository.updateSession).not.toHaveBeenCalled();
         stopLoad.resolve(session);
         await stopPromise;
-        expect(sessionRepository.updateSession).not.toHaveBeenCalledWith('session-race-test', {
-            status: SessionStatus.IDLE,
-        });
+        expect(sessionRepository.updateSession).not.toHaveBeenCalled();
+        expect(sessionRepository.updateSessionIfStatus).toHaveBeenCalledOnce();
         expect(sessionRepository.updateSessionIfStatus).toHaveBeenCalledWith('session-race-test', {
             status: SessionStatus.IDLE,
         }, [SessionStatus.RUNNING]);
@@ -738,12 +665,6 @@ describe('SessionService', () => {
         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,
-        });
         vi.mocked(acpRuntimeManager.stopClient).mockResolvedValue();
         mockCreatedAcpClient(acpHandle);
         const stopPromise = sessionLifecycleService.stopSession('session-1');
@@ -889,12 +810,6 @@ describe('SessionService', () => {
         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.getOrCreateSessionClient('session-runtime-exit');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
@@ -911,7 +826,7 @@ describe('SessionService', () => {
         const secondRejection = expect(secondSend).rejects.toMatchObject({ name: 'AbortError' });
         await Promise.resolve();
         expect(acpRuntimeManager.sendPrompt).toHaveBeenCalledTimes(1);
-        await acpHandlers.onExit('session-runtime-exit', 1);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: session.id, exitCode: 1 });
         await secondRejection;
         expect(acpRuntimeManager.sendPrompt).toHaveBeenCalledTimes(1);
         firstPrompt.resolve({ stopReason: 'end_turn' });
@@ -945,12 +860,6 @@ describe('SessionService', () => {
         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.getOrCreateSessionClient('session-runtime-exit');
         const pendingToolCalls = getAcpProcessorState().pendingAcpToolCalls;
@@ -969,7 +878,7 @@ describe('SessionService', () => {
             .spyOn(sessionDomainService, 'appendClaudeEvent')
             .mockReturnValue(77);
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-runtime-exit', 1);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: session.id, exitCode: 1 });
         expect(emitDeltaSpy).toHaveBeenCalledWith('session-runtime-exit', expect.objectContaining({
             type: 'tool_progress',
             tool_use_id: 'call-1',
@@ -1313,12 +1222,6 @@ describe('SessionService', () => {
         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,
-        });
         vi.mocked(acpRuntimeManager.getOrCreateClient).mockRejectedValue(new Error('spawn failed'));
         const setRuntimeSnapshotSpy = vi.spyOn(sessionDomainService, 'setRuntimeSnapshot');
         await expect(sessionLifecycleService.getOrCreateSessionClient('session-1')).rejects.toThrow('spawn failed');
@@ -1371,10 +1274,6 @@ describe('SessionService', () => {
             description: null,
             projectId: 'project-1',
         });
-        const project = unsafeCoerce({
-            id: 'project-1',
-            githubOwner: 'owner',
-        });
         const acpHandle = unsafeCoerce({
             getPid: vi.fn().mockReturnValue(456),
             isPromptInFlight: false,
@@ -1382,22 +1281,15 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getSessionById).mockResolvedValue(session);
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
-        vi.mocked(sessionRepository.getProjectById).mockResolvedValue(project);
         vi.mocked(sessionRepository.markWorkspaceHasHadSessions).mockResolvedValue();
         vi.mocked(sessionRepository.updateSession).mockResolvedValue(session);
         vi.mocked(sessionRepository.deleteSession).mockResolvedValue(session);
-        vi.mocked(sessionPromptBuilder.shouldInjectBranchRename).mockReturnValue(false);
-        vi.mocked(sessionPromptBuilder.buildSystemPrompt).mockReturnValue({
-            workflowPrompt: 'workflow',
-            systemPrompt: 'system',
-            injectedBranchRename: false,
-        });
         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);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-1', exitCode: 0 });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-1', {
             status: SessionStatus.COMPLETED,
         });
@@ -1427,10 +1319,6 @@ describe('SessionService', () => {
             description: null,
             projectId: 'project-1',
         });
-        const project = unsafeCoerce({
-            id: 'project-1',
-            githubOwner: 'owner',
-        });
         const acpHandle = unsafeCoerce({
             getPid: vi.fn().mockReturnValue(456),
             isPromptInFlight: false,
@@ -1438,22 +1326,15 @@ describe('SessionService', () => {
         });
         vi.mocked(sessionRepository.getSessionById).mockResolvedValue(session);
         vi.mocked(sessionRepository.getWorkspaceById).mockResolvedValue(workspace);
-        vi.mocked(sessionRepository.getProjectById).mockResolvedValue(project);
         vi.mocked(sessionRepository.markWorkspaceHasHadSessions).mockResolvedValue();
         vi.mocked(sessionRepository.updateSession).mockResolvedValue(session);
         vi.mocked(sessionRepository.deleteSession).mockResolvedValue(session);
         vi.mocked(closedSessionPersistenceService.persistClosedSession).mockRejectedValue(new Error('Disk full'));
-        vi.mocked(sessionPromptBuilder.shouldInjectBranchRename).mockReturnValue(false);
-        vi.mocked(sessionPromptBuilder.buildSystemPrompt).mockReturnValue({
-            workflowPrompt: 'workflow',
-            systemPrompt: 'system',
-            injectedBranchRename: false,
-        });
         mockCreatedAcpClient(acpHandle);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-1');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await expect(acpHandlers.onExit('session-1', 0)).resolves.toBeUndefined();
+        await expect(acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-1', exitCode: 0 })).resolves.toBeUndefined();
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-1', {
             status: SessionStatus.COMPLETED,
         });
@@ -1488,17 +1369,11 @@ describe('SessionService', () => {
         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);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-2');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-2', 0);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode: 0 });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-2', {
             status: SessionStatus.COMPLETED,
         });
@@ -1534,18 +1409,12 @@ describe('SessionService', () => {
         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);
+        const exitPromise = acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId, exitCode: 1 });
         await vi.waitFor(() => {
             expect(sessionRepository.updateSession).toHaveBeenCalledWith(sessionId, {
                 status: SessionStatus.FAILED,
@@ -1599,7 +1468,7 @@ describe('SessionService', () => {
     it.each([
         { exitCode: 1, expectedStatus: SessionStatus.FAILED },
         { exitCode: null, expectedStatus: SessionStatus.FAILED },
-    ])('persists $expectedStatus on ACP exit code $exitCode', async ({ exitCode, expectedStatus, }) => {
+    ])('persists $expectedStatus on ACP exit code $exitCode', async ({ exitCode, expectedStatus }) => {
         const session = unsafeCoerce({
             id: 'session-2',
             workspaceId: 'workspace-1',
@@ -1627,17 +1496,11 @@ describe('SessionService', () => {
         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);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-2');
         const acpHandlers = vi.mocked(acpRuntimeManager.getOrCreateClient).mock.calls[0][2];
-        await acpHandlers.onExit('session-2', exitCode);
+        await acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode });
         expect(sessionRepository.updateSession).toHaveBeenCalledWith('session-2', {
             status: expectedStatus,
         });
@@ -1685,12 +1548,6 @@ describe('SessionService', () => {
         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);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-2');
@@ -1698,7 +1555,7 @@ describe('SessionService', () => {
         vi.mocked(acpRuntimeManager.isSessionRunning).mockImplementation(() => {
             throw new Error('isSessionRunning failed');
         });
-        await expect(acpHandlers.onExit('session-2', 0)).rejects.toThrow('isSessionRunning failed');
+        await expect(acpHandlers.onRuntimeExit({ ...activeRuntime, sessionId: 'session-2', exitCode: 0 })).rejects.toThrow('isSessionRunning failed');
         expect(mockAcpTraceLoggerCloseSession).toHaveBeenCalledWith('session-2');
     });
     it('updates DB status when ACP client is created', async () => {
@@ -1729,12 +1586,6 @@ describe('SessionService', () => {
         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.getOrCreateSessionClient('session-1');
         expect(acpRuntimeManager.getOrCreateClient).toHaveBeenCalled();
@@ -2073,12 +1924,6 @@ describe('SessionService', () => {
         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);
         vi.mocked(acpRuntimeManager.sendPrompt).mockResolvedValue({ stopReason: 'end_turn' });
         await sessionLifecycleService.startSession('session-1', { initialPrompt: 'go' });