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

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

@@ -7,10 +7,10 @@ import path from 'node:path';
 import os from 'node:os';
 import type { AuthUser } from '@bevel-software/platform-shared';
 import { GitService } from '../git.service.js';
-import { runGit, gitOut, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { runGit, gitOut, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /**
- * The post-merge refresh path: `WorkflowService.mergeChangeRequest` merges a
+ * The post-merge refresh path: `VersionControlService.mergeChangeRequest` merges a
  * change request onto `origin/<base>` and then pulls the BASE branch's own
  * workspace so its working tree (what every file read serves) isn't left behind
  * the remote.
@@ -109,7 +109,7 @@ describe('post-merge refresh of the target branch workspace', () => {
         [sourceWsId]: path.dirname(sourceRepo),
         [baseWsId]: path.dirname(baseRepo),
       }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext({ kbDirName: KB_DIR }),
     );
 
@@ -163,7 +163,7 @@ describe('post-merge refresh of the target branch workspace', () => {
         [sourceWsId]: path.dirname(sourceRepo),
         [baseWsId]: path.dirname(baseRepo),
       }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext({ kbDirName: KB_DIR }),
     );
 
@@ -254,7 +254,7 @@ describe('post-merge refresh of the target branch workspace', () => {
         [sourceWsId]: path.dirname(sourceRepo),
         [baseWsId]: path.dirname(baseRepo),
       }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext({ kbDirName: KB_DIR }),
     );
 

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

@@ -6,7 +6,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
 
 const execFileAsync = promisify(execFile);
@@ -71,7 +71,7 @@ function service(): GitService {
   const workspaces = {
     getWorkspacePath: async () => path.dirname(repo),
   } as unknown as WorkspaceService;
-  return new GitService(workspaces, new WorkflowHooks(), testKbContext());
+  return new GitService(workspaces, new VersionControlHooks(), testKbContext());
 }
 
 /** Everything the service logged at warn level, as one string per line. */

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

@@ -5,7 +5,7 @@ import path from 'node:path';
 import os from 'node:os';
 import { GitService } from '../git.service.js';
 import { PullRebaseConflictError } from '../../../../shared/domain-errors.js';
-import { runGit, gitOut, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { runGit, gitOut, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /** See git.service.createBranch.test.ts — same prod-mirroring layout. */
 async function seedWorkspace(root: string, workspaceId: string): Promise<{
@@ -85,7 +85,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -128,7 +128,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -174,7 +174,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -219,7 +219,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -247,7 +247,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -269,7 +269,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -284,7 +284,7 @@ describe('GitService.pull', () => {
   // both rewrote the same file, so replaying the local commit conflicts. The
   // pull must (a) abort the rebase so the clone isn't left in a detached
   // apply state, (b) surface a TYPED error naming the contested paths so the
-  // workflow layer can queue background recovery, and (c) leave the local
+  // version-control layer can queue background recovery, and (c) leave the local
   // commit intact (it's someone's saved content).
   it('throws PullRebaseConflictError with the conflicted paths and aborts the rebase cleanly', async () => {
     const { upstream, repo } = await seedWorkspace(root, workspaceId);
@@ -311,7 +311,7 @@ describe('GitService.pull', () => {
 
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -338,7 +338,7 @@ describe('GitService.pull', () => {
     const { repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -364,7 +364,7 @@ describe('GitService.pull', () => {
     const { repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
 
@@ -474,7 +474,7 @@ describe('GitService.pull — an unpushed merge commit', () => {
   function svcFor(): GitService {
     return new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
   }

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

@@ -6,7 +6,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
 
 const execFileAsync = promisify(execFile);
@@ -59,7 +59,7 @@ describe('GitService.readFileAtRef', () => {
   function makeSvc(workspaceDir: string) {
     return new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext({ kbDirName: PROCESS_MAP_DIR }),
     );
   }
@@ -115,7 +115,7 @@ describe('GitService.commitAtRef', () => {
   function makeSvc(workspaceDir: string) {
     return new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext({ kbDirName: PROCESS_MAP_DIR }),
     );
   }

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

@@ -4,7 +4,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
 import { GitService } from '../git.service.js';
-import { runGit, gitOut, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { runGit, gitOut, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /**
  * `GitService.revertPathsAndPush` — the git half of "Delete folder and its
@@ -59,7 +59,7 @@ async function seed(root: string, branches: string[]): Promise<Fixture> {
     await runGit(repo, ['config', 'core.autocrlf', 'false']);
     repos[b] = repo;
   }
-  const svc = new GitService(stubWorkspaceService(dirs), stubWorkflowHooks(), testKbContext({ kbDirName: KB }));
+  const svc = new GitService(stubWorkspaceService(dirs), stubVersionControlHooks(), testKbContext({ kbDirName: KB }));
   return { upstream, base, repos, svc };
 }
 

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

@@ -6,7 +6,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
 
 const execFileAsync = promisify(execFile);
@@ -81,7 +81,7 @@ describe('GitService.status — hasUpstream', () => {
 
   it('reports hasUpstream=true on a tracked branch (cloned from origin)', async () => {
     const { workspaceDir } = await seedWorkspace(root, workspaceId);
-    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new WorkflowHooks(), testKbContext());
+    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new VersionControlHooks(), testKbContext());
 
     const status = await svc.status(workspaceId);
     expect(status.branch).toBe('current-company-state');
@@ -97,7 +97,7 @@ describe('GitService.status — hasUpstream', () => {
     await runGit(repo, ['checkout', '-b', 'alice/unpublished-draft']);
     await runGit(repo, ['commit', '--allow-empty', '-m', 'local-only edit']);
 
-    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new WorkflowHooks(), testKbContext());
+    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new VersionControlHooks(), testKbContext());
     const status = await svc.status(workspaceId);
 
     expect(status.branch).toBe('alice/unpublished-draft');
@@ -115,7 +115,7 @@ describe('GitService.status — hasUpstream', () => {
     await runGit(repo, ['commit', '--allow-empty', '-m', 'two']);
     await runGit(repo, ['push', '-u', 'origin', 'alice/published-draft']);
 
-    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new WorkflowHooks(), testKbContext());
+    const svc = new GitService(stubWorkspaceService(workspaceId, workspaceDir), new VersionControlHooks(), testKbContext());
     const status = await svc.status(workspaceId);
 
     expect(status.branch).toBe('alice/published-draft');

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

@@ -5,7 +5,7 @@ import path from 'node:path';
 import os from 'node:os';
 import { GitService } from '../git.service.js';
 import { RemoteBranchGoneError } from '../../../../shared/domain-errors.js';
-import { runGit, gitOut, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { runGit, gitOut, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /**
  * `syncFromRemote` against real repositories: what it reports about the clone
@@ -82,7 +82,7 @@ describe('GitService.syncFromRemote', () => {
       await fs.writeFile(path.join(dir, 'b.md'), 'b\n');
       await fs.rename(path.join(dir, 'old name.md'), path.join(dir, 'new name.md'));
     });
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
 
     const r = await git.syncFromRemote('ws');
     expect(r.before).toBe(before);
@@ -106,7 +106,7 @@ describe('GitService.syncFromRemote', () => {
     await runGit(repo, ['config', 'user.email', 'workspace@bevel.test']);
     await runGit(repo, ['config', 'user.name', 'bevel Workspace']);
     await runGit(repo, ['checkout', '-b', BRANCH]).catch(() => undefined);
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
 
     // Still empty on both sides: nothing to sync, and NOT 'remote gone' — a
     // fresh deployment nobody has pushed to must never have its clone retired.
@@ -135,7 +135,7 @@ describe('GitService.syncFromRemote', () => {
     await runGit(upstream, ['branch', 'ali/x', BRANCH]);
     const { workspaceDir } = await cloneWorkspace(root, upstream, 'ali%2Fx', 'ali/x');
     await runGit(upstream, ['update-ref', '-d', 'refs/heads/ali/x']);
-    const git = new GitService(stubWorkspaceService({ 'ali%2Fx': workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ 'ali%2Fx': workspaceDir }), stubVersionControlHooks(), testKbContext());
     await expect(git.syncFromRemote('ali%2Fx')).rejects.toBeInstanceOf(RemoteBranchGoneError);
   });
 });
@@ -164,7 +164,7 @@ describe('GitService.syncFromRemote — the cases git exits 0 on but should not
     await pushFromElsewhere(root, upstream, async (dir) => {
       await fs.writeFile(path.join(dir, 'a.md'), 'edited on the host\n');
     });
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
 
     await expect(git.syncFromRemote('ws')).rejects.toMatchObject({
       name: 'PullRebaseConflictError',
@@ -187,7 +187,7 @@ describe('GitService.syncFromRemote — the cases git exits 0 on but should not
     await runGit(repo, ['rm', '-rf', '--cached', '.']).catch(() => undefined);
     await fs.rm(path.join(repo, 'a.md'), { force: true });
     await fs.rm(path.join(repo, 'old name.md'), { force: true });
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
     await expect(git.syncFromRemote('ws')).rejects.toBeInstanceOf(RemoteBranchGoneError);
   });
 
@@ -195,7 +195,7 @@ describe('GitService.syncFromRemote — the cases git exits 0 on but should not
     const upstream = await bareUpstream(root, true);
     await runGit(upstream, ['branch', 'ali/x', BRANCH]);
     const { workspaceDir } = await cloneWorkspace(root, upstream, 'ws');
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
     expect(await git.remoteBranchExists('ws', 'ali/x')).toBe(true);
     await runGit(upstream, ['update-ref', '-d', 'refs/heads/ali/x']);
     expect(await git.remoteBranchExists('ws', 'ali/x')).toBe(false);
@@ -242,7 +242,7 @@ describe('GitService.syncFromRemote — an unborn clone that already holds stage
     await runGit(seed, ['add', '.']);
     await runGit(seed, ['commit', '-m', 'first']);
     await runGit(seed, ['push', upstream, BRANCH]);
-    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubWorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService({ ws: workspaceDir }), stubVersionControlHooks(), testKbContext());
 
     await expect(git.syncFromRemote('ws')).rejects.toMatchObject({
       name: 'PullRebaseConflictError',

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

@@ -10,7 +10,7 @@ import { NodeFs } from '../../../kb-fs/node-fs.js';
 import { WorkspaceMutex } from '../../../kb-fs/mutex.js';
 import { WorkspaceService } from '../../../workspace/workspace.service.js';
 import { KbRepository, repositoryDirFor } from '../../../workspace/kb-repository.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
 import { NodeGitRunner } from '../node-git-runner.js';
 import { workspaceIdForBranch } from '../../../../shared/workspace-id.js';
@@ -74,7 +74,7 @@ beforeEach(async () => {
   workspaces = newWorkspaceService(
     workspacesRoot, upstream, testKbContext(), new NodeFs(), runner, undefined, undefined, repository,
   );
-  gitService = new GitService(workspaces, new WorkflowHooks(), testKbContext(), mutex, null, runner);
+  gitService = new GitService(workspaces, new VersionControlHooks(), testKbContext(), mutex, null, runner);
 });
 
 afterEach(async () => {
@@ -117,7 +117,7 @@ describe('GitService over worktrees', () => {
     await fs.mkdir(path.dirname(clone), { recursive: true });
     await git(root, ['clone', '-q', '-b', TARGET, upstream, clone]);
     const clones = newWorkspaceService(cloneRoot, upstream, testKbContext(), new NodeFs());
-    const onClones = await new GitService(clones, new WorkflowHooks(), testKbContext()).changedFilesForPr(
+    const onClones = await new GitService(clones, new VersionControlHooks(), testKbContext()).changedFilesForPr(
       id(TARGET), TARGET, 'alice/a',
     );
     expect(onWorktrees).toEqual(onClones);
@@ -227,7 +227,7 @@ describe('GitService and the repository administrator', () => {
         return runner.run(cwd, args, opts);
       }) as NodeGitRunner['run'],
     };
-    const service = new GitService(recorded, new WorkflowHooks(), testKbContext(), mutex, null, recordingRunner);
+    const service = new GitService(recorded, new VersionControlHooks(), testKbContext(), mutex, null, recordingRunner);
     await recorded.getOrCreateForBranch(TARGET);
     await recorded.getOrCreateForBranch('alice/a');
 

package/src/modules/{workflow → version-control}/git/__tests__/pull-request.service.list-fetch.test.ts

@@ -5,7 +5,7 @@ import type { Database } from '../../../database/connection.js';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
 import type { GitService } from '../git.service.js';
 import type { IAccessControl } from '../../../access/access-control.interface.js';
-import { WorkflowValidationError } from '../../../../shared/domain-errors.js';
+import { VersionControlValidationError } from '../../../../shared/domain-errors.js';
 
 /**
  * What a change-request LIST is allowed to cost.
@@ -178,7 +178,7 @@ describe('the list of applied requests reads each merge commit once', () => {
 
   it('asks again for a merge commit the clone did not hold the first time', async () => {
     const { svc, ofAppliedChange } = appliedHarness([applied(1)]);
-    ofAppliedChange.mockRejectedValueOnce(new WorkflowValidationError('commit is not in this clone'));
+    ofAppliedChange.mockRejectedValueOnce(new VersionControlValidationError('commit is not in this clone'));
 
     const before = await svc.listPrsByState(['merged']);
     const after = await svc.listPrsByState(['merged']);

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

@@ -6,7 +6,7 @@ import type { Database } from '../../../database/connection.js';
 import type { WorkspaceService } from '../../../workspace/workspace.service.js';
 import type { IAccessControl } from '../../../access/access-control.interface.js';
 import { hashEmail as hash } from '../../../../shared/email-identity.js';
-import { AppliedChangeMismatchError, WorkflowValidationError } from '../../../../shared/domain-errors.js';
+import { AppliedChangeMismatchError, VersionControlValidationError } from '../../../../shared/domain-errors.js';
 
 function pr(overrides: Partial<PullRequestSummary>): PullRequestSummary {
   return {
@@ -392,7 +392,7 @@ describe('PullRequestService.listPrsByState', () => {
 
     it('asks again for a commit the clone did not hold — that one the next fetch may bring', async () => {
       const { svc, atCommit } = svcOver([row({ number: 9, state: 'merged' })], ['A.md']);
-      atCommit.mockRejectedValueOnce(new WorkflowValidationError('commit is not in this clone'));
+      atCommit.mockRejectedValueOnce(new VersionControlValidationError('commit is not in this clone'));
       expect((await svc.listPrsByState(['closed', 'merged']))[0]?.touchedNodePaths).toEqual([]);
       expect((await svc.listPrsByState(['closed', 'merged']))[0]?.touchedNodePaths).toEqual(['A.md']);
       expect(atCommit).toHaveBeenCalledTimes(2);
@@ -432,7 +432,7 @@ describe('PullRequestService.listPrsByState', () => {
     } as unknown as WorkspaceService;
     const git = {
       changedPathsAndPairsOfAppliedChange: vi.fn(async () => {
-        throw new WorkflowValidationError(
+        throw new VersionControlValidationError(
           `commit ${MERGE_SHA} is not a merge commit in this clone, so it cannot be change request #1's`,
         );
       }),
@@ -487,7 +487,7 @@ describe('PullRequestService.getPrDetail with a retired branch and no merge comm
     } as unknown as WorkspaceService;
     const git = {
       resolvePrShas: async () => {
-        throw new WorkflowValidationError('unknown branch: feature/x');
+        throw new VersionControlValidationError('unknown branch: feature/x');
       },
     } as unknown as GitService;
     return new PullRequestService(db, workspace, makeAccessControl({}), git);
@@ -561,7 +561,7 @@ describe('PullRequestService.getPrDetail of an applied request', () => {
       findAnyWorkspaceId: async () => 'ws',
     } as unknown as WorkspaceService;
     const resolvePrShas = vi.fn(async () => {
-      throw new WorkflowValidationError('unknown branch: feature/x');
+      throw new VersionControlValidationError('unknown branch: feature/x');
     });
     const appliedChangeShas = vi.fn(async () => ({ baseSha: BASE_SHA, headSha: HEAD_SHA }));
     const changedFilesOfAppliedChange = vi.fn(async () => [
@@ -637,7 +637,7 @@ describe('PullRequestService.getPrDetail of an applied request', () => {
     const { svc } = svcFor();
     const git = (svc as unknown as { gitService: Record<string, unknown> }).gitService;
     git.appliedChangeShas = async () => {
-      throw new WorkflowValidationError(`no first parent for commit ${MERGE_SHA}`);
+      throw new VersionControlValidationError(`no first parent for commit ${MERGE_SHA}`);
     };
     // Fail-closed, as before the decision: no files, so author-only — never
     // somebody else's file list.