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

package/src/modules/{workflow/__tests__/workflow.routes.push-refused.test.ts → version-control/__tests__/version-control.routes.push-refused.test.ts}

@@ -3,19 +3,19 @@ import type { AddressInfo } from 'node:net';
 import express from 'express';
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { testKbContext } from '../../../__tests__/kb-context.js';
-import type { AuthUser, IWorkflowService } from '@bevel-software/platform-shared';
+import type { AuthUser, IVersionControlService } from '@bevel-software/platform-shared';
 import type { Database } from '../../database/connection.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 { 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 { WorkflowEventBus } from '../event-bus.js';
-import { WorkflowService } from '../workflow.service.js';
-import { createWorkflowRoutes } from '../workflow.routes.js';
+import { VersionControlEventBus } from '../event-bus.js';
+import { VersionControlService } from '../version-control.service.js';
+import { createVersionControlRoutes } from '../version-control.routes.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 import {
   BranchDeleteRefusedError,
@@ -52,7 +52,7 @@ const REVERT_BRANCH = 'alice/revert-src';
 const OPEN_BRANCH = 'alice/open-src';
 const UPDATE_BRANCH = 'alice/update-src';
 
-async function serve(workflow: Partial<IWorkflowService>): Promise<{ server: Server; baseUrl: string }> {
+async function serve(versionControl: Partial<IVersionControlService>): Promise<{ server: Server; baseUrl: string }> {
   const authService = { getUserById: vi.fn(async () => ALICE) } as unknown as AuthService;
   const workspaceService = {
     getOrCreateForBranch: vi.fn(async (branch: string) => ({ id: encodeURIComponent(branch) })),
@@ -65,11 +65,11 @@ async function serve(workflow: Partial<IWorkflowService>): Promise<{ server: Ser
   });
   app.use(
     '/api',
-    createWorkflowRoutes(
-      workflow as IWorkflowService,
+    createVersionControlRoutes(
+      versionControl as IVersionControlService,
       workspaceService,
       authService,
-      new WorkflowEventBus(),
+      new VersionControlEventBus(),
       {} as unknown as IAccessControl,
       'knowledge-base',
     ),
@@ -102,7 +102,7 @@ describe('routes answer a push the host refused with 409 and the saved-locally s
   let server: Server;
   let baseUrl: string;
 
-  const workflow: Partial<IWorkflowService> = {
+  const versionControl: Partial<IVersionControlService> = {
     revertChangeRequestFile: vi.fn(async () => {
       throw refused('Sales/Deal.md', REVERT_BRANCH);
     }),
@@ -119,7 +119,7 @@ describe('routes answer a push the host refused with 409 and the saved-locally s
   };
 
   beforeEach(async () => {
-    ({ server, baseUrl } = await serve(workflow));
+    ({ server, baseUrl } = await serve(versionControl));
   });
   afterEach(async () => {
     await close(server);
@@ -171,11 +171,11 @@ describe('the share route over the real service', () => {
       push,
       pull: vi.fn().mockResolvedValue({ treeChanged: false }),
     } as unknown as GitService;
-    const workflow = new WorkflowService(
+    const versionControl = new VersionControlService(
       {} as unknown as Database,
       git,
       {} as PullRequestService,
-      {} as IReviewWorkflowService,
+      {} as IChangeRequestReviewService,
       {} as WorkspaceService,
       {} as IAccessControl,
       {} as FileLockService,
@@ -183,7 +183,7 @@ describe('the share route over the real service', () => {
       testKbContext(),
       openChangeGate(),
     );
-    ({ server, baseUrl } = await serve(workflow as unknown as IWorkflowService));
+    ({ server, baseUrl } = await serve(versionControl as unknown as IVersionControlService));
   });
   afterEach(async () => {
     await close(server);

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

@@ -3,13 +3,13 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
 import { drizzle } from 'drizzle-orm/pg-proxy';
 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';
 
 /**
@@ -90,11 +90,11 @@ function fakeDb(rows: CrRow[]) {
 }
 
 function makeService(db: Database, git: Partial<GitService>) {
-  return new WorkflowService(
+  return new VersionControlService(
     db,
     git as GitService,
     { invalidateDetailCache: vi.fn() } as unknown as PullRequestService,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     {
       getOrCreateForBranch: vi.fn(async () => ({ id: 'ws-target' })),
       ensureRemotesFetched: vi.fn(async () => undefined),
@@ -124,7 +124,7 @@ const OPEN_24_INTO_RFI: CrRow = {
   state: 'open',
 };
 
-function retire(svc: WorkflowService, number: number, base: string) {
+function retire(svc: VersionControlService, number: number, base: string) {
   return (
     svc as unknown as {
       retireMergedSourceBranch(n: number, base: string, u: unknown): Promise<void>;
@@ -226,7 +226,7 @@ describe('runOnBranchPair', () => {
     runOnBranchPair(source: string, target: string, fn: () => Promise<void>): Promise<void>;
   };
 
-  function locks(svc: WorkflowService) {
+  function locks(svc: VersionControlService) {
     return svc as unknown as LockInternals;
   }
 

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

@@ -3,15 +3,15 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
 import type { AuthUser, Change } 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 { FileLockService } from '../file-lock.service.js';
 import { PendingCommitsService } from '../pending-commits.service.js';
-import { WorkflowEventBus } from '../event-bus.js';
-import { WorkflowService } from '../workflow.service.js';
+import { VersionControlEventBus } from '../event-bus.js';
+import { VersionControlService } from '../version-control.service.js';
 import type { Database } from '../../database/connection.js';
-import { WorkflowValidationError } from '../../../shared/domain-errors.js';
+import { VersionControlValidationError } from '../../../shared/domain-errors.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 
 /**
@@ -90,7 +90,7 @@ function makeGit(overrides: Partial<{
   } as unknown as GitService;
 }
 
-function makeFacade(git: GitService, locks: FileLockService, events: WorkflowEventBus): WorkflowService {
+function makeFacade(git: GitService, locks: FileLockService, events: VersionControlEventBus): VersionControlService {
   // Pending-commits is irrelevant to commitFileWhileLocked (autosave
   // checkpoint commits land synchronously, not through the queue), so a
   // bare stub suffices.
@@ -105,11 +105,11 @@ function makeFacade(git: GitService, locks: FileLockService, events: WorkflowEve
     countPending: vi.fn().mockResolvedValue(0),
     startupReconcile: vi.fn().mockResolvedValue(undefined),
   } as unknown as PendingCommitsService;
-  return new WorkflowService(
+  return new VersionControlService(
     {} as unknown as Database,
     git,
     {} as PullRequestService,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     {} as WorkspaceService,
     {} as IAccessControl,
     locks,
@@ -120,14 +120,14 @@ function makeFacade(git: GitService, locks: FileLockService, events: WorkflowEve
   );
 }
 
-describe('WorkflowService.commitFileWhileLocked', () => {
-  let events: WorkflowEventBus;
+describe('VersionControlService.commitFileWhileLocked', () => {
+  let events: VersionControlEventBus;
   let emitSpy: ReturnType<typeof spyOnEmit>;
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  function spyOnEmit() { return vi.spyOn(new WorkflowEventBus(), 'emit'); }
+  function spyOnEmit() { return vi.spyOn(new VersionControlEventBus(), 'emit'); }
 
   beforeEach(() => {
-    events = new WorkflowEventBus();
+    events = new VersionControlEventBus();
     emitSpy = vi.spyOn(events, 'emit');
   });
 
@@ -173,7 +173,7 @@ describe('WorkflowService.commitFileWhileLocked', () => {
     const svc = makeFacade(git, locks, events);
 
     await expect(svc.commitFileWhileLocked('ws-1', 'feat/x', 'foo.md', USER)).rejects.toBeInstanceOf(
-      WorkflowValidationError,
+      VersionControlValidationError,
     );
     expect(git.commitFile).not.toHaveBeenCalled();
     expect(emitSpy).not.toHaveBeenCalled();
@@ -204,8 +204,8 @@ describe('WorkflowService.commitFileWhileLocked', () => {
       .commitFileWhileLocked('ws-1', 'feat/x', 'foo.md', USER)
       .then(() => null)
       .catch((e: unknown) => e);
-    expect(err).toBeInstanceOf(WorkflowValidationError);
-    expect((err as WorkflowValidationError).payload?.kind).toBe('coordination-hold');
+    expect(err).toBeInstanceOf(VersionControlValidationError);
+    expect((err as VersionControlValidationError).payload?.kind).toBe('coordination-hold');
     expect(git.commitFile).not.toHaveBeenCalled();
     expect(git.push).not.toHaveBeenCalled();
     expect(emitSpy).not.toHaveBeenCalled();

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

@@ -10,15 +10,15 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
 import { openChangeGate } from '../../../__tests__/open-change-gate.js';
 import { 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 { FileLockService } from '../file-lock.service.js';
 import type { PendingCommitsService } from '../pending-commits.service.js';
 import type { Database } from '../../database/connection.js';
-import { WorkflowHooks } from '../workflow-hooks.js';
-import { WorkflowService } from '../workflow.service.js';
-import type { WorkflowEventBus } from '../event-bus.js';
+import { VersionControlHooks } from '../version-control-hooks.js';
+import { VersionControlService } from '../version-control.service.js';
+import type { VersionControlEventBus } from '../event-bus.js';
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import { makeFakeLockDb } from './fake-file-lock-db.js';
 import {
@@ -35,7 +35,7 @@ import {
  *
  * The change-request rows are answered by the REAL drizzle query, read back off
  * the SQL the pg-proxy driver hands over (the harness of
- * `workflow.service.branch-in-use.test.ts`): a stub answering by call order
+ * `version-control.service.branch-in-use.test.ts`): a stub answering by call order
  * would pass just as happily against a guard that asked about the wrong end of
  * a request, or the wrong state.
  */
@@ -103,7 +103,7 @@ const DEFAULT = 'target-company-state';
 type State = { exists: boolean; lastCommit: string | null; unmergedCommits: number };
 
 interface Harness {
-  svc: WorkflowService;
+  svc: VersionControlService;
   git: {
     branchState: ReturnType<typeof vi.fn>;
     mayDeleteBranch: ReturnType<typeof vi.fn>;
@@ -183,7 +183,7 @@ function harness(opts: {
   const hasAnyActive = opts.realLocks
     ? vi.spyOn(fileLocks, 'hasAnyActive')
     : vi.spyOn(fileLocks, 'hasAnyActive').mockImplementation(async (ws: string) => landing.has(ws));
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     fakeDb(rows),
     git as unknown as GitService,
     {
@@ -196,13 +196,13 @@ function harness(opts: {
       }),
     } as unknown as PullRequestService,
     {
-      // The merge itself: the request's row is marked merged, as the review workflow records it.
+      // The merge itself: the request's row is marked merged, as the change-request review records it.
       mergePr: vi.fn(async (n: number) => {
         const row = rows.find((r) => r.number === n)!;
         row.state = 'merged';
         return { sha: `m${n}` };
       }),
-    } as unknown as IReviewWorkflowService,
+    } as unknown as IChangeRequestReviewService,
     {
       getOrCreateForBranch: vi.fn(async (b: string) => ({ id: workspaceIdForBranch(b) })),
       ensureRemotesFetched: fetch,
@@ -213,7 +213,7 @@ function harness(opts: {
     { hasAnyForWorkspace: vi.fn(async (ws: string) => queued.has(ws)) } as unknown as PendingCommitsService,
     testKbContext(),
     openChangeGate(),
-    { emit: (e: { kind: string; number?: number }) => void emitted.push(e) } as unknown as WorkflowEventBus,
+    { emit: (e: { kind: string; number?: number }) => void emitted.push(e) } as unknown as VersionControlEventBus,
     undefined,
     undefined,
     changeRequestHooks,
@@ -1048,12 +1048,12 @@ describe('deleteBranchChecked over real git — a delete made from another works
         ),
       deleteWorkspace: async (id: string) => fs.rm(wsDir(id), { recursive: true, force: true }),
     } as unknown as WorkspaceService;
-    const gitService = new GitService(workspaces, new WorkflowHooks(), testKbContext());
-    const svc = new WorkflowService(
+    const gitService = new GitService(workspaces, new VersionControlHooks(), testKbContext());
+    const svc = new VersionControlService(
       fakeDb([]),
       gitService,
       { invalidateDetailCache: vi.fn() } as unknown as PullRequestService,
-      {} as IReviewWorkflowService,
+      {} as IChangeRequestReviewService,
       workspaces,
       {} as IAccessControl,
       { hasAnyActive: async () => false, whileNoneAcquired: (_b: string, fn: () => Promise<unknown>) => fn() } as unknown as FileLockService,
@@ -1108,7 +1108,7 @@ describe('emptiness over real git — judged from the default workspace as from
     await git(root, ['clone', '-b', 'ali/sync', upstream, path.join(wsDir(ownId), 'knowledge-base')]);
     const gitService = new GitService(
       { getWorkspacePath: async (id: string) => wsDir(id) } as unknown as WorkspaceService,
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     const fetchDefault = () => git(path.join(wsDir(defaultId), 'knowledge-base'), ['fetch', '--prune', 'origin']);

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

@@ -2,13 +2,13 @@ import { describe, it, expect, vi } from 'vitest';
 import { testKbContext } from '../../../__tests__/kb-context.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 { 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';
 
 /**
@@ -58,11 +58,11 @@ function makeService(open: OpenRow[], listBranches: () => Promise<{ name: string
   const prs = {
     invalidateDetailCache: vi.fn((n: number) => invalidated.push(n)),
   } as unknown as PullRequestService;
-  const svc = new WorkflowService(
+  const svc = new VersionControlService(
     makeDb(open, []),
     git,
     prs,
-    {} as IReviewWorkflowService,
+    {} as IChangeRequestReviewService,
     {} as WorkspaceService,
     {} as IAccessControl,
     {} as FileLockService,