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

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

@@ -3,14 +3,14 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
 import type { RemoteSyncPullResult } from '@bevel-software/platform-shared';
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
-import type { IReviewWorkflowService } from '../review-workflow/review-workflow.interface.js';
+import type { IChangeRequestReviewService } from '../change-request-review/change-request-review.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
 import type { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
-import type { WorkflowEventBus } from '../event-bus.js';
+import type { VersionControlEventBus } from '../event-bus.js';
 import type { Database } from '../../database/connection.js';
-import { WorkflowService, syncConflictMessage } from '../workflow.service.js';
+import { VersionControlService, syncConflictMessage } from '../version-control.service.js';
 import { PullRebaseConflictError, RemoteBranchGoneError } from '../../../shared/domain-errors.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 
@@ -28,12 +28,12 @@ function build(opts: { sync: () => Promise<RemoteSyncPullResult> }) {
   const git = { syncFromRemote: vi.fn(opts.sync) } as unknown as GitService;
   const prs = { invalidateListCache: vi.fn() } as unknown as PullRequestService;
   const pendingCommits = { enqueueIfAbsent: vi.fn(async () => true) } as unknown as PendingCommitsService;
-  const events = { emit: vi.fn() } as unknown as WorkflowEventBus;
-  const svc = new WorkflowService(
+  const events = { emit: vi.fn() } as unknown as VersionControlEventBus;
+  const svc = new VersionControlService(
     {} as Database,
     git,
     prs,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     {} as WorkspaceService,
     {} as IAccessControl,
     {} as FileLockService,
@@ -48,7 +48,7 @@ function build(opts: { sync: () => Promise<RemoteSyncPullResult> }) {
 const kinds = (emit: ReturnType<typeof vi.fn>) =>
   emit.mock.calls.map((c) => (c[0] as { kind: string }).kind);
 
-describe('WorkflowService.syncWorkspaceFromRemote', () => {
+describe('VersionControlService.syncWorkspaceFromRemote', () => {
   it('content changed: reports updated, announces the tree and each changed file, drops the CR list cache', async () => {
     const { svc, prs, emit } = build({
       sync: async () => ({ ...PULLED, changedPaths: ['Plugins/x/SKILL.md', 'Docs/a.md'] }),
@@ -246,7 +246,7 @@ describe('WorkflowService.syncWorkspaceFromRemote', () => {
   });
 });
 
-describe('WorkflowService.retireRemoteGoneClone', () => {
+describe('VersionControlService.retireRemoteGoneClone', () => {
   function buildRetire(opts: { cloned: boolean; stillOnOrigin: boolean; bootstrapping?: boolean }) {
     const git = {
       remoteBranchExists: vi.fn(async () => opts.stillOnOrigin),
@@ -257,8 +257,8 @@ describe('WorkflowService.retireRemoteGoneClone', () => {
       isBootstrapInFlight: vi.fn(() => opts.bootstrapping === true),
       deleteWorkspace: vi.fn(async () => {}),
     } as unknown as WorkspaceService;
-    const svc = new WorkflowService(
-      {} as Database, git, {} as PullRequestService, {} as IReviewWorkflowService,
+    const svc = new VersionControlService(
+      {} as Database, git, {} as PullRequestService, {} as IChangeRequestReviewService,
       workspaceService, {} as IAccessControl, {} as FileLockService, {} as PendingCommitsService,
       testKbContext(),
       openChangeGate(),
@@ -317,7 +317,7 @@ describe('WorkflowService.retireRemoteGoneClone', () => {
   });
 });
 
-describe('WorkflowService.retireRemoteGoneClone — what can bring the branch back', () => {
+describe('VersionControlService.retireRemoteGoneClone — what can bring the branch back', () => {
   it('backs off while a clone of the branch is being bootstrapped', async () => {
     const git = { remoteBranchExists: vi.fn(async () => false) } as unknown as GitService;
     const workspaceService = {
@@ -325,8 +325,8 @@ describe('WorkflowService.retireRemoteGoneClone — what can bring the branch ba
       isBootstrapInFlight: vi.fn(() => true),
       deleteWorkspace: vi.fn(async () => {}),
     } as unknown as WorkspaceService;
-    const svc = new WorkflowService(
-      {} as Database, git, {} as PullRequestService, {} as IReviewWorkflowService,
+    const svc = new VersionControlService(
+      {} as Database, git, {} as PullRequestService, {} as IChangeRequestReviewService,
       workspaceService, {} as IAccessControl, {} as FileLockService, {} as PendingCommitsService,
       testKbContext(),
       openChangeGate(),
@@ -354,8 +354,8 @@ describe('WorkflowService.retireRemoteGoneClone — what can bring the branch ba
         order.push('retire-deletes');
       }),
     } as unknown as WorkspaceService;
-    const svc = new WorkflowService(
-      {} as Database, git, {} as PullRequestService, {} as IReviewWorkflowService,
+    const svc = new VersionControlService(
+      {} as Database, git, {} as PullRequestService, {} as IChangeRequestReviewService,
       workspaceService, {} as IAccessControl, {} as FileLockService, {} as PendingCommitsService,
       testKbContext(),
       openChangeGate(),
@@ -370,7 +370,7 @@ describe('WorkflowService.retireRemoteGoneClone — what can bring the branch ba
   });
 });
 
-describe('WorkflowService.syncWorkspaceFromRemote — an announcement is owed until delivered', () => {
+describe('VersionControlService.syncWorkspaceFromRemote — an announcement is owed until delivered', () => {
   it('a retry after a failed announcement delivers it even though HEAD did not move again', async () => {
     let head = 'bbb';
     let pulls = 0;
@@ -420,7 +420,7 @@ describe('WorkflowService.syncWorkspaceFromRemote — an announcement is owed un
   });
 });
 
-describe('WorkflowService.syncWorkspaceFromRemote — a debt dies with its clone', () => {
+describe('VersionControlService.syncWorkspaceFromRemote — a debt dies with its clone', () => {
   it('an announcement owed to a branch the host deleted is not replayed against a branch recreated under that name', async () => {
     let pulls = 0;
     const { svc, prs, emit } = build({

package/src/modules/{workflow/__tests__/workflow.service.update-change-request.pg.test.ts → version-control/__tests__/version-control.service.update-change-request.pg.test.ts}

@@ -14,10 +14,10 @@ import type { IAccessControl } from '../../access/access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
-import type { IReviewWorkflowService } from '../review-workflow/review-workflow.interface.js';
+import type { IChangeRequestReviewService } from '../change-request-review/change-request-review.interface.js';
 import type { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
-import { WorkflowService } from '../workflow.service.js';
+import { VersionControlService } from '../version-control.service.js';
 
 /**
  * An edit against a real Postgres with column encryption ON. `title` and
@@ -30,7 +30,7 @@ const AUTHOR = 'alice@example.com';
 const alice: AuthUser = { id: 'u-alice', email: AUTHOR, name: 'Alice' };
 const open: Database[] = [];
 
-async function seeded(): Promise<{ svc: WorkflowService; db: Database; number: number }> {
+async function seeded(): Promise<{ svc: VersionControlService; db: Database; number: number }> {
   const db = createDb(await scratchDatabaseUrl('hexis_cr_edit'), { piiKey: KEY });
   open.push(db);
   await runCoreMigrations(db, coreMigrationsDir());
@@ -56,11 +56,11 @@ async function seeded(): Promise<{ svc: WorkflowService; db: Database; number: n
     }),
     invalidateDetailCache: vi.fn(),
   } as unknown as PullRequestService;
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     db,
     {} as GitService,
     prs,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     {} as WorkspaceService,
     {} as IAccessControl,
     {} as FileLockService,
@@ -71,7 +71,7 @@ async function seeded(): Promise<{ svc: WorkflowService; db: Database; number: n
   return { svc, db, number };
 }
 
-describe.skipIf(!PG_ADMIN_URL)('WorkflowService.updateChangeRequest on a real, encrypted Postgres', () => {
+describe.skipIf(!PG_ADMIN_URL)('VersionControlService.updateChangeRequest on a real, encrypted Postgres', () => {
   afterAll(async () => {
     for (const db of open) await closeDb(db);
     await dropScratchDatabases();

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from 'vitest';
-import type { AuthUser, WorkflowEventPayload } from '@bevel-software/platform-shared';
+import type { AuthUser, VersionControlEventPayload } from '@bevel-software/platform-shared';
 import { testKbContext } from '../../../__tests__/kb-context.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 import { hashEmail } from '../../../shared/email-identity.js';
@@ -8,11 +8,11 @@ import type { IAccessControl } from '../../access/access-control.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
-import type { IReviewWorkflowService } from '../review-workflow/review-workflow.interface.js';
+import type { IChangeRequestReviewService } from '../change-request-review/change-request-review.interface.js';
 import type { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
-import type { WorkflowEventBus } from '../event-bus.js';
-import { WorkflowService } from '../workflow.service.js';
+import type { VersionControlEventBus } from '../event-bus.js';
+import { VersionControlService } from '../version-control.service.js';
 
 /**
  * Who may change an open request's title and description: its author, or
@@ -96,14 +96,14 @@ function harness(
     getOrCreateForBranch: vi.fn(async (b: string) => ({ id: encodeURIComponent(b) })),
     ensureRemotesFetched: vi.fn(async () => undefined),
   } as unknown as WorkspaceService;
-  const emitted: WorkflowEventPayload[] = [];
-  const events = { emit: (e: WorkflowEventPayload) => emitted.push(e) } as unknown as WorkflowEventBus;
+  const emitted: VersionControlEventPayload[] = [];
+  const events = { emit: (e: VersionControlEventPayload) => emitted.push(e) } as unknown as VersionControlEventBus;
 
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     db as unknown as Database,
     {} as GitService,
     prs,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     workspaces,
     access,
     {} as FileLockService,
@@ -115,7 +115,7 @@ function harness(
   return { svc, db, tx, written, prs, access, workspaces, emitted };
 }
 
-describe('WorkflowService.updateChangeRequest — who may edit', () => {
+describe('VersionControlService.updateChangeRequest — who may edit', () => {
   it('lets the AUTHOR edit without any further grant, and resolves no workspace and reads no access tree', async () => {
     const h = harness({ authorEmail: AUTHOR });
     await h.svc.updateChangeRequest(9, user(AUTHOR), { description: 'P2 - Planned\n\nNew reason.' });
@@ -250,7 +250,7 @@ describe('WorkflowService.updateChangeRequest — who may edit', () => {
   });
 });
 
-describe('WorkflowService.openChangeRequest — the same ceiling on the description', () => {
+describe('VersionControlService.openChangeRequest — the same ceiling on the description', () => {
   it('refuses a description past 64,000 characters with 400 before touching a workspace', async () => {
     const h = harness({ authorEmail: AUTHOR });
     await expect(
@@ -265,7 +265,7 @@ describe('WorkflowService.openChangeRequest — the same ceiling on the descript
   });
 });
 
-describe('WorkflowService.updateChangeRequest — what an edit writes', () => {
+describe('VersionControlService.updateChangeRequest — what an edit writes', () => {
   it('replaces the body whole — the body is the description and nothing else', async () => {
     const h = harness({ authorEmail: AUTHOR });
     const before = Date.now();

package/src/modules/{workflow/__tests__/workflow.service.update-from-target.test.ts → version-control/__tests__/version-control.service.update-from-target.test.ts}

@@ -3,20 +3,20 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
 import type { AuthUser, PullRequestDetail } from '@bevel-software/platform-shared';
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
-import type { IReviewWorkflowService } from '../review-workflow/review-workflow.interface.js';
+import type { IChangeRequestReviewService } from '../change-request-review/change-request-review.interface.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
 import type { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
 import type { Database } from '../../database/connection.js';
-import { WorkflowService } from '../workflow.service.js';
+import { VersionControlService } from '../version-control.service.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
-import type { WorkflowEventBus } from '../event-bus.js';
+import type { VersionControlEventBus } from '../event-bus.js';
 import {
   ChangeRequestConflictsError,
   PullRebaseConflictError,
   PushNeedsAgentResolutionError,
-  WorkflowDomainError,
+  VersionControlDomainError,
 } from '../../../shared/domain-errors.js';
 
 /**
@@ -118,27 +118,27 @@ function harness(opts: {
     .mockResolvedValue(refreshed);
   const prs = { getPrDetail, invalidateDetailCache: vi.fn() };
   const pendingCommits = { enqueueIfAbsent: vi.fn().mockResolvedValue(true) };
-  const reviewWorkflow = {
+  const changeRequestReview = {
     carryApprovalsForward: vi.fn().mockResolvedValue(opts.carried ?? 0),
   };
   const emit = vi.fn();
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     {} as unknown as Database,
     git as unknown as GitService,
     prs as unknown as PullRequestService,
-    reviewWorkflow as unknown as IReviewWorkflowService,
+    changeRequestReview as unknown as IChangeRequestReviewService,
     {} as unknown as WorkspaceService,
     {} as unknown as IAccessControl,
     {} as unknown as FileLockService,
     pendingCommits as unknown as PendingCommitsService,
     testKbContext(),
     openChangeGate(),
-    { emit } as unknown as WorkflowEventBus,
+    { emit } as unknown as VersionControlEventBus,
   );
-  return { svc, git, prs, pendingCommits, reviewWorkflow, refreshed, emit };
+  return { svc, git, prs, pendingCommits, changeRequestReview, refreshed, emit };
 }
 
-describe('WorkflowService.updateFromTarget', () => {
+describe('VersionControlService.updateFromTarget', () => {
   it('merges the target into the proposal, pushes, and returns the refreshed detail', async () => {
     const h = harness({ changedPaths: ['Sales/Deal.md'] });
     await expect(h.svc.updateFromTarget(WS, USER, 7)).resolves.toEqual({
@@ -168,7 +168,7 @@ describe('WorkflowService.updateFromTarget', () => {
     const h = harness({ changedPaths: ['Sales/Deal.md'], carried: 2 });
     await h.svc.updateFromTarget(WS, USER, 7);
     expect(h.prs.getPrDetail).toHaveBeenCalledTimes(2);
-    const carriedAt = h.reviewWorkflow.carryApprovalsForward.mock.invocationCallOrder[0];
+    const carriedAt = h.changeRequestReview.carryApprovalsForward.mock.invocationCallOrder[0];
     const lastReadAt = h.prs.getPrDetail.mock.invocationCallOrder[1];
     expect(carriedAt).toBeLessThan(lastReadAt);
   });
@@ -186,8 +186,8 @@ describe('WorkflowService.updateFromTarget', () => {
   it('refuses a viewer who is neither the author nor able to apply — nothing is merged', async () => {
     const h = harness({ first: detail({ viewerCanUpdate: false }) });
     const err = await h.svc.updateFromTarget(WS, USER, 7).catch((e: unknown) => e);
-    expect(err).toBeInstanceOf(WorkflowDomainError);
-    expect((err as WorkflowDomainError).status).toBe(403);
+    expect(err).toBeInstanceOf(VersionControlDomainError);
+    expect((err as VersionControlDomainError).status).toBe(403);
     expect(h.git.mergeFromOrigin).not.toHaveBeenCalled();
     expect(h.git.push).not.toHaveBeenCalled();
   });
@@ -280,7 +280,7 @@ describe('WorkflowService.updateFromTarget', () => {
   });
 });
 
-describe('WorkflowService.updateFromTarget: the approvals the merge did not touch', () => {
+describe('VersionControlService.updateFromTarget: the approvals the merge did not touch', () => {
   it('carries them onto the new head, before the one detail read that goes back', async () => {
     const h = harness({ changedPaths: ['Sales/Deal.md'], carried: 2 });
 
@@ -292,7 +292,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     // What moved is git's answer between the two heads — never a guess, and
     // never the request's own three-dot diff against the target.
     expect(h.git.pathsChangedBetween).toHaveBeenCalledWith(WS, HEAD, MERGED_HEAD);
-    expect(h.reviewWorkflow.carryApprovalsForward).toHaveBeenCalledWith(
+    expect(h.changeRequestReview.carryApprovalsForward).toHaveBeenCalledWith(
       7,
       HEAD,
       MERGED_HEAD,
@@ -307,7 +307,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     const h = harness({ changedPaths: ['Sales/Deal.md', 'Sales/Terms.md'], carried: 1 });
     const result = await h.svc.updateFromTarget(WS, USER, 7);
     expect(result.updatedPaths).toEqual(['Sales/Deal.md', 'Sales/Terms.md']);
-    expect(h.reviewWorkflow.carryApprovalsForward).toHaveBeenCalledWith(
+    expect(h.changeRequestReview.carryApprovalsForward).toHaveBeenCalledWith(
       7,
       HEAD,
       MERGED_HEAD,
@@ -323,7 +323,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     });
     const result = await h.svc.updateFromTarget(WS, USER, 7);
     expect(h.git.pathsChangedBetween).not.toHaveBeenCalled();
-    expect(h.reviewWorkflow.carryApprovalsForward).not.toHaveBeenCalled();
+    expect(h.changeRequestReview.carryApprovalsForward).not.toHaveBeenCalled();
     expect(result.updatedPaths).toEqual([]);
   });
 
@@ -331,7 +331,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     const h = harness({ merge: { kind: 'conflicts', paths: ['Sales/Deal.md'] } });
     await h.svc.updateFromTarget(WS, USER, 7).catch(() => undefined);
     expect(h.git.pathsChangedBetween).not.toHaveBeenCalled();
-    expect(h.reviewWorkflow.carryApprovalsForward).not.toHaveBeenCalled();
+    expect(h.changeRequestReview.carryApprovalsForward).not.toHaveBeenCalled();
   });
 
   it('carries them from the head the branch is actually ON, not the one the detail read', async () => {
@@ -348,7 +348,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     // Resolved after the pull and before the merge, from the branch itself.
     expect(h.git.resolvePrShas).toHaveBeenCalledWith(WS, 'current-company-state', 'alice/deal');
     expect(h.git.pathsChangedBetween).toHaveBeenCalledWith(WS, PUSHED, MERGED_HEAD);
-    expect(h.reviewWorkflow.carryApprovalsForward).toHaveBeenCalledWith(7, PUSHED, MERGED_HEAD, [
+    expect(h.changeRequestReview.carryApprovalsForward).toHaveBeenCalledWith(7, PUSHED, MERGED_HEAD, [
       'Sales/Deal.md',
     ]);
   });
@@ -361,7 +361,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     const h = harness({ resolveError: new Error('no such ref'), carried: 1 });
     await h.svc.updateFromTarget(WS, USER, 7);
     expect(h.git.push).toHaveBeenCalledWith(WS, USER);
-    expect(h.reviewWorkflow.carryApprovalsForward).not.toHaveBeenCalled();
+    expect(h.changeRequestReview.carryApprovalsForward).not.toHaveBeenCalled();
   });
 
   it('carries nothing when there is no head to compare at all', async () => {
@@ -380,7 +380,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     });
     expect(h.git.push).toHaveBeenCalledWith(WS, USER);
     expect(h.git.pathsChangedBetween).not.toHaveBeenCalled();
-    expect(h.reviewWorkflow.carryApprovalsForward).not.toHaveBeenCalled();
+    expect(h.changeRequestReview.carryApprovalsForward).not.toHaveBeenCalled();
   });
 
   it('still returns the up-to-date request when the bookkeeping itself fails', async () => {
@@ -389,7 +389,7 @@ describe('WorkflowService.updateFromTarget: the approvals the merge did not touc
     const h = harness({ changedPathsError: new Error('git exploded') });
     const result = await h.svc.updateFromTarget(WS, USER, 7);
     expect(result).toMatchObject({ number: 7, behind: false });
-    expect(h.reviewWorkflow.carryApprovalsForward).not.toHaveBeenCalled();
+    expect(h.changeRequestReview.carryApprovalsForward).not.toHaveBeenCalled();
     // Which files moved is unknown, so every file the request had is named:
     // slow beats a dialog that goes on presenting pre-merge text as current.
     expect(result.updatedPaths).toEqual(['Sales/Deal.md']);

package/src/modules/{workflow → version-control}/agent-tools/__tests__/change-request-read.tools.test.ts

@@ -154,7 +154,7 @@ const workspaceService = {
 
 /** The workspace each listing was asked to read in, in order. */
 let listedIn: Array<string | undefined> = [];
-const workflowService = {
+const versionControlService = {
   listChangeRequestsByState: async (states: ChangeRequestState[], opts?: { workspaceId?: string }) => {
     calls.push(['listChangeRequestsByState', [...states].sort()]);
     listedIn.push(opts?.workspaceId);
@@ -205,7 +205,7 @@ async function start(): Promise<string> {
   const resolve = createToolContextResolver({
     authService,
     workspaceService,
-    workflowService,
+    versionControlService,
     events,
     kbDirName: 'knowledge-base',
     creatorAccess: {
@@ -299,7 +299,7 @@ describe('the four read tools', () => {
     }
   });
 
-  it('call only reads on the workflow service', async () => {
+  it('call only reads on the version-control service', async () => {
     const base = await start();
     summaries = [summary()];
     details.set(12, detail());

package/src/modules/{workflow → version-control}/agent-tools/__tests__/update-change-request.parity.test.ts

@@ -1,27 +1,27 @@
 import type { Server as HttpServer } from 'node:http';
 import express from 'express';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import type { IWorkflowService } from '@bevel-software/platform-shared';
+import type { IVersionControlService } from '@bevel-software/platform-shared';
 import { testKbContext } from '../../../../__tests__/kb-context.js';
 import { ToolRegistry } from '../../../tool-registry/tool-registry.js';
 import { InternalTokenService } from '../../../tool-auth/internal-token.service.js';
 import { createToolAuthMiddleware } from '../../../tool-auth/tool-auth.middleware.js';
 import { createToolContextResolver } from '../../../tool-helpers/tool-context.js';
 import { createToolHandlerFactory } from '../../../tool-helpers/tool-handler.js';
-import { WorkflowDomainError } from '../../../../shared/domain-errors.js';
+import { VersionControlDomainError } from '../../../../shared/domain-errors.js';
 import type { IAccessControl } from '../../../access/access-control.interface.js';
 import type { AuthService } from '../../../auth/auth.service.js';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import type { WorkflowEventBus } from '../../event-bus.js';
-import { createWorkflowRoutes } from '../../workflow.routes.js';
-import { registerWorkflowTools } from '../workflow.tools.js';
+import type { VersionControlEventBus } from '../../event-bus.js';
+import { createVersionControlRoutes } from '../../version-control.routes.js';
+import { registerVersionControlTools } from '../version-control.tools.js';
 
 /**
  * The app's `PATCH /api/workflow/change-requests/:number` and the agent's
  * `update_change_request` are one verb: both reach the SAME service method
  * with the same caller and the same fields, and every refusal it makes reaches
  * both callers with the same status and the same words. The rule itself is
- * pinned in `workflow.service.update-change-request.test.ts`; this pins that
+ * pinned in `version-control.service.update-change-request.test.ts`; this pins that
  * neither surface narrows, widens or rewords it.
  *
  * One answer differs, and on purpose: a request the caller may not READ is
@@ -46,19 +46,19 @@ const updated = {
   touchedNodePaths: ['Docs/a.md'],
 };
 
-const workflowService = {
+const versionControlService = {
   updateChangeRequest: async (number: number, user: { id: string; email: string }, input: unknown) => {
     calls.push(['updateChangeRequest', number, user.id, input]);
     return outcome();
   },
-} as unknown as IWorkflowService;
+} as unknown as IVersionControlService;
 
 const authService = { getUserById: async () => CALLER } as unknown as AuthService;
 const workspaceService = {
   getOrCreateForUser: async () => ({ id: 'ws' }),
   findAnyWorkspaceId: async () => 'ws',
 } as unknown as WorkspaceService;
-const events = { emit: () => ({}) } as unknown as WorkflowEventBus;
+const events = { emit: () => ({}) } as unknown as VersionControlEventBus;
 const internalToken = new InternalTokenService({ secret: 's' });
 
 let httpServer: HttpServer | undefined;
@@ -76,8 +76,8 @@ async function start(): Promise<string> {
     next();
   });
   appRouter.use(
-    createWorkflowRoutes(
-      workflowService,
+    createVersionControlRoutes(
+      versionControlService,
       workspaceService,
       authService,
       events,
@@ -96,12 +96,12 @@ async function start(): Promise<string> {
   const resolve = createToolContextResolver({
     authService,
     workspaceService,
-    workflowService,
+    versionControlService,
     events,
     kbDirName: 'knowledge-base',
     creatorAccess: { planForCreate: async () => null, grantInExtractedFile: async () => null, noteAccessFileWritten: () => {} },
   } as never);
-  registerWorkflowTools(registry, toolRouter, toolAuth, createToolHandlerFactory(resolve), testKbContext(), async (_ctx, number) =>
+  registerVersionControlTools(registry, toolRouter, toolAuth, createToolHandlerFactory(resolve), testKbContext(), async (_ctx, number) =>
     maySee(number),
   );
 
@@ -186,7 +186,7 @@ describe('update_change_request ⇔ PATCH /workflow/change-requests/:number', ()
     [
       'neither the author nor someone who may merge it (403)',
       () => {
-        throw new WorkflowDomainError(
+        throw new VersionControlDomainError(
           "Only the request's author, an admin, or someone who may approve every file it changes can edit its title and description.",
           403,
         );
@@ -195,7 +195,7 @@ describe('update_change_request ⇔ PATCH /workflow/change-requests/:number', ()
     [
       'a merged request (409)',
       () => {
-        throw new WorkflowDomainError(
+        throw new VersionControlDomainError(
           'This change request has already been applied; its title and description can no longer be changed.',
           409,
         );
@@ -204,7 +204,7 @@ describe('update_change_request ⇔ PATCH /workflow/change-requests/:number', ()
     [
       'a closed request (409)',
       () => {
-        throw new WorkflowDomainError(
+        throw new VersionControlDomainError(
           'This change request is closed; its title and description can no longer be changed.',
           409,
         );

package/src/modules/{workflow/agent-tools/__tests__/workflow.tools.test.ts → version-control/agent-tools/__tests__/version-control.tools.test.ts}

@@ -9,9 +9,9 @@ import { createToolContextResolver } from '../../../tool-helpers/tool-context.js
 import { createToolHandlerFactory } from '../../../tool-helpers/tool-handler.js';
 import { createManualRoutes } from '../../../tool-registry/manual.routes.js';
 import { ToolError } from '../../../tool-helpers/index.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { ToolDescriptionNotes, type AgentAccessGate } from '../../../workspace/index.js';
-import { registerWorkflowTools } from '../workflow.tools.js';
+import { registerVersionControlTools } from '../version-control.tools.js';
 import {
   BranchAuthorshipError,
   BranchDeleteBlockedError,
@@ -101,7 +101,7 @@ const workspaceService = {
   // Repo-global tools resolve any existing clone instead of cloning a named branch.
   findAnyWorkspaceId: async () => 'existing-ws',
 } as never;
-const workflowService = {
+const versionControlService = {
   listBranches: async (ws: string) => {
     calls.push(['listBranches', ws]);
     // A real listing fetches first; mark when that fetch has landed.
@@ -296,7 +296,7 @@ const accessControl = {
  * `Failing/` and records every read it is told of (with the session it was
  * told for); the write hook refuses `Locked/`.
  */
-const agentHooks = new WorkflowHooks();
+const agentHooks = new VersionControlHooks();
 agentHooks.onAgentRead(async (op) => {
   calls.push(['agentRead', op.branch, op.wsPath, op.sessionId]);
   if (op.wsPath?.includes('Hooked/')) throw new ToolError('Not in this conversation.', 403);
@@ -317,12 +317,12 @@ async function start(): Promise<string> {
   const registry = new ToolRegistry();
   registryRef = registry;
   const toolAuth = createToolAuthMiddleware(externalApiKeyService, internalToken);
-  const resolve = createToolContextResolver({ authService, workspaceService, workflowService, events, kbDirName: 'knowledge-base', creatorAccess: { planForCreate: async () => null, grantInExtractedFile: async () => null, noteAccessFileWritten: () => {} } });
+  const resolve = createToolContextResolver({ authService, workspaceService, versionControlService, events, kbDirName: 'knowledge-base', creatorAccess: { planForCreate: async () => null, grantInExtractedFile: async () => null, noteAccessFileWritten: () => {} } });
   const toolHandler = createToolHandlerFactory(resolve);
 
   const router = express.Router();
   // Request #13 is one the caller may not see.
-  registerWorkflowTools(
+  registerVersionControlTools(
     registry,
     router,
     toolAuth,
@@ -361,7 +361,7 @@ afterEach(async () => {
 
 const writeTok = () => internalToken.mint({ userId: 'user-A' });
 
-describe('registerWorkflowTools', () => {
+describe('registerVersionControlTools', () => {
   it('commit_change commits as the context user + workspace', async () => {
     const base = await start();
     const res = await post(`${base}/api/agent/tools/commit_change`, writeTok(), { summary: 'fix typo', branch: WS });
@@ -878,7 +878,7 @@ describe('registerWorkflowTools', () => {
           error: '`branch` is required: pass the branch (draft) you are working on.',
         });
       }
-      // No workflow call was made at all — least of all one naming a workspace
+      // No version-control call was made at all — least of all one naming a workspace
       // id built out of the missing value, or a branch forked from it.
       expect(calls).toEqual([]);
     });
@@ -988,7 +988,7 @@ describe('registerWorkflowTools', () => {
     expect((await post(`${base}/api/agent/tools/switch_branch`, 'bevel_key', { branch: 'main' })).status).toBe(403);
   });
 
-  it('registers workflow tools into the right catalogs (switch_branch internal-only)', async () => {
+  it('registers version-control tools into the right catalogs (switch_branch internal-only)', async () => {
     const base = await start();
     const fetchManual = async (which: 'utcp' | 'internal/utcp') =>
       ((await (await fetch(`${base}/api/agent/${which}`, { headers: { authorization: `Bearer ${writeTok()}` } })).json()) as { tools: { name: string }[] }).tools

package/src/modules/{workflow → version-control}/agent-tools/change-request-read.tools.ts

@@ -274,7 +274,7 @@ export function registerChangeRequestReadTools(
       // list cannot hide a request the detail would serve — or the reverse —
       // for want of a workspace the other path fell back to.
       const workspaceId = await repoGlobalWorkspaceId(ctx);
-      const all = await ctx.workflowService.listChangeRequestsByState(statesFor(state), { workspaceId });
+      const all = await ctx.versionControlService.listChangeRequestsByState(statesFor(state), { workspaceId });
       const matching = all.filter(
         (cr) =>
           (head === undefined || cr.branch === head) &&
@@ -612,7 +612,7 @@ export function changeRequestScope(
     opts: { patches: boolean },
   ): Promise<ScopedDetail> => {
     const workspaceId = await repoGlobalWorkspaceId(ctx);
-    const detail = await ctx.workflowService.getChangeRequestDetail(number, {
+    const detail = await ctx.versionControlService.getChangeRequestDetail(number, {
       workspaceId,
       viewerEmail: ctx.user.email,
       patches: opts.patches,