factory-factory 0.3.21 → 0.4.1

package/dist/src/backend/services/workspace/service/worktree/worktree-init.test.js

@@ -6,7 +6,8 @@ import { SessionStatus } from '../../../../../shared/core/index.js';
 const mocks = vi.hoisted(() => ({
     findById: vi.fn(),
     findByIdWithProject: vi.fn(),
-    updateWorkspace: vi.fn(),
+    registerInitializedWorktree: vi.fn(),
+    setRunScriptCommands: vi.fn(),
     findByWorkspaceId: vi.fn(),
     ensureBaseBranchExists: vi.fn(),
     createWorktree: vi.fn(),
@@ -15,6 +16,7 @@ const mocks = vi.hoisted(() => ({
     getAuthenticatedUsername: vi.fn(),
     getIssue: vi.fn(),
     readConfig: vi.fn(),
+    syncWorkspaceCommandsFromFactoryConfig: vi.fn(),
     runStartupScript: vi.fn(),
     hasStartupScript: vi.fn(),
     startSession: vi.fn(),
@@ -48,16 +50,25 @@ vi.mock('@/backend/services/workspace', () => ({
         getInitMode: mocks.getInitMode,
         clearInitMode: mocks.clearInitMode,
     },
-    workspaceAccessor: {
+    workspaceDataService: {
         findById: mocks.findById,
         findByIdWithProject: mocks.findByIdWithProject,
-        update: mocks.updateWorkspace,
+    },
+    workspaceRelationshipsService: {
+        findParent: vi.fn(),
+    },
+    workspaceRunScriptService: {
+        registerInitializedWorktree: mocks.registerInitializedWorktree,
+        setCommands: mocks.setRunScriptCommands,
+    },
+    gitOpsService: {
+        ensureBaseBranchExists: mocks.ensureBaseBranchExists,
+        createWorktree: mocks.createWorktree,
+        createWorktreeFromExistingBranch: mocks.createWorktreeFromExistingBranch,
+        removeWorktree: mocks.removeWorktree,
     },
 }));
 vi.mock('@/backend/services/session', () => ({
-    agentSessionAccessor: {
-        findByWorkspaceId: mocks.findByWorkspaceId,
-    },
     sessionService: {
         startSession: mocks.startSession,
         stopWorkspaceSessions: mocks.stopWorkspaceSessions,
@@ -70,8 +81,7 @@ vi.mock('@/backend/services/session', () => ({
         tryDispatchNextMessage: mocks.tryDispatchNextMessage,
     },
     sessionDataService: {
-        createTerminalSession: mocks.createTerminalSession,
-        clearTerminalPid: mocks.clearTerminalPid,
+        findAgentSessionsByWorkspaceId: mocks.findByWorkspaceId,
     },
 }));
 vi.mock('@/backend/services/terminal', () => ({
@@ -81,13 +91,9 @@ vi.mock('@/backend/services/terminal', () => ({
         getTerminalsForWorkspace: mocks.getTerminalsForWorkspace,
         onExit: mocks.onExit,
     },
-}));
-vi.mock('@/backend/services/git-ops.service', () => ({
-    gitOpsService: {
-        ensureBaseBranchExists: mocks.ensureBaseBranchExists,
-        createWorktree: mocks.createWorktree,
-        createWorktreeFromExistingBranch: mocks.createWorktreeFromExistingBranch,
-        removeWorktree: mocks.removeWorktree,
+    terminalSessionService: {
+        registerSession: mocks.createTerminalSession,
+        releaseSessionPid: mocks.clearTerminalPid,
     },
 }));
 vi.mock('@/backend/services/github', () => ({
@@ -96,12 +102,13 @@ vi.mock('@/backend/services/github', () => ({
         getIssue: mocks.getIssue,
     },
 }));
-vi.mock('@/backend/services/factory-config.service', () => ({
+vi.mock('@/backend/services/run-script', () => ({
     FactoryConfigService: {
         readConfig: mocks.readConfig,
     },
-}));
-vi.mock('@/backend/services/run-script', () => ({
+    runScriptConfigPersistenceService: {
+        syncWorkspaceCommandsFromFactoryConfig: mocks.syncWorkspaceCommandsFromFactoryConfig,
+    },
     startupScriptService: {
         runStartupScript: mocks.runStartupScript,
         hasStartupScript: mocks.hasStartupScript,
@@ -143,7 +150,8 @@ describe('initializeWorkspaceWorktree orchestrator', () => {
         mocks.removeWorktree.mockResolvedValue(undefined);
         mocks.getAuthenticatedUsername.mockResolvedValue(null);
         mocks.getIssue.mockResolvedValue(null);
-        mocks.updateWorkspace.mockResolvedValue(undefined);
+        mocks.registerInitializedWorktree.mockResolvedValue(undefined);
+        mocks.setRunScriptCommands.mockResolvedValue(undefined);
         mocks.hasStartupScript.mockReturnValue(false);
         mocks.readConfig.mockResolvedValue({
             scripts: {
@@ -280,7 +288,7 @@ describe('initializeWorkspaceWorktree orchestrator', () => {
         });
         expect(mocks.stopWorkspaceSessions).toHaveBeenCalledWith('workspace-1');
         expect(mocks.destroyTerminal).toHaveBeenCalledWith('workspace-1', 'term-default');
-        expect(mocks.clearTerminalPid).toHaveBeenCalledWith('term-default');
+        expect(mocks.clearTerminalPid).toHaveBeenCalledWith('workspace-1', 'term-default');
         expect(mocks.markFailed).toHaveBeenCalled();
     });
     it('continues session normally when startup script reports failure (non-blocking)', async () => {

package/dist/src/backend/services/workspace/service/worktree/worktree-init.test.js.map

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

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.d.ts

@@ -2,7 +2,7 @@ import { workspaceAccessor } from '../../../../../backend/services/workspace/res
 export declare class WorktreePathSafetyError extends Error {
     constructor(message: string);
 }
-export declare function assertWorktreePathSafe(worktreePath: string, worktreeBasePath: string): void;
+export declare function assertWorktreePathSafe(worktreePath: string, worktreeBasePath: string): Promise<void>;
 type WorkspaceWithProject = Exclude<Awaited<ReturnType<typeof workspaceAccessor.findByIdWithProject>>, null | undefined>;
 interface WorktreeCleanupOptions {
     commitUncommitted: boolean;

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-lifecycle.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/workspace/service/worktree/worktree-lifecycle.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2DAA2D,CAAC;AAE9F,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAU3F;AAED,KAAK,oBAAoB,GAAG,OAAO,CACjC,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EACjE,IAAI,GAAG,SAAS,CACjB,CAAC;AAEF,UAAU,sBAAsB;IAC9B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAUD,cAAM,wBAAwB;IAE5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAExD,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAepE,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C,wBAAwB,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;CAiBjB;AAED,eAAO,MAAM,wBAAwB,0BAAiC,CAAC"}
+{"version":3,"file":"worktree-lifecycle.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/workspace/service/worktree/worktree-lifecycle.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2DAA2D,CAAC;AAI9F,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,OAAO,EAAE,MAAM;CAI5B;AAeD,wBAAsB,sBAAsB,CAC1C,YAAY,EAAE,MAAM,EACpB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED,KAAK,oBAAoB,GAAG,OAAO,CACjC,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EACjE,IAAI,GAAG,SAAS,CACjB,CAAC;AAEF,UAAU,sBAAsB;IAC9B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAUD,cAAM,wBAAwB;IAE5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAExD,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjF,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAepE,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C,wBAAwB,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;CAkBjB;AAED,eAAO,MAAM,wBAAwB,0BAAiC,CAAC"}

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.js

@@ -1,19 +1,55 @@
+import { lstat, realpath } from 'node:fs/promises';
 import * as path from 'node:path';
 import { pathExists } from '../../../../../backend/lib/file-helpers.js';
-import { gitOpsService } from '../../../../../backend/services/git-ops.service.js';
 import { workspaceAccessor } from '../../../../../backend/services/workspace/resources/workspace.accessor.js';
+import { workspaceGitStateService } from '../../../../../backend/services/workspace-git-state.service.js';
+import { gitOpsService } from './git-ops.service.js';
 export class WorktreePathSafetyError extends Error {
     constructor(message) {
         super(message);
         this.name = 'WorktreePathSafetyError';
     }
 }
-export function assertWorktreePathSafe(worktreePath, worktreeBasePath) {
+const isErrnoCode = (error, code) => error.code === code;
+function assertPathWithinBase(worktreePath, basePath) {
+    const basePrefix = `${basePath}${path.sep}`;
+    if (worktreePath === basePath || !worktreePath.startsWith(basePrefix)) {
+        throw new WorktreePathSafetyError('Workspace worktree path is outside the worktree base directory');
+    }
+}
+export async function assertWorktreePathSafe(worktreePath, worktreeBasePath) {
     const resolvedWorktreePath = path.resolve(worktreePath);
     const resolvedBasePath = path.resolve(worktreeBasePath);
-    const basePrefix = `${resolvedBasePath}${path.sep}`;
-    if (resolvedWorktreePath === resolvedBasePath || !resolvedWorktreePath.startsWith(basePrefix)) {
-        throw new WorktreePathSafetyError('Workspace worktree path is outside the worktree base directory');
+    assertPathWithinBase(resolvedWorktreePath, resolvedBasePath);
+    let worktreeStats;
+    try {
+        worktreeStats = await lstat(resolvedWorktreePath);
+    }
+    catch (error) {
+        if (isErrnoCode(error, 'ENOENT')) {
+            return;
+        }
+        throw error;
+    }
+    if (worktreeStats.isSymbolicLink()) {
+        throw new WorktreePathSafetyError('Workspace worktree path must not be a symbolic link');
+    }
+    let realBasePath;
+    let realWorktreePath;
+    try {
+        [realBasePath, realWorktreePath] = await Promise.all([
+            realpath(resolvedBasePath),
+            realpath(resolvedWorktreePath),
+        ]);
+    }
+    catch (error) {
+        throw new WorktreePathSafetyError(`Unable to verify workspace worktree path: ${error.message}`);
+    }
+    try {
+        assertPathWithinBase(realWorktreePath, realBasePath);
+    }
+    catch {
+        throw new WorktreePathSafetyError('Workspace worktree real path is outside the worktree base directory');
     }
 }
 function getProjectOrThrow(workspace) {
@@ -52,9 +88,10 @@ class WorktreeLifecycleService {
             return;
         }
         const project = getProjectOrThrow(workspace);
-        assertWorktreePathSafe(worktreePath, project.worktreeBasePath);
+        await assertWorktreePathSafe(worktreePath, project.worktreeBasePath);
         const worktreeExists = await pathExists(worktreePath);
         if (!worktreeExists) {
+            workspaceGitStateService.remove(worktreePath);
             return;
         }
         await gitOpsService.commitIfNeeded(worktreePath, workspace.name, options.commitUncommitted);

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.js.map

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

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.test.js

@@ -1,16 +1,131 @@
+import { mkdir, mkdtemp, rm, symlink } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { workspaceAccessor } from '../../../../../backend/services/workspace/index.js';
+import { workspaceAccessor } from '../../../../../backend/services/workspace/resources/workspace.accessor.js';
+import { workspaceGitStateService } from '../../../../../backend/services/workspace-git-state.service.js';
 import { unsafeCoerce } from '../../../../../test-utils/unsafe-coerce.js';
+import { gitOpsService } from './git-ops.service.js';
 import { assertWorktreePathSafe, WorktreePathSafetyError, worktreeLifecycleService, } from './worktree-lifecycle.service.js';
 describe('worktreeLifecycleService path safety', () => {
-    it('allows worktree paths under the base path', () => {
-        expect(() => assertWorktreePathSafe('/tmp/worktrees/ws-1', '/tmp/worktrees')).not.toThrow();
+    it('allows worktree paths under the base path', async () => {
+        await expect(assertWorktreePathSafe('/tmp/worktrees/ws-1', '/tmp/worktrees')).resolves.toBe(undefined);
     });
-    it('rejects worktree paths that equal the base path', () => {
-        expect(() => assertWorktreePathSafe('/tmp/worktrees', '/tmp/worktrees')).toThrow(WorktreePathSafetyError);
+    it('rejects worktree paths that equal the base path', async () => {
+        await expect(assertWorktreePathSafe('/tmp/worktrees', '/tmp/worktrees')).rejects.toThrow(WorktreePathSafetyError);
     });
-    it('rejects worktree paths outside the base path', () => {
-        expect(() => assertWorktreePathSafe('/tmp/worktrees/../other', '/tmp/worktrees')).toThrow(WorktreePathSafetyError);
+    it('rejects worktree paths outside the base path', async () => {
+        await expect(assertWorktreePathSafe('/tmp/worktrees/../other', '/tmp/worktrees')).rejects.toThrow(WorktreePathSafetyError);
+    });
+    it('rejects a worktree root that has been replaced with a symlink', async () => {
+        const tempRoot = await mkdtemp(path.join(tmpdir(), 'ff-worktree-safety-'));
+        const worktreeBasePath = path.join(tempRoot, 'worktrees');
+        const victimWorktreePath = path.join(worktreeBasePath, 'victim');
+        const swappedWorktreePath = path.join(worktreeBasePath, 'swapped');
+        await mkdir(victimWorktreePath, { recursive: true });
+        await symlink(victimWorktreePath, swappedWorktreePath, 'dir');
+        try {
+            await expect(assertWorktreePathSafe(swappedWorktreePath, worktreeBasePath)).rejects.toThrow(WorktreePathSafetyError);
+        }
+        finally {
+            await rm(tempRoot, { recursive: true, force: true });
+        }
+    });
+});
+describe('worktreeLifecycleService cleanup', () => {
+    beforeEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('refuses cleanup when the worktree root is a symlink to another worktree', async () => {
+        const tempRoot = await mkdtemp(path.join(tmpdir(), 'ff-worktree-cleanup-'));
+        const worktreeBasePath = path.join(tempRoot, 'worktrees');
+        const victimWorktreePath = path.join(worktreeBasePath, 'victim');
+        const swappedWorktreePath = path.join(worktreeBasePath, 'swapped');
+        const commitSpy = vi.spyOn(gitOpsService, 'commitIfNeeded').mockResolvedValue(undefined);
+        const removeSpy = vi.spyOn(gitOpsService, 'removeWorktree').mockResolvedValue(undefined);
+        await mkdir(victimWorktreePath, { recursive: true });
+        await symlink(victimWorktreePath, swappedWorktreePath, 'dir');
+        const workspace = unsafeCoerce({
+            name: 'Swapped workspace',
+            worktreePath: swappedWorktreePath,
+            project: {
+                repoPath: path.join(tempRoot, 'repo'),
+                worktreeBasePath,
+            },
+        });
+        try {
+            await expect(worktreeLifecycleService.cleanupWorkspaceWorktree(workspace, {
+                commitUncommitted: true,
+            })).rejects.toThrow(WorktreePathSafetyError);
+            expect(commitSpy).not.toHaveBeenCalled();
+            expect(removeSpy).not.toHaveBeenCalled();
+        }
+        finally {
+            await rm(tempRoot, { recursive: true, force: true });
+        }
+    });
+    it('leaves successful removal eviction to GitOpsService', async () => {
+        const tempRoot = await mkdtemp(path.join(tmpdir(), 'ff-worktree-cleanup-'));
+        const worktreeBasePath = path.join(tempRoot, 'worktrees');
+        const worktreePath = path.join(worktreeBasePath, 'workspace');
+        await mkdir(worktreePath, { recursive: true });
+        vi.spyOn(gitOpsService, 'commitIfNeeded').mockResolvedValue(undefined);
+        vi.spyOn(gitOpsService, 'removeWorktree').mockResolvedValue(undefined);
+        const removeStateSpy = vi.spyOn(workspaceGitStateService, 'remove');
+        const workspace = unsafeCoerce({
+            name: 'Workspace',
+            worktreePath,
+            project: { repoPath: path.join(tempRoot, 'repo'), worktreeBasePath },
+        });
+        try {
+            await worktreeLifecycleService.cleanupWorkspaceWorktree(workspace, {
+                commitUncommitted: true,
+            });
+            expect(removeStateSpy).not.toHaveBeenCalled();
+        }
+        finally {
+            await rm(tempRoot, { recursive: true, force: true });
+        }
+    });
+    it('evicts Git state when the worktree is already missing', async () => {
+        const worktreePath = '/tmp/worktrees/missing-workspace';
+        vi.spyOn(gitOpsService, 'commitIfNeeded').mockResolvedValue(undefined);
+        vi.spyOn(gitOpsService, 'removeWorktree').mockResolvedValue(undefined);
+        const removeStateSpy = vi.spyOn(workspaceGitStateService, 'remove');
+        const workspace = unsafeCoerce({
+            name: 'Missing workspace',
+            worktreePath,
+            project: { repoPath: '/tmp/repo', worktreeBasePath: '/tmp/worktrees' },
+        });
+        await worktreeLifecycleService.cleanupWorkspaceWorktree(workspace, {
+            commitUncommitted: true,
+        });
+        expect(removeStateSpy).toHaveBeenCalledWith(worktreePath);
+        expect(gitOpsService.commitIfNeeded).not.toHaveBeenCalled();
+        expect(gitOpsService.removeWorktree).not.toHaveBeenCalled();
+    });
+    it('does not evict Git state when worktree removal fails', async () => {
+        const tempRoot = await mkdtemp(path.join(tmpdir(), 'ff-worktree-cleanup-'));
+        const worktreeBasePath = path.join(tempRoot, 'worktrees');
+        const worktreePath = path.join(worktreeBasePath, 'workspace');
+        await mkdir(worktreePath, { recursive: true });
+        vi.spyOn(gitOpsService, 'commitIfNeeded').mockResolvedValue(undefined);
+        vi.spyOn(gitOpsService, 'removeWorktree').mockRejectedValue(new Error('remove failed'));
+        const removeStateSpy = vi.spyOn(workspaceGitStateService, 'remove');
+        const workspace = unsafeCoerce({
+            name: 'Workspace',
+            worktreePath,
+            project: { repoPath: path.join(tempRoot, 'repo'), worktreeBasePath },
+        });
+        try {
+            await expect(worktreeLifecycleService.cleanupWorkspaceWorktree(workspace, {
+                commitUncommitted: true,
+            })).rejects.toThrow('remove failed');
+            expect(removeStateSpy).not.toHaveBeenCalled();
+        }
+        finally {
+            await rm(tempRoot, { recursive: true, force: true });
+        }
     });
 });
 describe('worktreeLifecycleService init mode', () => {

package/dist/src/backend/services/workspace/service/worktree/worktree-lifecycle.service.test.js.map

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

package/dist/src/backend/services/workspace/types.d.ts

@@ -0,0 +1,32 @@
+import type { CIStatus, PRState, WorkspaceProviderSelection, WorkspaceStatus } from '../../../shared/core/index.js';
+export interface PRDiscoveryClaim {
+    branchName: string;
+    checkedAt: Date;
+    retryCount: number;
+    nextCheckAt: Date;
+}
+export interface PRSnapshotFields {
+    prNumber: number;
+    prState: PRState;
+    prReviewState: string | null;
+    prCiStatus: CIStatus;
+}
+export interface WorkspaceProviderSelectionSnapshot {
+    id: string;
+    defaultSessionProvider: WorkspaceProviderSelection;
+    ratchetSessionProvider: WorkspaceProviderSelection;
+}
+export interface WorkspaceFixerContext extends WorkspaceProviderSelectionSnapshot {
+    worktreePath: string | null;
+}
+export interface WorkspaceStatusSnapshot {
+    status: WorkspaceStatus;
+    prUrl: string | null;
+    prNumber: number | null;
+    initCompletedAt: Date | null;
+}
+export interface WorkspacePRContext {
+    branchName: string | null;
+    prUrl: string | null;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/src/backend/services/workspace/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/backend/services/workspace/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,QAAQ,CAAC;CACtB;AAED,MAAM,WAAW,kCAAkC;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,sBAAsB,EAAE,0BAA0B,CAAC;IACnD,sBAAsB,EAAE,0BAA0B,CAAC;CACpD;AAED,MAAM,WAAW,qBAAsB,SAAQ,kCAAkC;IAC/E,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,eAAe,EAAE,IAAI,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB"}

package/dist/src/backend/services/workspace/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/backend/services/workspace/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/backend/services/workspace/types.ts"],"names":[],"mappings":""}

package/dist/src/backend/services/workspace-git-state.service.d.ts

@@ -0,0 +1,99 @@
+import { type GitStatusFile } from '../../backend/lib/git-helpers.js';
+import { type ExecResult } from '../../backend/lib/shell.js';
+export interface WorkspaceGitStateInput {
+    worktreePath: string;
+    defaultBranch: string;
+}
+export interface WorkspaceGitStats {
+    total: number;
+    additions: number;
+    deletions: number;
+    hasUncommitted: boolean;
+}
+export interface WorkspaceGitStateSnapshot {
+    worktreePath: string;
+    defaultBranch: string;
+    computedAt: number;
+    status: {
+        files: GitStatusFile[];
+        hasUncommitted: boolean;
+        error?: string;
+    };
+    base: {
+        mergeBase: string | null;
+        noMergeBase: boolean;
+        stats: WorkspaceGitStats | null;
+        added: Array<{
+            path: string;
+            status: 'added';
+        }>;
+        modified: Array<{
+            path: string;
+            status: 'modified';
+        }>;
+        deleted: Array<{
+            path: string;
+            status: 'deleted';
+        }>;
+        statsError?: string;
+        changesError?: string;
+    };
+    upstream: {
+        ref: string | null;
+        hasUpstream: boolean;
+        files: string[];
+        error?: string;
+    };
+}
+type RunGit = (args: string[], cwd: string) => Promise<ExecResult>;
+type ReadFile = (filePath: string) => Promise<string>;
+interface WatchHandle {
+    close(): void;
+    on(event: 'error', listener: (error: Error) => void): WatchHandle;
+}
+type WatchPath = (filePath: string, options: {
+    recursive: boolean;
+}, listener: (eventType: string, filename: string | null) => void) => WatchHandle;
+interface WorkspaceGitStateServiceOptions {
+    runGit?: RunGit;
+    now?: () => number;
+    readFile?: ReadFile;
+    watchPath?: WatchPath;
+}
+export declare function getStats(snapshot: WorkspaceGitStateSnapshot): WorkspaceGitStats | null;
+export declare class WorkspaceGitStateService {
+    private readonly runGit;
+    private readonly now;
+    private readonly readFile;
+    private readonly watchPath;
+    private readonly cache;
+    private readonly inFlight;
+    private readonly generations;
+    private readonly activeCalculations;
+    private readonly watchers;
+    constructor(options?: WorkspaceGitStateServiceOptions);
+    getSnapshot(input: WorkspaceGitStateInput): Promise<WorkspaceGitStateSnapshot>;
+    getMergeBase(input: WorkspaceGitStateInput): Promise<string | null>;
+    invalidate(worktreePath: string): void;
+    invalidateAll(): void;
+    remove(worktreePath: string): void;
+    stop(): void;
+    getCachedSnapshotCount(): number;
+    getGenerationCount(): number;
+    private invalidatePath;
+    private invalidateMatching;
+    private cacheKey;
+    private ensureWatcher;
+    private installWatchers;
+    private resolveWatchRoots;
+    private scheduleInvalidation;
+    private activateFallback;
+    private closeWatcher;
+    private calculate;
+    private populateFallbackFileTotal;
+    private findMergeBase;
+    private calculateUpstream;
+}
+export declare const workspaceGitStateService: WorkspaceGitStateService;
+export {};
+//# sourceMappingURL=workspace-git-state.service.d.ts.map

package/dist/src/backend/services/workspace-git-state.service.d.ts.map

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