factory-factory 0.4.8 → 0.4.10

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.js

@@ -0,0 +1,131 @@
+import { prisma } from '../../../db.js';
+import { agentSessionAccessor } from './agent-session.accessor.js';
+import { PR_DEDICATED_WORKFLOW } from '../../../../shared/pr-monitoring.js';
+class AcquisitionCancelled extends Error {
+}
+class PRDedicatedSessionAccessor {
+    acquire(input) {
+        return agentSessionAccessor
+            .runWorkspaceAcquisition(input.workspaceId, () => prisma.$transaction((tx) => this.acquireInTransaction(tx, input)))
+            .catch((error) => {
+            if (error instanceof AcquisitionCancelled) {
+                return { outcome: 'unavailable' };
+            }
+            throw error;
+        });
+    }
+    async findWorkspace(target) {
+        const pr = await prisma.workspacePR.findFirst({
+            where: {
+                id: target.prId,
+                workspaceId: target.workspaceId,
+                detachedAt: null,
+                workspace: { status: 'READY' },
+            },
+            include: { workspace: true },
+        });
+        return pr?.workspace ?? null;
+    }
+    async find(target) {
+        const pr = await prisma.workspacePR.findFirst({
+            where: { id: target.prId, workspaceId: target.workspaceId, detachedAt: null },
+            include: { dedicatedSession: { include: { session: true } } },
+        });
+        const session = pr?.dedicatedSession?.session;
+        return session && this.owns(target, session) ? session : null;
+    }
+    async restore(tx, input) {
+        if (input.sessionId === '') {
+            return false;
+        }
+        const pr = await tx.workspacePR.findFirst({
+            where: { id: input.prId, workspaceId: input.workspaceId },
+        });
+        if (!pr) {
+            return false;
+        }
+        if (input.sessionId) {
+            const session = await tx.agentSession.findUnique({ where: { id: input.sessionId } });
+            const binding = await tx.workspacePRDedicatedSession.findUnique({
+                where: { sessionId: input.sessionId },
+            });
+            if (!(session && this.owns(input, session)) || (binding && binding.prId !== input.prId)) {
+                return false;
+            }
+        }
+        await tx.workspacePRDedicatedSession.upsert({
+            where: { prId: input.prId },
+            create: { prId: input.prId, sessionId: input.sessionId },
+            update: { sessionId: input.sessionId },
+        });
+        return true;
+    }
+    owns(target, session) {
+        return (session.workspaceId === target.workspaceId &&
+            session.workspacePrId === target.prId &&
+            session.workflow === PR_DEDICATED_WORKFLOW);
+    }
+    async acquireInTransaction(tx, input) {
+        if (input.isCurrent?.() === false) {
+            return { outcome: 'unavailable' };
+        }
+        const pr = await tx.workspacePR.findFirst({
+            where: { id: input.prId, workspaceId: input.workspaceId, detachedAt: null },
+            include: {
+                workspace: { include: { prMonitoring: true } },
+                dedicatedSession: { include: { session: true } },
+            },
+        });
+        const config = pr?.workspace.prMonitoring;
+        if (input.isCurrent?.() === false ||
+            !pr ||
+            pr.workspace.status !== 'READY' ||
+            !config?.enabled ||
+            config.deliveryMode !== 'DEDICATED' ||
+            config.deliveryPauseReason ||
+            (input.expectedBindingRevision !== undefined &&
+                config.bindingRevision !== input.expectedBindingRevision)) {
+            return { outcome: 'unavailable' };
+        }
+        const session = pr.dedicatedSession?.session;
+        if (session) {
+            return this.owns(input, session)
+                ? { outcome: 'reused', session }
+                : { outcome: 'unavailable' };
+        }
+        const count = await tx.agentSession.count({
+            where: { workspaceId: input.workspaceId, status: { in: ['RUNNING', 'IDLE'] } },
+        });
+        if (input.isCurrent?.() === false) {
+            return { outcome: 'unavailable' };
+        }
+        if (count >= input.maxSessions) {
+            return { outcome: 'limit_reached' };
+        }
+        const created = await tx.agentSession.create({
+            data: {
+                workspaceId: input.workspaceId,
+                workspacePrId: input.prId,
+                workflow: PR_DEDICATED_WORKFLOW,
+                name: `PR ${pr.number ?? pr.id}`,
+                provider: input.provider,
+                model: input.model,
+                providerProjectPath: pr.workspace.worktreePath,
+            },
+        });
+        if (input.isCurrent?.() === false) {
+            throw new AcquisitionCancelled();
+        }
+        await tx.workspacePRDedicatedSession.upsert({
+            where: { prId: input.prId },
+            create: { prId: input.prId, sessionId: created.id },
+            update: { sessionId: created.id },
+        });
+        if (input.isCurrent?.() === false) {
+            throw new AcquisitionCancelled();
+        }
+        return { outcome: 'created', session: created };
+    }
+}
+export const prDedicatedSessionAccessor = new PRDedicatedSessionAccessor();
+//# sourceMappingURL=pr-dedicated-session.accessor.js.map

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-dedicated-session.accessor.js","sourceRoot":"","sources":["../../../../../../src/backend/services/session/resources/pr-dedicated-session.accessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAC;AACnG,OAAO,EAAE,qBAAqB,EAAiB,MAAM,wBAAwB,CAAC;AAa9E,MAAM,oBAAqB,SAAQ,KAAK;CAAG;AAE3C,MAAM,0BAA0B;IAC9B,OAAO,CAAC,KAAqC;QAC3C,OAAO,oBAAoB;aACxB,uBAAuB,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,CAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAClE;aACA,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;gBAC1C,OAAO,EAAE,OAAO,EAAE,aAAsB,EAAE,CAAC;YAC7C,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IACD,KAAK,CAAC,aAAa,CAAC,MAAgB;QAClC,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;YAC5C,KAAK,EAAE;gBACL,EAAE,EAAE,MAAM,CAAC,IAAI;gBACf,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,UAAU,EAAE,IAAI;gBAChB,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;aAC/B;YACD,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;SAC7B,CAAC,CAAC;QACH,OAAO,EAAE,EAAE,SAAS,IAAI,IAAI,CAAC;IAC/B,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,MAAgB;QACzB,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;YAC5C,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;YAC7E,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;SAC9D,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,EAAE,gBAAgB,EAAE,OAAO,CAAC;QAC9C,OAAO,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAChE,CAAC;IACD,KAAK,CAAC,OAAO,CACX,EAA4B,EAC5B,KAA8C;QAE9C,IAAI,KAAK,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;YACxC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE;SAC1D,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACrF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,2BAA2B,CAAC,UAAU,CAAC;gBAC9D,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;aACtC,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxF,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC;YAC1C,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;YACxD,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;SACvC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IACO,IAAI,CAAC,MAAgB,EAAE,OAAqB;QAClD,OAAO,CACL,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW;YAC1C,OAAO,CAAC,aAAa,KAAK,MAAM,CAAC,IAAI;YACrC,OAAO,CAAC,QAAQ,KAAK,qBAAqB,CAC3C,CAAC;IACJ,CAAC;IACO,KAAK,CAAC,oBAAoB,CAChC,EAA4B,EAC5B,KAAqC;QAErC,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YAClC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;YACxC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;YAC3E,OAAO,EAAE;gBACP,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;gBAC9C,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;aACjD;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,EAAE,EAAE,SAAS,CAAC,YAAY,CAAC;QAC1C,IACE,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,KAAK;YAC7B,CAAC,EAAE;YACH,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,OAAO;YAC/B,CAAC,MAAM,EAAE,OAAO;YAChB,MAAM,CAAC,YAAY,KAAK,WAAW;YACnC,MAAM,CAAC,mBAAmB;YAC1B,CAAC,KAAK,CAAC,uBAAuB,KAAK,SAAS;gBAC1C,MAAM,CAAC,eAAe,KAAK,KAAK,CAAC,uBAAuB,CAAC,EAC3D,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,CAAC,gBAAgB,EAAE,OAAO,CAAC;QAC7C,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC;gBAC9B,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;gBAChC,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC;YACxC,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE;SAC/E,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YAClC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,KAAK,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YAC/B,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QACtC,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;YAC3C,IAAI,EAAE;gBACJ,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,aAAa,EAAE,KAAK,CAAC,IAAI;gBACzB,QAAQ,EAAE,qBAAqB;gBAC/B,IAAI,EAAE,MAAM,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,EAAE;gBAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,mBAAmB,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY;aAC/C;SACF,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,oBAAoB,EAAE,CAAC;QACnC,CAAC;QACD,MAAM,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC;YAC1C,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;YACnD,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;SAClC,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,KAAK,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,oBAAoB,EAAE,CAAC;QACnC,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAClD,CAAC;CACF;AACD,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,EAAE,CAAC"}

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.test.d.ts

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

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.test.d.ts.map

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

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.test.js

@@ -0,0 +1,217 @@
+import { afterAll, beforeAll, beforeEach, expect, it, vi } from 'vitest';
+import { agentSessionAccessor } from './agent-session.accessor.js';
+import { prDedicatedSessionAccessor } from './pr-dedicated-session.accessor.js';
+import { clearIntegrationDatabase, createIntegrationDatabase, destroyIntegrationDatabase, } from '../../../testing/integration-db.js';
+const database = vi.hoisted(() => ({ prisma: undefined }));
+vi.mock('@/backend/db', () => ({
+    get prisma() {
+        return database.prisma;
+    },
+}));
+let db;
+beforeAll(async () => {
+    db = await createIntegrationDatabase();
+    database.prisma = db.prisma;
+}, 30_000);
+afterAll(async () => {
+    if (db) {
+        await destroyIntegrationDatabase(db);
+    }
+});
+beforeEach(async () => {
+    await clearIntegrationDatabase(db.prisma);
+    await db.prisma.project.create({
+        data: {
+            id: 'project',
+            name: 'Project',
+            slug: 'project',
+            repoPath: '/tmp/repo',
+            worktreeBasePath: '/tmp/worktrees',
+        },
+    });
+    await db.prisma.workspace.create({
+        data: {
+            id: 'w',
+            projectId: 'project',
+            name: 'Workspace',
+            status: 'READY',
+            worktreePath: '/tmp/worktree',
+            prs: {
+                create: [
+                    { id: 'a', url: 'https://github.com/o/r/pull/1' },
+                    { id: 'b', url: 'https://github.com/o/r/pull/2' },
+                ],
+            },
+            prMonitoring: { create: { enabled: true, deliveryMode: 'DEDICATED', bindingRevision: 4 } },
+        },
+    });
+});
+const input = {
+    workspaceId: 'w',
+    prId: 'a',
+    provider: 'CLAUDE',
+    model: 'sonnet',
+    maxSessions: 5,
+    expectedBindingRevision: 4,
+};
+it('atomically creates one binding for concurrent wakes of the same PR', async () => {
+    const results = await Promise.all([
+        prDedicatedSessionAccessor.acquire(input),
+        prDedicatedSessionAccessor.acquire(input),
+    ]);
+    expect(results.map((result) => result.outcome).sort()).toEqual(['created', 'reused']);
+    expect(await db.prisma.agentSession.count()).toBe(1);
+    expect(await db.prisma.workspacePRDedicatedSession.count()).toBe(1);
+});
+it('enforces the shared workspace limit across independent PRs and human acquisition', async () => {
+    const results = await Promise.all([
+        prDedicatedSessionAccessor.acquire({ ...input, maxSessions: 1 }),
+        prDedicatedSessionAccessor.acquire({ ...input, prId: 'b', maxSessions: 1 }),
+        agentSessionAccessor.createWithinWorkspaceLimit({
+            workspaceId: 'w',
+            workflow: 'implement',
+            provider: 'CLAUDE',
+            model: 'sonnet',
+            maxSessions: 1,
+        }),
+    ]);
+    expect(results.filter((result) => result.outcome === 'created')).toHaveLength(1);
+    expect(results.filter((result) => result.outcome === 'limit_reached')).toHaveLength(2);
+    expect(await db.prisma.agentSession.count()).toBe(1);
+});
+it('reuses a cold saved identity despite different defaults and a full cap', async () => {
+    const first = await prDedicatedSessionAccessor.acquire(input);
+    if (first.outcome !== 'created') {
+        throw new Error('Expected creation');
+    }
+    await db.prisma.agentSession.update({
+        where: { id: first.session.id },
+        data: { providerSessionId: 'saved', status: 'FAILED' },
+    });
+    const reused = await prDedicatedSessionAccessor.acquire({
+        ...input,
+        provider: 'CODEX',
+        model: 'default',
+        maxSessions: 0,
+    });
+    expect(reused).toMatchObject({
+        outcome: 'reused',
+        session: {
+            id: first.session.id,
+            provider: 'CLAUDE',
+            providerSessionId: 'saved',
+            status: 'FAILED',
+        },
+    });
+});
+it.each(['missing', 'detached', 'inactive', 'disabled', 'stale', 'stopped'])('does not acquire for %s ownership or monitoring', async (reason) => {
+    if (reason === 'detached') {
+        await db.prisma.workspacePR.update({ where: { id: 'a' }, data: { detachedAt: new Date() } });
+    }
+    if (reason === 'inactive') {
+        await db.prisma.workspace.update({ where: { id: 'w' }, data: { status: 'ARCHIVED' } });
+    }
+    if (reason === 'disabled') {
+        await db.prisma.workspacePRMonitoring.update({
+            where: { workspaceId: 'w' },
+            data: { enabled: false },
+        });
+    }
+    if (reason === 'stopped') {
+        await db.prisma.workspacePRMonitoring.update({
+            where: { workspaceId: 'w' },
+            data: { deliveryPauseReason: 'USER_STOPPED' },
+        });
+    }
+    expect(await prDedicatedSessionAccessor.acquire({
+        ...input,
+        prId: reason === 'missing' ? 'missing' : 'a',
+        expectedBindingRevision: reason === 'stale' ? 3 : 4,
+    })).toEqual({ outcome: 'unavailable' });
+    expect(await db.prisma.agentSession.count()).toBe(0);
+});
+it.each([3, 4, 5])('rolls back acquisition when a stop advances at checkpoint %s', async (checkpoint) => {
+    let checks = 0;
+    expect(await prDedicatedSessionAccessor.acquire({ ...input, isCurrent: () => ++checks < checkpoint })).toEqual({ outcome: 'unavailable' });
+    expect(await db.prisma.agentSession.count()).toBe(0);
+});
+it('clears a deleted session binding and acquires a new future recipient', async () => {
+    const first = await prDedicatedSessionAccessor.acquire(input);
+    if (first.outcome !== 'created') {
+        throw new Error('Expected creation');
+    }
+    await db.prisma.agentSession.delete({ where: { id: first.session.id } });
+    expect(await db.prisma.workspacePRDedicatedSession.findUnique({ where: { prId: 'a' } })).toMatchObject({ sessionId: null });
+    expect(await prDedicatedSessionAccessor.acquire(input)).toMatchObject({ outcome: 'created' });
+});
+it('restores nullable bindings and rejects foreign session workflow or PR ownership', async () => {
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, { workspaceId: 'w', prId: 'a', sessionId: null }))).toBe(true);
+    await db.prisma.agentSession.create({
+        data: {
+            id: 'human',
+            workspaceId: 'w',
+            workflow: 'implement',
+            provider: 'CLAUDE',
+            model: 'sonnet',
+            workspacePrId: 'a',
+        },
+    });
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, { workspaceId: 'w', prId: 'a', sessionId: 'human' }))).toBe(false);
+    await db.prisma.agentSession.update({
+        where: { id: 'human' },
+        data: { workflow: 'pr-monitoring', workspacePrId: 'b' },
+    });
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, { workspaceId: 'w', prId: 'a', sessionId: 'human' }))).toBe(false);
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, { workspaceId: 'foreign', prId: 'a', sessionId: null }))).toBe(false);
+    await db.prisma.agentSession.update({ where: { id: 'human' }, data: { workspacePrId: 'a' } });
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, { workspaceId: 'w', prId: 'a', sessionId: 'human' }))).toBe(true);
+    expect(await prDedicatedSessionAccessor.find({ workspaceId: 'w', prId: 'a' })).toMatchObject({
+        id: 'human',
+        workspacePrId: 'a',
+    });
+});
+it('does not treat a detached PR binding as an active recipient', async () => {
+    await prDedicatedSessionAccessor.acquire(input);
+    await db.prisma.workspacePR.update({ where: { id: 'a' }, data: { detachedAt: new Date() } });
+    expect(await prDedicatedSessionAccessor.find({ workspaceId: 'w', prId: 'a' })).toBeNull();
+});
+it('serializes actual adapter transactions across different workspace acquisition queues', async () => {
+    await db.prisma.workspace.create({
+        data: {
+            id: 'other',
+            projectId: 'project',
+            name: 'Other',
+            status: 'READY',
+            worktreePath: '/tmp/other',
+            prs: { create: { id: 'other-pr', url: 'https://github.com/o/r/pull/3' } },
+            prMonitoring: { create: { enabled: true, deliveryMode: 'DEDICATED', bindingRevision: 4 } },
+        },
+    });
+    const result = await Promise.all([
+        prDedicatedSessionAccessor.acquire(input),
+        prDedicatedSessionAccessor.acquire({ ...input, workspaceId: 'other', prId: 'other-pr' }),
+    ]);
+    expect(result.map((item) => item.outcome)).toEqual(['created', 'created']);
+    expect(await db.prisma.agentSession.count()).toBe(2);
+    expect(await db.prisma.workspacePRDedicatedSession.count()).toBe(2);
+});
+it.each([false, true])('rejects empty restored session ID even when an ordinary empty ID exists: %s', async (existing) => {
+    if (existing) {
+        await db.prisma.agentSession.create({
+            data: {
+                id: '',
+                workspaceId: 'w',
+                workflow: 'implement',
+                provider: 'CLAUDE',
+                model: 'sonnet',
+            },
+        });
+    }
+    expect(await db.prisma.$transaction((tx) => prDedicatedSessionAccessor.restore(tx, {
+        workspaceId: 'w',
+        prId: 'a',
+        sessionId: '',
+    }))).toBe(false);
+    expect(await db.prisma.workspacePRDedicatedSession.count()).toBe(0);
+});
+//# sourceMappingURL=pr-dedicated-session.accessor.test.js.map

package/dist/src/backend/services/session/resources/pr-dedicated-session.accessor.test.js.map

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

package/dist/src/backend/services/session/resources/provider-identity-rollover.integration.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=provider-identity-rollover.integration.test.d.ts.map

package/dist/src/backend/services/session/resources/provider-identity-rollover.integration.test.d.ts.map

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

package/dist/src/backend/services/session/resources/provider-identity-rollover.integration.test.js

@@ -0,0 +1,153 @@
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { createIntegrationDatabase, destroyIntegrationDatabase, } from '../../../testing/integration-db.js';
+let db;
+let accessor;
+let counter = 0;
+beforeAll(async () => {
+    db = await createIntegrationDatabase();
+    ({ agentSessionAccessor: accessor } = await vi.importActual('./agent-session.accessor'));
+});
+afterAll(async () => {
+    await destroyIntegrationDatabase(db);
+});
+async function fixture(withMetadata = true) {
+    const project = await db.prisma.project.create({
+        data: {
+            name: 'fixture',
+            slug: `identity-${counter++}`,
+            repoPath: '/tmp/identity-fixture',
+            worktreeBasePath: '/tmp/identity-fixture',
+            defaultBranch: 'main',
+        },
+    });
+    const workspace = await db.prisma.workspace.create({
+        data: { name: 'fixture', projectId: project.id },
+    });
+    return db.prisma.agentSession.create({
+        data: {
+            workspaceId: workspace.id,
+            workflow: 'default',
+            provider: 'CODEX',
+            model: 'test',
+            providerSessionId: 'old',
+            ...(withMetadata
+                ? { providerMetadata: { acpConfigSnapshot: { providerSessionId: 'old' } } }
+                : {}),
+        },
+    });
+}
+describe('atomic provider identity reconciliation in SQLite', () => {
+    it('guards initially null metadata for both config writes and identity rollover', async () => {
+        const configSession = await fixture(false);
+        expect(configSession.providerMetadata).toBeNull();
+        expect(await accessor.updateIfProviderIdentity(configSession.id, configSession, {
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'old' } },
+        })).toBe(1);
+        expect(await accessor.updateIfProviderIdentity(configSession.id, configSession, {
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'wrong' } },
+        })).toBe(0);
+        const session = await fixture(false);
+        expect(session.providerMetadata).toBeNull();
+        expect(await accessor.rolloverProviderIdentity(session.id, {
+            previousProviderSessionId: 'old',
+            providerSessionId: 'new',
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: null,
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'new' } },
+        })).toBe(1);
+        expect(await accessor.updateIfProviderIdentity(session.id, session, {
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'old' } },
+        })).toBe(0);
+    });
+    it('persists matching identity, config snapshot and audit in the final row', async () => {
+        const session = await fixture();
+        const metadata = {
+            acpConfigSnapshot: { providerSessionId: 'new' },
+            providerIdentityRollovers: [
+                { previousProviderSessionId: 'old', providerSessionId: 'new', incarnationId: 'runtime-1' },
+            ],
+        };
+        expect(await accessor.rolloverProviderIdentity(session.id, {
+            previousProviderSessionId: 'old',
+            providerSessionId: 'new',
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            providerMetadata: metadata,
+        })).toBe(1);
+        const persisted = await accessor.findById(session.id);
+        expect(persisted?.providerSessionId).toBe('new');
+        expect(persisted?.providerMetadata).toEqual(metadata);
+    });
+    it('rejects stale identity and stale metadata versions without a partial write', async () => {
+        const session = await fixture();
+        const expectedUpdatedAt = new Date(session.updatedAt.getTime() - 1);
+        const input = {
+            previousProviderSessionId: 'old',
+            providerSessionId: 'wrong',
+            expectedUpdatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'wrong' } },
+        };
+        expect(await accessor.rolloverProviderIdentity(session.id, input)).toBe(0);
+        expect(await accessor.rolloverProviderIdentity(session.id, {
+            ...input,
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            previousProviderSessionId: 'different',
+        })).toBe(0);
+        const persisted = await accessor.findById(session.id);
+        expect(persisted?.providerSessionId).toBe('old');
+        expect(persisted?.providerMetadata).toEqual(session.providerMetadata);
+    });
+    it('rejects changed metadata even when timestamps coincide', async () => {
+        const session = await fixture();
+        await db.prisma.agentSession.update({
+            where: { id: session.id },
+            data: { providerMetadata: { preserved: 'concurrent update' }, updatedAt: session.updatedAt },
+        });
+        expect(await accessor.rolloverProviderIdentity(session.id, {
+            previousProviderSessionId: 'old',
+            providerSessionId: 'wrong',
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            providerMetadata: {},
+        })).toBe(0);
+        expect((await accessor.findById(session.id))?.providerMetadata).toEqual({
+            preserved: 'concurrent update',
+        });
+    });
+    it('prevents an old configuration write from undoing an atomic rollover', async () => {
+        const session = await fixture();
+        const metadata = {
+            acpConfigSnapshot: { providerSessionId: 'new' },
+            providerIdentityRollovers: ['audit'],
+        };
+        await accessor.rolloverProviderIdentity(session.id, {
+            previousProviderSessionId: 'old',
+            providerSessionId: 'new',
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            providerMetadata: metadata,
+        });
+        expect(await accessor.updateIfProviderIdentity(session.id, session, {
+            providerMetadata: { acpConfigSnapshot: { providerSessionId: 'old' } },
+        })).toBe(0);
+        expect((await accessor.findById(session.id))?.providerMetadata).toEqual(metadata);
+    });
+    it('allows only one concurrent repair for the same original identity', async () => {
+        const session = await fixture();
+        const results = await Promise.all(['first', 'second'].map((providerSessionId) => accessor.rolloverProviderIdentity(session.id, {
+            previousProviderSessionId: 'old',
+            providerSessionId,
+            expectedUpdatedAt: session.updatedAt,
+            expectedProviderMetadata: session.providerMetadata,
+            providerMetadata: { acpConfigSnapshot: { providerSessionId } },
+        })));
+        expect([...results].sort()).toEqual([0, 1]);
+        const persisted = await accessor.findById(session.id);
+        expect(persisted?.providerMetadata).toEqual({
+            acpConfigSnapshot: { providerSessionId: persisted?.providerSessionId },
+        });
+    });
+});
+//# sourceMappingURL=provider-identity-rollover.integration.test.js.map

package/dist/src/backend/services/session/resources/provider-identity-rollover.integration.test.js.map

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

package/dist/src/backend/services/session/service/acp/acp-client-factory.d.ts

@@ -11,6 +11,7 @@ export type CreateAcpClientParams = {
     shutdownSignal: AcpStartupSignal;
     stopSignal: AcpStartupSignal;
     shouldDispatchRuntimeError(child: ChildProcess): boolean;
+    discardFailedResumeReplay?(): void;
 };
 export declare class AcpClientFactory {
     private acpStartupTimeoutMs;

package/dist/src/backend/services/session/service/acp/acp-client-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-client-factory.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAW9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGpF,OAAO,KAAK,EAAmB,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAYrF,OAAO,KAAK,EAAE,gBAAgB,EAAoB,MAAM,SAAS,CAAC;AAKlE,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,uBAAuB,CAAC;IAClC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,gBAAgB,CAAC;IACjC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,0BAA0B,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC;CAC1D,CAAC;AA8BF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,sBAAsB,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAiD;IAEhF,YAAY,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAAE,EAErD;IAED,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAM9C;IAED,oBAAoB,CAAC,OAAO,EAAE;QAC5B,sBAAsB,EAAE,OAAO,CAAC;QAChC,uBAAuB,EAAE,MAAM,MAAM,CAAC,UAAU,CAAC;KAClD,GAAG,IAAI,CAGP;IAEK,YAAY,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0I3E;YAEa,qBAAqB;YA4CrB,oBAAoB;IA6ClC,OAAO,CAAC,qBAAqB;CAgB9B;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAmCf"}
+{"version":3,"file":"acp-client-factory.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAW9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGpF,OAAO,KAAK,EAEV,uBAAuB,EAExB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,KAAK,EAAE,gBAAgB,EAAoB,MAAM,SAAS,CAAC;AAKlE,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,uBAAuB,CAAC;IAClC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,gBAAgB,CAAC;IACjC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,0BAA0B,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC;IACzD,yBAAyB,CAAC,IAAI,IAAI,CAAC;CACpC,CAAC;AA8BF,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,sBAAsB,CAAQ;IACtC,OAAO,CAAC,uBAAuB,CAAiD;IAEhF,YAAY,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,MAAM,CAAA;KAAE,EAErD;IAED,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAM9C;IAED,oBAAoB,CAAC,OAAO,EAAE;QAC5B,sBAAsB,EAAE,OAAO,CAAC;QAChC,uBAAuB,EAAE,MAAM,MAAM,CAAC,UAAU,CAAC;KAClD,GAAG,IAAI,CAGP;IAEK,YAAY,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiJ3E;YAEa,qBAAqB;YA8DrB,oBAAoB;IA6ClC,OAAO,CAAC,qBAAqB;CAgB9B;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAmCf"}

package/dist/src/backend/services/session/service/acp/acp-client-factory.js

@@ -139,7 +139,7 @@ export class AcpClientFactory {
             const agentCapabilities = initResult.agentCapabilities ?? {};
             const sessionInfo = await Promise.race([
                 withTimeout({
-                    promise: this.createOrResumeSession(connection, sessionId, options, agentCapabilities),
+                    promise: this.createOrResumeSession(connection, sessionId, options, agentCapabilities, params.discardFailedResumeReplay),
                     timeoutMs: startupTimeoutMs,
                     description: 'session creation',
                     cancelOn: startupCancelOn,
@@ -154,6 +154,7 @@ export class AcpClientFactory {
                 child,
                 provider: options.provider,
                 providerSessionId: sessionInfo.providerSessionId,
+                sessionCreationOutcome: sessionInfo.outcome,
                 agentCapabilities,
             });
             handle.configOptions = sessionInfo.configOptions;
@@ -170,7 +171,7 @@ export class AcpClientFactory {
             }
         }
     }
-    async createOrResumeSession(connection, sessionId, options, agentCapabilities) {
+    async createOrResumeSession(connection, sessionId, options, agentCapabilities, discardFailedResumeReplay) {
         const storedId = options.resumeProviderSessionId;
         const browseOnly = options.purpose === 'browse';
         const mcpServers = (options.mcpServers ?? []).map((server) => ({
@@ -181,13 +182,19 @@ export class AcpClientFactory {
         }));
         const resumed = await this.tryLoadStoredSession(connection, sessionId, options, agentCapabilities, mcpServers);
         if (resumed) {
-            return resumed;
+            return { ...resumed, outcome: { kind: 'resumed' } };
+        }
+        if (options.resumePolicy === 'require_existing') {
+            throw new Error('Cannot restore the existing provider conversation for PR monitoring');
         }
         if (browseOnly) {
             throw new AcpBrowseSessionUnavailableError(storedId
                 ? 'Provider does not support restoring this session for sub-agent browsing.'
                 : 'Stored provider session is required for sub-agent browsing.');
         }
+        if (storedId) {
+            discardFailedResumeReplay?.();
+        }
         const sessionResult = await connection.newSession({ cwd: options.workingDir, mcpServers });
         logger.info('ACP session created', {
             sessionId,
@@ -195,6 +202,13 @@ export class AcpClientFactory {
         });
         return {
             providerSessionId: sessionResult.sessionId,
+            outcome: storedId
+                ? {
+                    kind: 'resume_fallback',
+                    previousProviderSessionId: storedId,
+                    reason: agentCapabilities.loadSession === true ? 'load_failed' : 'load_unsupported',
+                }
+                : { kind: 'new' },
             configOptions: requireSessionConfigOptions(options.provider, 'newSession', sessionResult),
         };
     }