factory-factory 0.4.0 → 0.4.1

package/dist/src/backend/trpc/workspace/composition.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"composition.test.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/composition.test.ts"],"names":[],"mappings":""}

package/dist/src/backend/trpc/workspace/composition.test.js

@@ -0,0 +1,51 @@
+import { readFileSync } from 'node:fs';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { createFakeApplicationGraph } from '../../../test-utils/application-graph.js';
+const mockFindByProjectId = vi.hoisted(() => vi.fn());
+const mockCountPending = vi.hoisted(() => vi.fn());
+const mockGetWorkspaceWithWorktree = vi.hoisted(() => vi.fn());
+vi.mock('@/backend/trpc/workspace/workspace-helpers', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        getWorkspaceWithWorktree: mockGetWorkspaceWithWorktree,
+    };
+});
+import { workspaceRouter } from '../../../backend/trpc/workspace.trpc.js';
+import { unsafeCoerce } from '../../../test-utils/unsafe-coerce.js';
+describe('workspace router composition', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockFindByProjectId.mockResolvedValue([]);
+        mockCountPending.mockResolvedValue(0);
+        mockGetWorkspaceWithWorktree.mockResolvedValue(null);
+    });
+    it('does not read internal procedure definitions', () => {
+        const workspaceRouterSource = readFileSync(new URL('../workspace.trpc.ts', import.meta.url), 'utf8');
+        expect(workspaceRouterSource).not.toContain('_def.procedures');
+    });
+    it('keeps core, child-workspace, and file procedures on the public flat caller', async () => {
+        const fakeGraph = createFakeApplicationGraph('workspace-composition');
+        const services = {
+            ...fakeGraph.services,
+            workspaceDataService: Object.assign({}, fakeGraph.services.workspaceDataService, {
+                findByProjectId: mockFindByProjectId,
+            }),
+            workspaceNotificationService: Object.assign({}, fakeGraph.services.workspaceNotificationService, { countPending: mockCountPending }),
+        };
+        const caller = workspaceRouter.createCaller(unsafeCoerce({
+            appContext: {
+                services,
+                lifecycle: fakeGraph.lifecycle,
+                config: fakeGraph.config,
+            },
+        }));
+        await expect(caller.list({ projectId: 'project-1' })).resolves.toEqual([]);
+        await expect(caller.getPendingNotificationCount({ workspaceId: 'workspace-1' })).resolves.toBe(0);
+        await expect(caller.listAllFiles({ workspaceId: 'workspace-1', limit: 50 })).resolves.toEqual({
+            files: [],
+            hasWorktree: false,
+        });
+    });
+});
+//# sourceMappingURL=composition.test.js.map

package/dist/src/backend/trpc/workspace/composition.test.js.map

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

package/dist/src/backend/trpc/workspace/files.router.test.js

@@ -4,10 +4,14 @@ import path, { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const mockGetWorkspaceWithWorktree = vi.hoisted(() => vi.fn());
 const mockGetWorkspaceWithWorktreeOrThrow = vi.hoisted(() => vi.fn());
+const mockGitStateInvalidate = vi.hoisted(() => vi.fn());
 vi.mock('./workspace-helpers', () => ({
     getWorkspaceWithWorktree: (...args) => mockGetWorkspaceWithWorktree(...args),
     getWorkspaceWithWorktreeOrThrow: (...args) => mockGetWorkspaceWithWorktreeOrThrow(...args),
 }));
+vi.mock('@/backend/services/workspace-git-state.service', () => ({
+    workspaceGitStateService: { invalidate: mockGitStateInvalidate },
+}));
 import { workspaceFilesRouter } from './files.trpc.js';
 function createCaller() {
     return workspaceFilesRouter.createCaller({
@@ -19,6 +23,7 @@ function createCaller() {
                     warn: vi.fn(),
                     error: vi.fn(),
                 }),
+                workspaceGitStateService: { invalidate: mockGitStateInvalidate },
             },
         },
     });
@@ -112,6 +117,7 @@ describe('workspaceFilesRouter', () => {
             path: '.factory-factory/screenshots/shot.png',
         })).resolves.toEqual({ success: true });
         expect(() => unlinkSync(screenshotPath)).toThrow();
+        expect(mockGitStateInvalidate).toHaveBeenCalledWith(rootDir);
     });
 });
 //# sourceMappingURL=files.router.test.js.map

package/dist/src/backend/trpc/workspace/files.router.test.js.map

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

package/dist/src/backend/trpc/workspace/files.trpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/files.trpc.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,SAAS,EAKf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,KAAK,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AA+B5E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAqMQ,MAAM;sBAAQ,MAAM;sBAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEzE,CAAC"}
+{"version":3,"file":"files.trpc.d.ts","sourceRoot":"","sources":["../../../../../src/backend/trpc/workspace/files.trpc.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,SAAS,EAKf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,KAAK,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAgC5E,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAiNQ,MAAM;sBAAQ,MAAM;sBAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+EzE,CAAC"}

package/dist/src/backend/trpc/workspace/files.trpc.js

@@ -9,11 +9,11 @@ import { getWorkspaceWithWorktree, getWorkspaceWithWorktreeOrThrow } from './wor
 const loggerName = 'workspace-files-trpc';
 const getLogger = (ctx) => ctx.appContext.services.createLogger(loggerName);
 const SCREENSHOT_IMAGE_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.webp']);
-async function validateScreenshotPath(workspaceId, screenshotPath) {
+async function validateScreenshotPath(workspaceDataService, workspaceId, screenshotPath) {
     if (!screenshotPath.startsWith('.factory-factory/screenshots/')) {
         throw new Error('Invalid screenshot path');
     }
-    const { worktreePath } = await getWorkspaceWithWorktreeOrThrow(workspaceId);
+    const { worktreePath } = await getWorkspaceWithWorktreeOrThrow(workspaceDataService, workspaceId);
     if (!(await isPathSafe(worktreePath, screenshotPath))) {
         throw new Error('Invalid file path');
     }
@@ -21,7 +21,7 @@ async function validateScreenshotPath(workspaceId, screenshotPath) {
     if (!SCREENSHOT_IMAGE_EXTENSIONS.has(ext)) {
         throw new Error('Invalid image format');
     }
-    return path.join(worktreePath, screenshotPath);
+    return { fullPath: path.join(worktreePath, screenshotPath), worktreePath };
 }
 export const workspaceFilesRouter = router({
     listAllFiles: publicProcedure
@@ -32,7 +32,7 @@ export const workspaceFilesRouter = router({
     }))
         .query(async ({ ctx, input }) => {
         const logger = getLogger(ctx);
-        const result = await getWorkspaceWithWorktree(input.workspaceId);
+        const result = await getWorkspaceWithWorktree(ctx.appContext.services.workspaceDataService, input.workspaceId);
         if (!result) {
             logger.warn('No worktreePath for workspace', { workspaceId: input.workspaceId });
             return { files: [], hasWorktree: false };
@@ -64,7 +64,7 @@ export const workspaceFilesRouter = router({
     }))
         .query(async ({ ctx, input }) => {
         const logger = getLogger(ctx);
-        const result = await getWorkspaceWithWorktree(input.workspaceId);
+        const result = await getWorkspaceWithWorktree(ctx.appContext.services.workspaceDataService, input.workspaceId);
         logger.info('listFiles called', {
             workspaceId: input.workspaceId,
             worktreePath: result?.worktreePath,
@@ -124,8 +124,8 @@ export const workspaceFilesRouter = router({
         workspaceId: z.string(),
         path: z.string(),
     }))
-        .query(async ({ input }) => {
-        const { worktreePath } = await getWorkspaceWithWorktreeOrThrow(input.workspaceId);
+        .query(async ({ ctx, input }) => {
+        const { worktreePath } = await getWorkspaceWithWorktreeOrThrow(ctx.appContext.services.workspaceDataService, input.workspaceId);
         if (!(await isPathSafe(worktreePath, input.path))) {
             throw new Error('Invalid file path');
         }
@@ -168,8 +168,8 @@ export const workspaceFilesRouter = router({
     }),
     listScreenshots: publicProcedure
         .input(z.object({ workspaceId: z.string() }))
-        .query(async ({ input }) => {
-        const result = await getWorkspaceWithWorktree(input.workspaceId);
+        .query(async ({ ctx, input }) => {
+        const result = await getWorkspaceWithWorktree(ctx.appContext.services.workspaceDataService, input.workspaceId);
         if (!result) {
             return { screenshots: [], hasWorktree: false };
         }
@@ -208,8 +208,8 @@ export const workspaceFilesRouter = router({
         workspaceId: z.string(),
         path: z.string(),
     }))
-        .query(async ({ input }) => {
-        const fullPath = await validateScreenshotPath(input.workspaceId, input.path);
+        .query(async ({ ctx, input }) => {
+        const { fullPath } = await validateScreenshotPath(ctx.appContext.services.workspaceDataService, input.workspaceId, input.path);
         const buffer = await readFile(fullPath);
         const ext = path.extname(input.path).toLowerCase();
         const mimeMap = {
@@ -229,9 +229,10 @@ export const workspaceFilesRouter = router({
         workspaceId: z.string(),
         path: z.string(),
     }))
-        .mutation(async ({ input }) => {
-        const fullPath = await validateScreenshotPath(input.workspaceId, input.path);
+        .mutation(async ({ ctx, input }) => {
+        const { fullPath, worktreePath } = await validateScreenshotPath(ctx.appContext.services.workspaceDataService, input.workspaceId, input.path);
         await unlink(fullPath);
+        ctx.appContext.services.workspaceGitStateService.invalidate(worktreePath);
         return { success: true };
     }),
 });

package/dist/src/backend/trpc/workspace/files.trpc.js.map

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

package/dist/src/backend/trpc/workspace/git.router.test.js

@@ -5,32 +5,55 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const mockWorkspaceDataService = vi.hoisted(() => ({
     findByIdWithProject: vi.fn(),
 }));
-const mockGetWorkspaceWithWorktree = vi.hoisted(() => vi.fn());
 const mockGetWorkspaceWithProjectAndWorktreeOrThrow = vi.hoisted(() => vi.fn());
 const mockGitCommand = vi.hoisted(() => vi.fn());
-const mockGetMergeBase = vi.hoisted(() => vi.fn());
 const mockIsPathSafe = vi.hoisted(() => vi.fn(async () => true));
-vi.mock('@/backend/services/workspace', () => ({
-    workspaceDataService: mockWorkspaceDataService,
-}));
-vi.mock('./workspace-helpers', () => ({
-    getWorkspaceWithWorktree: (...args) => mockGetWorkspaceWithWorktree(...args),
-    getWorkspaceWithProjectAndWorktreeOrThrow: (...args) => mockGetWorkspaceWithProjectAndWorktreeOrThrow(...args),
-}));
+const mockGetSnapshot = vi.hoisted(() => vi.fn());
+const mockGetMergeBase = vi.hoisted(() => vi.fn());
+vi.mock('./workspace-helpers', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        getWorkspaceWithProjectAndWorktreeOrThrow: (...args) => mockGetWorkspaceWithProjectAndWorktreeOrThrow(...args),
+    };
+});
 vi.mock('@/backend/lib/shell', () => ({
     gitCommand: (...args) => mockGitCommand(...args),
 }));
 vi.mock('@/backend/lib/file-helpers', () => ({
     isPathSafe: mockIsPathSafe,
 }));
-vi.mock('@/backend/lib/git-helpers', async (importOriginal) => {
-    const actual = await importOriginal();
+import { workspaceGitRouter } from './git.trpc.js';
+function makeSnapshot(overrides = {}) {
     return {
-        ...actual,
-        getMergeBase: (...args) => mockGetMergeBase(...args),
+        worktreePath: '/repo/w1',
+        defaultBranch: 'main',
+        computedAt: 1,
+        status: {
+            files: [
+                { path: 'README.md', status: 'M', staged: false },
+                { path: 'package.json', status: 'M', staged: true },
+            ],
+            hasUncommitted: true,
+            ...overrides.status,
+        },
+        base: {
+            mergeBase: 'merge-base-sha',
+            noMergeBase: false,
+            stats: { total: 3, additions: 2, deletions: 1, hasUncommitted: true },
+            added: [{ path: 'new.ts', status: 'added' }],
+            modified: [{ path: 'mod.ts', status: 'modified' }],
+            deleted: [{ path: 'gone.ts', status: 'deleted' }],
+            ...overrides.base,
+        },
+        upstream: {
+            ref: 'origin/feature',
+            hasUpstream: true,
+            files: ['src/a.ts', 'src/b.ts'],
+            ...overrides.upstream,
+        },
     };
-});
-import { workspaceGitRouter } from './git.trpc.js';
+}
 function createCaller() {
     const logger = {
         debug: vi.fn(),
@@ -42,6 +65,11 @@ function createCaller() {
         appContext: {
             services: {
                 createLogger: () => logger,
+                workspaceDataService: mockWorkspaceDataService,
+                workspaceGitStateService: {
+                    getSnapshot: (...args) => mockGetSnapshot(...args),
+                    getMergeBase: (...args) => mockGetMergeBase(...args),
+                },
             },
         },
     });
@@ -56,187 +84,144 @@ describe('workspaceGitRouter', () => {
     afterEach(() => {
         rmSync(rootDir, { recursive: true, force: true });
     });
-    it('returns empty status when workspace has no worktree', async () => {
-        mockGetWorkspaceWithWorktree.mockResolvedValue(null);
+    it('preserves NOT_FOUND errors for every aggregate endpoint when the workspace is missing', async () => {
+        mockWorkspaceDataService.findByIdWithProject.mockResolvedValue(null);
+        const caller = createCaller();
+        const requests = [
+            caller.getGitStatus({ workspaceId: 'missing' }),
+            caller.getUnstagedChanges({ workspaceId: 'missing' }),
+            caller.getDiffVsMain({ workspaceId: 'missing' }),
+            caller.getUnpushedFiles({ workspaceId: 'missing' }),
+        ];
+        await Promise.all(requests.map((request) => expect(request).rejects.toMatchObject({
+            code: 'NOT_FOUND',
+            message: 'Workspace not found: missing',
+        })));
+    });
+    it('preserves empty aggregate responses when workspace has no worktree', async () => {
+        mockWorkspaceDataService.findByIdWithProject.mockResolvedValue({
+            id: 'w1',
+            worktreePath: null,
+            project: { defaultBranch: 'main' },
+        });
         const caller = createCaller();
         await expect(caller.getGitStatus({ workspaceId: 'w1' })).resolves.toEqual({
             files: [],
             hasUncommitted: false,
         });
-    });
-    it('throws when git status fails and handles empty unstaged workspace result', async () => {
-        const caller = createCaller();
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce({
-            workspace: { id: 'w1' },
-            worktreePath: '/repo',
-        });
-        mockGitCommand.mockResolvedValueOnce({
-            code: 1,
-            stdout: '',
-            stderr: 'fatal',
-        });
-        await expect(caller.getGitStatus({ workspaceId: 'w1' })).rejects.toThrow('Git status failed: fatal');
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce(null);
         await expect(caller.getUnstagedChanges({ workspaceId: 'w1' })).resolves.toEqual({
             files: [],
         });
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce({
-            workspace: { id: 'w1' },
-            worktreePath: '/repo',
+        await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).resolves.toEqual({
+            added: [],
+            modified: [],
+            deleted: [],
+            noMergeBase: false,
         });
-        mockGitCommand.mockResolvedValueOnce({
-            code: 1,
-            stdout: '',
-            stderr: 'status failed',
+        await expect(caller.getUnpushedFiles({ workspaceId: 'w1' })).resolves.toEqual({
+            files: [],
+            hasUpstream: false,
         });
-        await expect(caller.getUnstagedChanges({ workspaceId: 'w1' })).rejects.toThrow('Git status failed: status failed');
+        expect(mockGetSnapshot).not.toHaveBeenCalled();
     });
-    it('parses git status and unstaged changes', async () => {
-        mockGetWorkspaceWithWorktree.mockResolvedValue({
-            workspace: { id: 'w1' },
-            worktreePath: '/repo',
-        });
-        mockGitCommand.mockResolvedValue({
-            code: 0,
-            stdout: ' M README.md\nM  package.json\n',
-            stderr: '',
+    it('projects all aggregate endpoints from concurrent shared snapshot requests', async () => {
+        mockWorkspaceDataService.findByIdWithProject.mockResolvedValue({
+            id: 'w1',
+            worktreePath: '/repo/w1',
+            project: { defaultBranch: 'main' },
         });
+        const snapshot = makeSnapshot();
+        const sharedRequest = Promise.resolve(snapshot);
+        mockGetSnapshot.mockReturnValue(sharedRequest);
         const caller = createCaller();
-        await expect(caller.getGitStatus({ workspaceId: 'w1' })).resolves.toEqual({
+        const [status, unstaged, diff, unpushed] = await Promise.all([
+            caller.getGitStatus({ workspaceId: 'w1' }),
+            caller.getUnstagedChanges({ workspaceId: 'w1' }),
+            caller.getDiffVsMain({ workspaceId: 'w1' }),
+            caller.getUnpushedFiles({ workspaceId: 'w1' }),
+        ]);
+        expect(status).toEqual({
             files: [
                 { path: 'README.md', status: 'M', staged: false },
                 { path: 'package.json', status: 'M', staged: true },
             ],
             hasUncommitted: true,
         });
-        await expect(caller.getUnstagedChanges({ workspaceId: 'w1' })).resolves.toEqual({
+        expect(unstaged).toEqual({
             files: [{ path: 'README.md', status: 'M', staged: false }],
         });
-    });
-    it('handles diff-vs-main missing workspace/no-worktree and parses status lines', async () => {
-        const caller = createCaller();
-        mockWorkspaceDataService.findByIdWithProject.mockResolvedValueOnce(null);
-        await expect(caller.getDiffVsMain({ workspaceId: 'missing' })).rejects.toThrow('Workspace not found: missing');
-        mockWorkspaceDataService.findByIdWithProject.mockResolvedValueOnce({
-            id: 'w1',
-            worktreePath: null,
-            project: { defaultBranch: 'main' },
-        });
-        await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).resolves.toEqual({
-            added: [],
-            modified: [],
-            deleted: [],
-            noMergeBase: false,
-        });
-        mockWorkspaceDataService.findByIdWithProject.mockResolvedValueOnce({
-            id: 'w2',
-            worktreePath: '/repo',
-            project: {},
-        });
-        mockGetMergeBase.mockResolvedValueOnce('merge-base-sha');
-        mockGitCommand.mockResolvedValueOnce({
-            code: 0,
-            stdout: 'A\tnew.ts\nM\tmod.ts\nD\tgone.ts\nR100\told.ts\tnew.ts\nbad-line\n',
-            stderr: '',
-        });
-        await expect(caller.getDiffVsMain({ workspaceId: 'w2' })).resolves.toEqual({
+        expect(diff).toEqual({
             added: [{ path: 'new.ts', status: 'added' }],
             modified: [{ path: 'mod.ts', status: 'modified' }],
             deleted: [{ path: 'gone.ts', status: 'deleted' }],
             noMergeBase: false,
         });
-        mockWorkspaceDataService.findByIdWithProject.mockResolvedValueOnce({
-            id: 'w3',
-            worktreePath: '/repo',
-            project: { defaultBranch: 'main' },
+        expect(unpushed).toEqual({
+            files: ['src/a.ts', 'src/b.ts'],
+            hasUpstream: true,
         });
-        mockGetMergeBase.mockResolvedValueOnce('merge-base-sha');
-        mockGitCommand.mockResolvedValueOnce({
-            code: 1,
-            stdout: '',
-            stderr: 'diff failed',
+        expect(mockGetSnapshot).toHaveBeenCalledTimes(4);
+        expect(mockGetSnapshot).toHaveBeenCalledWith({
+            worktreePath: '/repo/w1',
+            defaultBranch: 'main',
         });
-        await expect(caller.getDiffVsMain({ workspaceId: 'w3' })).rejects.toThrow('Git diff failed: diff failed');
+        expect(mockGitCommand).not.toHaveBeenCalled();
     });
-    it('handles unpushed-files branches for upstream and diff failures', async () => {
+    it('throws only errors from the section requested by each endpoint', async () => {
         const caller = createCaller();
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce(null);
-        await expect(caller.getUnpushedFiles({ workspaceId: 'missing' })).resolves.toEqual({
-            files: [],
-            hasUpstream: false,
-        });
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce({
-            workspace: { id: 'w1' },
-            worktreePath: '/repo',
-        });
-        mockGitCommand.mockResolvedValueOnce({
-            code: 0,
-            stdout: '\n',
-            stderr: '',
-        });
-        await expect(caller.getUnpushedFiles({ workspaceId: 'w1' })).resolves.toEqual({
-            files: [],
-            hasUpstream: false,
-        });
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce({
-            workspace: { id: 'w2' },
-            worktreePath: '/repo',
+        mockWorkspaceDataService.findByIdWithProject.mockResolvedValue({
+            id: 'w1',
+            worktreePath: '/repo/w1',
+            project: { defaultBranch: 'main' },
         });
-        mockGitCommand
-            .mockResolvedValueOnce({
-            code: 0,
-            stdout: 'origin/main\n',
-            stderr: '',
-        })
-            .mockResolvedValueOnce({
-            code: 1,
-            stdout: '',
-            stderr: 'cannot diff',
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({
+            base: { statsError: 'stats failed', changesError: 'changes failed' },
+            upstream: { error: 'upstream failed' },
+        }));
+        await expect(caller.getGitStatus({ workspaceId: 'w1' })).resolves.toMatchObject({
+            hasUncommitted: true,
         });
-        await expect(caller.getUnpushedFiles({ workspaceId: 'w2' })).rejects.toThrow('Git diff failed: cannot diff');
-        mockGetWorkspaceWithWorktree.mockResolvedValueOnce({
-            workspace: { id: 'w3' },
-            worktreePath: '/repo',
+        await expect(caller.getUnstagedChanges({ workspaceId: 'w1' })).resolves.toEqual({
+            files: [{ path: 'README.md', status: 'M', staged: false }],
         });
-        mockGitCommand
-            .mockResolvedValueOnce({
-            code: 0,
-            stdout: 'origin/main\n',
-            stderr: '',
-        })
-            .mockResolvedValueOnce({
-            code: 0,
-            stdout: 'src/a.ts\n\nsrc/b.ts\n',
-            stderr: '',
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ status: { error: 'status failed' }, upstream: { error: 'upstream failed' } }));
+        await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).resolves.toMatchObject({
+            noMergeBase: false,
         });
-        await expect(caller.getUnpushedFiles({ workspaceId: 'w3' })).resolves.toEqual({
-            files: ['src/a.ts', 'src/b.ts'],
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ status: { error: 'status failed' }, base: { changesError: 'changes failed' } }));
+        await expect(caller.getUnpushedFiles({ workspaceId: 'w1' })).resolves.toMatchObject({
             hasUpstream: true,
         });
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ status: { error: 'status failed' } }));
+        await expect(caller.getGitStatus({ workspaceId: 'w1' })).rejects.toThrow('Git status failed: status failed');
+        await expect(caller.getUnstagedChanges({ workspaceId: 'w1' })).rejects.toThrow('Git status failed: status failed');
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ base: { changesError: 'changes failed' } }));
+        await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).rejects.toThrow('Git diff failed: changes failed');
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ base: { statsError: 'stats failed' } }));
+        await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).resolves.toMatchObject({
+            added: [{ path: 'new.ts', status: 'added' }],
+            noMergeBase: false,
+        });
+        mockGetSnapshot.mockResolvedValue(makeSnapshot({ upstream: { error: 'upstream failed' } }));
+        await expect(caller.getUnpushedFiles({ workspaceId: 'w1' })).rejects.toThrow('Git diff failed: upstream failed');
     });
-    it('handles diff-vs-main, unpushed files, and untracked file diff fallback', async () => {
+    it('handles no merge base, no upstream, and untracked file diff fallback', async () => {
         const caller = createCaller();
         mockWorkspaceDataService.findByIdWithProject.mockResolvedValue({
             id: 'w1',
             worktreePath: '/repo',
             project: { defaultBranch: 'main' },
         });
-        mockGetMergeBase.mockResolvedValueOnce(null);
+        mockGetSnapshot.mockResolvedValueOnce(makeSnapshot({
+            base: { mergeBase: null, noMergeBase: true, added: [], modified: [], deleted: [] },
+        }));
         await expect(caller.getDiffVsMain({ workspaceId: 'w1' })).resolves.toEqual({
             added: [],
             modified: [],
             deleted: [],
             noMergeBase: true,
         });
-        mockGetWorkspaceWithWorktree.mockResolvedValue({
-            workspace: { id: 'w1' },
-            worktreePath: '/repo',
-        });
-        mockGitCommand.mockResolvedValueOnce({
-            code: 1,
-            stdout: '',
-            stderr: 'no upstream',
-        });
+        mockGetSnapshot.mockResolvedValueOnce(makeSnapshot({ upstream: { ref: null, hasUpstream: false, files: [] } }));
         await expect(caller.getUnpushedFiles({ workspaceId: 'w1' })).resolves.toEqual({
             files: [],
             hasUpstream: false,
@@ -303,6 +288,11 @@ describe('workspaceGitRouter', () => {
             stderr: 'broken diff',
         });
         await expect(caller.getFileDiff({ workspaceId: 'w4', filePath })).rejects.toThrow('Git diff failed: broken diff');
+        expect(mockGetSnapshot).not.toHaveBeenCalled();
+        expect(mockGetMergeBase).toHaveBeenCalledWith({
+            worktreePath: '/repo',
+            defaultBranch: 'main',
+        });
     });
 });
 //# sourceMappingURL=git.router.test.js.map