@bevel-software/platform-core-backend 0.10.0 → 0.11.0

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

@@ -17,6 +17,17 @@ import { PROTECTED_BRANCHES } from './branch-name.js';
  * we keep the new path and discard the old one.
  */
 export declare function parsePorcelainZ(stdout: string): string[];
+/**
+ * Like {@link parsePorcelainZ}, but also reports each rename/copy entry's
+ * OLD path (keyed by the new path). A pathspec-scoped commit needs the old
+ * path too: committing only the new path of a staged rename records an ADD
+ * and leaves the deletion of the old path behind — the rename becomes two
+ * files.
+ */
+export declare function parsePorcelainZDetailed(stdout: string): {
+    paths: string[];
+    renameOldByNew: Map<string, string>;
+};
 export declare class GitService implements IGitService {
     private readonly workspaceService;
     /**
@@ -159,20 +170,26 @@ export declare class GitService implements IGitService {
     discardPath(workspaceId: string, relativePath: string): Promise<void>;
     commitFile(workspaceId: string, user: AuthUser, relativePath: string, summary?: string, skipValidator?: boolean): Promise<CommitAttribution | null>;
     /**
-     * Atomic multi-file commit — commits whatever is currently dirty in the
-     * working tree as ONE commit attributed to `user`, then returns its
-     * attribution (or null when the tree is clean — idempotent re-apply). The
-     * multi-file sibling of `commit()`: same `git add -A` + commit, but WITHOUT
-     * the one-file-per-change guard — the caller has assembled + written + validated
-     * a batch (bulk node upload; the role-rename rewrite via `LockingFilesystem`).
+     * Atomic multi-file commit — commits the caller's batch as ONE commit
+     * attributed to `user`, then returns its attribution (or null when nothing
+     * in scope is dirty — idempotent re-apply). The multi-file sibling of
+     * `commit()`, WITHOUT the one-file-per-change guard — the caller has
+     * assembled + written + validated a batch (bulk node upload; the lock-aware
+     * saves and admin roster writes via `LockingFilesystem` /
+     * `AdminLockedCommits`).
+     *
+     * `onlyPaths` (workspace-relative) scopes staging + commit to the caller's
+     * own files via git pathspecs: on the shared per-branch workspace other
+     * paths may be dirty from a concurrent save whose commit is still queued,
+     * and sweeping them in would land them under this caller's author/summary.
+     * Omitted → the whole dirty set (`git add -A`), for flows that own the
+     * workspace.
      *
      * Deliberately does NOT write file content itself — disk writes are the
-     * caller's job. This is the git layer: it only stages + commits what is already
-     * on disk (the working tree is expected otherwise-clean under save=share, so
-     * `git add -A` stages exactly the caller's batch). Caller pushes separately
-     * (mirrors `commitFile` + `push`).
+     * caller's job. This is the git layer: it only stages + commits what is
+     * already on disk. Caller pushes separately (mirrors `commitFile` + `push`).
      */
-    commitChanges(workspaceId: string, user: AuthUser, summary: string): Promise<CommitAttribution | null>;
+    commitChanges(workspaceId: string, user: AuthUser, summary: string, onlyPaths?: string[]): Promise<CommitAttribution | null>;
     push(workspaceId: string, user: AuthUser, opts?: {
         systemAuthorized?: boolean;
     }): Promise<void>;
@@ -289,6 +306,12 @@ export declare class GitService implements IGitService {
      * Used by the pending-commits worker's no-op arm: a clean tree does NOT
      * mean "nothing to share" when a prior best-effort push (the autosave
      * path) failed and left the committed change stranded locally.
+     *
+     * Serialized under the workspace mutex: a pull-rebase in flight moves HEAD
+     * through states where the local commits are momentarily unreachable, and
+     * an unserialized read there answers "nothing unpushed" about work that is
+     * about to be replayed — callers use this as a publication PROOF, so it may
+     * only ever see settled states.
      */
     hasUnpushedCommits(workspaceId: string): Promise<boolean>;
     /**

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

@@ -34,8 +34,19 @@ const BOT_EMAIL = 'bevel-workflow@bevel.software';
  * we keep the new path and discard the old one.
  */
 export function parsePorcelainZ(stdout) {
+    return parsePorcelainZDetailed(stdout).paths;
+}
+/**
+ * Like {@link parsePorcelainZ}, but also reports each rename/copy entry's
+ * OLD path (keyed by the new path). A pathspec-scoped commit needs the old
+ * path too: committing only the new path of a staged rename records an ADD
+ * and leaves the deletion of the old path behind — the rename becomes two
+ * files.
+ */
+export function parsePorcelainZDetailed(stdout) {
     const tokens = stdout.split('\0').filter((t) => t.length > 0);
     const paths = new Set();
+    const renameOldByNew = new Map();
     let i = 0;
     while (i < tokens.length) {
         const token = tokens[i];
@@ -46,12 +57,21 @@ export function parsePorcelainZ(stdout) {
         }
         const x = token[0];
         const y = token[1];
-        paths.add(token.slice(3));
+        const newPath = token.slice(3);
+        paths.add(newPath);
         // Rename or copy in either the index or worktree position carries an
-        // extra NUL-separated old-path field we must skip.
-        i += (x === 'R' || x === 'C' || y === 'R' || y === 'C') ? 2 : 1;
+        // extra NUL-separated old-path field.
+        if (x === 'R' || x === 'C' || y === 'R' || y === 'C') {
+            const oldPath = tokens[i + 1];
+            if (oldPath)
+                renameOldByNew.set(newPath, oldPath);
+            i += 2;
+        }
+        else {
+            i += 1;
+        }
     }
-    return Array.from(paths);
+    return { paths: Array.from(paths), renameOldByNew };
 }
 /**
  * Default commit subject used when a caller (typically `LockingFilesystem`'s
@@ -839,20 +859,26 @@ export class GitService {
         });
     }
     /**
-     * Atomic multi-file commit — commits whatever is currently dirty in the
-     * working tree as ONE commit attributed to `user`, then returns its
-     * attribution (or null when the tree is clean — idempotent re-apply). The
-     * multi-file sibling of `commit()`: same `git add -A` + commit, but WITHOUT
-     * the one-file-per-change guard — the caller has assembled + written + validated
-     * a batch (bulk node upload; the role-rename rewrite via `LockingFilesystem`).
+     * Atomic multi-file commit — commits the caller's batch as ONE commit
+     * attributed to `user`, then returns its attribution (or null when nothing
+     * in scope is dirty — idempotent re-apply). The multi-file sibling of
+     * `commit()`, WITHOUT the one-file-per-change guard — the caller has
+     * assembled + written + validated a batch (bulk node upload; the lock-aware
+     * saves and admin roster writes via `LockingFilesystem` /
+     * `AdminLockedCommits`).
+     *
+     * `onlyPaths` (workspace-relative) scopes staging + commit to the caller's
+     * own files via git pathspecs: on the shared per-branch workspace other
+     * paths may be dirty from a concurrent save whose commit is still queued,
+     * and sweeping them in would land them under this caller's author/summary.
+     * Omitted → the whole dirty set (`git add -A`), for flows that own the
+     * workspace.
      *
      * Deliberately does NOT write file content itself — disk writes are the
-     * caller's job. This is the git layer: it only stages + commits what is already
-     * on disk (the working tree is expected otherwise-clean under save=share, so
-     * `git add -A` stages exactly the caller's batch). Caller pushes separately
-     * (mirrors `commitFile` + `push`).
+     * caller's job. This is the git layer: it only stages + commits what is
+     * already on disk. Caller pushes separately (mirrors `commitFile` + `push`).
      */
-    async commitChanges(workspaceId, user, summary) {
+    async commitChanges(workspaceId, user, summary, onlyPaths) {
         assertValidAuthor(user);
         const subject = summary?.trim();
         if (!subject)
@@ -866,8 +892,28 @@ export class GitService {
             const branch = await this.currentBranch(cwd);
             // Nothing dirty → no-op (idempotent). Compute touched BEFORE `git add` so
             // the protected-branch gate sees the same path set `commit()` would.
-            const { stdout: porcelain } = await this.git(cwd, ['status', '--porcelain=v1', '-z']);
-            const touched = parsePorcelainZ(porcelain);
+            // `--untracked-files=all` lists every untracked FILE individually —
+            // without it a brand-new directory shows as one `?? dir/` entry, so a
+            // scoped batch creating files under a new folder would match nothing
+            // against `onlyPaths` and silently no-op.
+            const { stdout: porcelain } = await this.git(cwd, ['status', '--porcelain=v1', '-z', '--untracked-files=all']);
+            const detailed = parsePorcelainZDetailed(porcelain);
+            let touched = detailed.paths;
+            // Scope to the caller's own paths (see the interface doc): other files
+            // may be dirty from a concurrent same-branch save whose commit is still
+            // queued — sweeping them in would land them under this caller's
+            // author/summary, and gate the commit on paths the caller never touched.
+            // An in-scope RENAME keeps its old path too: a pathspec naming only the
+            // new path records an add and strands the deletion of the old one.
+            if (onlyPaths) {
+                const scope = new Set(onlyPaths.map((p) => this.stripRepoPrefix(p)));
+                touched = touched.filter((p) => scope.has(p));
+                for (const p of touched.slice()) {
+                    const oldPath = detailed.renameOldByNew.get(p);
+                    if (oldPath && !touched.includes(oldPath))
+                        touched.push(oldPath);
+                }
+            }
             if (touched.length === 0)
                 return null;
             // Protected-branch access gate (defence in depth — callers already gate at
@@ -876,19 +922,85 @@ export class GitService {
             if (isProtectedBranch(branch)) {
                 await this.assertCanWriteAtRef(workspaceId, 'HEAD', user.email, touched);
             }
-            await this.git(cwd, ['add', '-A']);
-            await this.git(cwd, ['commit', `--author=${user.name} <${user.email}>`, '-m', subject]);
-            const { stdout } = await this.git(cwd, [
-                'log', '-1', '--pretty=format:%H%x00%an%x00%ae%x00%s%x00%aI',
-            ]);
-            const [sha, authorName, authorEmail, subj, committedAt] = stdout.split('\x00');
+            // Scoped → stage the batch (a brand-new file must be `add`ed before a
+            // pathspec commit will know it), then commit WITH the pathspec: it
+            // records exactly those paths, so neither other dirty files nor an
+            // unrelated entry someone left staged can ride along.
+            //
+            // Both stages feed the pathspecs over STDIN (`--pathspec-from-file=-`,
+            // NUL-separated) instead of argv: a several-hundred-file batch of long
+            // KB paths would otherwise blow Windows' ~32K command-line limit. The
+            // add is ONE spawn for the whole batch; only when git reports the ONE
+            // expected miss — a fully-staged deletion (or the old half of a rename)
+            // has nothing left in the worktree to match, which fails the entire
+            // batched add — do we fall back to per-path adds with the same
+            // tolerance, in argv-safe chunks of one path per spawn.
+            if (onlyPaths) {
+                const pathspecInput = touched.join('\0');
+                const pathspecArgs = ['--pathspec-from-file=-', '--pathspec-file-nul'];
+                const isExpectedMiss = (err) => {
+                    // (LC_ALL=C pins the message to English.)
+                    const e = err;
+                    return /did not match any files/.test(`${e.stderr ?? ''}\n${e.message}`);
+                };
+                try {
+                    await this.git(cwd, ['add', '-A', ...pathspecArgs], { input: pathspecInput });
+                }
+                catch (err) {
+                    // Any other add failure — index.lock contention, I/O — must abort:
+                    // committing without staging would record stale index content as
+                    // this caller's change.
+                    if (!isExpectedMiss(err))
+                        throw err;
+                    for (const p of touched) {
+                        try {
+                            await this.git(cwd, ['add', '-A', '--', p]);
+                        }
+                        catch (perPathErr) {
+                            if (!isExpectedMiss(perPathErr))
+                                throw perPathErr;
+                        }
+                    }
+                }
+                await this.git(cwd, ['commit', `--author=${user.name} <${user.email}>`, '-m', subject, ...pathspecArgs], { input: pathspecInput });
+            }
+            else {
+                await this.git(cwd, ['add', '-A']);
+                await this.git(cwd, ['commit', `--author=${user.name} <${user.email}>`, '-m', subject]);
+            }
+            // CONTRACT: past this point the commit EXISTS, so this method must not
+            // throw — callers (writeAndCommitLocked) treat a throw as "nothing was
+            // committed" and restore their pre-edit bytes, which here would publish
+            // a compensating revert of a commit that DID land. The attribution read
+            // is best-effort; on failure fall back to what we already know.
+            let sha = '';
+            let authorName = user.name;
+            let authorEmail = user.email;
+            let subj = subject;
+            let committedAt = '';
+            try {
+                const { stdout } = await this.git(cwd, [
+                    'log', '-1', '--pretty=format:%H%x00%an%x00%ae%x00%s%x00%aI',
+                ]);
+                [sha, authorName, authorEmail, subj, committedAt] = stdout.split('\x00');
+            }
+            catch {
+                // The commit landed; only its attribution read failed. Give the sha
+                // one simpler second chance — callers use it as the commit id, and an
+                // empty sha would make a landed change unidentifiable downstream.
+                try {
+                    const { stdout } = await this.git(cwd, ['rev-parse', 'HEAD']);
+                    sha = stdout;
+                }
+                catch { /* keep the fallback attribution */ }
+            }
             this.accessControl?.invalidate(workspaceId);
             return {
                 sha: sha?.trim() ?? '',
                 authorName: authorName ?? '',
                 authorEmail: authorEmail ?? '',
                 subject: subj ?? subject,
-                committedAt: committedAt?.trim() ?? new Date().toISOString(),
+                committedAt: committedAt?.trim() || new Date().toISOString(),
             };
         });
     }
@@ -1289,19 +1401,27 @@ export class GitService {
      * Used by the pending-commits worker's no-op arm: a clean tree does NOT
      * mean "nothing to share" when a prior best-effort push (the autosave
      * path) failed and left the committed change stranded locally.
+     *
+     * Serialized under the workspace mutex: a pull-rebase in flight moves HEAD
+     * through states where the local commits are momentarily unreachable, and
+     * an unserialized read there answers "nothing unpushed" about work that is
+     * about to be replayed — callers use this as a publication PROOF, so it may
+     * only ever see settled states.
      */
     async hasUnpushedCommits(workspaceId) {
-        const cwd = await this.repoDir(workspaceId);
-        const branch = await this.currentBranch(cwd);
-        try {
-            const { stdout } = await this.git(cwd, [
-                'rev-list', '--count', `refs/remotes/origin/${branch}..HEAD`,
-            ]);
-            return Number(stdout.trim()) > 0;
-        }
-        catch {
-            return true;
-        }
+        return this.mutex.run(workspaceId, async () => {
+            const cwd = await this.repoDir(workspaceId);
+            const branch = await this.currentBranch(cwd);
+            try {
+                const { stdout } = await this.git(cwd, [
+                    'rev-list', '--count', `refs/remotes/origin/${branch}..HEAD`,
+                ]);
+                return Number(stdout.trim()) > 0;
+            }
+            catch {
+                return true;
+            }
+        });
     }
     /**
      * Hard-reset the workspace's checked-out branch to `origin/<branch>`, fetching
@@ -2010,9 +2130,9 @@ export class GitService {
         ]);
         return stdout.trim().length > 0;
     }
-    async git(cwd, args) {
+    async git(cwd, args, opts) {
         try {
-            const { stdout, stderr } = await execFileAsync('git', args, {
+            const pending = execFileAsync('git', args, {
                 cwd,
                 // `GIT_LITERAL_PATHSPECS=1` makes git treat every pathspec literally
                 // instead of interpreting `[`, `]`, `*`, `?`, `!`, or `:(magic)` as
@@ -2033,6 +2153,14 @@ export class GitService {
                 env: { ...process.env, GIT_LITERAL_PATHSPECS: '1', LC_ALL: 'C', LANG: 'C' },
                 maxBuffer: 32 * 1024 * 1024,
             });
+            if (opts?.input !== undefined && pending.child.stdin) {
+                // A dying git can close stdin mid-write; the promise below still
+                // rejects with the exit code, which is the error we want to surface.
+                pending.child.stdin.on('error', () => undefined);
+                pending.child.stdin.write(opts.input);
+                pending.child.stdin.end();
+            }
+            const { stdout, stderr } = await pending;
             return { stdout: stdout.toString(), stderr: stderr.toString() };
         }
         catch (err) {