factory-factory 0.3.21 → 0.4.1

package/dist/src/backend/services/{git-clone.service.test.js → workspace/service/worktree/git-clone.service.test.js}

@@ -1,14 +1,21 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 const mockPathExists = vi.fn();
+const mockMkdir = vi.fn();
+const mockRm = vi.fn();
+const mockExecCommand = vi.fn();
 const mockGitCommand = vi.fn();
+vi.mock('node:fs/promises', () => ({
+    mkdir: (...args) => mockMkdir(...args),
+    rm: (...args) => mockRm(...args),
+}));
 vi.mock('@/backend/lib/file-helpers', () => ({
     pathExists: (...args) => mockPathExists(...args),
 }));
 vi.mock('@/backend/lib/shell', () => ({
-    execCommand: vi.fn(),
+    execCommand: (...args) => mockExecCommand(...args),
     gitCommand: (...args) => mockGitCommand(...args),
 }));
-vi.mock('./logger.service', () => ({
+vi.mock('@/backend/services/logger.service', () => ({
     createLogger: () => ({
         info: vi.fn(),
         debug: vi.fn(),
@@ -112,4 +119,77 @@ describe('GitCloneService.checkExistingClone', () => {
         await expect(gitCloneService.checkExistingClone('/tmp/source-tree/src')).resolves.toBe('not_repo');
     });
 });
+describe('GitCloneService.clone', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockMkdir.mockResolvedValue(undefined);
+        mockRm.mockResolvedValue(undefined);
+        mockPathExists.mockResolvedValue(false);
+    });
+    it('runs git clone with a timeout and non-interactive prompts disabled', async () => {
+        mockExecCommand.mockResolvedValue({ code: 0, stdout: '', stderr: 'Receiving objects' });
+        await expect(gitCloneService.clone('https://github.com/purplefish-ai/factory-factory', '/tmp/repos/purplefish-ai/factory-factory')).resolves.toEqual({ success: true, output: 'Receiving objects' });
+        expect(mockMkdir).toHaveBeenCalledWith('/tmp/repos/purplefish-ai', { recursive: true });
+        expect(mockExecCommand).toHaveBeenCalledWith('git', [
+            'clone',
+            '--progress',
+            'https://github.com/purplefish-ai/factory-factory',
+            '/tmp/repos/purplefish-ai/factory-factory',
+        ], expect.objectContaining({
+            timeout: 600_000,
+            env: expect.objectContaining({
+                GCM_INTERACTIVE: 'never',
+                GIT_TERMINAL_PROMPT: '0',
+                GIT_SSH_COMMAND: expect.stringContaining('BatchMode=yes'),
+            }),
+        }));
+    });
+    it('cleans up a failed partial clone destination that did not exist before cloning', async () => {
+        mockPathExists.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
+        mockExecCommand.mockResolvedValue({
+            code: 128,
+            stdout: '',
+            stderr: 'fatal: remote end hung up unexpectedly',
+        });
+        await expect(gitCloneService.clone('https://github.com/purplefish-ai/factory-factory', '/tmp/repos/purplefish-ai/factory-factory')).resolves.toEqual({
+            success: false,
+            output: 'fatal: remote end hung up unexpectedly',
+            error: 'fatal: remote end hung up unexpectedly',
+        });
+        expect(mockRm).toHaveBeenCalledWith('/tmp/repos/purplefish-ai/factory-factory', {
+            recursive: true,
+            force: true,
+        });
+    });
+    it('does not remove a destination that existed before a failed clone attempt', async () => {
+        mockPathExists.mockResolvedValue(true);
+        mockExecCommand.mockResolvedValue({
+            code: 128,
+            stdout: '',
+            stderr: 'fatal: destination path already exists',
+        });
+        await expect(gitCloneService.clone('https://github.com/purplefish-ai/factory-factory', '/tmp/repos/purplefish-ai/factory-factory')).resolves.toMatchObject({
+            success: false,
+            error: 'fatal: destination path already exists',
+        });
+        expect(mockRm).not.toHaveBeenCalled();
+    });
+    it('returns a clear error when git clone times out', async () => {
+        mockPathExists.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
+        mockExecCommand.mockResolvedValue({
+            code: -1,
+            stdout: '',
+            stderr: 'git timed out after 600000ms',
+            timedOut: true,
+        });
+        await expect(gitCloneService.clone('https://github.com/purplefish-ai/factory-factory', '/tmp/repos/purplefish-ai/factory-factory')).resolves.toMatchObject({
+            success: false,
+            error: 'Clone timed out after 600 seconds',
+        });
+        expect(mockRm).toHaveBeenCalledWith('/tmp/repos/purplefish-ai/factory-factory', {
+            recursive: true,
+            force: true,
+        });
+    });
+});
 //# sourceMappingURL=git-clone.service.test.js.map

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

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

package/dist/src/backend/services/{git-ops.service.d.ts → workspace/service/worktree/git-ops.service.d.ts}

@@ -1,12 +1,12 @@
-import { getWorkspaceGitStats } from '../../backend/lib/git-helpers.js';
-export type WorkspaceGitStats = Awaited<ReturnType<typeof getWorkspaceGitStats>>;
+import { type WorkspaceGitStats } from '../../../../../backend/services/workspace-git-state.service.js';
+export type { WorkspaceGitStats };
 interface ProjectPaths {
     repoPath: string;
     worktreeBasePath: string;
 }
 declare class GitOpsService {
     private normalizeBranchName;
-    getWorkspaceGitStats(worktreePath: string, defaultBranch: string): Promise<WorkspaceGitStats>;
+    getWorkspaceGitStats(worktreePath: string, defaultBranch: string): Promise<WorkspaceGitStats | null>;
     isValidGitRepo(worktreePath: string): Promise<boolean>;
     commitIfNeeded(worktreePath: string, workspaceName: string, commitUncommitted: boolean): Promise<void>;
     removeWorktree(worktreePath: string, project: ProjectPaths): Promise<void>;
@@ -25,5 +25,4 @@ declare class GitOpsService {
     isBranchCheckedOut(project: ProjectPaths, branchName: string): Promise<boolean>;
 }
 export declare const gitOpsService: GitOpsService;
-export {};
 //# sourceMappingURL=git-ops.service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-ops.service.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/workspace/service/worktree/git-ops.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,iBAAiB,EAEvB,MAAM,gDAAgD,CAAC;AAExD,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,UAAU,YAAY;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,cAAM,aAAa;IACjB,OAAO,CAAC,mBAAmB;IAUrB,oBAAoB,CACxB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAS9B,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKtD,cAAc,CAClB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,OAAO,GACzB,OAAO,CAAC,IAAI,CAAC;IA+CV,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC1E,sBAAsB,CAC1B,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC;IA4BV,cAAc,CAClB,OAAO,EAAE,YAAY,EACrB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAelD,gCAAgC,CACpC,OAAO,EAAE,YAAY,EACrB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAkBlD,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBtF;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}

package/dist/src/backend/services/{git-ops.service.js → workspace/service/worktree/git-ops.service.js}

@@ -1,10 +1,10 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { TRPCError } from '@trpc/server';
-import { GitClientFactory } from '../../backend/clients/git.client.js';
-import { pathExists } from '../../backend/lib/file-helpers.js';
-import { getWorkspaceGitStats } from '../../backend/lib/git-helpers.js';
-import { gitCommand } from '../../backend/lib/shell.js';
+import { GitClientFactory } from '../../../../../backend/clients/git.client.js';
+import { ApplicationError } from '../../../../../backend/lib/application-error.js';
+import { pathExists } from '../../../../../backend/lib/file-helpers.js';
+import { gitCommand } from '../../../../../backend/lib/shell.js';
+import { getStats, workspaceGitStateService, } from '../../../../../backend/services/workspace-git-state.service.js';
 class GitOpsService {
     normalizeBranchName(branchName) {
         if (branchName.startsWith('origin/')) {
@@ -15,8 +15,9 @@ class GitOpsService {
         }
         return branchName;
     }
-    getWorkspaceGitStats(worktreePath, defaultBranch) {
-        return getWorkspaceGitStats(worktreePath, defaultBranch);
+    async getWorkspaceGitStats(worktreePath, defaultBranch) {
+        const snapshot = await workspaceGitStateService.getSnapshot({ worktreePath, defaultBranch });
+        return getStats(snapshot);
     }
     async isValidGitRepo(worktreePath) {
         const result = await gitCommand(['rev-parse', '--git-dir'], worktreePath);
@@ -29,34 +30,31 @@ class GitOpsService {
         }
         const statusResult = await gitCommand(['status', '--porcelain'], worktreePath);
         if (statusResult.code !== 0) {
-            throw new TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: `Git status failed: ${statusResult.stderr || statusResult.stdout}`,
+            throw new ApplicationError('INTERNAL_ERROR', 'Git status failed', {
+                cause: statusResult,
             });
         }
         if (statusResult.stdout.trim().length === 0) {
             return;
         }
         if (!commitUncommitted) {
-            throw new TRPCError({
-                code: 'PRECONDITION_FAILED',
-                message: 'Workspace has uncommitted changes. Enable commit-before-archive to proceed.',
-            });
+            throw new ApplicationError('PRECONDITION_FAILED', 'Workspace has uncommitted changes. Enable commit-before-archive to proceed.');
         }
-        const addResult = await gitCommand(['add', '-A'], worktreePath);
-        if (addResult.code !== 0) {
-            throw new TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: `Git add failed: ${addResult.stderr || addResult.stdout}`,
-            });
+        try {
+            const addResult = await gitCommand(['add', '-A'], worktreePath);
+            if (addResult.code !== 0) {
+                throw new ApplicationError('INTERNAL_ERROR', 'Git add failed', { cause: addResult });
+            }
+            const commitMessage = `Archive workspace ${workspaceName}`;
+            const commitResult = await gitCommand(['commit', '-m', commitMessage, '--no-verify'], worktreePath);
+            if (commitResult.code !== 0) {
+                throw new ApplicationError('INTERNAL_ERROR', 'Git commit failed', {
+                    cause: commitResult,
+                });
+            }
         }
-        const commitMessage = `Archive workspace ${workspaceName}`;
-        const commitResult = await gitCommand(['commit', '-m', commitMessage, '--no-verify'], worktreePath);
-        if (commitResult.code !== 0) {
-            throw new TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: `Git commit failed: ${commitResult.stderr || commitResult.stdout}`,
-            });
+        finally {
+            workspaceGitStateService.invalidate(worktreePath);
         }
     }
     async removeWorktree(worktreePath, project) {
@@ -65,14 +63,33 @@ class GitOpsService {
             worktreeBasePath: project.worktreeBasePath,
         });
         const worktreeName = path.basename(worktreePath);
-        const registeredWorktree = await gitClient.checkWorktreeExists(worktreeName);
+        const expectedWorktreePath = path.resolve(worktreePath);
+        const configuredWorktreePath = path.resolve(gitClient.getWorktreePath(worktreeName));
+        if (expectedWorktreePath !== configuredWorktreePath) {
+            throw new Error('Refusing to remove worktree because requested path does not match project');
+        }
+        const registeredWorktree = (await gitClient.listWorktreesWithBranches()).find((entry) => path.resolve(entry.path) === expectedWorktreePath);
         if (registeredWorktree) {
-            await gitClient.deleteWorktree(worktreeName);
+            try {
+                await gitClient.deleteWorktree(worktreeName);
+            }
+            catch (error) {
+                workspaceGitStateService.invalidate(worktreePath);
+                throw error;
+            }
+            workspaceGitStateService.remove(worktreePath);
             return;
         }
         if (await pathExists(worktreePath)) {
-            await fs.rm(worktreePath, { recursive: true, force: true });
+            try {
+                await fs.rm(worktreePath, { recursive: true, force: true });
+            }
+            catch (error) {
+                workspaceGitStateService.invalidate(worktreePath);
+                throw error;
+            }
         }
+        workspaceGitStateService.remove(worktreePath);
     }
     async ensureBaseBranchExists(project, baseBranch, defaultBranch) {
         const gitClient = GitClientFactory.forProject({
@@ -98,18 +115,28 @@ class GitOpsService {
             repoPath: project.repoPath,
             worktreeBasePath: project.worktreeBasePath,
         });
-        const worktreeInfo = await gitClient.createWorktree(worktreeName, baseBranch, options);
         const worktreePath = gitClient.getWorktreePath(worktreeName);
-        return { worktreePath, branchName: worktreeInfo.branchName };
+        try {
+            const worktreeInfo = await gitClient.createWorktree(worktreeName, baseBranch, options);
+            return { worktreePath, branchName: worktreeInfo.branchName };
+        }
+        finally {
+            workspaceGitStateService.invalidate(worktreePath);
+        }
     }
     async createWorktreeFromExistingBranch(project, worktreeName, branchRef) {
         const gitClient = GitClientFactory.forProject({
             repoPath: project.repoPath,
             worktreeBasePath: project.worktreeBasePath,
         });
-        const worktreeInfo = await gitClient.createWorktreeFromExistingBranch(worktreeName, branchRef);
         const worktreePath = gitClient.getWorktreePath(worktreeName);
-        return { worktreePath, branchName: worktreeInfo.branchName };
+        try {
+            const worktreeInfo = await gitClient.createWorktreeFromExistingBranch(worktreeName, branchRef);
+            return { worktreePath, branchName: worktreeInfo.branchName };
+        }
+        finally {
+            workspaceGitStateService.invalidate(worktreePath);
+        }
     }
     async isBranchCheckedOut(project, branchName) {
         const gitClient = GitClientFactory.forProject({

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

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

package/dist/src/backend/services/workspace/service/worktree/git-ops.service.test.d.ts.map

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

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

@@ -0,0 +1,227 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ApplicationError } from '../../../../../backend/lib/application-error.js';
+const mockGitCommand = vi.hoisted(() => vi.fn());
+const mockGetSnapshot = vi.hoisted(() => vi.fn());
+const mockGetStats = vi.hoisted(() => vi.fn());
+const mockPathExists = vi.hoisted(() => vi.fn());
+const mockRm = vi.hoisted(() => vi.fn());
+const mockGitStateInvalidate = vi.hoisted(() => vi.fn());
+const mockGitStateRemove = vi.hoisted(() => vi.fn());
+const mockGitClient = vi.hoisted(() => ({
+    checkWorktreeExists: vi.fn(),
+    deleteWorktree: vi.fn(),
+    isBlankRepository: vi.fn(),
+    branchExists: vi.fn(),
+    createWorktree: vi.fn(),
+    createWorktreeFromExistingBranch: vi.fn(),
+    getWorktreePath: vi.fn(),
+    listWorktreesWithBranches: vi.fn(),
+}));
+vi.mock('@/backend/lib/shell', () => ({
+    gitCommand: (...args) => mockGitCommand(...args),
+}));
+vi.mock('@/backend/lib/file-helpers', () => ({
+    pathExists: (...args) => mockPathExists(...args),
+}));
+vi.mock('node:fs/promises', () => ({
+    rm: (...args) => mockRm(...args),
+}));
+vi.mock('@/backend/clients/git.client', () => ({
+    GitClientFactory: {
+        forProject: () => mockGitClient,
+    },
+}));
+vi.mock('@/backend/services/workspace-git-state.service', () => ({
+    getStats: (...args) => mockGetStats(...args),
+    workspaceGitStateService: {
+        getSnapshot: (...args) => mockGetSnapshot(...args),
+        invalidate: mockGitStateInvalidate,
+        remove: mockGitStateRemove,
+    },
+}));
+import { gitOpsService } from './git-ops.service.js';
+const project = {
+    repoPath: '/repo',
+    worktreeBasePath: '/repo/worktrees',
+};
+describe('gitOpsService', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockGitClient.getWorktreePath.mockImplementation((name) => `/repo/worktrees/${name}`);
+    });
+    it('derives workspace git stats from the shared snapshot', async () => {
+        const snapshot = { base: { stats: { total: 3, additions: 2, deletions: 1 } } };
+        const stats = { total: 3, additions: 2, deletions: 1, hasUncommitted: false };
+        mockGetSnapshot.mockResolvedValue(snapshot);
+        mockGetStats.mockReturnValue(stats);
+        await expect(gitOpsService.getWorkspaceGitStats('/repo/w1', 'main')).resolves.toEqual(stats);
+        expect(mockGetSnapshot).toHaveBeenCalledWith({
+            worktreePath: '/repo/w1',
+            defaultBranch: 'main',
+        });
+        expect(mockGetStats).toHaveBeenCalledWith(snapshot);
+    });
+    it('commitIfNeeded skips invalid repo, validates status, and commits when requested', async () => {
+        mockGitCommand.mockResolvedValueOnce({ code: 1, stdout: '', stderr: 'not a repo' });
+        await expect(gitOpsService.commitIfNeeded('/repo/w1', 'W1', true)).resolves.toBeUndefined();
+        mockGitCommand
+            .mockResolvedValueOnce({ code: 0, stdout: '.git', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: '', stderr: '' });
+        await expect(gitOpsService.commitIfNeeded('/repo/w1', 'W1', true)).resolves.toBeUndefined();
+        mockGitCommand
+            .mockResolvedValueOnce({ code: 0, stdout: '.git', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: ' M file.ts\n', stderr: '' });
+        await expect(gitOpsService.commitIfNeeded('/repo/w1', 'W1', false)).rejects.toMatchObject({
+            code: 'PRECONDITION_FAILED',
+        });
+        mockGitCommand
+            .mockResolvedValueOnce({ code: 0, stdout: '.git', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: ' M file.ts\n', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: '', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: '[main] Archive workspace W1', stderr: '' });
+        await expect(gitOpsService.commitIfNeeded('/repo/w1', 'W1', true)).resolves.toBeUndefined();
+        expect(mockGitCommand).toHaveBeenCalledWith(['add', '-A'], '/repo/w1');
+        expect(mockGitCommand).toHaveBeenCalledWith(['commit', '-m', 'Archive workspace W1', '--no-verify'], '/repo/w1');
+        expect(mockGitStateInvalidate).toHaveBeenCalledOnce();
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/w1');
+    });
+    it('invalidates staged archive changes when the commit fails', async () => {
+        const commitResult = { code: 1, stdout: '', stderr: 'commit failed' };
+        mockGitCommand
+            .mockResolvedValueOnce({ code: 0, stdout: '.git', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: ' M file.ts\n', stderr: '' })
+            .mockResolvedValueOnce({ code: 0, stdout: '', stderr: '' })
+            .mockResolvedValueOnce(commitResult);
+        await expect(gitOpsService.commitIfNeeded('/repo/w1', 'W1', true)).rejects.toMatchObject({
+            code: 'INTERNAL_ERROR',
+            message: 'Git commit failed',
+            cause: commitResult,
+        });
+        expect(mockGitStateInvalidate).toHaveBeenCalledOnce();
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/w1');
+    });
+    it('sanitizes git command failures while retaining the raw result as the cause', async () => {
+        const statusResult = {
+            code: 1,
+            stdout: 'status stdout SECRET_STDERR_TOKEN',
+            stderr: 'status stderr SECRET_STDERR_TOKEN',
+        };
+        mockGitCommand
+            .mockResolvedValueOnce({ code: 0, stdout: '.git', stderr: '' })
+            .mockResolvedValueOnce(statusResult);
+        const error = await gitOpsService
+            .commitIfNeeded('/repo/w1', 'W1', true)
+            .catch((caught) => caught);
+        expect(error).toBeInstanceOf(ApplicationError);
+        expect(error).toMatchObject({
+            code: 'INTERNAL_ERROR',
+            message: 'Git status failed',
+            cause: statusResult,
+        });
+        expect(error.message).not.toContain('SECRET_STDERR_TOKEN');
+    });
+    it('removeWorktree uses git when registered and fs fallback otherwise', async () => {
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([{ path: '/repo/worktrees/w1' }]);
+        await gitOpsService.removeWorktree('/repo/worktrees/w1', project);
+        expect(mockGitClient.deleteWorktree).toHaveBeenCalledWith('w1');
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([]);
+        mockPathExists.mockResolvedValueOnce(true);
+        await gitOpsService.removeWorktree('/repo/worktrees/w2', project);
+        expect(mockRm).toHaveBeenCalledWith('/repo/worktrees/w2', { recursive: true, force: true });
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([]);
+        mockPathExists.mockResolvedValueOnce(false);
+        await gitOpsService.removeWorktree('/repo/worktrees/w3', project);
+        expect(mockRm).toHaveBeenCalledTimes(1);
+    });
+    it('evicts Git state after successful registered worktree removal', async () => {
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([{ path: '/repo/worktrees/w1' }]);
+        await gitOpsService.removeWorktree('/repo/worktrees/w1', project);
+        expect(mockGitClient.deleteWorktree).toHaveBeenCalledWith('w1');
+        expect(mockGitStateRemove).toHaveBeenCalledOnce();
+        expect(mockGitStateRemove).toHaveBeenCalledWith('/repo/worktrees/w1');
+    });
+    it('evicts Git state after successful filesystem-fallback removal', async () => {
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([]);
+        mockPathExists.mockResolvedValueOnce(true);
+        await gitOpsService.removeWorktree('/repo/worktrees/w1', project);
+        expect(mockRm).toHaveBeenCalledWith('/repo/worktrees/w1', { recursive: true, force: true });
+        expect(mockGitStateRemove).toHaveBeenCalledOnce();
+        expect(mockGitStateRemove).toHaveBeenCalledWith('/repo/worktrees/w1');
+    });
+    it('does not evict Git state when registered worktree removal fails', async () => {
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([{ path: '/repo/worktrees/w1' }]);
+        mockGitClient.deleteWorktree.mockRejectedValueOnce(new Error('remove failed'));
+        await expect(gitOpsService.removeWorktree('/repo/worktrees/w1', project)).rejects.toThrow('remove failed');
+        expect(mockGitStateRemove).not.toHaveBeenCalled();
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/worktrees/w1');
+    });
+    it('removeWorktree refuses requested paths that do not match the configured worktree path', async () => {
+        await expect(gitOpsService.removeWorktree('/repo/other/w1', project)).rejects.toThrow('Refusing to remove worktree because requested path does not match project');
+        expect(mockGitClient.listWorktreesWithBranches).not.toHaveBeenCalled();
+        expect(mockGitClient.deleteWorktree).not.toHaveBeenCalled();
+        expect(mockRm).not.toHaveBeenCalled();
+    });
+    it('removeWorktree matches the registered worktree by full path when basenames collide', async () => {
+        const collidingProject = {
+            repoPath: '/repo/factory-factory',
+            worktreeBasePath: '/repo/factory-factory/worktrees',
+        };
+        mockGitClient.getWorktreePath.mockImplementation((name) => `/repo/factory-factory/worktrees/${name}`);
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([
+            { path: '/repo/factory-factory' },
+            { path: '/repo/factory-factory/worktrees/factory-factory' },
+        ]);
+        await gitOpsService.removeWorktree('/repo/factory-factory/worktrees/factory-factory', collidingProject);
+        expect(mockGitClient.deleteWorktree).toHaveBeenCalledWith('factory-factory');
+        expect(mockRm).not.toHaveBeenCalled();
+    });
+    it('ensures base branch exists unless repository is blank', async () => {
+        mockGitClient.isBlankRepository.mockResolvedValueOnce(true);
+        await expect(gitOpsService.ensureBaseBranchExists(project, 'main', 'main')).resolves.toBeUndefined();
+        mockGitClient.isBlankRepository.mockResolvedValueOnce(false);
+        mockGitClient.branchExists.mockResolvedValueOnce(true);
+        await expect(gitOpsService.ensureBaseBranchExists(project, 'origin/main', 'main')).resolves.toBeUndefined();
+        mockGitClient.isBlankRepository.mockResolvedValueOnce(false);
+        mockGitClient.branchExists.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
+        await expect(gitOpsService.ensureBaseBranchExists(project, 'refs/heads/main', 'main')).resolves.toBeUndefined();
+        mockGitClient.isBlankRepository.mockResolvedValueOnce(false);
+        mockGitClient.branchExists.mockResolvedValueOnce(false).mockResolvedValueOnce(false);
+        await expect(gitOpsService.ensureBaseBranchExists(project, 'feature/missing', 'main')).rejects.toThrow("Branch 'feature/missing' does not exist");
+    });
+    it('creates worktrees and checks branch checkout status', async () => {
+        mockGitClient.createWorktree.mockResolvedValueOnce({ branchName: 'feature/w1' });
+        mockGitClient.getWorktreePath.mockReturnValue('/repo/worktrees/w1');
+        await expect(gitOpsService.createWorktree(project, 'w1', 'main', {
+            workspaceName: 'W1',
+            branchPrefix: 'pf',
+        })).resolves.toEqual({
+            worktreePath: '/repo/worktrees/w1',
+            branchName: 'feature/w1',
+        });
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/worktrees/w1');
+        mockGitClient.createWorktreeFromExistingBranch.mockResolvedValueOnce({ branchName: 'main' });
+        mockGitClient.getWorktreePath.mockReturnValue('/repo/worktrees/w2');
+        await expect(gitOpsService.createWorktreeFromExistingBranch(project, 'w2', 'origin/main')).resolves.toEqual({
+            worktreePath: '/repo/worktrees/w2',
+            branchName: 'main',
+        });
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/worktrees/w2');
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([
+            { path: '/repo', branchName: 'main' },
+            { path: '/repo/worktrees/w1', branchName: 'feature/test' },
+            { path: '/tmp/external', branchName: 'feature/test' },
+        ]);
+        await expect(gitOpsService.isBranchCheckedOut(project, 'origin/feature/test')).resolves.toBe(true);
+        mockGitClient.listWorktreesWithBranches.mockResolvedValueOnce([
+            { path: '/repo', branchName: 'main' },
+            { path: '/repo/worktrees/w2', branchName: 'feature/other' },
+        ]);
+        await expect(gitOpsService.isBranchCheckedOut(project, 'feature/test')).resolves.toBe(false);
+    });
+    it('invalidates a partial worktree when creation fails', async () => {
+        mockGitClient.createWorktree.mockRejectedValueOnce(new Error('create failed'));
+        await expect(gitOpsService.createWorktree(project, 'w1', 'main', { workspaceName: 'W1' })).rejects.toThrow('create failed');
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith('/repo/worktrees/w1');
+    });
+});
+//# sourceMappingURL=git-ops.service.test.js.map

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

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