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

package/src/modules/{workflow/review-workflow/review-workflow.service.ts → version-control/change-request-review/change-request-review.service.ts}

@@ -20,16 +20,16 @@ import { mergeCommitSubject } from '../git/merge-commit.js';
 import { redactSecret } from '../../../shared/redact-secret.js';
 import {
   ChangeRequestConflictsError,
-  WorkflowDomainError,
-  WorkflowValidationError,
+  VersionControlDomainError,
+  VersionControlValidationError,
 } from '../../../shared/domain-errors.js';
 import type { WorkspaceService } from '../../workspace/index.js';
 import { canonicalEmail, hashEmail } from '../../../shared/email-identity.js';
 import type {
-  IReviewWorkflowService,
+  IChangeRequestReviewService,
   MergeGateInput,
   MergeGateResult,
-} from './review-workflow.interface.js';
+} from './change-request-review.interface.js';
 import {
   APPROVAL_LOCK_TIMEOUT_MS,
   isApprovalLockTimeout,
@@ -67,7 +67,7 @@ function redactTokens(msg: string, token: string | null | undefined): string {
  * let go. Retryable BY THE CALLER, and said in words a business user can act
  * on: nothing was written, and trying again is the whole fix.
  */
-class ApprovalBusyError extends WorkflowDomainError {
+class ApprovalBusyError extends VersionControlDomainError {
   constructor() {
     super(
       'This change request is being updated right now — try that again in a moment.',
@@ -78,7 +78,7 @@ class ApprovalBusyError extends WorkflowDomainError {
   }
 }
 
-class MergeBlockedError extends WorkflowDomainError {
+class MergeBlockedError extends VersionControlDomainError {
   constructor(reasons: string[]) {
     super(`Merge gate rejected: ${reasons.join('; ') || 'unknown'}`, 422, {
       mergeBlockedReasons: reasons,
@@ -87,14 +87,14 @@ class MergeBlockedError extends WorkflowDomainError {
   }
 }
 
-class MergeExecutionError extends WorkflowDomainError {
+class MergeExecutionError extends VersionControlDomainError {
   constructor(reason: string) {
     super(`Merge failed: ${reason}`, 502);
     this.name = 'MergeExecutionError';
   }
 }
 
-class ApprovalAuthError extends WorkflowDomainError {
+class ApprovalAuthError extends VersionControlDomainError {
   constructor(reason: 'not-eligible' | 'no-eligible-approvers' | 'path-not-in-pr') {
     const { status, msg } = {
       'not-eligible':          { status: 403, msg: "You don't have write access on this file's path" },
@@ -115,7 +115,7 @@ class ApprovalAuthError extends WorkflowDomainError {
  * Signing in again makes a fresh account at the same address, and approvals
  * made then are that new person's.
  */
-class ApprovalAccountGoneError extends WorkflowDomainError {
+class ApprovalAccountGoneError extends VersionControlDomainError {
   constructor() {
     super('This account no longer exists — sign in again to approve.', 401, {
       kind: 'approval-account-erased',
@@ -124,7 +124,7 @@ class ApprovalAccountGoneError extends WorkflowDomainError {
   }
 }
 
-class BypassAuthError extends WorkflowDomainError {
+class BypassAuthError extends VersionControlDomainError {
   constructor() {
     super(
       "Only admins can merge with bypass. You need write access to roles.yaml on the base branch to skip approval warnings.",
@@ -134,7 +134,7 @@ class BypassAuthError extends WorkflowDomainError {
   }
 }
 
-class CancelStateError extends WorkflowDomainError {
+class CancelStateError extends VersionControlDomainError {
   constructor(reason: 'already-applied' | 'already-cancelled') {
     const msg =
       reason === 'already-applied'
@@ -145,7 +145,7 @@ class CancelStateError extends WorkflowDomainError {
   }
 }
 
-class CancelAuthError extends WorkflowDomainError {
+class CancelAuthError extends VersionControlDomainError {
   constructor() {
     super(
       "You can't cancel this change request — that takes being its author, an admin, " +
@@ -158,7 +158,7 @@ class CancelAuthError extends WorkflowDomainError {
 
 function assertValidPrNumber(n: number): void {
   if (!Number.isInteger(n) || n <= 0) {
-    throw new WorkflowValidationError('PR number must be a positive integer');
+    throw new VersionControlValidationError('PR number must be a positive integer');
   }
 }
 
@@ -236,13 +236,13 @@ function evaluateGateParts(input: MergeGateInput): { hardReasons: string[]; warn
 
 function assertValidPath(p: unknown): asserts p is string | undefined {
   if (p === undefined || p === null) return;
-  if (typeof p !== 'string') throw new WorkflowValidationError('path must be a string');
-  if (!p) throw new WorkflowValidationError('path, if provided, must be non-empty');
-  if (p.length > 4096) throw new WorkflowValidationError('path exceeds 4096 character limit');
-  if (p.includes('\0')) throw new WorkflowValidationError('path contains NUL');
+  if (typeof p !== 'string') throw new VersionControlValidationError('path must be a string');
+  if (!p) throw new VersionControlValidationError('path, if provided, must be non-empty');
+  if (p.length > 4096) throw new VersionControlValidationError('path exceeds 4096 character limit');
+  if (p.includes('\0')) throw new VersionControlValidationError('path contains NUL');
 }
 
-export class ReviewWorkflowService implements IReviewWorkflowService {
+export class ChangeRequestReviewService implements IChangeRequestReviewService {
   constructor(
     private readonly db: Database,
     private readonly accessControl: IAccessControl,
@@ -394,8 +394,8 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
   ): Promise<FileApprovalState[]> {
     assertValidPrNumber(prNumber);
     assertValidPath(path);
-    if (!headSha) throw new WorkflowValidationError('head sha is required');
-    if (!baseBranch) throw new WorkflowValidationError('base branch is required');
+    if (!headSha) throw new VersionControlValidationError('head sha is required');
+    if (!baseBranch) throw new VersionControlValidationError('base branch is required');
 
     if (!files.some((f) => f.path === path)) {
       throw new ApprovalAuthError('path-not-in-pr');
@@ -513,9 +513,9 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
     opts: { bypass?: boolean } = {},
   ): Promise<MergePrResult> {
     assertValidPrNumber(prNumber);
-    if (!headSha) throw new WorkflowValidationError('head sha is required');
-    if (!baseBranch) throw new WorkflowValidationError('base branch is required');
-    if (!workspaceId) throw new WorkflowValidationError('workspace id is required');
+    if (!headSha) throw new VersionControlValidationError('head sha is required');
+    if (!baseBranch) throw new VersionControlValidationError('base branch is required');
+    if (!workspaceId) throw new VersionControlValidationError('workspace id is required');
 
     // Server-side re-validation — never trust the frontend's cached gate.
     // Hard blocks always refuse. Missing approvals refuse unless the caller
@@ -562,7 +562,7 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
       .from(changeRequests)
       .where(eq(changeRequests.number, prNumber))
       .limit(1);
-    if (!cr) throw new WorkflowValidationError(`Change request #${prNumber} not found`);
+    if (!cr) throw new VersionControlValidationError(`Change request #${prNumber} not found`);
     // Re-validate lifecycle against the AUTHORITATIVE row, not the caller's
     // `state` (which only drove the gate). A stale or duplicate request must not
     // re-run the git merge on a CR that's already merged or closed.
@@ -837,8 +837,8 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
     workspaceId: string,
   ): Promise<CancelPrResult> {
     assertValidPrNumber(prNumber);
-    if (!baseBranch) throw new WorkflowValidationError('base branch is required');
-    if (!workspaceId) throw new WorkflowValidationError('workspace id is required');
+    if (!baseBranch) throw new VersionControlValidationError('base branch is required');
+    if (!workspaceId) throw new VersionControlValidationError('workspace id is required');
 
     // Refuse early on terminal states so the gh call only fires for genuinely
     // open PRs. Two distinct 422s — frontend distinguishes "already applied"
@@ -938,7 +938,7 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
   ): Promise<number> {
     assertValidPrNumber(prNumber);
     if (!fromHeadSha || !toHeadSha) {
-      throw new WorkflowValidationError('both head shas are required');
+      throw new VersionControlValidationError('both head shas are required');
     }
     if (fromHeadSha === toHeadSha) return 0;
 
@@ -1023,7 +1023,7 @@ export class ReviewWorkflowService implements IReviewWorkflowService {
   ): Promise<FileApprovalState[]> {
     assertValidPrNumber(prNumber);
     assertValidPath(path);
-    if (!headSha) throw new WorkflowValidationError('head sha is required');
+    if (!headSha) throw new VersionControlValidationError('head sha is required');
 
     const callerEmail = canonicalEmail(user.email);
 

package/src/modules/{workflow → version-control}/event-bus.ts

@@ -1,7 +1,7 @@
 /**
- * In-process event bus that fans workflow state-change events out to
+ * In-process event bus that fans version-control state-change events out to
  * subscribed SSE sessions. The shape and scope rules live in
- * `@bevel-software/platform-shared/workflow/events.ts` — this module is the runtime that
+ * `@bevel-software/platform-shared/version-control/events.ts` — this module is the runtime that
  * makes them deliverable.
  *
  * **What this owns**
@@ -39,8 +39,8 @@
 import {
   isUserScoped,
   isWorkspaceScoped,
-  type WorkflowEvent,
-  type WorkflowEventPayload,
+  type VersionControlEvent,
+  type VersionControlEventPayload,
 } from '@bevel-software/platform-shared';
 import { logger } from '../../shared/logging.js';
 
@@ -60,7 +60,7 @@ const BUFFER_CAPACITY = 500;
  * stamped envelope + payload and SHOULD NOT throw — exceptions are caught
  * and logged so one misbehaving subscriber never blocks fan-out to the rest.
  */
-export type SubscriberPush = (event: WorkflowEvent) => void;
+export type SubscriberPush = (event: VersionControlEvent) => void;
 
 /**
  * Per-session subscription bookkeeping. `getFocusedWorkspaceIds` is a getter
@@ -96,11 +96,11 @@ function canonicalize(workspaceId: string): string {
   }
 }
 
-export class WorkflowEventBus {
+export class VersionControlEventBus {
   private nextId = 1;
-  private readonly buffer: WorkflowEvent[] = [];
+  private readonly buffer: VersionControlEvent[] = [];
   private readonly subscribers = new Map<string, Subscriber>();
-  private readonly emitListeners = new Set<(event: WorkflowEvent) => void>();
+  private readonly emitListeners = new Set<(event: VersionControlEvent) => void>();
 
   /**
    * Server-side tap: called for EVERY emitted event, before the per-session
@@ -111,7 +111,7 @@ export class WorkflowEventBus {
    * Best-effort like SSE dispatch: a throwing listener is logged, never
    * propagated to the emitter. Returns the unsubscribe.
    */
-  onEmit(listener: (event: WorkflowEvent) => void): () => void {
+  onEmit(listener: (event: VersionControlEvent) => void): () => void {
     this.emitListeners.add(listener);
     return () => this.emitListeners.delete(listener);
   }
@@ -122,8 +122,8 @@ export class WorkflowEventBus {
    * event so callers (e.g. tests, debug logs) can see what was actually
    * delivered.
    */
-  emit(payload: WorkflowEventPayload): WorkflowEvent {
-    const event: WorkflowEvent = {
+  emit(payload: VersionControlEventPayload): VersionControlEvent {
+    const event: VersionControlEvent = {
       id: this.nextId++,
       ts: new Date().toISOString(),
       ...payload,
@@ -165,7 +165,7 @@ export class WorkflowEventBus {
       // try/catch covers both the scope check (`matches` reaches into
       // `sub.getFocusedWorkspaceIds()`, which could throw if a bizarre
       // subscriber holds buggy state) and the dispatch itself, so
-      // workflow mutations stay successful even if a listener throws.
+      // version-control mutations stay successful even if a listener throws.
       // Callers can rely on `emit` never throwing, so they don't need
       // to wrap every emit call site in their own try/catch.
       try {
@@ -220,7 +220,7 @@ export class WorkflowEventBus {
    * is greater than `lastSeenId + 1` (i.e. we evicted events the client
    * needs to see).
    */
-  replayAfter(lastSeenId: number, sub: Pick<Subscriber, 'userId' | 'getFocusedWorkspaceIds'>): WorkflowEvent[] | null {
+  replayAfter(lastSeenId: number, sub: Pick<Subscriber, 'userId' | 'getFocusedWorkspaceIds'>): VersionControlEvent[] | null {
     // Empty buffer: a client that never saw anything (lastSeenId === 0) has
     // nothing to replay and the empty array is correct. A client that DID
     // see events (lastSeenId > 0) but reached an empty buffer means the
@@ -262,7 +262,7 @@ export class WorkflowEventBus {
    * that hasn't yet POSTed its focus gets no workspace events (correct —
    * we don't know what it cares about).
    */
-  private matches(event: WorkflowEvent, sub: Pick<Subscriber, 'userId' | 'getFocusedWorkspaceIds'>): boolean {
+  private matches(event: VersionControlEvent, sub: Pick<Subscriber, 'userId' | 'getFocusedWorkspaceIds'>): boolean {
     if (isWorkspaceScoped(event)) {
       const watched = sub.getFocusedWorkspaceIds();
       if (watched.length === 0) return false;

package/src/modules/{workflow → version-control}/events-delivery.ts

@@ -49,7 +49,7 @@
  * Nothing here changes what publishers emit; the rule only reads the event.
  */
 
-import type { ChangeRequest, WorkflowEvent } from '@bevel-software/platform-shared';
+import type { ChangeRequest, VersionControlEvent } from '@bevel-software/platform-shared';
 import { logger } from '../../shared/logging.js';
 import { workspaceIdForBranch } from '../../shared/workspace-id.js';
 import type { IAccessControl } from '../access/index.js';
@@ -100,14 +100,14 @@ export type ChangeRequestFacts = Pick<ChangeRequest, 'base' | 'authorId' | 'touc
  */
 export interface IEventDelivery {
   /** The event as `viewer` may receive it: itself, a redacted copy, or null. Never rejects. */
-  judge(event: WorkflowEvent, viewer: EventViewer): Promise<WorkflowEvent | null>;
+  judge(event: VersionControlEvent, viewer: EventViewer): Promise<VersionControlEvent | null>;
 }
 
 /** The deployment's `EventAccess`: the access service the file routes use, read in the server's own checkouts. */
 export function createEventAccess(deps: {
   accessControl: Pick<IAccessControl, 'canRead' | 'canReadBatch' | 'canReadBatchAtRef'>;
   kbDirName: string;
-  /** `IWorkflowService.getChangeRequest`: the summary the request list judges, files included. */
+  /** `IVersionControlService.getChangeRequest`: the summary the request list judges, files included. */
   getChangeRequest(number: number): Promise<ChangeRequestFacts | null>;
   workspaces: {
     /** Whether the server holds a checkout for `workspaceId` (the branch's own workspace). */
@@ -172,10 +172,10 @@ export function createEventAccess(deps: {
  * null for nothing at all.
  */
 async function deliveryFor(
-  event: WorkflowEvent,
+  event: VersionControlEvent,
   viewer: EventViewer,
   access: EventAccess,
-): Promise<WorkflowEvent | null> {
+): Promise<VersionControlEvent | null> {
   const email = viewer.email;
   try {
     switch (event.kind) {
@@ -217,7 +217,7 @@ async function maySeeRequest(number: number, email: string, access: EventAccess)
   return maySeeChangeRequest({ readableFiles, isAuthor: false });
 }
 
-type GitSyncFailed = Extract<WorkflowEvent, { kind: 'git-sync-failed' }>;
+type GitSyncFailed = Extract<VersionControlEvent, { kind: 'git-sync-failed' }>;
 
 /**
  * Every path the event names is judged: the root, which git's words are about,
@@ -225,7 +225,7 @@ type GitSyncFailed = Extract<WorkflowEvent, { kind: 'git-sync-failed' }>;
  * words go out only when every one of them is readable; otherwise the person
  * keeps the conflicted files they may read and a fixed sentence.
  */
-async function gitSyncFailedFor(event: GitSyncFailed, email: string, access: EventAccess): Promise<WorkflowEvent> {
+async function gitSyncFailedFor(event: GitSyncFailed, email: string, access: EventAccess): Promise<VersionControlEvent> {
   const conflicted = event.conflictedPaths ?? [];
   const [root, ...each] = await Promise.all([
     access.mayReadRepoPath(event.workspaceId, email, ''),
@@ -235,7 +235,7 @@ async function gitSyncFailedFor(event: GitSyncFailed, email: string, access: Eve
   return root && readable.length === conflicted.length ? event : redactGitSyncFailed(event, readable);
 }
 
-function pathOnWorkspace(event: WorkflowEvent): { workspaceId: string; path: string } | null {
+function pathOnWorkspace(event: VersionControlEvent): { workspaceId: string; path: string } | null {
   const e = event as { workspaceId?: unknown; path?: unknown };
   return typeof e.workspaceId === 'string' && typeof e.path === 'string'
     ? { workspaceId: e.workspaceId, path: e.path }
@@ -246,7 +246,7 @@ function pathOnWorkspace(event: WorkflowEvent): { workspaceId: string; path: str
  * Same shape, so a client parses it as before: git's words are gone, and of
  * the conflicted files only `readable` remain (none, the key absent).
  */
-function redactGitSyncFailed(event: GitSyncFailed, readable: string[]): WorkflowEvent {
+function redactGitSyncFailed(event: GitSyncFailed, readable: string[]): VersionControlEvent {
   const redacted: GitSyncFailed = { ...event, reason: GIT_SYNC_FAILED_REDACTED_REASON };
   if (readable.length > 0) redacted.conflictedPaths = readable;
   else delete redacted.conflictedPaths;
@@ -261,11 +261,11 @@ function redactGitSyncFailed(event: GitSyncFailed, readable: string[]): Workflow
  * delivered decides what the replay carries.
  */
 export class EventDelivery implements IEventDelivery {
-  private readonly inFlight = new Map<string, Promise<WorkflowEvent | null>>();
+  private readonly inFlight = new Map<string, Promise<VersionControlEvent | null>>();
 
   constructor(private readonly access: EventAccess) {}
 
-  judge(event: WorkflowEvent, viewer: EventViewer): Promise<WorkflowEvent | null> {
+  judge(event: VersionControlEvent, viewer: EventViewer): Promise<VersionControlEvent | null> {
     const key = `${event.id}\u0000${event.ts}\u0000${viewer.userId}`;
     const pending = this.inFlight.get(key);
     if (pending) return pending;

package/src/modules/{workflow → version-control}/events.routes.ts

@@ -44,8 +44,8 @@ import { logger } from '../../shared/logging.js';
 
 const log = logger('events');
 import express from 'express';
-import { type WorkflowEvent } from '@bevel-software/platform-shared';
-import type { WorkflowEventBus } from './event-bus.js';
+import { type VersionControlEvent } from '@bevel-software/platform-shared';
+import type { VersionControlEventBus } from './event-bus.js';
 import type { IEventDelivery } from './events-delivery.js';
 import '../auth/index.js'; // Express Request augmentation
 
@@ -104,7 +104,7 @@ interface ActiveSession {
 }
 
 export function createEventsRoutes(
-  bus: WorkflowEventBus,
+  bus: VersionControlEventBus,
   authMiddleware: express.RequestHandler,
   delivery: IEventDelivery,
 ): express.Router {
@@ -178,7 +178,7 @@ export function createEventsRoutes(
 
     // Every event this session hears goes through the delivery rule, in the
     // order it arrived: the verdict is async, the stream must not reorder.
-    const push = (event: WorkflowEvent): void => {
+    const push = (event: VersionControlEvent): void => {
       if (session.closed) return;
       const verdict = delivery.judge(event, viewer);
       session.queue = session.queue.then(async () => {
@@ -312,7 +312,7 @@ export function createEventsRoutes(
  * Data is a single line of JSON — never embedded newlines, which would
  * break the SSE parser. JSON.stringify guarantees that.
  */
-function writeSseEvent(res: Response, event: WorkflowEvent): void {
+function writeSseEvent(res: Response, event: VersionControlEvent): void {
   res.write(`id: ${event.id}\n`);
   res.write(`data: ${JSON.stringify(event)}\n\n`);
 }

package/src/modules/{workflow → version-control}/file-lock.service.ts

@@ -42,7 +42,7 @@
  * writing: a previous-version process never looks at a canonical row, so no
  * check here could make the two contend while both run. They never do — one
  * server process owns the workspaces directory (see `branchLifecycle` in the
- * workflow service; this service's deletion gate is in-process for the same
+ * version-control service; this service's deletion gate is in-process for the same
  * reason), and an upgrade stops the old process before the new one starts.
  *
  * There is no transition handling for rows written under a raw spelling
@@ -61,7 +61,7 @@ import { and, eq, gt, inArray, lte } from 'drizzle-orm';
 import type { Database } from '../database/index.js';
 import { fileLocks } from '../database/index.js';
 import type { AcquireLockResult, AuthUser, FileLock } from '@bevel-software/platform-shared';
-import { WorkflowValidationError } from '../../shared/domain-errors.js';
+import { VersionControlValidationError } from '../../shared/domain-errors.js';
 import { canonicalFileIdentity } from '../../shared/canonical-file-identity.js';
 import { branchForWorkspaceId, canonicalWorkspaceId } from '../../shared/workspace-id.js';
 
@@ -152,7 +152,7 @@ export class FileLockService {
    *
    * `opts.coordination` stamps the row's `mode` as `'coordination'` — a
    * pure-mutex hold that grants no write authority (see
-   * `IWorkflowService.acquireLock`). The mode is persisted so the workflow
+   * `IVersionControlService.acquireLock`). The mode is persisted so the version-control
    * service's write paths can refuse to treat the hold as write possession
    * for the row's whole lifetime; a takeover of an expired row re-stamps the
    * mode, so a stale coordination row can't launder a later edit acquire
@@ -168,7 +168,7 @@ export class FileLockService {
     const targetPath = canonicalFileIdentity(rawPath);
     const workspaceId = canonicalWorkspaceId(rawWorkspaceId);
     if (this.closing.has(branch)) {
-      throw new WorkflowValidationError(`"${branch}" is being deleted, so "${targetPath}" cannot be held for editing.`, {
+      throw new VersionControlValidationError(`"${branch}" is being deleted, so "${targetPath}" cannot be held for editing.`, {
         kind: 'branch-being-deleted',
         branch,
         path: targetPath,
@@ -294,7 +294,7 @@ export class FileLockService {
       )
       .limit(1);
     if (!holder) {
-      throw new WorkflowValidationError(
+      throw new VersionControlValidationError(
         `Lock contention race on "${targetPath}" — please retry.`,
         { kind: 'lock-contention-race', branch, path: targetPath },
       );
@@ -343,7 +343,7 @@ export class FileLockService {
       )
       .returning();
     if (!updated) {
-      throw new WorkflowValidationError(
+      throw new VersionControlValidationError(
         `Cannot heartbeat lock on "${targetPath}": not held by you (or no longer exists).`,
         { kind: 'lock-not-held', branch, path: targetPath },
       );

package/src/modules/{workflow → version-control}/git/__tests__/git-test-helpers.ts

@@ -1,7 +1,7 @@
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 
 /**
  * Helpers shared by the GitService integration suites that drive a real git
@@ -31,8 +31,8 @@ export async function gitOut(cwd: string, args: string[]): Promise<string> {
 }
 
 /** An empty hooks registry — no commit-time validation, so pulls/merges never block. */
-export function stubWorkflowHooks(): WorkflowHooks {
-  return new WorkflowHooks();
+export function stubVersionControlHooks(): VersionControlHooks {
+  return new VersionControlHooks();
 }
 
 /** Resolves each workspace id to its directory, like the real service does. */

package/src/modules/{workflow → version-control}/git/__tests__/git.service.accessGating.test.ts

@@ -7,7 +7,7 @@ import path from 'node:path';
 import os from 'node:os';
 
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import type { IAccessControl } from '../../../access/access-control.interface.js';
 import { GitService } from '../git.service.js';
 import { AccessDeniedError } from '../../../access-model/access-errors.js';
@@ -140,7 +140,7 @@ async function makeSvc(
   const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
   const svc = new GitService(
     stubWorkspaceService(workspaceId, workspaceDir),
-    new WorkflowHooks(),
+    new VersionControlHooks(),
     testKbContext(),
     undefined,
     ac ?? null,
@@ -262,7 +262,7 @@ describe('GitService — push gate uses origin/<branch> (not HEAD or working tre
     const { ac, calls } = recordingAccessControl();
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
       undefined,
       ac,
@@ -306,7 +306,7 @@ describe('GitService — push gate uses origin/<branch> (not HEAD or working tre
     });
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
       undefined,
       ac,
@@ -337,7 +337,7 @@ describe('GitService — push gate uses origin/<branch> (not HEAD or working tre
     });
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
       undefined,
       ac,

package/src/modules/{workflow → version-control}/git/__tests__/git.service.appliedChange.test.ts

@@ -3,9 +3,9 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
 import { testKbContext } from '../../../../__tests__/kb-context.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
-import { WorkflowValidationError } from '../../../../shared/domain-errors.js';
+import { VersionControlValidationError } from '../../../../shared/domain-errors.js';
 import { mergeCommitSubject } from '../merge-commit.js';
 import { runGit, gitOut, stubWorkspaceService } from './git-test-helpers.js';
 
@@ -78,7 +78,7 @@ describe('GitService reading an applied change from its merge commit', () => {
 
     git = new GitService(
       stubWorkspaceService({ [workspaceId]: path.dirname(repo) }),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     return { mergeSha, targetBefore, sourceTip };
@@ -234,7 +234,7 @@ describe('GitService reading an applied change from its merge commit', () => {
       () => git.changedPathsAndPairsOfAppliedChange(workspaceId, ref(absent)),
       () => git.appliedChangeShas(workspaceId, ref(absent)),
     ]) {
-      await expect(call()).rejects.toThrow(WorkflowValidationError);
+      await expect(call()).rejects.toThrow(VersionControlValidationError);
     }
   });