@bevel-software/platform-core-backend 0.34.0 → 0.36.1

package/dist/modules/{workflow → version-control}/git/git.service.d.ts

@@ -1,6 +1,6 @@
 import type { AppliedChangeRef, AppliedMergeResult, AuthUser, BranchCounts, BranchInfo, ChangedPathPair, CommitAttribution, IGitService, MergeIntoBranchOutcome, MergeResolution, ReservedPushOps, RemoteSyncPullResult, PrFileStatus, PullRequestFile, ShareChangesRequest, WorkingTreeStatus } from '@bevel-software/platform-shared';
 import type { WorkspaceService } from '../../workspace/index.js';
-import type { WorkflowHooks } from '../workflow-hooks.js';
+import type { VersionControlHooks } from '../version-control-hooks.js';
 import type { IAccessControl } from '../../access/index.js';
 import { type WorkspaceMutex } from '../../kb-fs/index.js';
 import type { KbContext } from '../../../shared/kb-context.js';
@@ -32,7 +32,7 @@ export declare function parsePorcelainZDetailed(stdout: string): {
 export declare class GitService implements IGitService {
     private readonly workspaceService;
     /**
-     * Workflow lifecycle hooks. This service only consults the ADVISORY
+     * Version-control lifecycle hooks. This service only consults the ADVISORY
      * `commitValidation` hooks (registered by the enterprise kb module in the
      * composition root — the constructor-injected `IKbValidator` this
      * replaced). No hooks registered = no commit-time validation, which is
@@ -75,13 +75,13 @@ export declare class GitService implements IGitService {
     private static readonly CHANGED_ENTRIES_MAX;
     constructor(workspaceService: WorkspaceService, 
     /**
-     * Workflow lifecycle hooks. This service only consults the ADVISORY
+     * Version-control lifecycle hooks. This service only consults the ADVISORY
      * `commitValidation` hooks (registered by the enterprise kb module in the
      * composition root — the constructor-injected `IKbValidator` this
      * replaced). No hooks registered = no commit-time validation, which is
      * safe because validation is advisory and never blocks a commit.
      */
-    hooks: WorkflowHooks, kb: KbContext, mutex?: WorkspaceMutex, accessControl?: IAccessControl | null, 
+    hooks: VersionControlHooks, kb: KbContext, mutex?: WorkspaceMutex, accessControl?: IAccessControl | null, 
     /**
      * How git is actually run — see `shared/git.contract.ts`. The composition
      * root passes the one runner, carrying the deployment's configured
@@ -318,7 +318,7 @@ export declare class GitService implements IGitService {
     private pushUnlocked;
     /**
      * Attempt a local merge of `origin/<targetBranch>` into the currently-
-     * checked-out branch. Used by the workflow module to auto-merge target →
+     * checked-out branch. Used by the version-control module to auto-merge target →
      * source when a change request is opened or refreshed (PLAN §1).
      *
      * Two outcomes:
@@ -369,7 +369,7 @@ export declare class GitService implements IGitService {
      *
      * `publish` runs over the merge commit inside this same reservation, so no
      * save or sync can land between the commit and its push; it is the
-     * caller's push policy (the workflow's `pushWithRecovery`: one replay onto
+     * caller's push policy (the version-control service's `pushWithRecovery`: one replay onto
      * the moved branch with the merge kept, `--rebase-merges`, then the typed
      * hand-off) over this checkout's own unlocked moves.
      */
@@ -624,7 +624,7 @@ export declare class GitService implements IGitService {
     private refreshRemoteBranchRefForSync;
     /**
      * Rebase the checked-out branch onto `remoteRef`, turning a content
-     * conflict into the typed error the workflow layer queues recovery for.
+     * conflict into the typed error the version-control layer queues recovery for.
      * Shared by `pull` and `syncFromRemote` so the two cannot drift.
      */
     private rebaseOntoRemote;
@@ -855,7 +855,7 @@ export declare class GitService implements IGitService {
      * side for a merge commit, and for a squashed or fast-forwarded commit it is
      * simply the commit before — the same answer either way.
      *
-     * Throws `WorkflowValidationError` whenever the recorded commit cannot be
+     * Throws `VersionControlValidationError` whenever the recorded commit cannot be
      * PROVEN to be this request's own merge commit — see
      * {@link appliedChangeShas}. Every caller reads that as "the file set could
      * not be resolved" and falls back to its own fail-closed answer, which is what

package/dist/modules/version-control/git/git.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.service.d.ts","sourceRoot":"","sources":["../../../../src/modules/version-control/git/git.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,gBAAgB,EAChB,kBAAkB,EAClB,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,eAAe,EACf,iBAAiB,EAEjB,WAAW,EACX,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,6BAA6B,CAAC;AAChG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAoB,KAAK,cAAc,EAAmF,MAAM,sBAAsB,CAAC;AAW9J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAa/D,OAAO,EAIL,KAAK,cAAc,EAGnB,KAAK,UAAU,EAChB,MAAM,iCAAiC,CAAC;AAoBzC;;;;;GAKG;AACH;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG;IACvD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAwBA;AA0JD,qBAAa,UAAW,YAAW,WAAW;IAiC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,EAAE;IAInB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,SAAS;IAhD5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA6B;IACjE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8B;IAClE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAEtD;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAwC;IAChF,yFAAyF;IACzF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAiD;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;gBAGhC,gBAAgB,EAAE,gBAAgB;IACnD;;;;;;OAMG;IACc,KAAK,EAAE,mBAAmB,EAC1B,EAAE,EAAE,SAAS,EAIb,KAAK,GAAE,cAAuC,EAC9C,aAAa,GAAE,cAAc,GAAG,IAAW;IAC5D;;;;;;OAMG;IACc,SAAS,GAAE,UAAgC;IAG9D,OAAO,KAAK,SAAS,GAEpB;IAED;;;OAGG;IACH,IAAI,WAAW,IAAI,cAAc,CAEhC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB,CAA4D;IAEvF,sBAAsB,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAI9E;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB,CAA4C;IAEpE,yBAAyB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,IAAI;IAIpE;;;;;OAKG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAS/C;;;;;OAKG;IACH,iBAAiB,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAYvD;;;;;;;OAOG;YACW,wBAAwB;IAiBtC;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;YACW,mBAAmB;IA0B3B,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIvD,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAO,GACzD,OAAO,CAAC,UAAU,EAAE,CAAC;IAmHlB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAkB9D;;;;;;;;;;;;;OAaG;YACW,kBAAkB;IA0E1B,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,UAAU,CAAC;IAgEtB;;;;;;;;;OASG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,IAAI,GAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GACnF,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAmFzC;;;;;;;;;;;;;;OAcG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1F;;;;;;;;;;OAUG;IACG,WAAW,CACf,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC;IAoBnF;;;;OAIG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7F,wFAAwF;YAC1E,kBAAkB;IAUhC;;;;;;;;;;OAUG;YACW,SAAS;IA2BjB,MAAM,CACV,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,mBAAmB,GACvB,OAAO,CAAC,iBAAiB,CAAC;IAiG7B;;;;;;;;;;;;;OAaG;IACH;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BrE,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAiBpC,wFAAwF;YAC1E,kBAAkB;IAmFhC;;;;;;;;;;;;;;;;;;;OAmBG;IACG,aAAa,CACjB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA4H9B,IAAI,CACR,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,QAAQ,EACd,IAAI,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GACpC,OAAO,CAAC,IAAI,CAAC;IAMhB,kFAAkF;YACpE,YAAY;IAmE1B;;;;;;;;;;;;;;;;;OAiBG;IACG,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,QAAQ,GACb,OAAO,CACN;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,OAAO,CAAA;KAAE,GAC3C;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CACzC;IA2BD,2HAA2H;IAC3H,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAW;IAEpD,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE;QACJ,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACnF,GACA,OAAO,CAAC,sBAAsB,CAAC;IAyClC;;;;;;;;;;;;;;;;;;;OAmBG;YACW,oBAAoB;IA0IlC;;;;;;;OAOG;YACW,WAAW;IAezB;;;;;OAKG;YACW,UAAU;IAcxB,iGAAiG;YACnF,WAAW;IA6BzB;;;;;;;OAOG;YACW,gBAAgB;IAsC9B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAMnB;;;;;;OAMG;YACW,eAAe;IAkCvB,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAsBhE;;;;;;;;;;;;;;OAcG;IACG,kBAAkB,CACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EACzC,IAAI,EAAE,QAAQ,EACd,IAAI,GAAE;QACJ;;;;;;;;;;;WAWG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B;;;;;;;;;;;WAWG;QACH,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,EAAE,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/E;;;;;;;;;WASG;QACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,iGAAiG;QACjG,kBAAkB,CAAC,EAAE,MAAM,CAAC;KACxB,GACL,OAAO,CAAC,kBAAkB,CAAC;IAiJ9B;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACG,0BAA0B,CAC9B,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA2BzB;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;YACW,gBAAgB;IAuB9B,6EAA6E;YAC/D,eAAe;IAS7B;;;;;OAKG;YACW,oBAAoB;IAoB5B,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAwCG;YACW,sBAAsB;IAWpC,6EAA6E;IAC7E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAA8C;IAEpF;;;;OAIG;YACW,gBAAgB;IAK9B;;;;OAIG;IACG,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/E,yFAAyF;YAC3E,eAAe;YAUf,eAAe;IAU7B,oEAAoE;YACtD,kBAAkB;IAKhC;;;;;;;;;OASG;YACW,cAAc;IAU5B;;;OAGG;YACW,6BAA6B;IAU3C;;;;OAIG;YACW,gBAAgB;IAsH9B;;;;OAIG;YACW,mBAAmB;IAqB3B,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA0ClE,IAAI,CACR,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,GACtC,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;IAIpC,kFAAkF;YACpE,YAAY;IAqB1B;;;;;;;;;;;;;;;;;;OAkBG;IACG,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI/D;;;;;;;;;;;;;;;OAeG;IACG,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc/D;;;;;OAKG;YACW,oBAAoB;IAYlC;;;;;;;;;;;;;;;;;;;;;OAqBG;IACG,kBAAkB,CACtB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE;QACL,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAC9E,EAAE,GACF,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE;YAAE,WAAW,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,GAAG,IAAI,CAAA;KAAE,CAAC;IA0ExF;;;;;;;;;;;;;;;OAeG;IACG,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBjE,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBlF;;;;;;;OAOG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC;IAclB;;;;;OAKG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC;IAyBb,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoB/D,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ5D;;;;OAIG;IACG,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQxD,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,KAAK,SAAK,GACT,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA2DzB,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC;IA2ClB;;;;;;;OAOG;IACG,oBAAoB,CACxB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAiCzD,uBAAuB,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,EAAE,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,GACrE,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IA6EtD;;;;;OAKG;IACG,aAAa,CACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAmBhD;;;;;;;;;;;;;;;;;;OAkBG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;KAAO,GAC1E,OAAO,CAAC,eAAe,EAAE,CAAC;IAuB7B;;;;;;;;;;;;;OAaG;YACW,eAAe;IAwE7B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;YACW,WAAW;IAuDzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAKhD;;;;;;;;;;;;;OAaG;IACG,2BAA2B,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,gBAAgB,EACzB,IAAI,GAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAO,GAC/B,OAAO,CAAC,eAAe,EAAE,CAAC;IAQ7B;;;;;OAKG;IACG,mCAAmC,CACvC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;IAYzD;;;;;;;;;;;;;;;;;;;OAmBG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE;QACJ,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB;;;;;;WAMG;QACH,cAAc,CAAC,EAAE,OAAO,CAAC;KACrB,GACL,OAAO,CAAC,MAAM,EAAE,CAAC;IA2BpB;;;;;OAKG;YACW,gBAAgB;IAS9B;;;;;;;;;;;OAWG;YACW,kBAAkB;IAQhC;;;;OAIG;YACW,wBAAwB;IAQtC;;;;;OAKG;IACG,yBAAyB,CAC7B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,GAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAO,GAC7B,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;IAkBzD;;;;;OAKG;YACW,8BAA8B;IAiC5C;;;;;OAKG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoBzB;;;;;;;;;;;;OAYG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACvC,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAuB5D;;;;;;;;;;;;;;;OAeG;IACG,mBAAmB,CACvB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBpB;;;;;;OAMG;IACG,mBAAmB,CACvB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA0BzB;;;;;OAKG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBnG;;;;;;OAMG;IACG,kBAAkB,CACtB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC;IAOhB,gGAAgG;YAClF,mBAAmB;IA0BjC,gFAAgF;YAClE,WAAW;IAsBzB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IAEpE;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,kBAAkB;IAkB1B,0EAA0E;YAC5D,cAAc;IA2B5B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,eAAe;IAMvB;;;;;;;;OAQG;YACW,kBAAkB;IAahC,8GAA8G;YAChG,eAAe;IAU7B;;;;;;;;OAQG;YACW,yBAAyB;IAIvC;;;;OAIG;YACW,sBAAsB;IA0BpC;;;;;;;;OAQG;YACW,aAAa;IAW3B;;;;;;OAMG;YACW,gBAAgB;YAchB,cAAc;YA2Dd,aAAa;IAK3B;;;;;;OAMG;YACW,oBAAoB;YAoBpB,cAAc;IAmB5B;;;;;;OAMG;IACH;;;;;;;;;OASG;YACW,kBAAkB;IAiC1B,aAAa,CACjB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqBzB;;;;;;;;;;;;;;;;;;OAkBG;YACW,SAAS;IAkCvB;;;;;;;;;;;;;;;;;;;OAmBG;YACW,qBAAqB;IA8BnC;;;;;;;;;;;;;OAaG;IACG,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,OAAO,GAAG,QAAQ,GACvB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAepD;;;;;OAKG;IACG,WAAW,CACf,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC;IAYpB;;;;;OAKG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMzF;;;;;;;;;;;OAWG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW3E;;;;;;;;;;;;;;;;;OAiBG;YACW,uBAAuB;YAavB,OAAO;YAIP,eAAe;IAW7B;;;;;;;;;OASG;IACH,OAAO,CAAC,GAAG;IAwBX,0GAA0G;YAC5F,yBAAyB;IAKvC;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ;CAWjB;AAeD,UAAU,eAAe;IACvB,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAmED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,CAsB/D;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAOhF;AAED,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAwBzD"}

package/dist/modules/{workflow → version-control}/git/git.service.js

@@ -10,7 +10,7 @@ import { utf8Text } from '../../../shared/utf8-text.js';
 import { lstatOrNull } from '../../../shared/rename-no-replace.js';
 import { linkedAncestor } from '../../../shared/no-link-below.js';
 import { assertValidBranchName, assertValidRelativePath, isBranchAuthoredBy, isOwnSuggestionsBranch, } from '../../kb-fs/index.js';
-import { AppliedChangeMismatchError, BranchAuthorshipError, BranchDeleteRefusedError, WorkflowDomainError, WorkflowValidationError, ProtectedBranchError, PullRebaseConflictError, RemoteBranchGoneError, VersionNotOnBranchError, isMissingRemoteBranchFailure, } from '../../../shared/domain-errors.js';
+import { AppliedChangeMismatchError, BranchAuthorshipError, BranchDeleteRefusedError, VersionControlDomainError, VersionControlValidationError, ProtectedBranchError, PullRebaseConflictError, RemoteBranchGoneError, VersionNotOnBranchError, isMissingRemoteBranchFailure, } from '../../../shared/domain-errors.js';
 import { GitRunError, assertOneSpecPerLine, redactGitToken, } from '../../../shared/git.contract.js';
 import { NodeGitRunner } from './node-git-runner.js';
 import { printable } from '../../../shared/printable.js';
@@ -19,7 +19,7 @@ import { sanitizeError } from '../sanitize-error.js';
 const log = logger('git');
 const crLog = logger('cr');
 /**
- * Fallback committer identity. Every workflow commit overrides the author via
+ * Fallback committer identity. Every version-control commit overrides the author via
  * `--author=…` so the real human shows up in `git log`; this is just the
  * committer git records need. Mirrors the value `WorkspaceService` stamps on
  * each clone — set again where an operation must not depend on that ambient
@@ -99,13 +99,13 @@ function buildDefaultCommitSummary(repoRelativePath) {
 }
 function assertValidAuthor(user) {
     if (!user.name || !user.email) {
-        throw new WorkflowValidationError('commit author name and email are required');
+        throw new VersionControlValidationError('commit author name and email are required');
     }
     if (/[\r\n<>]/.test(user.name)) {
-        throw new WorkflowValidationError('commit author name contains invalid characters');
+        throw new VersionControlValidationError('commit author name contains invalid characters');
     }
     if (/[\r\n<>\s]/.test(user.email) || !/^[^@\s]+@[^@\s]+$/.test(user.email)) {
-        throw new WorkflowValidationError('commit author email is not a valid address');
+        throw new VersionControlValidationError('commit author email is not a valid address');
     }
 }
 /**
@@ -260,7 +260,7 @@ export class GitService {
     static CHANGED_ENTRIES_MAX = 4096;
     constructor(workspaceService, 
     /**
-     * Workflow lifecycle hooks. This service only consults the ADVISORY
+     * Version-control lifecycle hooks. This service only consults the ADVISORY
      * `commitValidation` hooks (registered by the enterprise kb module in the
      * composition root — the constructor-injected `IKbValidator` this
      * replaced). No hooks registered = no commit-time validation, which is
@@ -705,7 +705,7 @@ export class GitService {
             const cwd = await this.repoDir(workspaceId);
             const current = await this.currentBranch(cwd);
             if (current === name) {
-                throw new WorkflowValidationError(`Cannot delete "${name}" while it's the checked-out branch.`);
+                throw new VersionControlValidationError(`Cannot delete "${name}" while it's the checked-out branch.`);
             }
             if (opts.systemCleanup) {
                 // Internal post-merge retirement (never reachable from a route): the
@@ -719,7 +719,7 @@ export class GitService {
                 // not just their own — but keep the "refuse if origin still has the
                 // ref" safety: a present remote means the branch is still live.
                 if (await this.refExists(cwd, `refs/remotes/origin/${name}`)) {
-                    throw new WorkflowValidationError(`Branch "${name}" still exists on origin — refusing to auto-prune.`);
+                    throw new VersionControlValidationError(`Branch "${name}" still exists on origin — refusing to auto-prune.`);
                 }
             }
             else if (!(await this.mayDeleteBranch(workspaceId, name, user))) {
@@ -892,12 +892,12 @@ export class GitService {
     async commit(workspaceId, user, req) {
         const subject = req.summary?.trim();
         if (!subject)
-            throw new WorkflowValidationError('commit summary is required');
+            throw new VersionControlValidationError('commit summary is required');
         if (subject.length > 200) {
-            throw new WorkflowValidationError('commit summary must be ≤ 200 characters');
+            throw new VersionControlValidationError('commit summary must be ≤ 200 characters');
         }
         if (subject.includes('\n')) {
-            throw new WorkflowValidationError('commit summary must be a single line');
+            throw new VersionControlValidationError('commit summary must be a single line');
         }
         assertValidAuthor(user);
         return this.mutex.run(workspaceId, async () => {
@@ -915,12 +915,12 @@ export class GitService {
             ]);
             const touched = parsePorcelainZ(porcelain);
             if (touched.length === 0) {
-                throw new WorkflowValidationError('No pending changes to commit', {
+                throw new VersionControlValidationError('No pending changes to commit', {
                     kind: 'no-pending-changes',
                 });
             }
             if (touched.length > 1) {
-                throw new WorkflowValidationError(`Each change must affect exactly one file. ${touched.length} files are currently pending: ${touched.join(', ')}. Commit them one at a time.`, { kind: 'too-many-files-dirty', paths: touched });
+                throw new VersionControlValidationError(`Each change must affect exactly one file. ${touched.length} files are currently pending: ${touched.join(', ')}. Commit them one at a time.`, { kind: 'too-many-files-dirty', paths: touched });
             }
             // Gate by access-control rules — but ONLY on protected branches.
             // Feature/draft branches are free-for-all: anyone can commit anything
@@ -1047,7 +1047,7 @@ export class GitService {
             // **No access check at commit time.** Per the "disk is the source of
             // truth" rule, by the time content is on disk it must not be rejected.
             // The permission check that used to live here now runs at lock
-            // acquisition (see `WorkflowService.acquireLock`'s
+            // acquisition (see `VersionControlService.acquireLock`'s
             // `assertCanWriteAtPath`), so a user can't even start editing a file
             // they lack write permission on — they never reach this commit. The
             // legacy gate could destroy a user's edits when access changed
@@ -1069,10 +1069,10 @@ export class GitService {
             await this.git(cwd, ['add', '--', repoRelativePath]);
             const subject = summary?.trim() || buildDefaultCommitSummary(repoRelativePath);
             if (subject.length > 200) {
-                throw new WorkflowValidationError('commit summary must be ≤ 200 characters');
+                throw new VersionControlValidationError('commit summary must be ≤ 200 characters');
             }
             if (subject.includes('\n')) {
-                throw new WorkflowValidationError('commit summary must be a single line');
+                throw new VersionControlValidationError('commit summary must be a single line');
             }
             await this.git(cwd, [
                 'commit',
@@ -1119,11 +1119,11 @@ export class GitService {
         assertValidAuthor(user);
         const subject = summary?.trim();
         if (!subject)
-            throw new WorkflowValidationError('commit summary is required');
+            throw new VersionControlValidationError('commit summary is required');
         if (subject.length > 200)
-            throw new WorkflowValidationError('commit summary must be ≤ 200 characters');
+            throw new VersionControlValidationError('commit summary must be ≤ 200 characters');
         if (subject.includes('\n'))
-            throw new WorkflowValidationError('commit summary must be a single line');
+            throw new VersionControlValidationError('commit summary must be a single line');
         return this.mutex.run(workspaceId, async () => {
             const cwd = await this.repoDir(workspaceId);
             const branch = await this.currentBranch(cwd);
@@ -1289,7 +1289,7 @@ export class GitService {
             }
         }
     }
-    // `forcePush` method removed. The workflow layer no longer auto-force-pushes
+    // `forcePush` method removed. The version-control layer no longer auto-force-pushes
     // as a recovery — when the cooperative `pull --rebase` + retry can't
     // reconcile, we throw `PushNeedsAgentResolutionError` and hand off to the
     // agent. The agent has git + gh CLI access and can choose to run a raw
@@ -1301,7 +1301,7 @@ export class GitService {
     // automatic-recovery path.
     /**
      * Attempt a local merge of `origin/<targetBranch>` into the currently-
-     * checked-out branch. Used by the workflow module to auto-merge target →
+     * checked-out branch. Used by the version-control module to auto-merge target →
      * source when a change request is opened or refreshed (PLAN §1).
      *
      * Two outcomes:
@@ -1350,7 +1350,7 @@ export class GitService {
         assertValidBranchName(fromBranch);
         assertValidAuthor(user);
         if (/\n\s*\n/.test(opts.subject)) {
-            throw new WorkflowValidationError('merge commit subject must be a single paragraph');
+            throw new VersionControlValidationError('merge commit subject must be a single paragraph');
         }
         // Every resolution names a repository path; which of them are conflicted
         // is only known inside the merge, where they are matched exactly.
@@ -1365,13 +1365,13 @@ export class GitService {
             const p = this.stripRepoPrefix(r.path);
             const ways = [r.content !== undefined, r.choose !== undefined].filter(Boolean).length;
             if (ways !== 1) {
-                throw new WorkflowValidationError(`resolution for "${p}": give either \`content\` or \`choose\`, not ${ways === 0 ? 'neither' : 'both'}`);
+                throw new VersionControlValidationError(`resolution for "${p}": give either \`content\` or \`choose\`, not ${ways === 0 ? 'neither' : 'both'}`);
             }
             if (r.choose !== undefined && !['ours', 'theirs', 'delete'].includes(r.choose)) {
-                throw new WorkflowValidationError(`resolution for "${p}": \`choose\` is \`ours\`, \`theirs\` or \`delete\``);
+                throw new VersionControlValidationError(`resolution for "${p}": \`choose\` is \`ours\`, \`theirs\` or \`delete\``);
             }
             if (resolutions.has(p))
-                throw new WorkflowValidationError(`"${p}" is resolved twice`);
+                throw new VersionControlValidationError(`"${p}" is resolved twice`);
             resolutions.set(p, { ...r, path: p });
         }
         return this.mutex.run(workspaceId, async () => this.mergeRefIntoCheckout(workspaceId, await this.repoDir(workspaceId), branch, fromBranch, user, {
@@ -1400,7 +1400,7 @@ export class GitService {
      *
      * `publish` runs over the merge commit inside this same reservation, so no
      * save or sync can land between the commit and its push; it is the
-     * caller's push policy (the workflow's `pushWithRecovery`: one replay onto
+     * caller's push policy (the version-control service's `pushWithRecovery`: one replay onto
      * the moved branch with the merge kept, `--rebase-merges`, then the typed
      * hand-off) over this checkout's own unlocked moves.
      */
@@ -1409,14 +1409,14 @@ export class GitService {
         if (opts.guardCheckout) {
             const checkedOut = await this.currentBranch(cwd);
             if (checkedOut !== branch) {
-                throw new WorkflowValidationError(`the workspace is on "${checkedOut}", not on "${branch}"`);
+                throw new VersionControlValidationError(`the workspace is on "${checkedOut}", not on "${branch}"`);
             }
             // A merge rewrites tracked files. Edits still on their way to a commit
             // (a save the worker has not landed) would be swept into the merge
             // commit under this user's name, or lost under the merge's version.
             const { stdout: dirty } = await this.git(cwd, ['status', '--porcelain=v1', '-z']);
             if (parsePorcelainZ(dirty).length > 0) {
-                throw new WorkflowDomainError(`"${branch}" has edits that are not committed yet. Try again once they are saved.`, 409, { kind: 'branch-busy', branch });
+                throw new VersionControlDomainError(`"${branch}" has edits that are not committed yet. Try again once they are saved.`, 409, { kind: 'branch-busy', branch });
             }
         }
         // `git merge`/`git commit` need a committer identity (see `mergeChangeRequest`).
@@ -1440,7 +1440,7 @@ export class GitService {
         // A merge with nothing to settle leaves no resolution a place to go: one
         // supplied anyway names a path that is not conflicted, and is refused as
         // such rather than dropped on the floor behind a published merge.
-        const noConflictsFor = () => new WorkflowValidationError(`nothing conflicted, so nothing is resolved here: ${[...opts.resolutions.keys()].join(', ')}.`, { kind: 'not-conflicted', paths: [...opts.resolutions.keys()] });
+        const noConflictsFor = () => new VersionControlValidationError(`nothing conflicted, so nothing is resolved here: ${[...opts.resolutions.keys()].join(', ')}.`, { kind: 'not-conflicted', paths: [...opts.resolutions.keys()] });
         // Nothing to merge is a question of ANCESTRY, not of content: a source
         // the branch already reaches is merged; one it does not reach is merged
         // in even when the two trees are identical, so the branch records that
@@ -1468,7 +1468,7 @@ export class GitService {
                     // locks. Refused whole, before any resolution is applied — naming
                     // the caller's own paths only, never the conflicted set (which the
                     // caller is told of, cut to what they may read, by the answer).
-                    throw new WorkflowValidationError(`not conflicted, so not resolved here: ${stray.join(', ')}.`, { kind: 'not-conflicted', paths: stray });
+                    throw new VersionControlValidationError(`not conflicted, so not resolved here: ${stray.join(', ')}.`, { kind: 'not-conflicted', paths: stray });
                 }
                 const unresolved = conflicted.filter((p) => !opts.resolutions.has(p));
                 if (unresolved.length > 0) {
@@ -1640,7 +1640,7 @@ export class GitService {
         // the way that is a link is refused, and a path that is itself a link is
         // replaced as a path (the link removed first), never written through.
         if ((await linkedAncestor(cwd, path.dirname(file))) !== null) {
-            throw new WorkflowValidationError(`"${r.path}" is reached through a link, so it is not resolved here`);
+            throw new VersionControlValidationError(`"${r.path}" is reached through a link, so it is not resolved here`);
         }
         if (r.content !== undefined) {
             if ((await lstatOrNull(file))?.isSymbolicLink())
@@ -1718,7 +1718,7 @@ export class GitService {
         // `mergeCommitSubject` already flattens the title it builds from; this is the
         // guard that keeps any other caller from reintroducing the break.
         if (/\n\s*\n/.test(commit.subject)) {
-            throw new WorkflowValidationError('merge commit subject must be a single paragraph');
+            throw new VersionControlValidationError('merge commit subject must be a single paragraph');
         }
         const MAX_ATTEMPTS = 3;
         return this.mutex.run(baseWorkspaceId, async () => {
@@ -1733,7 +1733,7 @@ export class GitService {
                 const { stdout: dirty } = await this.git(cwd, ['status', '--porcelain=v1', '-z']);
                 const unpushed = await this.hasUnpushedCommitsAt(cwd);
                 if (parsePorcelainZ(dirty).length > 0 || unpushed) {
-                    throw new WorkflowDomainError(`"${targetBranch}" has edits that are not shared yet. Try the merge again once they are saved.`, 409, { kind: 'merge-target-busy', targetBranch });
+                    throw new VersionControlDomainError(`"${targetBranch}" has edits that are not shared yet. Try the merge again once they are saved.`, 409, { kind: 'merge-target-busy', targetBranch });
                 }
             }
             for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt += 1) {
@@ -2108,7 +2108,7 @@ export class GitService {
     }
     /**
      * Rebase the checked-out branch onto `remoteRef`, turning a content
-     * conflict into the typed error the workflow layer queues recovery for.
+     * conflict into the typed error the version-control layer queues recovery for.
      * Shared by `pull` and `syncFromRemote` so the two cannot drift.
      */
     async rebaseOntoRemote(cwd, branch, remoteRef, opts = {}) {
@@ -2183,7 +2183,7 @@ export class GitService {
                 abortSucceeded = false;
             });
             if (abortSucceeded && conflictedPaths.length > 0) {
-                // Typed so the workflow layer can queue background recovery — this
+                // Typed so the version-control 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.
@@ -2620,7 +2620,7 @@ export class GitService {
                     // Only the genuinely empty separator lines are skipped.
                     const touched = nameLine.endsWith('\r') ? nameLine.slice(0, -1) : nameLine;
                     if (touched && touched !== repoRelativePath) {
-                        throw new WorkflowValidationError(`"${relativePath}" is a directory at that point in history — history is served per file`);
+                        throw new VersionControlValidationError(`"${relativePath}" is a directory at that point in history — history is served per file`);
                     }
                 }
             }
@@ -2648,7 +2648,7 @@ export class GitService {
     async diffFileAtCommit(workspaceId, relativePath, sha) {
         assertValidRelativePath(relativePath);
         if (!/^[a-f0-9]{7,40}$/i.test(sha)) {
-            throw new WorkflowValidationError('invalid commit sha');
+            throw new VersionControlValidationError('invalid commit sha');
         }
         const repoRelativePath = this.stripRepoPrefix(relativePath);
         return this.mutex.run(workspaceId, async () => {
@@ -2696,7 +2696,7 @@ export class GitService {
     async fileContentsAtCommit(workspaceId, relativePath, sha) {
         assertValidRelativePath(relativePath);
         if (!/^[a-f0-9]{7,40}$/i.test(sha)) {
-            throw new WorkflowValidationError('invalid commit sha');
+            throw new VersionControlValidationError('invalid commit sha');
         }
         const repoRelativePath = this.stripRepoPrefix(relativePath);
         return this.mutex.run(workspaceId, async () => {
@@ -2732,7 +2732,7 @@ export class GitService {
         assertValidBranchName(fromBranch);
         assertValidBranchName(toBranch);
         if (fromBranch === toBranch) {
-            throw new WorkflowValidationError('from and to branches must differ');
+            throw new VersionControlValidationError('from and to branches must differ');
         }
         const repoRelativePath = this.stripRepoPrefix(relativePath);
         return this.mutex.run(workspaceId, async () => {
@@ -2850,7 +2850,7 @@ export class GitService {
         if (opts.at) {
             for (const sha of [opts.at.baseSha, opts.at.headSha]) {
                 if (!/^[0-9a-f]{40,64}$/.test(sha)) {
-                    throw new WorkflowValidationError(`invalid commit sha: ${sha}`);
+                    throw new VersionControlValidationError(`invalid commit sha: ${sha}`);
                 }
             }
         }
@@ -2963,7 +2963,7 @@ export class GitService {
      * side for a merge commit, and for a squashed or fast-forwarded commit it is
      * simply the commit before — the same answer either way.
      *
-     * Throws `WorkflowValidationError` whenever the recorded commit cannot be
+     * Throws `VersionControlValidationError` whenever the recorded commit cannot be
      * PROVEN to be this request's own merge commit — see
      * {@link appliedChangeShas}. Every caller reads that as "the file set could
      * not be resolved" and falls back to its own fail-closed answer, which is what
@@ -2973,7 +2973,7 @@ export class GitService {
     async appliedEnds(cwd, applied) {
         const { mergeSha, number } = applied;
         if (!/^[0-9a-f]{40,64}$/.test(mergeSha)) {
-            throw new WorkflowValidationError(`invalid commit sha: ${mergeSha}`);
+            throw new VersionControlValidationError(`invalid commit sha: ${mergeSha}`);
         }
         const revParse = async (rev) => {
             try {
@@ -2998,7 +2998,7 @@ export class GitService {
         // or a message that does not name the request) never becomes it, and is
         // reported as a mismatch the caller may remember.
         if (!(await revParse(`${mergeSha}^{commit}`))) {
-            throw new WorkflowValidationError(`commit ${mergeSha} is not in this clone, so change request #${number} cannot be read from it yet`);
+            throw new VersionControlValidationError(`commit ${mergeSha} is not in this clone, so change request #${number} cannot be read from it yet`);
         }
         // The SECOND parent first, because its absence is the whole P1: a merge
         // `--no-ff` always has one, and a commit that does not is not a merge this
@@ -3125,7 +3125,7 @@ export class GitService {
         // concurrent `fetch --prune origin` (`ensureRemotesFetched` and
         // `fetchPrRefs` both run outside this mutex, deliberately) can drop a
         // remote-tracking ref between the two, and re-resolving inside the mutex
-        // would then throw `WorkflowValidationError` — which `touchedPathsFor`
+        // would then throw `VersionControlValidationError` — which `touchedPathsFor`
         // swallows into an empty touched-path set, i.e. exactly the change
         // request missing from its own author's tree that the skip is guarded
         // against. The commits stay readable whatever happens to the ref names.
@@ -3274,7 +3274,7 @@ export class GitService {
     async forkPointForPr(workspaceId, at) {
         for (const sha of [at.baseSha, at.headSha]) {
             if (!/^[0-9a-f]{40,64}$/.test(sha)) {
-                throw new WorkflowValidationError(`invalid commit sha: ${sha}`);
+                throw new VersionControlValidationError(`invalid commit sha: ${sha}`);
             }
         }
         const cwd = await this.repoDir(workspaceId);
@@ -3314,7 +3314,7 @@ export class GitService {
     async pathsChangedBetween(workspaceId, fromSha, toSha) {
         for (const sha of [fromSha, toSha]) {
             if (!/^[0-9a-f]{40,64}$/.test(sha)) {
-                throw new WorkflowValidationError(`invalid commit sha: ${sha}`);
+                throw new VersionControlValidationError(`invalid commit sha: ${sha}`);
             }
         }
         const cwd = await this.repoDir(workspaceId);
@@ -3339,7 +3339,7 @@ export class GitService {
         assertValidBranchName(baseBranch);
         assertValidRelativePath(relativePath);
         if (!/^[0-9a-f]{40,64}$/.test(sha)) {
-            throw new WorkflowValidationError(`invalid commit sha: ${sha}`);
+            throw new VersionControlValidationError(`invalid commit sha: ${sha}`);
         }
         const repoRelativePath = this.stripRepoPrefix(relativePath);
         return this.mutex.run(workspaceId, async () => {
@@ -3350,7 +3350,7 @@ export class GitService {
             }
             catch (err) {
                 if (err.exitCode === 1) {
-                    throw new WorkflowDomainError(`That commit is not part of "${baseBranch}" — it is not this request's fork point.`, 404);
+                    throw new VersionControlDomainError(`That commit is not part of "${baseBranch}" — it is not this request's fork point.`, 404);
                 }
                 throw err;
             }
@@ -3532,7 +3532,7 @@ export class GitService {
             return await this.publishedPrEnds(cwd, baseBranch, headBranch);
         }
         catch (err) {
-            if (err instanceof WorkflowValidationError)
+            if (err instanceof VersionControlValidationError)
                 return null;
             throw err;
         }
@@ -3584,7 +3584,7 @@ export class GitService {
                     throw err;
             }
         }
-        throw new WorkflowValidationError(`unknown branch: ${branch}`);
+        throw new VersionControlValidationError(`unknown branch: ${branch}`);
     }
     /**
      * Every commit `branch` resolves to in this repository — its local head
@@ -3623,7 +3623,7 @@ export class GitService {
                 // Try the next candidate.
             }
         }
-        throw new WorkflowValidationError(`unknown branch: ${branch}`);
+        throw new VersionControlValidationError(`unknown branch: ${branch}`);
     }
     // ── internals ──────────────────────────────────────────────────────────
     async statusInternal(workspaceId) {
@@ -3759,7 +3759,7 @@ export class GitService {
             throw err;
         }
         if (kind === 'tree') {
-            throw new WorkflowValidationError(`"${displayPath}" is a directory at that point in history — history is served per file`);
+            throw new VersionControlValidationError(`"${displayPath}" is a directory at that point in history — history is served per file`);
         }
     }
     async readFileAtRef(workspaceId, ref, repoRelativePath) {
@@ -3899,7 +3899,7 @@ export class GitService {
     async fileBytesAtCommit(workspaceId, relativePath, sha, side) {
         assertValidRelativePath(relativePath);
         if (!/^[a-f0-9]{7,40}$/i.test(sha)) {
-            throw new WorkflowValidationError('invalid commit sha');
+            throw new VersionControlValidationError('invalid commit sha');
         }
         const repoRelativePath = this.stripRepoPrefix(relativePath);
         return this.mutex.run(workspaceId, async () => {