factory-factory 0.4.0 → 0.4.1

package/dist/src/backend/services/session/service/data/session-data.service.d.ts

@@ -1,85 +1,9 @@
-import type { Prisma, SessionProvider, TerminalSession } from '../../../../../../prisma/generated/client.js';
-import { type AgentSessionRecord } from '../../../../../backend/services/session/resources/agent-session.accessor.js';
+import type { Prisma, SessionProvider } from '../../../../../../prisma/generated/client.js';
 import { type ClosedSessionRecord, type ClosedSessionWithWorkspace } from '../../../../../backend/services/session/resources/closed-session.accessor.js';
+import type { AgentSessionRecord, AgentSessionRecordWithWorkspace } from '../../../../../backend/services/session/types.js';
 import type { SessionStatus } from '../../../../../shared/core/index.js';
 declare class SessionDataService {
-    findAgentSessionById(id: string): Promise<({
-        workspace: {
-            name: string;
-            prUrl: string | null;
-            status: import("../../../../../../prisma/generated/client.js").WorkspaceStatus;
-            createdAt: Date;
-            updatedAt: Date;
-            id: string;
-            description: string | null;
-            prNumber: number | null;
-            prReviewState: string | null;
-            prState: import("../../../../../../prisma/generated/client.js").PRState;
-            prCiStatus: import("../../../../../../prisma/generated/client.js").CIStatus;
-            branchName: string | null;
-            projectId: string;
-            worktreePath: string | null;
-            isAutoGeneratedBranch: boolean;
-            creationSource: import("../../../../../../prisma/generated/client.js").WorkspaceCreationSource;
-            creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
-            initErrorMessage: string | null;
-            initOutput: string | null;
-            initStartedAt: Date | null;
-            initCompletedAt: Date | null;
-            initScriptPid: number | null;
-            initRetryCount: number;
-            runScriptCommand: string | null;
-            runScriptPostRunCommand: string | null;
-            runScriptCleanupCommand: string | null;
-            runScriptPid: number | null;
-            runScriptPort: number | null;
-            runScriptStartedAt: Date | null;
-            runScriptStatus: import("../../../../../../prisma/generated/client.js").RunScriptStatus;
-            githubIssueNumber: number | null;
-            githubIssueUrl: string | null;
-            linearIssueId: string | null;
-            linearIssueIdentifier: string | null;
-            linearIssueUrl: string | null;
-            defaultSessionProvider: import("../../../../../../prisma/generated/client.js").WorkspaceProviderSelection;
-            ratchetSessionProvider: import("../../../../../../prisma/generated/client.js").WorkspaceProviderSelection;
-            prUpdatedAt: Date | null;
-            prCiFailedAt: Date | null;
-            prCiLastNotifiedAt: Date | null;
-            prReviewLastCheckedAt: Date | null;
-            prReviewLastCommentId: string | null;
-            ratchetEnabled: boolean;
-            ratchetState: import("../../../../../../prisma/generated/client.js").RatchetState;
-            ratchetLastCheckedAt: Date | null;
-            ratchetActiveSessionId: string | null;
-            ratchetLastCiRunId: string | null;
-            ratchetDispatchOutcome: import("../../../../../../prisma/generated/client.js").RatchetDispatchOutcome | null;
-            ratchetDispatchRetryCount: number;
-            mode: import("../../../../../../prisma/generated/client.js").WorkspaceMode;
-            autoIterationStatus: import("../../../../../../prisma/generated/client.js").AutoIterationStatus | null;
-            autoIterationConfig: import("@prisma/client/runtime/client").JsonValue | null;
-            autoIterationProgress: import("@prisma/client/runtime/client").JsonValue | null;
-            autoIterationSessionId: string | null;
-            periodicTaskId: string | null;
-            parentWorkspaceId: string | null;
-            hasHadSessions: boolean;
-            cachedKanbanColumn: import("../../../../../../prisma/generated/client.js").KanbanColumn;
-            stateComputedAt: Date | null;
-        };
-    } & {
-        name: string | null;
-        workspaceId: string;
-        status: import("../../../../../../prisma/generated/client.js").SessionStatus;
-        createdAt: Date;
-        updatedAt: Date;
-        id: string;
-        model: string;
-        workflow: string;
-        provider: SessionProvider;
-        providerSessionId: string | null;
-        providerProjectPath: string | null;
-        providerProcessPid: number | null;
-        providerMetadata: import("@prisma/client/runtime/client").JsonValue | null;
-    }) | null>;
+    findAgentSessionById(id: string): Promise<AgentSessionRecordWithWorkspace | null>;
     findAgentSessionsByIds(ids: string[]): Promise<AgentSessionRecord[]>;
     findAgentSessionsByWorkspaceId(workspaceId: string, filters?: {
         status?: SessionStatus;
@@ -103,7 +27,20 @@ declare class SessionDataService {
         provider?: SessionProvider;
         providerProjectPath?: string | null;
         maxSessions: number;
-    }): Promise<import("../../../../../backend/services/session/resources/agent-session.accessor.js").LimitedAgentSessionCreation>;
+    }): Promise<{
+        outcome: "limit_reached";
+    } | {
+        session: AgentSessionRecord;
+        outcome: "created";
+    }>;
+    acquireFixerSession(data: {
+        workspaceId: string;
+        workflow: string;
+        sessionName: string;
+        maxSessions: number;
+        provider?: SessionProvider;
+        providerProjectPath: string | null;
+    }): Promise<import("../../../../../backend/services/session/resources/agent-session.accessor.js").FixerAgentSessionAcquisition>;
     updateAgentSession(id: string, data: {
         name?: string;
         workflow?: string;
@@ -117,95 +54,10 @@ declare class SessionDataService {
     }): Promise<AgentSessionRecord>;
     deleteAgentSession(id: string): Promise<AgentSessionRecord>;
     findAgentSessionsWithPid(): Promise<AgentSessionRecord[]>;
+    recoverStaleRunningAgentSessions(): Promise<number>;
     findClosedSessionsByWorkspaceId(workspaceId: string, limit: number): Promise<ClosedSessionRecord[]>;
     findClosedSessionByIdWithWorkspace(id: string): Promise<ClosedSessionWithWorkspace | null>;
     deleteClosedSession(id: string): Promise<ClosedSessionRecord>;
-    findTerminalSessionById(id: string): Promise<({
-        workspace: {
-            name: string;
-            prUrl: string | null;
-            status: import("../../../../../../prisma/generated/client.js").WorkspaceStatus;
-            createdAt: Date;
-            updatedAt: Date;
-            id: string;
-            description: string | null;
-            prNumber: number | null;
-            prReviewState: string | null;
-            prState: import("../../../../../../prisma/generated/client.js").PRState;
-            prCiStatus: import("../../../../../../prisma/generated/client.js").CIStatus;
-            branchName: string | null;
-            projectId: string;
-            worktreePath: string | null;
-            isAutoGeneratedBranch: boolean;
-            creationSource: import("../../../../../../prisma/generated/client.js").WorkspaceCreationSource;
-            creationMetadata: import("@prisma/client/runtime/client").JsonValue | null;
-            initErrorMessage: string | null;
-            initOutput: string | null;
-            initStartedAt: Date | null;
-            initCompletedAt: Date | null;
-            initScriptPid: number | null;
-            initRetryCount: number;
-            runScriptCommand: string | null;
-            runScriptPostRunCommand: string | null;
-            runScriptCleanupCommand: string | null;
-            runScriptPid: number | null;
-            runScriptPort: number | null;
-            runScriptStartedAt: Date | null;
-            runScriptStatus: import("../../../../../../prisma/generated/client.js").RunScriptStatus;
-            githubIssueNumber: number | null;
-            githubIssueUrl: string | null;
-            linearIssueId: string | null;
-            linearIssueIdentifier: string | null;
-            linearIssueUrl: string | null;
-            defaultSessionProvider: import("../../../../../../prisma/generated/client.js").WorkspaceProviderSelection;
-            ratchetSessionProvider: import("../../../../../../prisma/generated/client.js").WorkspaceProviderSelection;
-            prUpdatedAt: Date | null;
-            prCiFailedAt: Date | null;
-            prCiLastNotifiedAt: Date | null;
-            prReviewLastCheckedAt: Date | null;
-            prReviewLastCommentId: string | null;
-            ratchetEnabled: boolean;
-            ratchetState: import("../../../../../../prisma/generated/client.js").RatchetState;
-            ratchetLastCheckedAt: Date | null;
-            ratchetActiveSessionId: string | null;
-            ratchetLastCiRunId: string | null;
-            ratchetDispatchOutcome: import("../../../../../../prisma/generated/client.js").RatchetDispatchOutcome | null;
-            ratchetDispatchRetryCount: number;
-            mode: import("../../../../../../prisma/generated/client.js").WorkspaceMode;
-            autoIterationStatus: import("../../../../../../prisma/generated/client.js").AutoIterationStatus | null;
-            autoIterationConfig: import("@prisma/client/runtime/client").JsonValue | null;
-            autoIterationProgress: import("@prisma/client/runtime/client").JsonValue | null;
-            autoIterationSessionId: string | null;
-            periodicTaskId: string | null;
-            parentWorkspaceId: string | null;
-            hasHadSessions: boolean;
-            cachedKanbanColumn: import("../../../../../../prisma/generated/client.js").KanbanColumn;
-            stateComputedAt: Date | null;
-        };
-    } & {
-        name: string | null;
-        workspaceId: string;
-        status: import("../../../../../../prisma/generated/client.js").SessionStatus;
-        createdAt: Date;
-        updatedAt: Date;
-        id: string;
-        pid: number | null;
-    }) | null>;
-    findTerminalSessionsByWorkspaceId(workspaceId: string, filters?: {
-        status?: SessionStatus;
-        limit?: number;
-    }): Promise<TerminalSession[]>;
-    createTerminalSession(data: {
-        workspaceId: string;
-        name?: string;
-        pid?: number;
-    }): Promise<TerminalSession>;
-    updateTerminalSession(id: string, data: {
-        name?: string;
-    }): Promise<TerminalSession>;
-    deleteTerminalSession(id: string): Promise<TerminalSession>;
-    findTerminalSessionsWithPid(): Promise<TerminalSession[]>;
-    clearTerminalPid(workspaceId: string, name: string): Promise<void>;
 }
 export declare const sessionDataService: SessionDataService;
 export {};

package/dist/src/backend/services/session/service/data/session-data.service.d.ts.map

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

package/dist/src/backend/services/session/service/data/session-data.service.js

@@ -1,33 +1,86 @@
 import { agentSessionAccessor, } from '../../../../../backend/services/session/resources/agent-session.accessor.js';
 import { closedSessionAccessor, } from '../../../../../backend/services/session/resources/closed-session.accessor.js';
-import { terminalSessionAccessor } from '../../../../../backend/services/terminal/index.js';
+import { sessionProviderResolverService } from './session-provider-resolver.service.js';
+function toAgentSessionRecord(session) {
+    return {
+        id: session.id,
+        workspaceId: session.workspaceId,
+        name: session.name,
+        workflow: session.workflow,
+        model: session.model,
+        status: session.status,
+        provider: session.provider,
+        providerSessionId: session.providerSessionId,
+        providerProjectPath: session.providerProjectPath,
+        providerProcessPid: session.providerProcessPid,
+        providerMetadata: session.providerMetadata,
+        createdAt: session.createdAt,
+        updatedAt: session.updatedAt,
+    };
+}
+function toAgentSessionRecordWithWorkspace(session) {
+    return {
+        ...toAgentSessionRecord(session),
+        workspace: {
+            status: session.workspace.status,
+            worktreePath: session.workspace.worktreePath,
+            initErrorMessage: session.workspace.initErrorMessage,
+        },
+    };
+}
 class SessionDataService {
-    findAgentSessionById(id) {
-        return agentSessionAccessor.findById(id);
+    async findAgentSessionById(id) {
+        const session = await agentSessionAccessor.findById(id);
+        return session ? toAgentSessionRecordWithWorkspace(session) : null;
     }
-    findAgentSessionsByIds(ids) {
-        return agentSessionAccessor.findByIds(ids);
+    async findAgentSessionsByIds(ids) {
+        return (await agentSessionAccessor.findByIds(ids)).map(toAgentSessionRecord);
     }
-    findAgentSessionsByWorkspaceId(workspaceId, filters) {
-        return agentSessionAccessor.findByWorkspaceId(workspaceId, filters);
+    async findAgentSessionsByWorkspaceId(workspaceId, filters) {
+        return (await agentSessionAccessor.findByWorkspaceId(workspaceId, filters)).map(toAgentSessionRecord);
     }
     countActiveAgentSessionsByWorkspaceId(workspaceId) {
         return agentSessionAccessor.countActiveByWorkspaceId(workspaceId);
     }
-    createAgentSession(data) {
-        return agentSessionAccessor.create(data);
-    }
-    createAgentSessionWithinWorkspaceLimit(data) {
-        return agentSessionAccessor.createWithinWorkspaceLimit(data);
+    async createAgentSession(data) {
+        const defaults = await sessionProviderResolverService.resolveSessionDefaults({
+            workspaceId: data.workspaceId,
+            explicitProvider: data.provider,
+            explicitModel: data.model,
+        });
+        return toAgentSessionRecord(await agentSessionAccessor.create({ ...data, ...defaults }));
+    }
+    async createAgentSessionWithinWorkspaceLimit(data) {
+        const defaults = await sessionProviderResolverService.resolveSessionDefaults({
+            workspaceId: data.workspaceId,
+            explicitProvider: data.provider,
+            explicitModel: data.model,
+        });
+        const result = await agentSessionAccessor.createWithinWorkspaceLimit({ ...data, ...defaults });
+        return result.outcome === 'created'
+            ? { ...result, session: toAgentSessionRecord(result.session) }
+            : result;
+    }
+    async acquireFixerSession(data) {
+        const defaults = await sessionProviderResolverService.resolveSessionDefaults({
+            workspaceId: data.workspaceId,
+            explicitProvider: data.provider,
+        });
+        return agentSessionAccessor.acquireFixerSession({ ...data, ...defaults });
     }
     updateAgentSession(id, data) {
-        return agentSessionAccessor.update(id, data);
+        return agentSessionAccessor.update(id, data).then(toAgentSessionRecord);
     }
     deleteAgentSession(id) {
-        return agentSessionAccessor.delete(id);
+        return agentSessionAccessor.delete(id).then(toAgentSessionRecord);
     }
     findAgentSessionsWithPid() {
-        return agentSessionAccessor.findWithPid();
+        return agentSessionAccessor
+            .findWithPid()
+            .then((sessions) => sessions.map(toAgentSessionRecord));
+    }
+    recoverStaleRunningAgentSessions() {
+        return agentSessionAccessor.recoverStaleRunning();
     }
     findClosedSessionsByWorkspaceId(workspaceId, limit) {
         return closedSessionAccessor.findByWorkspaceId(workspaceId, limit);
@@ -38,27 +91,6 @@ class SessionDataService {
     deleteClosedSession(id) {
         return closedSessionAccessor.delete(id);
     }
-    findTerminalSessionById(id) {
-        return terminalSessionAccessor.findById(id);
-    }
-    findTerminalSessionsByWorkspaceId(workspaceId, filters) {
-        return terminalSessionAccessor.findByWorkspaceId(workspaceId, filters);
-    }
-    createTerminalSession(data) {
-        return terminalSessionAccessor.create(data);
-    }
-    updateTerminalSession(id, data) {
-        return terminalSessionAccessor.update(id, data);
-    }
-    deleteTerminalSession(id) {
-        return terminalSessionAccessor.delete(id);
-    }
-    findTerminalSessionsWithPid() {
-        return terminalSessionAccessor.findWithPid();
-    }
-    clearTerminalPid(workspaceId, name) {
-        return terminalSessionAccessor.clearPid(workspaceId, name);
-    }
 }
 export const sessionDataService = new SessionDataService();
 //# sourceMappingURL=session-data.service.js.map

package/dist/src/backend/services/session/service/data/session-data.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-data.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-data.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,GACrB,MAAM,6DAA6D,CAAC;AACrE,OAAO,EAGL,qBAAqB,GACtB,MAAM,8DAA8D,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAGtE,MAAM,kBAAkB;IAGtB,oBAAoB,CAAC,EAAU;QAC7B,OAAO,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,sBAAsB,CAAC,GAAa;QAClC,OAAO,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,8BAA8B,CAC5B,WAAmB,EACnB,OAAgF;QAEhF,OAAO,oBAAoB,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IAED,qCAAqC,CAAC,WAAmB;QACvD,OAAO,oBAAoB,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACpE,CAAC;IAED,kBAAkB,CAAC,IAOlB;QACC,OAAO,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,sCAAsC,CAAC,IAQtC;QACC,OAAO,oBAAoB,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,kBAAkB,CAChB,EAAU,EACV,IAUC;QAED,OAAO,oBAAoB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,kBAAkB,CAAC,EAAU;QAC3B,OAAO,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,wBAAwB;QACtB,OAAO,oBAAoB,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;IAID,+BAA+B,CAC7B,WAAmB,EACnB,KAAa;QAEb,OAAO,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,kCAAkC,CAAC,EAAU;QAC3C,OAAO,qBAAqB,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,mBAAmB,CAAC,EAAU;QAC5B,OAAO,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IAID,uBAAuB,CAAC,EAAU;QAChC,OAAO,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,iCAAiC,CAC/B,WAAmB,EACnB,OAAoD;QAEpD,OAAO,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,qBAAqB,CAAC,IAIrB;QACC,OAAO,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,qBAAqB,CAAC,EAAU,EAAE,IAAuB;QACvD,OAAO,uBAAuB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,qBAAqB,CAAC,EAAU;QAC9B,OAAO,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,2BAA2B;QACzB,OAAO,uBAAuB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;IAED,gBAAgB,CAAC,WAAmB,EAAE,IAAY;QAChD,OAAO,uBAAuB,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"session-data.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-data.service.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/data/session-data.service.test.d.ts

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

package/dist/src/backend/services/session/service/data/session-data.service.test.d.ts.map

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

package/dist/src/backend/services/session/service/data/session-data.service.test.js

@@ -0,0 +1,103 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { agentSessionAccessor } from '../../../../../backend/services/session/resources/agent-session.accessor.js';
+import { sessionDataService } from './session-data.service.js';
+import { sessionProviderResolverService } from './session-provider-resolver.service.js';
+vi.mock('@/backend/services/session/resources/agent-session.accessor', () => ({
+    agentSessionAccessor: {
+        acquireFixerSession: vi.fn(),
+        findById: vi.fn(),
+        recoverStaleRunning: vi.fn(),
+    },
+}));
+vi.mock('./session-provider-resolver.service', () => ({
+    sessionProviderResolverService: {
+        resolveSessionDefaults: vi.fn(),
+    },
+}));
+describe('sessionDataService', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('resolves provider and model defaults before atomic fixer acquisition', async () => {
+        vi.mocked(sessionProviderResolverService.resolveSessionDefaults).mockResolvedValue({
+            provider: 'CODEX',
+            model: 'gpt-5.3-codex',
+        });
+        vi.mocked(agentSessionAccessor.acquireFixerSession).mockResolvedValue({
+            outcome: 'created',
+            sessionId: 'session-1',
+        });
+        await expect(sessionDataService.acquireFixerSession({
+            workspaceId: 'workspace-1',
+            workflow: 'ci-fix',
+            sessionName: 'CI Fixing',
+            maxSessions: 5,
+            providerProjectPath: null,
+        })).resolves.toEqual({ outcome: 'created', sessionId: 'session-1' });
+        expect(sessionProviderResolverService.resolveSessionDefaults).toHaveBeenCalledWith({
+            workspaceId: 'workspace-1',
+            explicitProvider: undefined,
+        });
+        expect(agentSessionAccessor.acquireFixerSession).toHaveBeenCalledWith({
+            workspaceId: 'workspace-1',
+            workflow: 'ci-fix',
+            sessionName: 'CI Fixing',
+            maxSessions: 5,
+            provider: 'CODEX',
+            model: 'gpt-5.3-codex',
+            providerProjectPath: null,
+        });
+    });
+    it('recovers stale running agent sessions through the session boundary', async () => {
+        vi.mocked(agentSessionAccessor.recoverStaleRunning).mockResolvedValue(3);
+        await expect(sessionDataService.recoverStaleRunningAgentSessions()).resolves.toBe(3);
+        expect(agentSessionAccessor.recoverStaleRunning).toHaveBeenCalledOnce();
+    });
+    it('maps persistence rows to capsule-owned session records', async () => {
+        vi.mocked(agentSessionAccessor.findById).mockResolvedValue({
+            id: 'session-1',
+            workspaceId: 'workspace-1',
+            name: 'Implement',
+            workflow: 'implement',
+            model: 'gpt-5.3-codex',
+            status: 'IDLE',
+            provider: 'CODEX',
+            providerSessionId: null,
+            providerProjectPath: null,
+            providerProcessPid: null,
+            providerMetadata: null,
+            createdAt: new Date('2026-07-17T00:00:00.000Z'),
+            updatedAt: new Date('2026-07-17T00:00:00.000Z'),
+            workspace: {
+                status: 'READY',
+                worktreePath: '/tmp/worktree',
+                initErrorMessage: null,
+            },
+        });
+        await expect(sessionDataService.findAgentSessionById('session-1')).resolves.toEqual({
+            id: 'session-1',
+            workspaceId: 'workspace-1',
+            name: 'Implement',
+            workflow: 'implement',
+            model: 'gpt-5.3-codex',
+            status: 'IDLE',
+            provider: 'CODEX',
+            providerSessionId: null,
+            providerProjectPath: null,
+            providerProcessPid: null,
+            providerMetadata: null,
+            createdAt: new Date('2026-07-17T00:00:00.000Z'),
+            updatedAt: new Date('2026-07-17T00:00:00.000Z'),
+            workspace: {
+                status: 'READY',
+                worktreePath: '/tmp/worktree',
+                initErrorMessage: null,
+            },
+        });
+    });
+    it('returns null when the persistence session does not exist', async () => {
+        vi.mocked(agentSessionAccessor.findById).mockResolvedValue(null);
+        await expect(sessionDataService.findAgentSessionById('missing-session')).resolves.toBeNull();
+    });
+});
+//# sourceMappingURL=session-data.service.test.js.map

package/dist/src/backend/services/session/service/data/session-data.service.test.js.map

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

package/dist/src/backend/services/session/service/data/session-provider-resolver.service.d.ts

@@ -1,5 +1,14 @@
 import type { SessionProvider, Workspace } from '../../../../../../prisma/generated/client.js';
 declare class SessionProviderResolverService {
+    resolveSessionDefaults(params: {
+        workspaceId: string;
+        explicitProvider?: SessionProvider;
+        explicitModel?: string;
+        workspace?: Workspace;
+    }): Promise<{
+        provider: SessionProvider;
+        model: string;
+    }>;
     resolveProviderForWorkspaceCreation(explicitProvider?: SessionProvider): Promise<SessionProvider>;
     resolveSessionProvider(params: {
         workspaceId: string;

package/dist/src/backend/services/session/service/data/session-provider-resolver.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-provider-resolver.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-provider-resolver.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAKrE,cAAM,8BAA8B;IAC5B,mCAAmC,CACvC,gBAAgB,CAAC,EAAE,eAAe,GACjC,OAAO,CAAC,eAAe,CAAC;IAQrB,sBAAsB,CAAC,MAAM,EAAE;QACnC,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,CAAC,EAAE,eAAe,CAAC;QACnC,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB,GAAG,OAAO,CAAC,eAAe,CAAC;CAiB7B;AAED,eAAO,MAAM,8BAA8B,gCAAuC,CAAC"}
+{"version":3,"file":"session-provider-resolver.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-provider-resolver.service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAMrE,cAAM,8BAA8B;IAC5B,sBAAsB,CAAC,MAAM,EAAE;QACnC,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,CAAC,EAAE,eAAe,CAAC;QACnC,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAYnD,mCAAmC,CACvC,gBAAgB,CAAC,EAAE,eAAe,GACjC,OAAO,CAAC,eAAe,CAAC;IAQrB,sBAAsB,CAAC,MAAM,EAAE;QACnC,WAAW,EAAE,MAAM,CAAC;QACpB,gBAAgB,CAAC,EAAE,eAAe,CAAC;QACnC,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB,GAAG,OAAO,CAAC,eAAe,CAAC;CAiB7B;AAED,eAAO,MAAM,8BAA8B,gCAAuC,CAAC"}

package/dist/src/backend/services/session/service/data/session-provider-resolver.service.js

@@ -1,18 +1,28 @@
 import { asConcreteWorkspaceProvider } from '../../../../../backend/lib/provider-selection.js';
-import { userSettingsAccessor } from '../../../../../backend/services/settings/index.js';
-import { workspaceAccessor } from '../../../../../backend/services/workspace/index.js';
+import { resolveSessionModelForProvider } from '../../../../../backend/lib/session-model.js';
+import { userSettingsService } from '../../../../../backend/services/settings/index.js';
+import { workspaceDataService } from '../../../../../backend/services/workspace/index.js';
 class SessionProviderResolverService {
+    async resolveSessionDefaults(params) {
+        const provider = await this.resolveSessionProvider(params);
+        const settings = await userSettingsService.get();
+        const configuredModel = provider === 'CLAUDE' ? settings.defaultClaudeModel : settings.defaultCodexModel;
+        return {
+            provider,
+            model: resolveSessionModelForProvider(params.explicitModel, provider, configuredModel),
+        };
+    }
     async resolveProviderForWorkspaceCreation(explicitProvider) {
         if (explicitProvider) {
             return explicitProvider;
         }
-        return await userSettingsAccessor.getDefaultSessionProvider();
+        return await userSettingsService.getDefaultSessionProvider();
     }
     async resolveSessionProvider(params) {
         if (params.explicitProvider) {
             return params.explicitProvider;
         }
-        const workspace = params.workspace ?? (await workspaceAccessor.findRawById(params.workspaceId));
+        const workspace = params.workspace ?? (await workspaceDataService.findById(params.workspaceId));
         if (!workspace) {
             throw new Error(`Workspace not found: ${params.workspaceId}`);
         }
@@ -20,7 +30,7 @@ class SessionProviderResolverService {
         if (workspaceProvider) {
             return workspaceProvider;
         }
-        return userSettingsAccessor.getDefaultSessionProvider();
+        return userSettingsService.getDefaultSessionProvider();
     }
 }
 export const sessionProviderResolverService = new SessionProviderResolverService();

package/dist/src/backend/services/session/service/data/session-provider-resolver.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-provider-resolver.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-provider-resolver.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,MAAM,8BAA8B;IAClC,KAAK,CAAC,mCAAmC,CACvC,gBAAkC;QAElC,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,OAAO,MAAM,oBAAoB,CAAC,yBAAyB,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAI5B;QACC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,gBAAgB,CAAC;QACjC,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACxF,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,oBAAoB,CAAC,yBAAyB,EAAE,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,8BAA8B,EAAE,CAAC"}
+{"version":3,"file":"session-provider-resolver.service.js","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/data/session-provider-resolver.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,8BAA8B;IAClC,KAAK,CAAC,sBAAsB,CAAC,MAK5B;QACC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,GAAG,EAAE,CAAC;QACjD,MAAM,eAAe,GACnB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QAEnF,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,8BAA8B,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,eAAe,CAAC;SACvF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,mCAAmC,CACvC,gBAAkC;QAElC,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,OAAO,MAAM,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAI5B;QACC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,gBAAgB,CAAC;QACjC,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACxF,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;IACzD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,8BAA8B,EAAE,CAAC"}