@bevel-software/platform-core-backend 0.14.0 → 0.15.1

package/dist/modules/workflow/git/git.service.d.ts

@@ -1,4 +1,4 @@
-import type { AuthUser, BranchInfo, CommitAttribution, IGitService, PrFileStatus, PullRequestFile, ShareChangesRequest, WorkingTreeStatus } from '@bevel-software/platform-shared';
+import type { AuthUser, BranchInfo, CommitAttribution, IGitService, RemoteSyncPullResult, PrFileStatus, PullRequestFile, ShareChangesRequest, WorkingTreeStatus } from '@bevel-software/platform-shared';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { WorkflowHooks } from '../workflow-hooks.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
@@ -299,7 +299,45 @@ export declare class GitService implements IGitService {
      * drift apart — which is precisely the failure class this guards against.
      */
     private refreshRemoteBranchRef;
-    pull(workspaceId: string): Promise<void>;
+    /** A commit-free tree, for diffing against a HEAD that did not exist yet. */
+    private static readonly EMPTY_TREE_SHA;
+    /**
+     * The checked-out branch by its symbolic ref, which an UNBORN HEAD (a clone
+     * of an empty upstream) still has — `rev-parse --abbrev-ref HEAD` does not
+     * resolve there, so the tolerant tree reads below would never be reached.
+     */
+    private checkedOutBranch;
+    /**
+     * Whether origin still has `branch`. `ls-remote --exit-code` answers with
+     * exit status 2 for "no such ref" — the one failure that is a fact about the
+     * branch rather than about reaching the host, which propagates.
+     */
+    remoteBranchExists(workspaceId: string, branch: string): Promise<boolean>;
+    /** Whether origin has ANY branch — an empty repository has none. */
+    private remoteHasAnyBranch;
+    /** `git rev-parse --verify` that answers null for a rev that does not resolve (an unborn HEAD). */
+    private revParseOrNull;
+    /**
+     * Refresh `refs/remotes/origin/<branch>` for a sync, naming the one failure
+     * that is not "origin unreachable": the branch no longer exists there.
+     */
+    private refreshRemoteBranchRefForSync;
+    /**
+     * Rebase the checked-out branch onto `remoteRef`, turning a content
+     * conflict into the typed error the workflow layer queues recovery for.
+     * Shared by `pull` and `syncFromRemote` so the two cannot drift.
+     */
+    private rebaseOntoRemote;
+    /**
+     * Repo-relative paths whose content differs between two commits. Rename-
+     * aware: a renamed file reports both its old and new path, so a viewer
+     * holding the OLD path learns it is gone. Caller holds the mutex.
+     */
+    private changedPathsBetween;
+    syncFromRemote(workspaceId: string): Promise<RemoteSyncPullResult>;
+    pull(workspaceId: string): Promise<{
+        treeChanged: boolean;
+    }>;
     /**
      * Does the checked-out branch carry commits its remote-tracking ref
      * doesn't reach? Purely local (`rev-list` against

package/dist/modules/workflow/git/git.service.d.ts.map

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

package/dist/modules/workflow/git/git.service.js

@@ -7,7 +7,7 @@ import { WorkspaceMutex } from '../../kb-fs/mutex.js';
 import { assertInsideRepo } from '../../kb-fs/repo-path.js';
 import { cloneTrackingConfigArgs, SAFE_IMPLICIT_FETCH_ARGS } from '../../kb-fs/clone-config.js';
 import { assertValidBranchName, assertValidRelativePath, isBranchAuthoredBy, isOwnSuggestionsBranch, isProtectedBranch, PROTECTED_BRANCHES, } from '../../kb-fs/branch-name.js';
-import { BranchAuthorshipError, WorkflowValidationError, ProtectedBranchError, PullRebaseConflictError, } from '../../../shared/domain-errors.js';
+import { BranchAuthorshipError, WorkflowValidationError, ProtectedBranchError, PullRebaseConflictError, RemoteBranchGoneError, isMissingRemoteBranchFailure, } from '../../../shared/domain-errors.js';
 const execFileAsync = promisify(execFile);
 function redact(msg) {
     const token = process.env.GITHUB_TOKEN;
@@ -1369,68 +1369,241 @@ export class GitService {
         ]);
         return `refs/remotes/origin/${branch}`;
     }
-    async pull(workspaceId) {
+    /** A commit-free tree, for diffing against a HEAD that did not exist yet. */
+    static EMPTY_TREE_SHA = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+    /**
+     * The checked-out branch by its symbolic ref, which an UNBORN HEAD (a clone
+     * of an empty upstream) still has — `rev-parse --abbrev-ref HEAD` does not
+     * resolve there, so the tolerant tree reads below would never be reached.
+     */
+    async checkedOutBranch(cwd) {
+        const { stdout } = await this.git(cwd, ['symbolic-ref', '--short', 'HEAD']);
+        return stdout.trim();
+    }
+    /**
+     * Whether origin still has `branch`. `ls-remote --exit-code` answers with
+     * exit status 2 for "no such ref" — the one failure that is a fact about the
+     * branch rather than about reaching the host, which propagates.
+     */
+    async remoteBranchExists(workspaceId, branch) {
+        assertValidBranchName(branch);
+        const cwd = await this.repoDir(workspaceId);
+        try {
+            await this.git(cwd, ['ls-remote', '--exit-code', '--heads', 'origin', `refs/heads/${branch}`]);
+            return true;
+        }
+        catch (err) {
+            if (err.exitCode === 2)
+                return false;
+            throw err;
+        }
+    }
+    /** Whether origin has ANY branch — an empty repository has none. */
+    async remoteHasAnyBranch(cwd) {
+        const { stdout } = await this.git(cwd, ['ls-remote', '--heads', 'origin']);
+        return stdout.trim().length > 0;
+    }
+    /** `git rev-parse --verify` that answers null for a rev that does not resolve (an unborn HEAD). */
+    async revParseOrNull(cwd, rev) {
+        try {
+            const { stdout } = await this.git(cwd, ['rev-parse', '--verify', '--quiet', rev]);
+            return stdout.trim() || null;
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Refresh `refs/remotes/origin/<branch>` for a sync, naming the one failure
+     * that is not "origin unreachable": the branch no longer exists there.
+     */
+    async refreshRemoteBranchRefForSync(cwd, branch) {
+        try {
+            return await this.refreshRemoteBranchRef(cwd, branch);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            if (isMissingRemoteBranchFailure(msg))
+                throw new RemoteBranchGoneError(branch);
+            throw err;
+        }
+    }
+    /**
+     * Rebase the checked-out branch onto `remoteRef`, turning a content
+     * conflict into the typed error the workflow layer queues recovery for.
+     * Shared by `pull` and `syncFromRemote` so the two cannot drift.
+     */
+    async rebaseOntoRemote(cwd, branch, remoteRef) {
+        // An UNBORN HEAD (a clone of an upstream that was empty when cloned) has
+        // no commit to replay and `git rebase` refuses to start from it, so the
+        // branch is moved to the remote commit instead. That is only safe while
+        // the index is EMPTY: files staged in an unborn clone are tracked, and a
+        // hard reset would destroy them where the normal path autostashes — and
+        // `git stash` cannot run without an initial commit. So a non-empty index
+        // is refused as a conflict, naming the staged paths, and takes the same
+        // recovery path a rebase conflict does; nothing on disk is touched.
+        if ((await this.revParseOrNull(cwd, 'HEAD')) === null) {
+            // `-z`: NUL-delimited and unquoted. Line output quotes a path with a
+            // non-ASCII or control character ("Entw\303\274rfe.md"), and that
+            // spelling would name a file that does not exist to whoever recovers.
+            const { stdout: stagedOut } = await this.git(cwd, ['ls-files', '--cached', '-z']);
+            const staged = stagedOut.split('\0').filter(Boolean);
+            if (staged.length > 0) {
+                throw new PullRebaseConflictError(branch, staged, 'The clone has files staged before its first commit; they cannot be replayed onto the remote branch automatically.');
+            }
+            await this.git(cwd, ['reset', '--hard', remoteRef]);
+            return;
+        }
+        try {
+            // `--autostash` is load-bearing for the cooperative push recovery.
+            // Under save=share the working tree is *supposed* to stay clean, but
+            // in practice it can carry modified tracked artifacts (e.g. the
+            // validator regenerates a dashboard HTML on every commit) that the
+            // single-file commit didn't pick up. A rebase without it aborts
+            // outright on those — "cannot rebase: You have unstaged
+            // changes" — which is exactly the failure that strands a diverged
+            // branch in an unrecoverable loop (the retry push stays non-fast-
+            // forward forever). Autostash stashes those modifications, rebases
+            // the local commits onto origin, then reapplies them, so the retry
+            // push can fast-forward. Untracked files don't block rebase and are
+            // left untouched.
+            await this.git(cwd, ['rebase', '--autostash', remoteRef]);
+        }
+        catch (err) {
+            // Capture the contested paths BEFORE the abort wipes the rebase
+            // state — `--diff-filter=U` lists exactly the files whose replay
+            // conflicted. Best-effort: an empty list just means this wasn't a
+            // content conflict (or the probe itself failed) and the raw error
+            // is surfaced unchanged.
+            let conflictedPaths = [];
+            try {
+                const { stdout } = await this.git(cwd, ['diff', '--name-only', '--diff-filter=U']);
+                conflictedPaths = stdout.split('\n').map((s) => s.trim()).filter(Boolean);
+            }
+            catch {
+                // fall through with an empty list
+            }
+            // A failed rebase leaves the repo in a "REBASE_HEAD" / detached-apply state,
+            // which makes every subsequent git command behave unexpectedly. Return the
+            // working tree to a clean state before surfacing the original error.
+            let abortSucceeded = true;
+            await this.git(cwd, ['rebase', '--abort']).catch(() => {
+                abortSucceeded = false;
+            });
+            if (abortSucceeded && conflictedPaths.length > 0) {
+                // Typed so the workflow layer can queue background recovery — this
+                // divergence never resolves on its own (every retry pull hits the
+                // same conflict) and the unpushed local commits are someone's saved
+                // content stuck violating save=share.
+                //
+                // Gated on the abort succeeding: a failed abort means either no
+                // rebase was ever active (the unmerged paths pre-date this pull —
+                // some earlier operation left the index broken) or the clone is in
+                // a state git itself can't unwind. Queueing recovery there would
+                // point the worker's commitFile at a repo mid-conflict, risking a
+                // commit full of conflict markers — surface the raw error instead
+                // and leave diagnosis to a human.
+                throw new PullRebaseConflictError(branch, conflictedPaths, err instanceof Error ? err.message : String(err));
+            }
+            throw err;
+        }
+        // `--autostash` reapplies the stashed edits AFTER the rebase, and when that
+        // reapply conflicts git exits 0: the clone is left with an unmerged index,
+        // the edits kept in `stash@{0}`, and nothing above has thrown. Read the
+        // index rather than the exit status. The rebase itself landed, so the
+        // branch is at the remote commit; resetting to it drops only the
+        // half-applied stash (still in the stash list) and lets the conflict
+        // travel the same typed path a rebase conflict does.
+        const { stdout: unmergedOut } = await this.git(cwd, ['diff', '--name-only', '--diff-filter=U']);
+        const unmerged = unmergedOut.split('\n').map((l) => l.trim()).filter(Boolean);
+        if (unmerged.length > 0) {
+            await this.git(cwd, ['reset', '--hard', 'HEAD']);
+            throw new PullRebaseConflictError(branch, unmerged, 'Reapplying the autostashed working-tree edits conflicted; the edits are kept in git stash.');
+        }
+    }
+    /**
+     * Repo-relative paths whose content differs between two commits. Rename-
+     * aware: a renamed file reports both its old and new path, so a viewer
+     * holding the OLD path learns it is gone. Caller holds the mutex.
+     */
+    async changedPathsBetween(cwd, fromSha, toSha) {
+        const { stdout } = await this.git(cwd, [
+            'diff', '--name-status', '-M', '--no-color', '-z', fromSha, toSha,
+        ]);
+        const fields = stdout.split('\0');
+        const paths = new Set();
+        for (let i = 0; i < fields.length;) {
+            const status = fields[i];
+            if (!status)
+                break;
+            if (status.startsWith('R') || status.startsWith('C')) {
+                if (fields[i + 1])
+                    paths.add(fields[i + 1]);
+                if (fields[i + 2])
+                    paths.add(fields[i + 2]);
+                i += 3;
+            }
+            else {
+                if (fields[i + 1])
+                    paths.add(fields[i + 1]);
+                i += 2;
+            }
+        }
+        return [...paths];
+    }
+    async syncFromRemote(workspaceId) {
+        // ONE mutex section for everything the sync reports about this clone.
+        // Bracketing `pull` with separate HEAD reads and a diff took the hold
+        // four times, and a save landing between any two of them was announced
+        // back to its author as a "Git sync" change with the wrong sha.
         return this.mutex.run(workspaceId, async () => {
             const cwd = await this.repoDir(workspaceId);
-            const branch = await this.currentBranch(cwd);
+            const branch = await this.checkedOutBranch(cwd);
+            const before = await this.revParseOrNull(cwd, 'HEAD');
+            const treeBefore = (await this.revParseOrNull(cwd, 'HEAD^{tree}')) ?? '';
+            let remoteRef;
             try {
-                // Refresh WITHOUT `git pull`, and without touching `FETCH_HEAD` — see
-                // `refreshRemoteBranchRef` for why both halves are load-bearing.
-                //
-                // `--autostash` is load-bearing for the cooperative push recovery.
-                // Under save=share the working tree is *supposed* to stay clean, but
-                // in practice it can carry modified tracked artifacts (e.g. the
-                // validator regenerates a dashboard HTML on every commit) that the
-                // single-file commit didn't pick up. A rebase without it aborts
-                // outright on those — "cannot rebase: You have unstaged
-                // changes" — which is exactly the failure that strands a diverged
-                // branch in an unrecoverable loop (the retry push stays non-fast-
-                // forward forever). Autostash stashes those modifications, rebases
-                // the local commits onto origin, then reapplies them, so the retry
-                // push can fast-forward. Untracked files don't block rebase and are
-                // left untouched.
-                const remoteRef = await this.refreshRemoteBranchRef(cwd, branch);
-                await this.git(cwd, ['rebase', '--autostash', remoteRef]);
+                remoteRef = await this.refreshRemoteBranchRefForSync(cwd, branch);
             }
             catch (err) {
-                // Capture the contested paths BEFORE the abort wipes the rebase
-                // state — `--diff-filter=U` lists exactly the files whose replay
-                // conflicted. Best-effort: an empty list just means this wasn't a
-                // content conflict (or the probe itself failed) and the raw error
-                // is surfaced unchanged.
-                let conflictedPaths = [];
-                try {
-                    const { stdout } = await this.git(cwd, ['diff', '--name-only', '--diff-filter=U']);
-                    conflictedPaths = stdout.split('\n').map((s) => s.trim()).filter(Boolean);
-                }
-                catch {
-                    // fall through with an empty list
-                }
-                // A failed rebase leaves the repo in a "REBASE_HEAD" / detached-apply state,
-                // which makes every subsequent git command behave unexpectedly. Return the
-                // working tree to a clean state before surfacing the original error.
-                let abortSucceeded = true;
-                await this.git(cwd, ['rebase', '--abort']).catch(() => {
-                    abortSucceeded = false;
-                });
-                if (abortSucceeded && conflictedPaths.length > 0) {
-                    // Typed so the workflow layer can queue background recovery — this
-                    // divergence never resolves on its own (every retry pull hits the
-                    // same conflict) and the unpushed local commits are someone's saved
-                    // content stuck violating save=share.
-                    //
-                    // Gated on the abort succeeding: a failed abort means either no
-                    // rebase was ever active (the unmerged paths pre-date this pull —
-                    // some earlier operation left the index broken) or the clone is in
-                    // a state git itself can't unwind. Queueing recovery there would
-                    // point the worker's commitFile at a repo mid-conflict, risking a
-                    // commit full of conflict markers — surface the raw error instead
-                    // and leave diagnosis to a human.
-                    throw new PullRebaseConflictError(branch, conflictedPaths, err instanceof Error ? err.message : String(err));
+                // An unborn clone whose branch origin does not have either: on a FRESH
+                // deployment (origin has no branch at all) nobody has pushed yet —
+                // nothing to sync, nothing to retire. But an origin that does have
+                // branches and lacks this one has had this branch created and deleted
+                // since the clone was made, and the clone is as stale as any other.
+                if (err instanceof RemoteBranchGoneError && before === null && !(await this.remoteHasAnyBranch(cwd))) {
+                    return { before: null, after: null, treeChanged: false, changedPaths: [] };
                 }
                 throw err;
             }
+            await this.rebaseOntoRemote(cwd, branch, remoteRef);
+            this.accessControl?.invalidate(workspaceId);
+            const after = await this.revParseOrNull(cwd, 'HEAD');
+            const treeAfter = (await this.revParseOrNull(cwd, 'HEAD^{tree}')) ?? '';
+            const treeChanged = treeAfter !== treeBefore;
+            const changedPaths = treeChanged && after
+                ? await this.changedPathsBetween(cwd, before ?? GitService.EMPTY_TREE_SHA, after)
+                : [];
+            return { before, after, treeChanged, changedPaths };
+        });
+    }
+    async pull(workspaceId) {
+        return this.mutex.run(workspaceId, async () => {
+            const cwd = await this.repoDir(workspaceId);
+            const branch = await this.checkedOutBranch(cwd);
+            // For `treeChanged` (see IGitService.pull): TREE ids, not commit ids —
+            // a pull that lands only content-identical commits (an empty commit)
+            // must not read as a content change. Tolerant of an unborn HEAD (a
+            // clone of an empty upstream): "" before + a tree after correctly
+            // reads as changed, "" both sides as not.
+            const treeBefore = (await this.revParseOrNull(cwd, 'HEAD^{tree}')) ?? '';
+            // Refresh WITHOUT `git pull`, and without touching `FETCH_HEAD` — see
+            // `refreshRemoteBranchRef` for why both halves are load-bearing.
+            const remoteRef = await this.refreshRemoteBranchRef(cwd, branch);
+            await this.rebaseOntoRemote(cwd, branch, remoteRef);
             this.accessControl?.invalidate(workspaceId);
+            const treeAfter = (await this.revParseOrNull(cwd, 'HEAD^{tree}')) ?? '';
+            return { treeChanged: treeAfter !== treeBefore };
         });
     }
     /**