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

package/src/modules/tool-registry/__tests__/tool-description-length.test.ts

@@ -1,4 +1,3 @@
-import express from 'express';
 import { describe, expect, it } from 'vitest';
 import {
   CALL_TOOL_CHAIN_NAME,
@@ -9,21 +8,9 @@ import {
   splitCallLine,
 } from '@bevel-software/platform-mcp-core';
 import { testKbContext } from '../../../__tests__/kb-context.js';
-import { EXTERNAL_KB_MANUAL_NAME } from '../../tool-manuals/tool-manuals.contract.js';
-import { ToolRegistry } from '../tool-registry.js';
+import { EXTERNAL_KB_MANUAL_NAME } from '../../tool-manuals/index.js';
 import type { UtcpTool } from '../tool.contract.js';
-import { createToolHandlerFactory } from '../../tool-helpers/tool-handler.js';
-import type { ToolAuth } from '../../tool-auth/tool-auth.middleware.js';
-import { registerWorkspaceTools } from '../../workspace/workspace.tools.js';
-import { RipgrepPatternMatcher } from '../../workspace/index.js';
-import { registerWorkflowTools } from '../../workflow/agent-tools/workflow.tools.js';
-import { registerPluginsTools } from '../../plugins/plugins.tools.js';
-import { registerSkillsTools } from '../../skills/skills.tools.js';
-import { registerToolManualsTools } from '../../tool-manuals/tool-manuals.tools.js';
-import { ToolDescriptionNotes } from '../../workspace/agent-access.gate.js';
-import { WorkflowHooks } from '../../workflow/workflow-hooks.js';
-import { UuidSessionSink } from '../../workspace/session-sink.js';
-import { RoutineWritePolicyService } from '../../workspace/routine-write-policy.js';
+import type { registerSkillsTools } from '../../skills/index.js';
 import { CLIENT_SHORT_CUT, TOOL_DESCRIPTION_CAP, clientVisibleLength, firstSentenceEnd } from '../description-length.js';
 import { CAN_WRITE_CLAUSE } from '../../tool-helpers/index.js';
 import {
@@ -31,9 +18,8 @@ import {
   sharedFileRules,
 } from '../../agent-instructions/index.js';
 import { isPlatformFile, platformFilesByDepth } from '@bevel-software/platform-shared';
-import { GET_AGENT_GUIDE_TOOL, GUIDE_FIRST_SENTENCE, guideFirstDescription } from '../guide-first.js';
-import { registerAgentGuideTool } from '../../agent-guide/agent-guide.tools.js';
-import { agentGuideSections } from '../../agent-guide/agent-guide.js';
+import { GET_AGENT_GUIDE_TOOL, GUIDE_FIRST_SENTENCE } from '../guide-first.js';
+import { emptySkills, hexisTools, servedMetaTools, unused } from '../../../__tests__/hexis-catalog.js';
 
 /**
  * The cap exists because clients cut a long tool description, and they cut it
@@ -43,104 +29,11 @@ import { agentGuideSections } from '../../agent-guide/agent-guide.js';
  * NAMING the tool: the next paragraph someone appends to a description has to
  * answer to this test rather than to an agent's truncated catalog.
  *
- * Every registrar Hexis owns is mounted here, on stand-ins, because the
- * descriptions are the only thing under test: a stand-in that is never called
- * is honest about that. Tools PROXIED from connected MCP servers are not
+ * The catalog is every registrar Hexis owns, mounted on stand-ins (see
+ * `hexis-catalog.ts`). Tools PROXIED from connected MCP servers are not
  * measured — their text is the other server's.
  */
 
-/** Dependencies the registrars take but never touch while they are only building defs. */
-const unused = <T,>(): T => ({}) as T;
-
-/** A `.tool` catalog with nothing in it: the shortest honest answer for a listing. */
-const emptyManuals = {
-  listLocalOnly: async () => [],
-  listAll: async () => [],
-  list: async () => [],
-  listInvalid: async () => [],
-} as unknown as Parameters<typeof registerToolManualsTools>[4];
-
-/** A skill catalog with nothing in it — the per-user skill line is then one fixed sentence. */
-const emptySkills = { listSkills: async () => [] } as unknown as Parameters<typeof registerSkillsTools>[4];
-
-/**
- * The meta-tools as the hosted endpoint builds them (`mcp.service.ts`):
- * examples written against the namespace it registers the knowledge-base tools
- * under and against the catalog it serves, and the chain without the rules it
- * states only in the shared places. So the chain description measured here
- * carries the worked call a client is really sent, which is its longest form.
- */
-function servedMetaTools(external: readonly UtcpTool[]) {
-  return codeModeMetaTools(
-    EXTERNAL_KB_MANUAL_NAME,
-    external.map((t) => ({ utcpName: `${EXTERNAL_KB_MANUAL_NAME}.${t.name}`, inputSchema: t.inputs })),
-    { sharedRulesPointer: '' },
-    // As the hosted endpoint serves them: opening with the guide-first
-    // sentence, through the one helper the endpoint itself uses.
-  ).map((t) => ({ ...t, description: guideFirstDescription(t.description) }));
-}
-
-/** Every tool Hexis itself registers, on both surfaces, deduplicated by name. */
-async function hexisTools(skills: Parameters<typeof registerSkillsTools>[4] = emptySkills): Promise<UtcpTool[]> {
-  const registry = new ToolRegistry();
-  const router = express.Router();
-  const toolAuth = ((_req, _res, next) => next()) as unknown as ToolAuth;
-  const toolHandler = createToolHandlerFactory(unused());
-  const kb = testKbContext();
-  const gate = { recoveryBotEmail: 'bot@x', hooks: new WorkflowHooks(), notes: new ToolDescriptionNotes() };
-
-  registerWorkspaceTools(
-    registry,
-    router,
-    toolAuth,
-    toolHandler,
-    unused(),
-    unused(),
-    unused(),
-    kb,
-    gate,
-    new RoutineWritePolicyService(),
-    new UuidSessionSink(),
-    undefined,
-    undefined,
-    // The two upload tools are mounted only when a store is supplied, and
-    // every real composition supplies one: without it they would be the two
-    // descriptions this suite never measured.
-    unused(),
-    // The guide reader, not needed to build defs; then the download store,
-    // mounted on the same terms as the upload one.
-    undefined,
-    unused(),
-    // Starter packs and the tree walk, not needed; then the grep matcher,
-    // mounted on the same terms (it spawns no worker until a search runs).
-    undefined,
-    undefined,
-    new RipgrepPatternMatcher(),
-  );
-  registerWorkflowTools(registry, router, toolAuth, toolHandler, kb, async () => true, { canRead: async () => true, canReadAtRef: async () => true, canReadBatch: async () => new Map(), canReadBatchAtRef: async () => new Map(), canWrite: async () => true } as never, { recoveryBotEmail: 'recovery@x', hooks: { runAgentRead: async () => undefined }, notes: { onChange: () => undefined } } as never);
-  registerPluginsTools(registry, kb);
-  registerSkillsTools(registry, router, toolAuth, toolHandler, skills);
-  registerToolManualsTools(registry, router, toolAuth, toolHandler, emptyManuals, {
-    accessControl: unused(),
-    variableStatus: unused(),
-    kb,
-  });
-  // The guide's own tool, with the platform's sections: the one description
-  // that lists the sections is measured with the list it really carries.
-  registerAgentGuideTool(registry, router, toolAuth, toolHandler, () => agentGuideSections(kb.layout));
-
-  const byName = new Map<string, UtcpTool>();
-  // The meta-tools as a client is served them (`mcp.service.ts` opens each
-  // with the guide-first sentence at the mount), so the catalog measured here
-  // is the catalog that goes out rather than the bare constant.
-  const external = (await registry.listExternal()) as UtcpTool[];
-  const metaTools = servedMetaTools(external);
-  for (const tool of [...(await registry.listInternal()), ...external, ...metaTools]) {
-    byName.set(tool.name, tool as UtcpTool);
-  }
-  return [...byName.values()];
-}
-
 describe('no Hexis tool description is long enough to be cut', () => {
   it(`keeps every description a client is handed within ${TOOL_DESCRIPTION_CAP} characters`, async () => {
     const over = (await hexisTools())
@@ -237,7 +130,7 @@ describe('no Hexis tool description is long enough to be cut', () => {
     // purpose, and this assertion is what keeps that a stated fact rather than
     // an oversight: if it ever reaches the catalog, the cap test above measures
     // it like everything else.
-    const { createCallToolChainTool } = await import('../../code-mode/code-mode.tool.js');
+    const { createCallToolChainTool } = await import('../../code-mode/index.js');
     const mastraTool = createCallToolChainTool(unused(), unused(), EXTERNAL_KB_MANUAL_NAME) as unknown as {
       description: string;
     };
@@ -325,14 +218,14 @@ describe('the shared rules describe the tools they name', () => {
     // The opener is only honest if the rules it points at are THERE. These
     // two were paragraphs of the chain's description; they moved, whole, and a
     // description that kept them as well would be the long one a client cuts.
-    const rule = sharedFileRules(testKbContext().layout).find((r) => r.id === 'tool-chain')!;
+    const rule = sharedFileRules(testKbContext().layout, testKbContext().defaultBranch).find((r) => r.id === 'tool-chain')!;
     expect(rule.body).toContain(CHAIN_FAILURES_RULE);
     expect(rule.body).toContain(CHAIN_LARGE_RESULTS_RULE);
     const served = (await hexisTools()).find((t) => t.name === CALL_TOOL_CHAIN_NAME)!;
     expect(served.description).not.toContain(CHAIN_FAILURES_RULE);
     expect(served.description).not.toContain(CHAIN_LARGE_RESULTS_RULE);
     // What a chained read does to an image was already one of the shared rules.
-    const content = sharedFileRules(testKbContext().layout).find((r) => r.id === 'content-kinds')!;
+    const content = sharedFileRules(testKbContext().layout, testKbContext().defaultBranch).find((r) => r.id === 'content-kinds')!;
     expect(content.body).toContain('image_omitted');
   });
 
@@ -351,7 +244,7 @@ describe('the shared rules describe the tools they name', () => {
     // rejects: `delete_file` has no `dryRun`, so an agent told to preflight a
     // single-file delete gets a validation error on the safe call and learns to
     // skip it. Read off the schemas rather than asserted by hand.
-    const rule = sharedFileRules(testKbContext().layout).find((r) => r.id === 'dry-run-confirm')!;
+    const rule = sharedFileRules(testKbContext().layout, testKbContext().defaultBranch).find((r) => r.id === 'dry-run-confirm')!;
     const tools = await hexisTools();
     // `toolDef` wraps a tool's own inputs under `body`, which is the schema a
     // client validates against — so that is where the argument either is or is not.
@@ -379,7 +272,7 @@ describe('the shared rules describe the tools they name', () => {
   });
 
   it('gives each platform file the depth it actually counts at', () => {
-    const rule = sharedFileRules(testKbContext().layout).find((r) => r.id === 'managed-items')!;
+    const rule = sharedFileRules(testKbContext().layout, testKbContext().defaultBranch).find((r) => r.id === 'managed-items')!;
     const { anyDepth, rootOnly } = platformFilesByDepth(testKbContext().layout);
     // The split is the half of the rule a list of names leaves out, and
     // `isPlatformFile` is the predicate the prose has to match.
@@ -390,7 +283,7 @@ describe('the shared rules describe the tools they name', () => {
   });
 
   it('says what unzip extracts, rather than that it takes any bytes', () => {
-    const rule = sharedFileRules(testKbContext().layout).find((r) => r.id === 'content-kinds')!;
+    const rule = sharedFileRules(testKbContext().layout, testKbContext().defaultBranch).find((r) => r.id === 'content-kinds')!;
     // `unzip` refuses anything but a `.zip` (`workspace.service.ts`: "Only .zip
     // files can be extracted"), so the byte-tool clause must not sweep it in.
     expect(rule.body).toContain('unzip extracts the entries of a `.zip`');

package/src/modules/{workflow → version-control}/__tests__/apply-failure.test.ts

@@ -5,7 +5,7 @@ import type { AddressInfo } from 'node:net';
 import express from 'express';
 import { describe, it, expect, afterEach, vi } from 'vitest';
 import { testKbContext } from '../../../__tests__/kb-context.js';
-import type { AuthUser, FileApprovalState, IWorkflowService, WorkflowEvent } from '@bevel-software/platform-shared';
+import type { AuthUser, FileApprovalState, IVersionControlService, VersionControlEvent } from '@bevel-software/platform-shared';
 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';
@@ -13,18 +13,18 @@ import type { Database } from '../../database/connection.js';
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
 import { PullRequestService as RealPullRequestService } from '../git/pull-request.service.js';
-import type { IReviewWorkflowService } from '../review-workflow/review-workflow.interface.js';
-import { ReviewWorkflowService } from '../review-workflow/review-workflow.service.js';
+import type { IChangeRequestReviewService } from '../change-request-review/change-request-review.interface.js';
+import { ChangeRequestReviewService } from '../change-request-review/change-request-review.service.js';
 import type { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
-import { WorkflowEventBus } from '../event-bus.js';
+import { VersionControlEventBus } from '../event-bus.js';
 import type { SQL } from 'drizzle-orm';
 import { PgDialect } from 'drizzle-orm/pg-core';
 import { changeRequests } from '../../database/schema.js';
 import { coreMigrationsDir } from '../../../assets.js';
-import { WorkflowService } from '../workflow.service.js';
-import { APPLY_FAILURE_REASON_WITHHELD, createWorkflowRoutes } from '../workflow.routes.js';
-import { WorkflowDomainError, WorkflowValidationError } from '../../../shared/domain-errors.js';
+import { VersionControlService } from '../version-control.service.js';
+import { APPLY_FAILURE_REASON_WITHHELD, createVersionControlRoutes } from '../version-control.routes.js';
+import { VersionControlDomainError, VersionControlValidationError } from '../../../shared/domain-errors.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 
 /**
@@ -43,8 +43,8 @@ const ADMIN: AuthUser = { id: 'u-admin', email: 'admin@example.com', name: 'Ada
 interface RouteHarness {
   server: Server;
   baseUrl: string;
-  emitted: WorkflowEvent[];
-  workflow: {
+  emitted: VersionControlEvent[];
+  versionControl: {
     getChangeRequestDetail: ReturnType<typeof vi.fn>;
     mergeChangeRequest: ReturnType<typeof vi.fn>;
     beginApplyAttempt: ReturnType<typeof vi.fn>;
@@ -60,9 +60,9 @@ async function routeHarness(
     canReadBatch?: (paths: string[]) => Promise<Map<string, boolean>>;
   } = {},
 ): Promise<RouteHarness> {
-  const emitted: WorkflowEvent[] = [];
+  const emitted: VersionControlEvent[] = [];
   const canReadBatch = opts.canReadBatch ?? (async (paths: string[]) => new Map(paths.map((p) => [p, true])));
-  const workflow = {
+  const versionControl = {
     getChangeRequestDetail: vi.fn(async () => ({
       headSha: 'h',
       approvals: [],
@@ -84,11 +84,11 @@ async function routeHarness(
   });
   app.use(
     '/api',
-    createWorkflowRoutes(
-      workflow as unknown as IWorkflowService,
+    createVersionControlRoutes(
+      versionControl as unknown as IVersionControlService,
       { getOrCreateForUser: vi.fn(async () => ({ id: 'ws-admin' })) } as unknown as WorkspaceService,
       { getUserById: vi.fn(async () => ADMIN) } as unknown as AuthService,
-      { emit: (e: WorkflowEvent) => emitted.push(e) } as unknown as WorkflowEventBus,
+      { emit: (e: VersionControlEvent) => emitted.push(e) } as unknown as VersionControlEventBus,
       {
         canReadBatch: async (_ws: string, _email: string, paths: string[]) => canReadBatch(paths),
       } as unknown as IAccessControl,
@@ -99,7 +99,7 @@ async function routeHarness(
     const s = app.listen(0, () => resolve(s));
   });
   const addr = server.address() as AddressInfo;
-  return { server, baseUrl: `http://127.0.0.1:${addr.port}`, emitted, workflow };
+  return { server, baseUrl: `http://127.0.0.1:${addr.port}`, emitted, versionControl };
 }
 
 const closeServer = (s: Server) =>
@@ -123,22 +123,22 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
     h = await routeHarness(async () => {
       // The gate's own `MergeBlockedError` shape: a 422 carrying the reasons it
       // still waits on. Its message is what the route reports.
-      throw new WorkflowDomainError('Merge gate rejected: Waiting on approval for Plugins/x/SKILL.md', 422, {
+      throw new VersionControlDomainError('Merge gate rejected: Waiting on approval for Plugins/x/SKILL.md', 422, {
         mergeBlockedReasons: ['Waiting on approval for Plugins/x/SKILL.md'],
       });
     });
     const res = await post(h.baseUrl);
     expect(res.status).toBe(202);
 
-    await vi.waitFor(() => expect(h!.workflow.recordApplyFailure).toHaveBeenCalled());
-    expect(h.workflow.recordApplyFailure).toHaveBeenCalledWith(
+    await vi.waitFor(() => expect(h!.versionControl.recordApplyFailure).toHaveBeenCalled());
+    expect(h.versionControl.recordApplyFailure).toHaveBeenCalledWith(
       7,
       { reason: expect.stringContaining('Waiting on approval'), kind: 'gate', at: expect.any(Date) },
       ADMIN,
       1,
     );
     // The clicker's event and the persisted refusal name the same instant.
-    const [, { at }] = h.workflow.recordApplyFailure.mock.calls[0] as [number, { at: Date }];
+    const [, { at }] = h.versionControl.recordApplyFailure.mock.calls[0] as [number, { at: Date }];
     // The clicker's own answer is unchanged.
     expect(h.emitted).toContainEqual(
       expect.objectContaining({
@@ -153,16 +153,16 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
   it("the clicker's own answer is scoped like the stored one: a clicker who cannot read the files gets no reason", async () => {
     h = await routeHarness(
       async () => {
-        throw new WorkflowValidationError('Waiting on approval for Plugins/x/SKILL.md');
+        throw new VersionControlValidationError('Waiting on approval for Plugins/x/SKILL.md');
       },
       { canReadBatch: async (paths) => new Map(paths.map((p) => [p, false])) },
     );
     await post(h.baseUrl);
-    await vi.waitFor(() => expect(h!.workflow.recordApplyFailure).toHaveBeenCalled());
+    await vi.waitFor(() => expect(h!.versionControl.recordApplyFailure).toHaveBeenCalled());
     const answer = h.emitted.find((e) => e.kind === 'change-request-merge-failed') as { reason: string };
     expect(answer.reason).toBe(APPLY_FAILURE_REASON_WITHHELD);
     // The raw reason is still what is stored, for the viewers who may read it.
-    expect(h.workflow.recordApplyFailure).toHaveBeenCalledWith(
+    expect(h.versionControl.recordApplyFailure).toHaveBeenCalledWith(
       7,
       expect.objectContaining({ reason: expect.stringContaining('Plugins/x/SKILL.md') }),
       ADMIN,
@@ -173,7 +173,7 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
   it("a request with no resolved touched paths withholds the clicker's reason too", async () => {
     h = await routeHarness(
       async () => {
-        throw new WorkflowValidationError('Waiting on approval for Plugins/x/SKILL.md');
+        throw new VersionControlValidationError('Waiting on approval for Plugins/x/SKILL.md');
       },
       { touchedNodePaths: [] },
     );
@@ -187,7 +187,7 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
 
   it('a refusal of the caller reaches the caller alone and erases nobody\'s verdict', async () => {
     h = await routeHarness(async () => {
-      throw new WorkflowDomainError('Only admins can merge with bypass.', 403);
+      throw new VersionControlDomainError('Only admins can merge with bypass.', 403);
     });
     await post(h.baseUrl);
     await vi.waitFor(() =>
@@ -195,16 +195,16 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
         expect.objectContaining({ kind: 'change-request-merge-failed', forUserId: ADMIN.id }),
       ),
     );
-    expect(h.workflow.recordApplyFailure).not.toHaveBeenCalled();
+    expect(h.versionControl.recordApplyFailure).not.toHaveBeenCalled();
   });
 
   it('any other refusal is persisted as an error, which an approval does not answer', async () => {
     h = await routeHarness(async () => {
-      throw new WorkflowDomainError('Merge failed: push rejected', 502);
+      throw new VersionControlDomainError('Merge failed: push rejected', 502);
     });
     await post(h.baseUrl);
-    await vi.waitFor(() => expect(h!.workflow.recordApplyFailure).toHaveBeenCalled());
-    expect(h.workflow.recordApplyFailure).toHaveBeenCalledWith(
+    await vi.waitFor(() => expect(h!.versionControl.recordApplyFailure).toHaveBeenCalled());
+    expect(h.versionControl.recordApplyFailure).toHaveBeenCalledWith(
       7,
       expect.objectContaining({ kind: 'error' }),
       ADMIN,
@@ -215,8 +215,8 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
   it('a conflict is persisted as a conflict', async () => {
     h = await routeHarness(async () => ({ kind: 'conflicts-need-resolution', conflictedPaths: ['a.md'] }));
     await post(h.baseUrl);
-    await vi.waitFor(() => expect(h!.workflow.recordApplyFailure).toHaveBeenCalled());
-    expect(h.workflow.recordApplyFailure).toHaveBeenCalledWith(
+    await vi.waitFor(() => expect(h!.versionControl.recordApplyFailure).toHaveBeenCalled());
+    expect(h.versionControl.recordApplyFailure).toHaveBeenCalledWith(
       7,
       expect.objectContaining({ kind: 'conflicts' }),
       ADMIN,
@@ -238,21 +238,21 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
     await done;
     // One macrotask: the route's continuation after `mergeChangeRequest` resolves.
     await new Promise((r) => setImmediate(r));
-    expect(h.workflow.mergeChangeRequest).toHaveBeenCalledTimes(1);
-    expect(h.workflow.recordApplyFailure).not.toHaveBeenCalled();
+    expect(h.versionControl.mergeChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.recordApplyFailure).not.toHaveBeenCalled();
     expect(h.emitted.filter((e) => e.kind === 'change-request-merge-failed')).toEqual([]);
     // The attempt ended, so the service holds no entry for it.
-    expect(h.workflow.endApplyAttempt).toHaveBeenCalledWith(7, 1);
+    expect(h.versionControl.endApplyAttempt).toHaveBeenCalledWith(7, 1);
   });
 
   it('a failed attempt ends too, after its refusal is recorded', async () => {
     h = await routeHarness(async () => {
-      throw new WorkflowValidationError('gate says no');
+      throw new VersionControlValidationError('gate says no');
     });
     await post(h.baseUrl);
-    await vi.waitFor(() => expect(h!.workflow.endApplyAttempt).toHaveBeenCalledWith(7, 1));
-    expect(h.workflow.recordApplyFailure.mock.invocationCallOrder[0]).toBeLessThan(
-      h.workflow.endApplyAttempt.mock.invocationCallOrder[0]!,
+    await vi.waitFor(() => expect(h!.versionControl.endApplyAttempt).toHaveBeenCalledWith(7, 1));
+    expect(h.versionControl.recordApplyFailure.mock.invocationCallOrder[0]).toBeLessThan(
+      h.versionControl.endApplyAttempt.mock.invocationCallOrder[0]!,
     );
   });
 
@@ -260,7 +260,7 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
     h = await routeHarness(async () => {
       throw new Error('gate says no');
     });
-    h.workflow.recordApplyFailure.mockRejectedValue(new Error('db down'));
+    h.versionControl.recordApplyFailure.mockRejectedValue(new Error('db down'));
     await post(h.baseUrl);
     await vi.waitFor(() =>
       expect(h!.emitted).toContainEqual(expect.objectContaining({ kind: 'change-request-merge-failed' })),
@@ -268,7 +268,7 @@ describe('POST /workflow/change-requests/:n/merge — a failed apply reaches eve
   });
 });
 
-// ── WorkflowService.recordApplyFailure ──────────────────────────────────────
+// ── VersionControlService.recordApplyFailure ──────────────────────────────────────
 
 function updateDb(openRows = 1) {
   const sets: Record<string, unknown>[] = [];
@@ -370,27 +370,27 @@ const refusal = (kind: 'gate' | 'conflicts' | 'error', at: Date): Partial<Row> =
 function service(
   db: Database,
   emit: (e: unknown) => void,
-  reviewWorkflow: Partial<IReviewWorkflowService> = {},
+  changeRequestReview: Partial<IChangeRequestReviewService> = {},
   deps: { git?: Partial<GitService>; prs?: Record<string, unknown> } = {},
 ) {
   const prs = { invalidateDetailCache: vi.fn(), ...deps.prs };
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     db,
     (deps.git ?? {}) as GitService,
     prs as unknown as PullRequestService,
-    reviewWorkflow as IReviewWorkflowService,
+    changeRequestReview as IChangeRequestReviewService,
     {} as WorkspaceService,
     {} as IAccessControl,
     {} as FileLockService,
     {} as PendingCommitsService,
     testKbContext(),
     openChangeGate(),
-    { emit } as unknown as WorkflowEventBus,
+    { emit } as unknown as VersionControlEventBus,
   );
   return { svc, prs };
 }
 
-describe('WorkflowService — the persisted apply refusal', () => {
+describe('VersionControlService — the persisted apply refusal', () => {
   it('records the reason, evicts the cached lists, and announces it to everyone without the text', async () => {
     const { db, sets } = updateDb();
     const emitted: unknown[] = [];
@@ -522,7 +522,7 @@ describe('WorkflowService — the persisted apply refusal', () => {
 
 describe('change-request-apply-failed on the bus', () => {
   it('reaches every session — the author and other viewers, not only the clicker', () => {
-    const bus = new WorkflowEventBus();
+    const bus = new VersionControlEventBus();
     const sub = (sessionId: string, userId: string) => ({
       sessionId,
       userId,
@@ -544,11 +544,11 @@ describe('change-request-apply-failed on the bus', () => {
 
 // ── Read back through the summary ───────────────────────────────────────────
 
-describe('WorkflowService — a refusal clears when a change makes it obsolete', () => {
+describe('VersionControlService — a refusal clears when a change makes it obsolete', () => {
   const approveArgs = [7, 'Plugins/x/SKILL.md', ADMIN, [], 'h', 'main', null, 'ws'] as const;
   const EARLIER = new Date(Date.now() - 60_000);
 
-  /** A gate-bound markdown file's approval state, as the review workflow returns it. */
+  /** A gate-bound markdown file's approval state, as the change-request review returns it. */
   const fileState = (path: string, isApproved: boolean): FileApprovalState => ({
     path,
     eligibleApprovers: { roles: ['Plugin owners'], users: [] },
@@ -571,7 +571,7 @@ describe('WorkflowService — a refusal clears when a change makes it obsolete',
         return approvalsAfter;
       }),
       // The real gate: whether an approval answers the refusal is its verdict.
-      evaluateMergeGate: (input) => ReviewWorkflowService.prototype.evaluateMergeGate.call({}, input),
+      evaluateMergeGate: (input) => ChangeRequestReviewService.prototype.evaluateMergeGate.call({}, input),
     });
     return { ...store, svc, prs, emitted };
   }
@@ -695,7 +695,7 @@ describe('WorkflowService — a refusal clears when a change makes it obsolete',
     } as unknown as Database;
     const { svc } = service(db, () => {}, {
       approveFile: vi.fn(async () => ALL_APPROVED),
-      evaluateMergeGate: (input) => ReviewWorkflowService.prototype.evaluateMergeGate.call({}, input),
+      evaluateMergeGate: (input) => ChangeRequestReviewService.prototype.evaluateMergeGate.call({}, input),
     });
     await expect(svc.approveFile(...approveArgs)).resolves.toEqual(ALL_APPROVED);
   });
@@ -839,7 +839,7 @@ describe('GET change requests — the refusal reason reaches only viewers who ca
       touchedNodePaths: opts.touchedNodePaths ?? CR.touchedNodePaths,
       lastApplyFailure: { ...FAILURE },
     };
-    const workflow = {
+    const versionControl = {
       listChangeRequests: vi.fn(async () => [cached]),
       listChangeRequestsAuthoredBy: vi.fn(async () => [cached]),
       listChangeRequestsForUser: vi.fn(async () => [cached]),
@@ -855,11 +855,11 @@ describe('GET change requests — the refusal reason reaches only viewers who ca
     });
     app.use(
       '/api',
-      createWorkflowRoutes(
-        workflow as unknown as IWorkflowService,
+      createVersionControlRoutes(
+        versionControl as unknown as IVersionControlService,
         { getOrCreateForUser: vi.fn(async () => ({ id: 'ws-bo' })) } as unknown as WorkspaceService,
         { getUserById: vi.fn(async () => BO) } as unknown as AuthService,
-        { emit: () => {} } as unknown as WorkflowEventBus,
+        { emit: () => {} } as unknown as VersionControlEventBus,
         { canReadBatch } as unknown as IAccessControl,
         'knowledge-base',
       ),
@@ -1043,7 +1043,7 @@ describe('migration 0009 — refusals recorded before the kind existed are class
 
   it("the prefix it matches is the one the merge gate's refusal actually carries", () => {
     const gateSource = readFileSync(
-      path.join(coreMigrationsDir(), '..', 'src/modules/workflow/review-workflow/review-workflow.service.ts'),
+      path.join(coreMigrationsDir(), '..', 'src/modules/version-control/change-request-review/change-request-review.service.ts'),
       'utf8',
     );
     const prefix = /LIKE '([^%']*)%' THEN 'gate'/.exec(migration)![1]!;