@bevel-software/platform-core-backend 0.35.0 → 0.37.0

package/src/modules/access/__tests__/access-requests.routes.test.ts

@@ -2,17 +2,17 @@ import type { Server } from 'node:http';
 import type { AddressInfo } from 'node:net';
 import express from 'express';
 import { describe, it, expect, afterEach, vi } from 'vitest';
-import { joinBranchFor, type IWorkflowService } from '@bevel-software/platform-shared';
+import { joinBranchFor, type IVersionControlService } from '@bevel-software/platform-shared';
 
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import { testKbContext, TEST_BRANCH_MODEL } from '../../../__tests__/kb-context.js';
-import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkspaceService } from '../../workspace/workspace.service.js';
+import type { AuthService } from '../../auth/index.js';
+import type { WorkspaceService } from '../../workspace/index.js';
 import type { IAccessControl } from '../access-control.interface.js';
 import type { IAccessRequestLifecycle } from '../access-requests.contract.js';
 import { createAccessRequestRoutes } from '../access-requests.routes.js';
 import { ChangeRequestConflictsError } from '../../../shared/domain-errors.js';
-import { pendingProposals } from '../../plugins/join-proposals.js';
+import { pendingProposals } from '../../plugins/index.js';
 
 /**
  * Asking for Can edit or Owner on an item, and what the editors then see.
@@ -71,7 +71,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
   const opened: unknown[] = [];
   const written: { path: string; text: string }[] = [];
 
-  const workflow = {
+  const versionControl = {
     listChangeRequestsAuthoredBy: vi.fn(async () => openCrs),
     listChangeRequests: vi.fn(async () => openCrs),
     // The ref list FOLLOWS create and delete, as origin's does: a probe that
@@ -94,7 +94,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
     latestClosedChangeRequest: vi.fn(async () => lastClosed),
     getChangeRequest: vi.fn(async (n: number) => ({ number: n, state: 'open' })),
     getChangeRequestDetail: vi.fn(async () => ({ body: '', ...detail })),
-  } as unknown as IWorkflowService;
+  } as unknown as IVersionControlService;
 
   const workspaceService = {
     getOrCreateForBranch: vi.fn(async (branch: string) => ({ id: workspaceIdForBranch(branch) })),
@@ -143,7 +143,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
       accessControl,
       workspaceService,
       authService: { getUserById: async () => RITA } as unknown as AuthService,
-      workflow,
+      versionControl,
       lifecycle,
       kb: testKbContext({ kbDirName: KB }),
     }),
@@ -153,7 +153,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
   });
   const { port } = server.address() as AddressInfo;
   const base = `http://127.0.0.1:${port}/api/workspace`;
-  return { server, base, workflow, workspaceService, accessControl, lifecycle, opened, written };
+  return { server, base, versionControl, workspaceService, accessControl, lifecycle, opened, written };
 }
 
 const post = (url: string, body: unknown) =>
@@ -264,7 +264,7 @@ describe('POST /workspace/:id/access/request', () => {
     server = h.server;
     const res = await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
     expect(await res.json()).toMatchObject({ number: 31 });
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.workspaceService.writeFile).not.toHaveBeenCalled();
   });
 
@@ -290,7 +290,7 @@ describe('POST /workspace/:id/access/request', () => {
     const res = await post(`${h.base}/${workspaceIdForBranch('rita/draft')}/access/request`, folderBody);
     expect(res.status).toBe(400);
     expect(await res.json()).toMatchObject({ kind: 'not-live-workspace' });
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('answers as unknown for an item the caller cannot read', async () => {
@@ -298,7 +298,7 @@ describe('POST /workspace/:id/access/request', () => {
     server = h.server;
     const res = await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
     expect(res.status).toBe(404);
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('refuses an editor — they have the dialog, not a request', async () => {
@@ -329,7 +329,7 @@ describe('POST /workspace/:id/access/request', () => {
     expect(
       (await post(`${h.base}/${LIVE_WS}/access/request`, { ...folderBody, note: 'x'.repeat(501) })).status,
     ).toBe(400);
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 });
 
@@ -517,10 +517,10 @@ describe('a branch left over from an answered request', () => {
     const res = await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
 
     expect(res.status).toBe(200);
-    expect(h.workflow.deleteBranch).toHaveBeenCalledWith(LIVE_WS, stale, expect.anything());
-    expect(h.workflow.createBranch).toHaveBeenCalledWith(LIVE_WS, stale, LIVE);
+    expect(h.versionControl.deleteBranch).toHaveBeenCalledWith(LIVE_WS, stale, expect.anything());
+    expect(h.versionControl.createBranch).toHaveBeenCalledWith(LIVE_WS, stale, LIVE);
     // Order matters: recut first, THEN write the proposal onto it.
-    const deleted = (h.workflow.deleteBranch as ReturnType<typeof vi.fn>).mock.invocationCallOrder[0];
+    const deleted = (h.versionControl.deleteBranch as ReturnType<typeof vi.fn>).mock.invocationCallOrder[0];
     const written = (h.workspaceService.writeFile as ReturnType<typeof vi.fn>).mock.invocationCallOrder[0];
     expect(deleted).toBeLessThan(written);
   });
@@ -529,20 +529,20 @@ describe('a branch left over from an answered request', () => {
     const h = await makeHarness();
     server = h.server;
     await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
-    expect(h.workflow.deleteBranch).not.toHaveBeenCalled();
-    expect(h.workflow.createBranch).toHaveBeenCalledWith(LIVE_WS, stale, LIVE);
+    expect(h.versionControl.deleteBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.createBranch).toHaveBeenCalledWith(LIVE_WS, stale, LIVE);
   });
 
   it('still opens the request when the recut fails, rather than refusing the person', async () => {
     vi.spyOn(console, 'warn').mockImplementation(() => {});
     const h = await makeHarness({ existingBranches: [stale] });
-    (h.workflow.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+    (h.versionControl.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
       new Error('the branch could not be removed'),
     );
     server = h.server;
     const res = await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
     expect(res.status).toBe(200);
-    expect(h.workflow.openChangeRequest).toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalled();
   });
 
   it('answers with the rival request when one opened while the recut was under way', async () => {
@@ -551,16 +551,16 @@ describe('a branch left over from an answered request', () => {
     // request is what they both get.
     const h = await makeHarness({ existingBranches: [stale] });
     let listings = 0;
-    (h.workflow.listChangeRequests as ReturnType<typeof vi.fn>).mockImplementation(async () =>
+    (h.versionControl.listChangeRequests as ReturnType<typeof vi.fn>).mockImplementation(async () =>
       listings++ === 0 ? [] : [{ number: 55, branch: stale, state: 'open' }],
     );
-    (h.workflow.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+    (h.versionControl.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
       new Error('Branch has an open change request (#55).'),
     );
     server = h.server;
     const res = await post(`${h.base}/${LIVE_WS}/access/request`, folderBody);
     expect(await res.json()).toMatchObject({ number: 55 });
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('answers a re-send with the level the OPEN request asks for, not the one just sent', async () => {
@@ -609,7 +609,7 @@ describe('what a failed send tells the person', () => {
     // reader2/join-artest3-04i7dr4-0nxlotq and try again" is not.
     vi.spyOn(console, 'warn').mockImplementation(() => {});
     const h = await makeHarness();
-    (h.workflow.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+    (h.versionControl.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
       new ChangeRequestConflictsError(joinBranchFor(RITA.email, FOLDER), LIVE, [
         `${FOLDER}/access.md`,
       ]),

package/src/modules/access/__tests__/access.routes.admins.test.ts

@@ -10,8 +10,8 @@ import { AccessControlService } from '../access-control.service.js';
 import { NodeFs } from '../../kb-fs/node-fs.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -93,8 +93,8 @@ async function makeHarness(
       workspaceService,
       authService,
       authService,
-      {} as unknown as WorkflowService,
-      { emit: vi.fn() } as unknown as WorkflowEventBus,
+      {} as unknown as VersionControlService,
+      { emit: vi.fn() } as unknown as VersionControlEventBus,
       db,
       testKbContext({ kbDirName: KB }),
       new NodeFs(),

package/src/modules/access/__tests__/access.routes.batch.test.ts

@@ -6,8 +6,8 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import type { IAccessControl } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -63,8 +63,8 @@ async function makeHarness(): Promise<Harness> {
       workspaceService,
       authService,
       authService,
-      {} as unknown as WorkflowService,
-      { emit: vi.fn() } as unknown as WorkflowEventBus,
+      {} as unknown as VersionControlService,
+      { emit: vi.fn() } as unknown as VersionControlEventBus,
       usersDbDouble(),
       testKbContext({ kbDirName: KB }),
       new NodeFs(),

package/src/modules/access/__tests__/access.routes.folder-governs.test.ts

@@ -10,8 +10,8 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import type { IAccessControl } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { AccessMutationError, AccessMutationService } from '../access-mutation.service.js';
@@ -137,13 +137,13 @@ describe('access mutations on a file that cannot carry frontmatter', () => {
     // The third release shape: the caller held the lock and touched nothing,
     // so disk and commit queue are left exactly as they are.
     releaseLockUntouched = vi.fn(async () => undefined);
-    const workflowService = {
+    const versionControlService = {
       getLock: vi.fn(async () => null),
       acquireLock,
       releaseLock: vi.fn(async () => undefined),
       releaseLockNoCommit,
       releaseLockUntouched,
-    } as unknown as WorkflowService;
+    } as unknown as VersionControlService;
 
     const app = express();
     app.use(express.json());
@@ -158,8 +158,8 @@ describe('access mutations on a file that cannot carry frontmatter', () => {
         workspaceService,
         { getUserById: vi.fn(async () => USER) } as unknown as AuthService,
         { whileSwitchedOn: async (_email: string, write: () => Promise<void>) => write() },
-        workflowService,
-        { emit: vi.fn() } as unknown as WorkflowEventBus,
+        versionControlService,
+        { emit: vi.fn() } as unknown as VersionControlEventBus,
         usersDbDouble(),
         testKbContext({ kbDirName: KB }),
         new NodeFs(),

package/src/modules/access/__tests__/access.routes.group-grant.test.ts

@@ -7,8 +7,8 @@ import type { IAccessControl } from '../access-control.interface.js';
 import { AccessControlService } from '../access-control.service.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -85,13 +85,13 @@ async function makeHarness(opts: {
   } as unknown as WorkspaceService;
 
   const authService = { getUserById: vi.fn(async () => USER) } as unknown as AuthService;
-  const workflowService = {
+  const versionControlService = {
     getLock: vi.fn(async () => null),
     acquireLock: vi.fn(async () => ({ acquired: true, lock: {} })),
     releaseLock: vi.fn(async () => undefined),
     releaseLockNoCommit: vi.fn(async () => undefined),
-  } as unknown as WorkflowService;
-  const eventBus = { emit: vi.fn() } as unknown as WorkflowEventBus;
+  } as unknown as VersionControlService;
+  const eventBus = { emit: vi.fn() } as unknown as VersionControlEventBus;
   const db = usersDbDouble();
 
   const app = express();
@@ -100,7 +100,7 @@ async function makeHarness(opts: {
     (req as unknown as { userId: string }).userId = USER.id;
     next();
   });
-  app.use('/api', createAccessRoutes(accessControl, workspaceService, authService, authService, workflowService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()));
+  app.use('/api', createAccessRoutes(accessControl, workspaceService, authService, authService, versionControlService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()));
 
   const server = await new Promise<Server>((resolve) => {
     const s = app.listen(0, () => resolve(s));

package/src/modules/access/__tests__/access.routes.overrides.test.ts

@@ -7,8 +7,8 @@ import type { FileTreeEntry } from '@bevel-software/platform-shared';
 import type { IAccessControl } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -87,8 +87,8 @@ async function makeHarness(opts: {
   } as unknown as WorkspaceService;
 
   const authService = { getUserById: vi.fn(async () => USER) } as unknown as AuthService;
-  const workflowService = {} as unknown as WorkflowService;
-  const eventBus = { emit: vi.fn() } as unknown as WorkflowEventBus;
+  const versionControlService = {} as unknown as VersionControlService;
+  const eventBus = { emit: vi.fn() } as unknown as VersionControlEventBus;
   const db = usersDbDouble();
 
   const app = express();
@@ -99,7 +99,7 @@ async function makeHarness(opts: {
   });
   app.use(
     '/api',
-    createAccessRoutes(accessControl, workspaceService, authService, authService, workflowService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()),
+    createAccessRoutes(accessControl, workspaceService, authService, authService, versionControlService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()),
   );
 
   const server = await new Promise<Server>((resolve) => {

package/src/modules/access/__tests__/access.routes.proposal-branch.test.ts

@@ -10,8 +10,8 @@ import { NodeFs } from '../../kb-fs/node-fs.js';
 
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { usersDbDouble } from './users-db-double.js';
 import { AccessControlService } from '../access-control.service.js';
 import { createAccessRoutes } from '../access.routes.js';
@@ -115,12 +115,12 @@ describe('access routes on a proposal branch (real git)', () => {
       git(repo, 'add', '-A');
       git(repo, 'commit', '-q', '-m', `access: ${wsPath} on ${branch}`);
     });
-    const workflowService = {
+    const versionControlService = {
       getLock: async () => null,
       acquireLock: async () => ({ acquired: true, lock: {} }),
       releaseLock,
       releaseLockNoCommit: async () => undefined,
-    } as unknown as WorkflowService;
+    } as unknown as VersionControlService;
 
     const app = express();
     app.use(express.json());
@@ -135,8 +135,8 @@ describe('access routes on a proposal branch (real git)', () => {
         workspaceService,
         authService,
         authService,
-        workflowService,
-        { emit: () => {} } as unknown as WorkflowEventBus,
+        versionControlService,
+        { emit: () => {} } as unknown as VersionControlEventBus,
         usersDbDouble(),
         testKbContext({ kbDirName: KB }),
         new NodeFs(),

package/src/modules/access/__tests__/access.routes.prospective.test.ts

@@ -6,7 +6,7 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import type { HolderChanges, IAccessControl, ProspectiveHolders } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/index.js';
 import type { AuthService } from '../../auth/index.js';
-import type { WorkflowEventBus, WorkflowService } from '../../workflow/index.js';
+import type { VersionControlEventBus, VersionControlService } from '../../version-control/index.js';
 import type { Database } from '../../database/index.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -76,8 +76,8 @@ async function makeHarness(opts: { canRead?: boolean; readable?: (path: string)
       {} as unknown as WorkspaceService,
       { getUserById: vi.fn(async () => USER) } as unknown as AuthService,
       { whileSwitchedOn: async (_email: string, write: () => Promise<void>) => write() },
-      {} as unknown as WorkflowService,
-      { emit: vi.fn() } as unknown as WorkflowEventBus,
+      {} as unknown as VersionControlService,
+      { emit: vi.fn() } as unknown as VersionControlEventBus,
       {} as unknown as Database,
       testKbContext({ kbDirName: KB }),
       realDisk(),

package/src/modules/access/__tests__/access.routes.revoke.test.ts

@@ -6,8 +6,8 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import type { IAccessControl, GrantSources } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import { usersDbDouble } from './users-db-double.js';
 import { testKbContext } from '../../../__tests__/kb-context.js';
@@ -121,14 +121,14 @@ async function makeHarness(opts: {
   const acquireLock = vi.fn(async () => ({ acquired: true, lock: {} }));
   const releaseLock = vi.fn(async () => undefined);
   const releaseLockNoCommit = vi.fn(async () => undefined);
-  const workflowService = {
+  const versionControlService = {
     getLock: vi.fn(async () => null),
     acquireLock,
     releaseLock,
     releaseLockNoCommit,
-  } as unknown as WorkflowService;
+  } as unknown as VersionControlService;
 
-  const eventBus = { emit: vi.fn() } as unknown as WorkflowEventBus;
+  const eventBus = { emit: vi.fn() } as unknown as VersionControlEventBus;
   const db = usersDbDouble();
 
   const app = express();
@@ -137,7 +137,7 @@ async function makeHarness(opts: {
     (req as unknown as { userId: string }).userId = USER.id;
     next();
   });
-  app.use('/api', createAccessRoutes(accessControl, workspaceService, authService, authService, workflowService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()));
+  app.use('/api', createAccessRoutes(accessControl, workspaceService, authService, authService, versionControlService, eventBus, db, testKbContext({ kbDirName: KB }), new NodeFs()));
 
   const server = await new Promise<Server>((resolve) => {
     const s = app.listen(0, () => resolve(s));

package/src/modules/access/__tests__/access.routes.unknown-email.test.ts

@@ -6,8 +6,8 @@ import { describe, it, expect, afterEach, vi } from 'vitest';
 import type { IAccessControl } from '../access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { AuthService } from '../../auth/auth.service.js';
-import type { WorkflowService } from '../../workflow/workflow.service.js';
-import type { WorkflowEventBus } from '../../workflow/event-bus.js';
+import type { VersionControlService } from '../../version-control/version-control.service.js';
+import type { VersionControlEventBus } from '../../version-control/event-bus.js';
 import { createAccessRoutes } from '../access.routes.js';
 import type { Database } from '../../database/connection.js';
 import { usersDbDouble } from './users-db-double.js';
@@ -89,12 +89,12 @@ async function makeHarness(opts: {
   } as unknown as WorkspaceService;
 
   const authService = { getUserById: vi.fn(async () => USER) } as unknown as AuthService;
-  const workflowService = {
+  const versionControlService = {
     getLock: vi.fn(async () => null),
     acquireLock: vi.fn(async () => ({ acquired: true, lock: {} })),
     releaseLock: vi.fn(async () => undefined),
     releaseLockNoCommit: vi.fn(async () => undefined),
-  } as unknown as WorkflowService;
+  } as unknown as VersionControlService;
 
   const app = express();
   app.use(express.json());
@@ -109,8 +109,8 @@ async function makeHarness(opts: {
       workspaceService,
       authService,
       authService,
-      workflowService,
-      { emit: vi.fn() } as unknown as WorkflowEventBus,
+      versionControlService,
+      { emit: vi.fn() } as unknown as VersionControlEventBus,
       opts.db ?? usersDbDouble(opts.accounts ?? []),
       testKbContext({ kbDirName: KB }),
       new NodeFs(),

package/src/modules/access/__tests__/admin-locked-commit.test.ts

@@ -1,8 +1,8 @@
 import { describe, it, expect, vi } from 'vitest';
 
 import { AdminLockedCommits } from '../admin-locked-commit.js';
-import { PushNeedsAgentResolutionError, WorkflowDomainError } from '../../../shared/domain-errors.js';
-import type { AuthUser, IWorkspaceService, IWorkflowService } from '@bevel-software/platform-shared';
+import { PushNeedsAgentResolutionError, VersionControlDomainError } from '../../../shared/domain-errors.js';
+import type { AuthUser, IWorkspaceService, IVersionControlService } from '@bevel-software/platform-shared';
 
 const KB = 'knowledge-base';
 const BRANCH = 'main';
@@ -41,7 +41,7 @@ function makeHarness(opts: {
     deleteFile: async (_id: string, wsRel: string) => void files.delete(wsRel),
   } as unknown as IWorkspaceService;
 
-  const workflowService = {
+  const versionControlService = {
     acquireLock: vi.fn(async (_w: string, _b: string, p: string, user: AuthUser) => {
       if (locks.has(p)) return { acquired: false, lock: { holderUserId: 'x', holderName: 'X' } };
       locks.set(p, user);
@@ -60,14 +60,14 @@ function makeHarness(opts: {
       if (opts.commitError) throw opts.commitError;
       return {};
     }),
-  } as unknown as IWorkflowService;
+  } as unknown as IVersionControlService;
 
   const locked = new AdminLockedCommits({
     workspaceService,
-    workflowService,
+    versionControlService,
     kbDirName: KB,
     defaultBranchOf: () => BRANCH,
-    makeError: (message, status, payload) => new WorkflowDomainError(message, status, payload),
+    makeError: (message, status, payload) => new VersionControlDomainError(message, status, payload),
     logTag: 'test-admin',
     contendedSubject: 'Things',
   });

package/src/modules/access/__tests__/admin-route-helpers.test.ts

@@ -1,14 +1,14 @@
 import { describe, it, expect, vi, afterEach } from 'vitest';
 
 import { toHttpError, requireNonEmptyString } from '../admin-route-helpers.js';
-import { WorkflowDomainError } from '../../../shared/domain-errors.js';
+import { VersionControlDomainError } from '../../../shared/domain-errors.js';
 import { AccessMutationError } from '../access-mutation.service.js';
 
 describe('toHttpError — the shared access-family error shape', () => {
   afterEach(() => vi.restoreAllMocks());
 
   it('a sub-500 domain error keeps its status, message, and payload', () => {
-    const err = new WorkflowDomainError('groups are being edited', 409, { kind: 'idp-mode' });
+    const err = new VersionControlDomainError('groups are being edited', 409, { kind: 'idp-mode' });
     expect(toHttpError(err, 'test')).toEqual({
       status: 409,
       body: { error: 'groups are being edited', kind: 'idp-mode' },
@@ -37,7 +37,7 @@ describe('toHttpError — the shared access-family error shape', () => {
   });
 
   it("a payload key named 'error' cannot overwrite the client-facing message", () => {
-    const err = new WorkflowDomainError('the real message', 422, { error: 'spoofed', kind: 'x' });
+    const err = new VersionControlDomainError('the real message', 422, { error: 'spoofed', kind: 'x' });
     const { body } = toHttpError(err, 'test');
     expect(body.error).toBe('the real message');
     expect(body.kind).toBe('x');
@@ -54,8 +54,8 @@ describe('requireNonEmptyString', () => {
       } catch (err) {
         caught = err;
       }
-      expect(caught).toBeInstanceOf(WorkflowDomainError);
-      expect((caught as WorkflowDomainError).status).toBe(400);
+      expect(caught).toBeInstanceOf(VersionControlDomainError);
+      expect((caught as VersionControlDomainError).status).toBe(400);
     }
   });
 });