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

package/src/modules/onboarding/starter-pack.service.ts

@@ -59,14 +59,14 @@ import {
   pluginManifestName,
   renderPluginManifest,
   type AuthUser,
-  type IWorkflowService,
+  type IVersionControlService,
 } from '@bevel-software/platform-shared';
 import { logger } from '../../shared/logging.js';
-import { PushNeedsAgentResolutionError, WorkflowDomainError } from '../../shared/domain-errors.js';
+import { PushNeedsAgentResolutionError, VersionControlDomainError } from '../../shared/domain-errors.js';
 import type { KbContext } from '../../shared/kb-context.js';
 import type { IAdminAccessService } from '../admin/index.js';
 import type { IAccessControl } from '../access/index.js';
-import type { FileChangeNotifier, WorkspaceMutex } from '../kb-fs/index.js';
+import type { WorkspaceMutex } from '../kb-fs/index.js';
 import { LockingFilesystem } from '../kb-fs/index.js';
 import type { IFsProbe, ITreeWalker } from '../../shared/fs.contract.js';
 import {
@@ -111,7 +111,7 @@ const CATCH_ALL_PACK = 'general';
 export type { ChosenStarterPack, IStarterPackService, StarterPackApplied, StarterPacksAnswer } from './onboarding.contract.js';
 
 /** A refusal the route passes through as its status. */
-export class StarterPackError extends WorkflowDomainError {
+export class StarterPackError extends VersionControlDomainError {
   constructor(message: string, status: number) {
     super(message, status);
     this.name = 'StarterPackError';
@@ -123,7 +123,7 @@ export interface StarterPackServiceDeps {
   packsDir: string;
   kb: KbContext;
   workspaceService: StarterPackWorkspaces;
-  workflow: IWorkflowService;
+  versionControl: IVersionControlService;
   adminAccess: IAdminAccessService;
   /** The claim and the answer (see the module doc). */
   settings: StarterPackSettings;
@@ -146,8 +146,6 @@ export interface StarterPackServiceDeps {
   pluginLocks: PluginIdentityLocks;
   /** The SSE bus: `fs-tree-changed` sends every open tree on the branch to fetch again. */
   events?: { emit(event: { kind: 'fs-tree-changed'; workspaceId: string; branch: string }): void };
-  /** The post-commit hook catalogs refresh on — the plugin's skills appear without a restart. */
-  fileChanges?: FileChangeNotifier;
   /**
    * One choice at a time on this replica: the second of two quick clicks
    * finds the first one's answer recorded. Across replicas the recorded
@@ -423,7 +421,7 @@ export class StarterPackService implements IStarterPackService, FirstRunStarterS
    * renewed at the last moment (see `fence`).
    */
   private async apply(user: AuthUser, pack: StarterPack, lease: Lease): Promise<string[]> {
-    const { kb, workspaceService, workflow, disk } = this.deps;
+    const { kb, workspaceService, versionControl, disk } = this.deps;
     const branch = kb.defaultBranch;
     const ws = await workspaceService.getOrCreateForBranch(branch);
     const basePath = await workspaceService.getWorkspacePath(ws.id);
@@ -434,7 +432,7 @@ export class StarterPackService implements IStarterPackService, FirstRunStarterS
       const writes = await this.plan(user, pack, files, path.join(basePath, kb.kbDirName));
       const fsys = new LockingFilesystem(
         { basePath, contained: true },
-        { workflow, workspaceId: ws.id, branch, user, kbDirName: kb.kbDirName, fileChanges: this.deps.fileChanges },
+        { versionControl, workspaceId: ws.id, branch, user, kbDirName: kb.kbDirName },
       );
       let written: string[] = [];
       try {

package/src/modules/plugins/__tests__/bundle-dialect.e2e.test.ts

@@ -17,7 +17,7 @@ import { PluginLinkIndex } from '../plugin-links.js';
 import { PluginLinksService } from '../plugin-links.service.js';
 import { KbPluginSource } from '../discovery/kb-plugin-source.js';
 import { MarketplaceCompilerService } from '../compile/marketplace-compiler.service.js';
-import { NodeGitRunner } from '../../workflow/git/node-git-runner.js';
+import { NodeGitRunner } from '../../version-control/git/node-git-runner.js';
 
 /**
  * A customer's repository, read as-is: lowercase `skills/` and `plugins/`

package/src/modules/plugins/__tests__/compile-marketplace.test.ts

@@ -12,7 +12,7 @@ import { SkillService } from '../../skills/skills.service.js';
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import { PluginLinkIndex } from '../plugin-links.js';
 import { MarketplaceCompilerService } from '../compile/marketplace-compiler.service.js';
-import { NodeGitRunner } from '../../workflow/git/node-git-runner.js';
+import { NodeGitRunner } from '../../version-control/git/node-git-runner.js';
 import express from 'express';
 import { ToolRegistry } from '../../tool-registry/tool-registry.js';
 import { registerSkillsTools } from '../../skills/skills.tools.js';

package/src/modules/plugins/__tests__/join-request-jobs.service.test.ts

@@ -24,7 +24,7 @@ const KB = 'knowledge-base';
 const ACCESS_MD = '---\nread:\n  - everyone\n---\nread: []\n';
 
 function harness(over: Partial<JoinRequestJobsDeps> = {}, sharedStore?: FakeJoinRequestStore) {
-  const workflow = {
+  const versionControl = {
     listChangeRequestsAuthoredBy: vi.fn(async () => [] as never[]),
     createBranch: vi.fn(async () => ({ name: 'x', isDefault: false, isProtected: false })),
     listBranches: vi.fn(async () => [] as { name: string }[]),
@@ -38,14 +38,14 @@ function harness(over: Partial<JoinRequestJobsDeps> = {}, sharedStore?: FakeJoin
   };
   const store = sharedStore ?? new FakeJoinRequestStore();
   const jobs = new PluginJoinRequestJobs(store, {
-    workflow: workflow as never,
+    versionControl: versionControl as never,
     workspaceService: workspaceService as never,
     kb: testKbContext({ kbDirName: KB }),
     target: async () => ({ folder: 'Plugins/Finance', displayName: 'Finance' }),
     requester: async (mail) => ({ ...ALI_USER, email: mail }),
     ...over,
   });
-  return { workflow, workspaceService, store, jobs };
+  return { versionControl, workspaceService, store, jobs };
 }
 
 function pendingRow(store: FakeJoinRequestStore) {
@@ -86,7 +86,7 @@ describe('PluginJoinRequestJobs', () => {
     await h.jobs.start(pendingRow(h.store));
 
     const branch = joinBranchFor(ALI, 'Finance');
-    expect(h.workflow.createBranch).toHaveBeenCalledWith(
+    expect(h.versionControl.createBranch).toHaveBeenCalledWith(
       workspaceIdForBranch(DEFAULT_BRANCH),
       branch,
       DEFAULT_BRANCH,
@@ -94,8 +94,8 @@ describe('PluginJoinRequestJobs', () => {
     const write = h.workspaceService.writeFile.mock.calls[0] as unknown as [string, string, string];
     expect(write[1]).toBe(`${KB}/Plugins/Finance/access.md`);
     expect(write[2]).toContain('Ali Baba <ali@bevel.software>');
-    expect(h.workflow.commitChanges).toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledWith(
+    expect(h.versionControl.commitChanges).toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledWith(
       workspaceIdForBranch(branch),
       expect.objectContaining({ email: ALI }),
       expect.objectContaining({ title: 'Join request: Finance', sourceBranch: branch }),
@@ -107,7 +107,7 @@ describe('PluginJoinRequestJobs', () => {
     const h = harness();
     const record = pendingRow(h.store);
     await Promise.all([h.jobs.start(record), h.jobs.start(record)]);
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('a start on a record another flight already opened does nothing at all', async () => {
@@ -117,7 +117,7 @@ describe('PluginJoinRequestJobs', () => {
     // The SAME stale snapshot a second tab would hold: still `pending` in
     // this object, `opened` in the store.
     await h.jobs.start(record);
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('leaves the branch alone when the grant is already on it', async () => {
@@ -127,14 +127,14 @@ describe('PluginJoinRequestJobs', () => {
     );
     await h.jobs.start(pendingRow(h.store));
     expect(h.workspaceService.writeFile).not.toHaveBeenCalled();
-    expect(h.workflow.commitChanges).not.toHaveBeenCalled();
+    expect(h.versionControl.commitChanges).not.toHaveBeenCalled();
     // Still opens the request: the branch carries the proposal either way.
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('records a failure in the words the git work used, with credentials stripped', async () => {
     const h = harness();
-    h.workflow.openChangeRequest.mockRejectedValue(
+    h.versionControl.openChangeRequest.mockRejectedValue(
       new Error("fatal: unable to access 'https://x-access-token:ghp_secret@github.com/acme/kb'"),
     );
     await h.jobs.start(pendingRow(h.store));
@@ -149,7 +149,7 @@ describe('PluginJoinRequestJobs', () => {
     const h = harness();
     // What Drizzle throws: its own error class, the SQL in the message, the
     // driver's error as the cause.
-    h.workflow.openChangeRequest.mockRejectedValue(
+    h.versionControl.openChangeRequest.mockRejectedValue(
       new DrizzleQueryError(
         'insert into "change_requests" ("id", "number", "title", "body", "source_branch", "target_branch", "author_id", "status", "created_at", "updated_at") values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)',
         [],
@@ -174,7 +174,7 @@ describe('PluginJoinRequestJobs', () => {
     // The git work failing behind a wrapper of its own: the cause is what is
     // logged, and what the requester reads, credentials stripped — the
     // database's stable sentence would hide the detail they can act on.
-    h.workflow.openChangeRequest.mockRejectedValue(
+    h.versionControl.openChangeRequest.mockRejectedValue(
       new Error('opening the change request failed', {
         cause: new Error('fatal: unable to access https://x:ghp_secret@github.com/acme/kb: could not resolve host'),
       }),
@@ -193,7 +193,7 @@ describe('PluginJoinRequestJobs', () => {
     expect(h.store.all()).toMatchObject([
       { status: 'failed', failureReason: 'the plugin is no longer available' },
     ]);
-    expect(h.workflow.createBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.createBranch).not.toHaveBeenCalled();
   });
 
   it('fails the record when no account answers to the address that asked', async () => {
@@ -210,7 +210,7 @@ describe('PluginJoinRequestJobs', () => {
       requester: async (mail) => ({ ...ALI_USER, id: asked++ === 0 ? 'u-1' : 'u-2', email: mail }),
     });
     await h.jobs.start(pendingRow(h.store));
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.store.all()).toMatchObject([{ status: 'failed' }]);
   });
 
@@ -218,7 +218,7 @@ describe('PluginJoinRequestJobs', () => {
     const h = harness();
     h.jobs.stopSweeping();
     await h.jobs.start(pendingRow(h.store));
-    expect(h.workflow.createBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.createBranch).not.toHaveBeenCalled();
     expect(h.store.all()).toMatchObject([{ status: 'pending' }]);
   });
 
@@ -230,8 +230,8 @@ describe('PluginJoinRequestJobs', () => {
       requester: async (mail) => (asked++ === 0 ? { ...ALI_USER, email: mail } : null),
     });
     await h.jobs.start(pendingRow(h.store));
-    expect(h.workflow.commitChanges).toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.commitChanges).toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.store.all()).toMatchObject([
       { status: 'failed', failureReason: 'the account that asked no longer exists' },
     ]);
@@ -262,7 +262,7 @@ describe('PluginJoinRequestJobs', () => {
     await h.jobs.sweep();
     await h.jobs.drain();
 
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
     expect(h.store.all().map((r) => r.status)).toEqual(['opened', 'opened', 'failed']);
   });
 
@@ -271,7 +271,7 @@ describe('PluginJoinRequestJobs', () => {
     // A first request from a person is a full clone; the boot must not queue
     // behind one, so `sweep` resolves once the work is under way.
     let release = () => {};
-    h.workflow.createBranch.mockReturnValue(
+    h.versionControl.createBranch.mockReturnValue(
       new Promise((resolve) => {
         release = () => resolve({ name: 'x', isDefault: false, isProtected: false });
       }) as never,
@@ -299,8 +299,8 @@ describe('PluginJoinRequestJobs', () => {
     // pushing the same branch into one shared workspace is the thing the
     // claim exists to prevent, and neither one's single-flight map can see
     // the other.
-    expect(h.workflow.createBranch).not.toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.createBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.store.all()[0].status).toBe('pending');
   });
 
@@ -340,7 +340,7 @@ describe('PluginJoinRequestJobs', () => {
     await fresh.jobs.drain();
 
     expect(h.store.all()[0]).toMatchObject({ status: 'opened', changeRequestNumber: 42 });
-    expect(fresh.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(fresh.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('a live process keeps its claim however long the work takes, by its own heartbeat', async () => {
@@ -358,7 +358,7 @@ describe('PluginJoinRequestJobs', () => {
     // stale window, which is the case the heartbeat exists for: without it
     // the work would be stolen out from under the process doing it.
     let finishClone = (): void => {};
-    h.workflow.createBranch.mockReturnValue(
+    h.versionControl.createBranch.mockReturnValue(
       new Promise((resolve) => {
         finishClone = () => resolve({ name: 'x', isDefault: false, isProtected: false });
       }) as never,
@@ -372,14 +372,14 @@ describe('PluginJoinRequestJobs', () => {
     // Four windows in, and still held — by the interval, and nothing else.
     const other = harness({}, h.store);
     await other.jobs.start({ ...record });
-    expect(other.workflow.createBranch).not.toHaveBeenCalled();
+    expect(other.versionControl.createBranch).not.toHaveBeenCalled();
     expect(h.store.all()[0].status).toBe('pending');
 
     // And it still completes: the beats did not disturb the work.
     finishClone();
     await flight;
     expect(h.store.all()[0]).toMatchObject({ status: 'opened', changeRequestNumber: 42 });
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('stops before the change request when the row was erased under it', async () => {
@@ -389,7 +389,7 @@ describe('PluginJoinRequestJobs', () => {
     // comes next is the one step that leaves something a manager sees.
     const h = harness();
     const record = pendingRow(h.store);
-    h.workflow.commitChanges.mockImplementation(async () => {
+    h.versionControl.commitChanges.mockImplementation(async () => {
       h.store.deleteFor(ALI, 'Finance');
       return null;
     });
@@ -398,7 +398,7 @@ describe('PluginJoinRequestJobs', () => {
 
     // No change request in a deleted person's name — and no row written back,
     // which would resurrect the ask the erasure just removed.
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.store.all()).toEqual([]);
   });
 
@@ -410,7 +410,7 @@ describe('PluginJoinRequestJobs', () => {
     // that replaced it.
     const h = harness();
     const record = pendingRow(h.store);
-    h.workflow.commitChanges.mockImplementation(async () => {
+    h.versionControl.commitChanges.mockImplementation(async () => {
       // A zero window is "the claim has lapsed", without minutes of fake time.
       await h.store.claim(record.id, 0);
       return null;
@@ -418,7 +418,7 @@ describe('PluginJoinRequestJobs', () => {
 
     await h.jobs.start(record);
 
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     // Still pending, under the NEW claim: not `failed`, which is what an
     // unfenced worker would have written over a run that is going fine.
     expect(h.store.all()[0]).toMatchObject({ status: 'pending', failureReason: null });
@@ -444,8 +444,8 @@ describe('PluginJoinRequestJobs', () => {
     // Nothing was written to the branch and nothing was opened — and the row
     // is left exactly as it was, pending, for the next sweep to redo.
     expect(h.workspaceService.writeFile).not.toHaveBeenCalled();
-    expect(h.workflow.commitChanges).not.toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.commitChanges).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     expect(h.store.all()[0]).toMatchObject({ status: 'pending', failureReason: null });
   });
 
@@ -466,7 +466,7 @@ describe('PluginJoinRequestJobs', () => {
     };
 
     let finishClone = (): void => {};
-    h.workflow.createBranch.mockReturnValue(
+    h.versionControl.createBranch.mockReturnValue(
       new Promise((resolve) => {
         finishClone = () => resolve({ name: 'x', isDefault: false, isProtected: false });
       }) as never,
@@ -502,8 +502,8 @@ describe('PluginJoinRequestJobs', () => {
     // The branch was created under a claim this process did hold — that is
     // idempotent and harmless — but nothing after the clone ran.
     expect(h.workspaceService.writeFile).not.toHaveBeenCalled();
-    expect(h.workflow.commitChanges).not.toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.commitChanges).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('a superseded token can neither beat nor decide the row', async () => {
@@ -562,7 +562,7 @@ describe('PluginJoinRequestJobs', () => {
     await vi.advanceTimersByTimeAsync(5000);
     await h.jobs.drain();
 
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it("a sweep that cannot read the table logs the database's reason, not the wrapper's cut-off SQL", async () => {
@@ -594,12 +594,12 @@ describe('PluginJoinRequestJobs', () => {
   it('proceeds past a createBranch failure only when the branch is really there', async () => {
     const h = harness();
     const branch = joinBranchFor(ALI, 'Finance');
-    h.workflow.createBranch.mockRejectedValue(new Error('a branch named that already exists'));
-    h.workflow.listBranches.mockResolvedValue([{ name: branch }]);
+    h.versionControl.createBranch.mockRejectedValue(new Error('a branch named that already exists'));
+    h.versionControl.listBranches.mockResolvedValue([{ name: branch }]);
 
     await h.jobs.start(pendingRow(h.store));
 
-    expect(h.workflow.listBranches).toHaveBeenCalledWith(expect.any(String), {
+    expect(h.versionControl.listBranches).toHaveBeenCalledWith(expect.any(String), {
       freshFetch: true,
       strictFetch: true,
     });
@@ -608,8 +608,8 @@ describe('PluginJoinRequestJobs', () => {
 
   it('fails the record when createBranch refuses and no branch exists to work against', async () => {
     const h = harness();
-    h.workflow.createBranch.mockRejectedValue(new Error('remote: permission denied'));
-    h.workflow.listBranches.mockResolvedValue([]);
+    h.versionControl.createBranch.mockRejectedValue(new Error('remote: permission denied'));
+    h.versionControl.listBranches.mockResolvedValue([]);
 
     await h.jobs.start(pendingRow(h.store));
 
@@ -620,7 +620,7 @@ describe('PluginJoinRequestJobs', () => {
       status: 'failed',
       failureReason: 'remote: permission denied',
     });
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('refuses to splice when access.md is unreadable for any reason but absence', async () => {
@@ -670,7 +670,7 @@ describe('PluginJoinRequestJobs', () => {
     // A cached listing taken before an earlier attempt opened its change
     // request shows nothing to adopt, which is how a retry becomes a
     // duplicate.
-    expect(h.workflow.listChangeRequestsAuthoredBy).toHaveBeenCalledWith(ALI, { fresh: true });
+    expect(h.versionControl.listChangeRequestsAuthoredBy).toHaveBeenCalledWith(ALI, { fresh: true });
   });
 
 });

package/src/modules/plugins/__tests__/join-requests.service.test.ts

@@ -4,7 +4,7 @@ import {
   joinBranchFor,
   type AuthUser,
   type ChangeRequest,
-  type IWorkflowService,
+  type IVersionControlService,
 } from '@bevel-software/platform-shared';
 import { type WorkspaceService } from '../../workspace/workspace.service.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
@@ -53,10 +53,10 @@ function makeHarness(byRef: Record<string, string>, holds: Record<string, unknow
       path === ACCESS_MD ? (byRef[ref] ?? null) : null,
     ),
   } as unknown as WorkspaceService;
-  const workflow = {
+  const versionControl = {
     rejectChangeRequest: vi.fn(async () => ({ number: 7, state: 'closed' })),
     deleteBranch: vi.fn(async () => undefined),
-  } as unknown as IWorkflowService;
+  } as unknown as IVersionControlService;
   // Nobody holds anything by default: every proposal stands on the file diff
   // alone, which is what these cases are about.
   const accessControl = {
@@ -67,8 +67,8 @@ function makeHarness(byRef: Record<string, string>, holds: Record<string, unknow
     ...holds,
   } as unknown as IAccessControl;
   return {
-    svc: new JoinRequestsService(workspaceService, workflow, testKbContext(), accessControl),
-    workflow,
+    svc: new JoinRequestsService(workspaceService, versionControl, testKbContext(), accessControl),
+    versionControl,
     workspaceService,
     accessControl,
   };
@@ -86,7 +86,7 @@ describe('JoinRequestsService.list', () => {
     expect(out).toHaveLength(1);
     expect(out[0]).toMatchObject({ number: 7, requesterName: 'Ali Baba' });
     expect(out[0].proposals.map((p) => p.label)).toEqual(['Ali Baba']);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
   });
 
   it('SETTLES a request whose proposals have all landed: closes it, deletes the branch, omits it', async () => {
@@ -94,7 +94,7 @@ describe('JoinRequestsService.list', () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
     const out = await h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR);
     expect(out).toEqual([]);
-    expect(h.workflow.rejectChangeRequest).toHaveBeenCalledWith(
+    expect(h.versionControl.rejectChangeRequest).toHaveBeenCalledWith(
       7,
       ACTOR,
       'open',
@@ -105,7 +105,7 @@ describe('JoinRequestsService.list', () => {
       // branch could never silently break this.
       workspaceIdForBranch(DEFAULT_BRANCH),
     );
-    expect(h.workflow.deleteBranch).toHaveBeenCalledWith(
+    expect(h.versionControl.deleteBranch).toHaveBeenCalledWith(
       workspaceIdForBranch(DEFAULT_BRANCH),
       joinBranchFor(ALI, 'GTM'),
       ACTOR,
@@ -121,12 +121,12 @@ describe('JoinRequestsService.list', () => {
       ACTOR,
     );
     expect(out).toEqual([]);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
   });
 
   it('keeps listing when closing one request fails', async () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
-    (h.workflow.rejectChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValue(
+    (h.versionControl.rejectChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValue(
       new Error('gh down'),
     );
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
@@ -137,12 +137,12 @@ describe('JoinRequestsService.list', () => {
 
   it('still closes the request when the branch delete fails, and says so', async () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
-    (h.workflow.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValue(new Error('protected'));
+    (h.versionControl.deleteBranch as ReturnType<typeof vi.fn>).mockRejectedValue(new Error('protected'));
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
     // The request still settles (omitted from the list) — the leftover branch
     // is cosmetic, and the failure is logged rather than swallowed.
     await expect(h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR)).resolves.toEqual([]);
-    expect(h.workflow.rejectChangeRequest).toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).toHaveBeenCalled();
     expect(warn).toHaveBeenCalledWith(expect.stringContaining('could not delete'));
     warn.mockRestore();
   });
@@ -159,10 +159,10 @@ describe('JoinRequestsService.list', () => {
       [`origin/${joinBranchFor(ALI, 'Finance!')}`]: DEFAULT_MD,
     });
     await expect(h.svc.list('finance', folderTarget('Plugins/finance'), [other], ACTOR)).resolves.toEqual([]);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
-    expect(h.workflow.deleteBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.deleteBranch).not.toHaveBeenCalled();
     await expect(h.svc.reconcile('finance', folderTarget('Plugins/finance'), other, ACTOR)).resolves.toBe(false);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
   });
 });
 
@@ -170,14 +170,14 @@ describe('JoinRequestsService.reconcile', () => {
   it('settles and reports true once nothing is pending', async () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
     await expect(h.svc.reconcile('GTM', folderTarget(FOLDER), cr(), ACTOR)).resolves.toBe(true);
-    expect(h.workflow.rejectChangeRequest).toHaveBeenCalled();
-    expect(h.workflow.deleteBranch).toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).toHaveBeenCalled();
+    expect(h.versionControl.deleteBranch).toHaveBeenCalled();
   });
 
   it('leaves a request alone while proposals remain', async () => {
     const h = makeHarness(refs(PROPOSING_MD));
     await expect(h.svc.reconcile('GTM', folderTarget(FOLDER), cr(), ACTOR)).resolves.toBe(false);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
   });
 
   it('refuses a change request that is not this plugin\'s join branch', async () => {
@@ -185,6 +185,6 @@ describe('JoinRequestsService.reconcile', () => {
     await expect(
       h.svc.reconcile('GTM', folderTarget(FOLDER), cr({ branch: 'ali/some-draft' }), ACTOR),
     ).resolves.toBe(false);
-    expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.rejectChangeRequest).not.toHaveBeenCalled();
   });
 });