factory-factory 0.4.0 → 0.4.1

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

@@ -2,9 +2,10 @@ 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 { gitOpsService } from '../../../../../backend/services/git-ops.service.js';
-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', async () => {
@@ -63,6 +64,69 @@ describe('worktreeLifecycleService cleanup', () => {
             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', () => {
     beforeEach(() => {

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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"}

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

@@ -0,0 +1,393 @@
+import { watch } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+import { parseGitStatusOutput, parseNumstatOutput, } from '../../backend/lib/git-helpers.js';
+import { gitCommand } from '../../backend/lib/shell.js';
+const WATCH_DEBOUNCE_MS = 100;
+const DEGRADED_TTL_MS = 5000;
+const FALLBACK_TTL_MS = 300_000;
+const IGNORED_WORKTREE_WATCH_DIRECTORIES = new Set([
+    'node_modules',
+    '.next',
+    'dist',
+    'build',
+    'out',
+    '.turbo',
+    'coverage',
+]);
+const defaultWatchPath = (filePath, options, listener) => watch(filePath, options, (eventType, filename) => {
+    listener(eventType, filename?.toString() ?? null);
+});
+function hasErrorCode(error, code) {
+    return error.code === code;
+}
+function commandError(result) {
+    return result.stderr.trim() || result.stdout.trim() || 'Git command failed';
+}
+function isDegraded(snapshot) {
+    return Boolean(snapshot.status.error ||
+        snapshot.base.statsError ||
+        snapshot.base.changesError ||
+        snapshot.upstream.error);
+}
+function shouldIgnoreWorktreeWatchEvent(filename) {
+    if (!filename) {
+        return false;
+    }
+    const [topLevelDirectory] = filename.split(/[\\/]+/);
+    return IGNORED_WORKTREE_WATCH_DIRECTORIES.has(topLevelDirectory ?? '');
+}
+function parseNameStatus(output) {
+    const added = [];
+    const modified = [];
+    const deleted = [];
+    for (const line of output.split('\n')) {
+        const [rawStatus, filePath, destinationPath] = line.split('\t');
+        if (!filePath) {
+            continue;
+        }
+        const status = rawStatus?.[0];
+        switch (status) {
+            case 'A':
+                added.push({ path: filePath, status: 'added' });
+                break;
+            case 'M':
+            case 'T':
+                modified.push({ path: filePath, status: 'modified' });
+                break;
+            case 'D':
+                deleted.push({ path: filePath, status: 'deleted' });
+                break;
+            case 'R':
+                deleted.push({ path: filePath, status: 'deleted' });
+                if (destinationPath) {
+                    added.push({ path: destinationPath, status: 'added' });
+                }
+                break;
+            case 'C':
+                if (destinationPath) {
+                    added.push({ path: destinationPath, status: 'added' });
+                }
+                break;
+        }
+    }
+    return { added, modified, deleted };
+}
+export function getStats(snapshot) {
+    if (snapshot.status.error) {
+        return null;
+    }
+    return snapshot.base.stats;
+}
+export class WorkspaceGitStateService {
+    runGit;
+    now;
+    readFile;
+    watchPath;
+    cache = new Map();
+    inFlight = new Map();
+    generations = new Map();
+    activeCalculations = new Map();
+    watchers = new Map();
+    constructor(options = {}) {
+        this.runGit = options.runGit ?? gitCommand;
+        this.now = options.now ?? Date.now;
+        this.readFile = options.readFile ?? ((filePath) => readFile(filePath, 'utf8'));
+        this.watchPath = options.watchPath ?? defaultWatchPath;
+    }
+    getSnapshot(input) {
+        const normalizedInput = { ...input, worktreePath: path.resolve(input.worktreePath) };
+        const watcher = this.ensureWatcher(normalizedInput.worktreePath);
+        const key = this.cacheKey(normalizedInput);
+        const cached = this.cache.get(key);
+        if (cached) {
+            const ttl = isDegraded(cached.snapshot)
+                ? DEGRADED_TTL_MS
+                : watcher.mode === 'healthy'
+                    ? Number.POSITIVE_INFINITY
+                    : FALLBACK_TTL_MS;
+            if (this.now() - cached.snapshot.computedAt < ttl) {
+                return Promise.resolve(cached.snapshot);
+            }
+        }
+        if (cached) {
+            this.cache.delete(key);
+        }
+        const existing = this.inFlight.get(key);
+        if (existing) {
+            return existing;
+        }
+        const generation = this.generations.get(key) ?? 0;
+        this.activeCalculations.set(key, (this.activeCalculations.get(key) ?? 0) + 1);
+        const calculation = watcher.setup
+            .then(() => this.calculate(normalizedInput))
+            .then((snapshot) => {
+            if ((this.generations.get(key) ?? 0) === generation) {
+                this.cache.set(key, { snapshot });
+            }
+            return snapshot;
+        })
+            .finally(() => {
+            if (this.inFlight.get(key) === calculation) {
+                this.inFlight.delete(key);
+            }
+            const activeCount = this.activeCalculations.get(key) ?? 0;
+            if (activeCount <= 1) {
+                this.activeCalculations.delete(key);
+                this.generations.delete(key);
+            }
+            else {
+                this.activeCalculations.set(key, activeCount - 1);
+            }
+        });
+        this.inFlight.set(key, calculation);
+        return calculation;
+    }
+    getMergeBase(input) {
+        return this.findMergeBase({ ...input, worktreePath: path.resolve(input.worktreePath) });
+    }
+    invalidate(worktreePath) {
+        this.invalidatePath(path.resolve(worktreePath));
+    }
+    invalidateAll() {
+        this.invalidateMatching(() => true);
+    }
+    remove(worktreePath) {
+        const normalizedPath = path.resolve(worktreePath);
+        this.closeWatcher(normalizedPath);
+        this.invalidatePath(normalizedPath);
+    }
+    stop() {
+        for (const worktreePath of [...this.watchers.keys()]) {
+            this.closeWatcher(worktreePath);
+        }
+        this.invalidateAll();
+    }
+    getCachedSnapshotCount() {
+        return this.cache.size;
+    }
+    getGenerationCount() {
+        return this.generations.size;
+    }
+    invalidatePath(worktreePath) {
+        const keyPrefix = `${worktreePath}\0`;
+        this.invalidateMatching((key) => key.startsWith(keyPrefix));
+    }
+    invalidateMatching(shouldInvalidate) {
+        const keys = new Set([
+            ...this.cache.keys(),
+            ...this.inFlight.keys(),
+            ...this.generations.keys(),
+            ...this.activeCalculations.keys(),
+        ]);
+        for (const key of keys) {
+            if (!shouldInvalidate(key)) {
+                continue;
+            }
+            this.cache.delete(key);
+            this.generations.set(key, (this.generations.get(key) ?? 0) + 1);
+            this.inFlight.delete(key);
+            if (!this.activeCalculations.has(key)) {
+                this.generations.delete(key);
+            }
+        }
+    }
+    cacheKey(input) {
+        return `${input.worktreePath}\0${input.defaultBranch}`;
+    }
+    ensureWatcher(worktreePath) {
+        const existing = this.watchers.get(worktreePath);
+        if (existing) {
+            return existing;
+        }
+        const record = {
+            mode: 'healthy',
+            handles: [],
+            setup: Promise.resolve(),
+        };
+        record.setup = this.installWatchers(worktreePath, record).catch(() => {
+            this.activateFallback(record);
+        });
+        this.watchers.set(worktreePath, record);
+        return record;
+    }
+    async installWatchers(worktreePath, record) {
+        const roots = await this.resolveWatchRoots(worktreePath);
+        for (const root of roots) {
+            if (record.mode !== 'healthy' || this.watchers.get(worktreePath) !== record) {
+                return;
+            }
+            const handle = this.watchPath(root, { recursive: true }, (_eventType, filename) => {
+                if (root === worktreePath && shouldIgnoreWorktreeWatchEvent(filename)) {
+                    return;
+                }
+                this.scheduleInvalidation(worktreePath, record);
+            });
+            record.handles.push(handle);
+            handle.on('error', () => {
+                this.activateFallback(record);
+            });
+        }
+    }
+    async resolveWatchRoots(worktreePath) {
+        const roots = [worktreePath];
+        const dotGitPath = path.join(worktreePath, '.git');
+        let dotGitContents;
+        try {
+            dotGitContents = await this.readFile(dotGitPath);
+        }
+        catch (error) {
+            if (hasErrorCode(error, 'EISDIR')) {
+                return roots;
+            }
+            throw error;
+        }
+        const gitDirMatch = dotGitContents.match(/^gitdir:\s*(.+)$/im);
+        if (!gitDirMatch?.[1]) {
+            throw new Error(`Invalid Git worktree metadata: ${dotGitPath}`);
+        }
+        const gitDir = path.resolve(path.dirname(dotGitPath), gitDirMatch[1].trim());
+        roots.push(gitDir);
+        try {
+            const commonDirContents = await this.readFile(path.join(gitDir, 'commondir'));
+            const commonDir = commonDirContents.trim();
+            if (commonDir) {
+                roots.push(path.resolve(gitDir, commonDir));
+            }
+        }
+        catch (error) {
+            if (!hasErrorCode(error, 'ENOENT')) {
+                throw error;
+            }
+        }
+        return [...new Set(roots)];
+    }
+    scheduleInvalidation(worktreePath, record) {
+        if (record.mode !== 'healthy' || this.watchers.get(worktreePath) !== record) {
+            return;
+        }
+        if (record.debounceTimer) {
+            clearTimeout(record.debounceTimer);
+        }
+        record.debounceTimer = setTimeout(() => {
+            record.debounceTimer = undefined;
+            if (record.mode === 'healthy' && this.watchers.get(worktreePath) === record) {
+                this.invalidate(worktreePath);
+            }
+        }, WATCH_DEBOUNCE_MS);
+    }
+    activateFallback(record) {
+        record.mode = 'fallback';
+        if (record.debounceTimer) {
+            clearTimeout(record.debounceTimer);
+            record.debounceTimer = undefined;
+        }
+        for (const handle of record.handles.splice(0)) {
+            try {
+                handle.close();
+            }
+            catch {
+            }
+        }
+    }
+    closeWatcher(worktreePath) {
+        const record = this.watchers.get(worktreePath);
+        if (!record) {
+            return;
+        }
+        this.watchers.delete(worktreePath);
+        this.activateFallback(record);
+    }
+    async calculate(input) {
+        const statusResult = await this.runGit(['--no-optional-locks', 'status', '--porcelain'], input.worktreePath);
+        const statusFiles = statusResult.code === 0 ? parseGitStatusOutput(statusResult.stdout) : [];
+        const status = {
+            files: statusFiles,
+            hasUncommitted: statusFiles.length > 0,
+        };
+        if (statusResult.code !== 0) {
+            status.error = commandError(statusResult);
+        }
+        const mergeBase = await this.findMergeBase(input);
+        const diffArgs = mergeBase ? ['diff', '--numstat', mergeBase] : ['diff', '--numstat'];
+        const numstatResult = await this.runGit(diffArgs, input.worktreePath);
+        const base = {
+            mergeBase,
+            noMergeBase: mergeBase === null,
+            stats: numstatResult.code === 0
+                ? { ...parseNumstatOutput(numstatResult.stdout), hasUncommitted: status.hasUncommitted }
+                : { total: 0, additions: 0, deletions: 0, hasUncommitted: status.hasUncommitted },
+            added: [],
+            modified: [],
+            deleted: [],
+        };
+        if (numstatResult.code !== 0) {
+            base.statsError = commandError(numstatResult);
+        }
+        let nameStatusResult = null;
+        if (mergeBase) {
+            nameStatusResult = await this.runGit(['diff', '--name-status', mergeBase], input.worktreePath);
+            if (nameStatusResult.code === 0) {
+                Object.assign(base, parseNameStatus(nameStatusResult.stdout));
+            }
+            else {
+                base.changesError = commandError(nameStatusResult);
+            }
+        }
+        await this.populateFallbackFileTotal(base, numstatResult, nameStatusResult, input.worktreePath);
+        const upstream = await this.calculateUpstream(input.worktreePath);
+        return {
+            ...input,
+            computedAt: this.now(),
+            status,
+            base,
+            upstream,
+        };
+    }
+    async populateFallbackFileTotal(base, numstatResult, nameStatusResult, worktreePath) {
+        if (numstatResult.code === 0) {
+            return;
+        }
+        const fileListResult = nameStatusResult ?? (await this.runGit(['diff', '--name-only'], worktreePath));
+        if (fileListResult.code === 0) {
+            base.stats.total = fileListResult.stdout
+                .split('\n')
+                .filter((line) => line.trim().length > 0).length;
+        }
+    }
+    async findMergeBase(input) {
+        for (const candidate of [`origin/${input.defaultBranch}`, input.defaultBranch]) {
+            const result = await this.runGit(['merge-base', 'HEAD', candidate], input.worktreePath);
+            if (result.code === 0 && result.stdout.trim()) {
+                return result.stdout.trim();
+            }
+        }
+        return null;
+    }
+    async calculateUpstream(worktreePath) {
+        const upstreamResult = await this.runGit(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'], worktreePath);
+        const ref = upstreamResult.code === 0 ? upstreamResult.stdout.trim() : '';
+        if (!ref) {
+            return { ref: null, hasUpstream: false, files: [] };
+        }
+        const diffResult = await this.runGit(['diff', '--name-only', `${ref}...HEAD`], worktreePath);
+        if (diffResult.code !== 0) {
+            return {
+                ref,
+                hasUpstream: true,
+                files: [],
+                error: commandError(diffResult),
+            };
+        }
+        return {
+            ref,
+            hasUpstream: true,
+            files: diffResult.stdout
+                .split('\n')
+                .map((line) => line.trim())
+                .filter(Boolean),
+        };
+    }
+}
+export const workspaceGitStateService = new WorkspaceGitStateService();
+//# sourceMappingURL=workspace-git-state.service.js.map