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

package/src/modules/{workflow → version-control}/git/__tests__/git.service.forkPoint.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 { gitOut, runGit, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { gitOut, runGit, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /**
  * A change request shows only what its author changed. When someone edits the
@@ -52,7 +52,7 @@ describe('GitService — fork point, behind, and Update', () => {
 
     git = new GitService(
       stubWorkspaceService({ [WS]: path.dirname(repo) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
   });

package/src/modules/{workflow → version-control}/git/__tests__/git.service.history-guards.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';
 
 // The history surfaces are per-file: their read gate checked exactly one
 // path, but a directory pathspec walks every child — and `show <ref>:<dir>`
@@ -34,7 +34,7 @@ describe('GitService history guards', () => {
     sha = await gitOut(repo, ['rev-parse', 'HEAD']);
     svc = new GitService(
       stubWorkspaceService({ [workspaceId]: workspaceDir }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
     );
   });

package/src/modules/{workflow → version-control}/git/__tests__/git.service.list-branches.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';
 import { NodeGitRunner } from '../node-git-runner.js';
 import type { IGitRunner } from '../../../../shared/git.contract.js';
@@ -84,7 +84,7 @@ describe('GitService.listBranches', () => {
     await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -103,7 +103,7 @@ describe('GitService.listBranches', () => {
     await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -117,7 +117,7 @@ describe('GitService.listBranches', () => {
     const { upstream } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     // Prime the cache: first call fetches and populates lastImplicitFetchAt.
@@ -133,7 +133,7 @@ describe('GitService.listBranches', () => {
 
     const freshSvc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     const branches = await freshSvc.listBranches(workspaceId);
@@ -147,7 +147,7 @@ describe('GitService.listBranches', () => {
 
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -161,7 +161,7 @@ describe('GitService.listBranches', () => {
     await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -180,7 +180,7 @@ describe('GitService.listBranches', () => {
     const { upstream } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     // Simulate a just-completed clone — the workspace is freshly fetched.
@@ -206,7 +206,7 @@ describe('GitService.listBranches', () => {
     await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     const seen: string[][] = [];
@@ -223,7 +223,7 @@ describe('GitService.listBranches', () => {
     await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     svc.setBranchesListedListener(() => { throw new Error('listener blew up'); });
@@ -254,7 +254,7 @@ describe('GitService.listBranches', () => {
     const { runner, commands } = recordingRunner();
     const svc = new GitService(
       stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
       undefined,
       null,
@@ -317,7 +317,7 @@ describe('GitService.branchCounts', () => {
   }
 
   function svcFor(runner: IGitRunner = new NodeGitRunner(), kb = testKbContext()): GitService {
-    return new GitService(stubWorkspaceService(draftWs, path.join(root, draftWs)), new WorkflowHooks(), kb, undefined, null, runner);
+    return new GitService(stubWorkspaceService(draftWs, path.join(root, draftWs)), new VersionControlHooks(), kb, undefined, null, runner);
   }
 
   it('counts the workspace\'s own branch against its upstream, with rev-list for that branch alone', async () => {

package/src/modules/{workflow → version-control}/git/__tests__/git.service.listTrackedFiles.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);
@@ -63,7 +63,7 @@ async function makeSvc(root: string, workspaceId: string) {
   const { repo } = await seedWorkspace(root, workspaceId);
   const svc = new GitService(
     stubWorkspaceService(workspaceId, path.join(root, workspaceId)),
-    new WorkflowHooks(),
+    new VersionControlHooks(),
     testKbContext(),
   );
   return { svc, repo };

package/src/modules/{workflow → version-control}/git/__tests__/git.service.logForFile.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);
@@ -120,7 +120,7 @@ describe('GitService.logForFile', () => {
     const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -140,7 +140,7 @@ describe('GitService.logForFile', () => {
     const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -159,7 +159,7 @@ describe('GitService.logForFile', () => {
     const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -174,7 +174,7 @@ describe('GitService.logForFile', () => {
     const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
 
@@ -206,7 +206,7 @@ describe('GitService.logForFile', () => {
     const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
     const svc = new GitService(
       stubWorkspaceService(workspaceId, workspaceDir),
-      new WorkflowHooks(),
+      new VersionControlHooks(),
       testKbContext(),
     );
     await runGit(repo, ['commit', '--allow-empty', '-m', 'init']);

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

@@ -5,10 +5,12 @@ import { promisify } from 'node:util';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
-import type { AuthUser } from '@bevel-software/platform-shared';
-import type { WorkspaceService } from '../../../workspace/workspace.service.js';
-import { WorkflowHooks } from '../../workflow-hooks.js';
+import type { AuthUser, FilesChange } from '@bevel-software/platform-shared';
+import type { WorkspaceService } from '../../../workspace/index.js';
+import type { IGitRunner } from '../../../../shared/git.contract.js';
+import { VersionControlHooks } from '../../version-control-hooks.js';
 import { GitService } from '../git.service.js';
+import { NodeGitRunner } from '../node-git-runner.js';
 import { mergeCommitSubject } from '../merge-commit.js';
 
 const execFileAsync = promisify(execFile);
@@ -96,7 +98,7 @@ describe('GitService.mergeChangeRequest', () => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const result = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE, { subject: 'Add feature (#1)', body: 'Merged via Bevel' }, USER,
     );
@@ -119,6 +121,81 @@ describe('GitService.mergeChangeRequest', () => {
     expect(log).toContain('Add feature (#1)');
   });
 
+  describe('reports the merge it lands through onCommitLanded, once, with every path it brought in', () => {
+    const KB = 'knowledge-base';
+    const sorted = (changes: FilesChange[]) => changes.map((c) => ({ ...c, paths: [...c.paths].sort() }));
+    function listening(baseWsId: string, baseRepo: string, runner?: IGitRunner) {
+      const hooks = new VersionControlHooks();
+      const landed: FilesChange[] = [];
+      hooks.onCommitLanded((change) => landed.push(change));
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), hooks, testKbContext(), undefined, null, runner);
+      return { git, landed };
+    }
+
+    it('names both ends of a rename and a non-ASCII name verbatim, after the push landed', async () => {
+      const { upstream, baseWsId, baseRepo } = await seed(root, { 'base.md': 'base\n', 'keep.md': 'keep\n' });
+      await pushFeatureBranch(root, upstream, 'alice/rename', async (dir) => {
+        await runGit(dir, ['mv', 'base.md', 'renamed.md']);
+        await fs.writeFile(path.join(dir, 'Ünïcode ñ.md'), 'ü\n');
+      });
+      const { git, landed } = listening(baseWsId, baseRepo);
+
+      const result = await git.mergeChangeRequest(baseWsId, 'alice/rename', BASE, { subject: 'Rename (#2)', body: '' }, USER);
+
+      expect(result.kind).toBe('merged');
+      expect(sorted(landed)).toEqual([
+        { workspaceId: baseWsId, branch: BASE, byUser: USER, paths: [`${KB}/base.md`, `${KB}/renamed.md`, `${KB}/Ünïcode ñ.md`] },
+      ]);
+    });
+
+    it('reports nothing when there was nothing to merge', async () => {
+      const { upstream, baseWsId, baseRepo } = await seed(root, { 'base.md': 'base\n' });
+      await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
+        await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
+      });
+      const { git, landed } = listening(baseWsId, baseRepo);
+      await git.mergeChangeRequest(baseWsId, 'alice/add', BASE, { subject: 'Add (#3)', body: '' }, USER);
+      expect(landed).toHaveLength(1);
+
+      // Again: the target already holds the source; no commit, no report.
+      const again = await git.mergeChangeRequest(baseWsId, 'alice/add', BASE, { subject: 'Add (#3)', body: '' }, USER);
+      expect(again.kind).toBe('merged');
+      expect(landed).toHaveLength(1);
+    });
+
+    it('reports once when the first push is rejected and the retry lands — the attempt that was reset away is not announced', async () => {
+      const { upstream, seedDir, baseWsId, baseRepo } = await seed(root, { 'base.md': 'base\n' });
+      await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
+        await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
+      });
+      // A runner like the real one, except that just before the first push a
+      // teammate's commit lands on the target, so that push is rejected and
+      // the merge is redone on the new tip.
+      const real = new NodeGitRunner();
+      let pushes = 0;
+      const racing: IGitRunner = {
+        defaultTimeoutMs: real.defaultTimeoutMs,
+        credentials: real.credentials,
+        run: (async (cwd: string, args: string[], opts?: unknown) => {
+          if (args[0] === 'push' && pushes++ === 0) {
+            await fs.writeFile(path.join(seedDir, 'teammate.md'), 'meanwhile\n');
+            await runGit(seedDir, ['add', '-A']);
+            await runGit(seedDir, ['commit', '-m', 'teammate']);
+            await runGit(seedDir, ['push', 'origin', BASE]);
+          }
+          return real.run(cwd, args, opts as never);
+        }) as IGitRunner['run'],
+      };
+      const { git, landed } = listening(baseWsId, baseRepo, racing);
+
+      const result = await git.mergeChangeRequest(baseWsId, 'alice/add', BASE, { subject: 'Add (#4)', body: '' }, USER);
+
+      expect(result.kind).toBe('merged');
+      expect(pushes).toBe(2);
+      expect(sorted(landed)).toEqual([{ workspaceId: baseWsId, branch: BASE, byUser: USER, paths: [`${KB}/feature.md`] }]);
+    });
+  });
+
   // cubic P1 on #347. When the target already contains the source there is
   // nothing to merge, so no commit is written and `sha` is the TARGET TIP —
   // whatever landed on the target last, which in a deployment that lands
@@ -134,7 +211,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'bob/first', async (dir) => {
       await fs.writeFile(path.join(dir, 'first.md'), 'first\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const first = await git.mergeChangeRequest(
       baseWsId, 'bob/first', BASE, { subject: mergeCommitSubject('First', 1), body: 'x' }, USER,
       { appliedChangeNumber: 1 },
@@ -181,7 +258,7 @@ describe('GitService.mergeChangeRequest', () => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const merge = () =>
       git.mergeChangeRequest(
         baseWsId, 'alice/add', BASE,
@@ -225,7 +302,7 @@ describe('GitService.mergeChangeRequest', () => {
     await fs.mkdir(path.join(root, staleWsId), { recursive: true });
     await runGit(root, ['clone', '-b', BASE, upstream, staleRepo]);
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const merged = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE,
       { subject: mergeCommitSubject('Add feature', 7), body: 'Merged via Bevel' }, USER,
@@ -237,7 +314,7 @@ describe('GitService.mergeChangeRequest', () => {
     // Retired, as applying a change request retires it.
     await runGit(root, ['-C', upstream, 'branch', '-D', 'alice/add']);
 
-    const stale = new GitService(stubWorkspaceService(staleWsId, staleRepo), new WorkflowHooks(), testKbContext());
+    const stale = new GitService(stubWorkspaceService(staleWsId, staleRepo), new VersionControlHooks(), testKbContext());
     expect(await stale.appliedMergeCommitOnTarget(staleWsId, BASE, 7)).toBe(merged.mergeCommit);
     // A number nothing on the target was merged under owns nothing.
     expect(await stale.appliedMergeCommitOnTarget(staleWsId, BASE, 8)).toBeNull();
@@ -248,7 +325,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const merged = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE,
       { subject: mergeCommitSubject('Add feature', 7), body: 'Merged via Bevel' }, USER,
@@ -293,7 +370,7 @@ describe('GitService.mergeChangeRequest', () => {
     const sha = (await gitOut(old, ['rev-parse', 'HEAD'])).trim();
     expect((await gitOut(old, ['log', '-1', '--format=%s'])).trim()).toBe('Add feature');
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     // With the title: the commit is the request's own, on the target and by sha.
     expect(await git.appliedMergeCommitOnTarget(baseWsId, BASE, 5, title)).toBe(sha);
     expect(await git.appliedChangeShas(baseWsId, { number: 5, mergeSha: sha, title }))
@@ -313,7 +390,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const merged = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE,
       { subject: mergeCommitSubject('Fix crash (#42)', 43), body: 'x' }, USER,
@@ -342,7 +419,7 @@ describe('GitService.mergeChangeRequest', () => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const merged = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE,
       { subject: mergeCommitSubject('Add feature', 7), body: 'Merged via Bevel' }, USER,
@@ -373,7 +450,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'bob/first', async (dir) => {
       await fs.writeFile(path.join(dir, 'first.md'), 'first\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     // #1's merge commit, whose BODY mentions #9 — the shape `--grep` matches and
     // the subject check must reject.
     await git.mergeChangeRequest(
@@ -408,7 +485,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     await expect(
       git.mergeChangeRequest(
         baseWsId, 'alice/add', BASE, { subject: 'Add feature\n\nand a note (#3)', body: 'x' }, USER,
@@ -429,7 +506,7 @@ describe('GitService.mergeChangeRequest', () => {
     await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
       await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
     });
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const result = await git.mergeChangeRequest(
       baseWsId, 'alice/add', BASE,
       { subject: mergeCommitSubject('Add feature\n\nand a note', 4), body: 'x' }, USER,
@@ -464,7 +541,7 @@ describe('GitService.mergeChangeRequest', () => {
     await runGit(root, ['clone', '-b', 'tmp-base-advance', upstream, advancer]);
     await runGit(advancer, ['push', 'origin', 'tmp-base-advance:' + BASE]);
 
-    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+    const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
     const result = await git.mergeChangeRequest(
       baseWsId, 'alice/edit', BASE, { subject: 'Edit (#2)', body: 'x' }, USER,
     );
@@ -498,7 +575,7 @@ describe('GitService.mergeChangeRequest', () => {
       // A save that has not been shared yet, exactly as a file tool leaves it.
       await fs.writeFile(path.join(baseRepo, 'base.md'), 'edited but not shared\n');
 
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       await expect(
         git.mergeChangeRequest(
           baseWsId, 'alice/add', BASE, { subject: 'Add (#1)', body: 'x' }, USER,
@@ -523,7 +600,7 @@ describe('GitService.mergeChangeRequest', () => {
       await runGit(baseRepo, ['add', '-A']);
       await runGit(baseRepo, ['commit', '-m', 'local only']);
 
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       await expect(
         git.mergeChangeRequest(
           baseWsId, 'alice/add', BASE, { subject: 'Add (#1)', body: 'x' }, USER,
@@ -538,7 +615,7 @@ describe('GitService.mergeChangeRequest', () => {
       await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
         await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
       });
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       const result = await git.mergeChangeRequest(
         baseWsId, 'alice/add', BASE, { subject: 'Add (#1)', body: 'x' }, USER,
         { requireCleanTarget: true },
@@ -571,7 +648,7 @@ describe('GitService.mergeChangeRequest', () => {
       const publishedTip = (await gitOut(advancer, ['rev-parse', 'HEAD'])).trim();
       expect(staleHead).not.toBe(publishedTip);
 
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       const seen: { sha: string; changedPaths: string[] }[] = [];
       const result = await git.mergeChangeRequest(
         baseWsId, 'alice/add', BASE, { subject: 'Add (#1)', body: 'x' }, USER,
@@ -589,7 +666,7 @@ describe('GitService.mergeChangeRequest', () => {
       await pushFeatureBranch(root, upstream, 'alice/add', async (dir) => {
         await fs.writeFile(path.join(dir, 'feature.md'), 'new content\n');
       });
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       await expect(
         git.mergeChangeRequest(
           baseWsId, 'alice/add', BASE, { subject: 'Add (#1)', body: 'x' }, USER,
@@ -614,7 +691,7 @@ describe('GitService.mergeChangeRequest', () => {
         await runGit(dir, ['mv', 'roles.yaml', 'people.yaml']);
       });
 
-      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new WorkflowHooks(), testKbContext());
+      const git = new GitService(stubWorkspaceService(baseWsId, baseRepo), new VersionControlHooks(), testKbContext());
       const seen: string[][] = [];
       const result = await git.mergeChangeRequest(
         baseWsId, 'alice/rename', BASE, { subject: 'Rename (#1)', body: 'x' }, USER,

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

@@ -7,8 +7,8 @@ import { GitService } from '../git.service.js';
 import { NodeGitRunner } from '../node-git-runner.js';
 import { GitRunError, type IGitRunner } from '../../../../shared/git.contract.js';
 import type { ReservedPushOps } from '@bevel-software/platform-shared';
-import { PullRebaseConflictError, WorkflowDomainError, WorkflowValidationError } from '../../../../shared/domain-errors.js';
-import { runGit, gitOut, stubWorkflowHooks, stubWorkspaceService } from './git-test-helpers.js';
+import { PullRebaseConflictError, VersionControlDomainError, VersionControlValidationError } from '../../../../shared/domain-errors.js';
+import { runGit, gitOut, stubVersionControlHooks, stubWorkspaceService } from './git-test-helpers.js';
 
 /**
  * `mergeIntoBranch`: the agent's merge, over real git. A conflict is described
@@ -24,7 +24,7 @@ const USER = { id: 'u1', email: 'ada@x.io', name: 'Ada Lovelace' };
 const allow = async (): Promise<void> => {};
 /**
  * The smallest publish a caller can bring: push, and on a rejection replay
- * onto the moved branch (the merge kept) and push once more. The workflow
+ * onto the moved branch (the merge kept) and push once more. The version-control service
  * facade brings its `pushWithRecovery` here; this stands in for it to show
  * the moves work inside the merge's reservation.
  */
@@ -107,7 +107,7 @@ describe('GitService.mergeIntoBranch', () => {
   });
 
   const service = () =>
-    new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubWorkflowHooks(), testKbContext());
+    new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubVersionControlHooks(), testKbContext());
 
   it('merges a target that moved into the draft as a merge commit by the user, and pushes nothing', async () => {
     const { repo, pusher } = await seed(root);
@@ -275,7 +275,7 @@ describe('GitService.mergeIntoBranch', () => {
     const svc = service();
     await expect(
       svc.mergeIntoBranch(workspaceId, DRAFT, TARGET, USER, { subject: 's', body: 'b', resolutions: [{ path: 'a.md' }], authorizeResolutions: allow }),
-    ).rejects.toBeInstanceOf(WorkflowValidationError);
+    ).rejects.toBeInstanceOf(VersionControlValidationError);
     await expect(
       svc.mergeIntoBranch(workspaceId, DRAFT, TARGET, USER, {
         subject: 's',
@@ -283,7 +283,7 @@ describe('GitService.mergeIntoBranch', () => {
         resolutions: [{ path: 'a.md', content: 'x', choose: 'ours' }],
         authorizeResolutions: allow,
       }),
-    ).rejects.toBeInstanceOf(WorkflowValidationError);
+    ).rejects.toBeInstanceOf(VersionControlValidationError);
   });
 
   it('refuses resolutions that nobody authorizes, before touching git', async () => {
@@ -306,9 +306,9 @@ describe('GitService.mergeIntoBranch', () => {
     const err = await service()
       .mergeIntoBranch(workspaceId, DRAFT, TARGET, USER, { subject: 's', body: 'b' })
       .catch((e: unknown) => e);
-    expect(err).toBeInstanceOf(WorkflowDomainError);
-    expect((err as WorkflowDomainError).status).toBe(409);
-    expect((err as WorkflowDomainError).payload).toMatchObject({ kind: 'branch-busy' });
+    expect(err).toBeInstanceOf(VersionControlDomainError);
+    expect((err as VersionControlDomainError).status).toBe(409);
+    expect((err as VersionControlDomainError).payload).toMatchObject({ kind: 'branch-busy' });
     expect(await fs.readFile(path.join(repo, 'shared.md'), 'utf-8')).toBe('unsaved edit\n');
   });
 
@@ -458,11 +458,11 @@ describe('GitService.mergeIntoBranch', () => {
             mergeHead: await gitOut(repo, ['rev-parse', '-q', '--verify', 'MERGE_HEAD']).then(() => true, () => false),
             sharedOnDisk: await fs.readFile(path.join(repo, 'shared.md'), 'utf-8'),
           });
-          throw new WorkflowDomainError('not yours to settle', 403);
+          throw new VersionControlDomainError('not yours to settle', 403);
         },
       })
       .catch((e: unknown) => e);
-    expect(err).toBeInstanceOf(WorkflowDomainError);
+    expect(err).toBeInstanceOf(VersionControlDomainError);
     // Asked with the target's tip as fetched by this very merge.
     expect(asked).toEqual([{ merge: { ours, theirs }, head: ours, mergeHead: false, sharedOnDisk: 'line 1\nline 2 from draft\nline 3\n' }]);
     expect((await gitOut(repo, ['rev-parse', 'HEAD'])).trim()).toBe(ours);
@@ -487,7 +487,7 @@ describe('GitService.mergeIntoBranch', () => {
     } as unknown as IGitRunner;
     const svc = new GitService(
       stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }),
-      stubWorkflowHooks(),
+      stubVersionControlHooks(),
       testKbContext(),
       undefined,
       null,
@@ -643,7 +643,7 @@ describe('GitService.readFileAtBranch', () => {
     const { repo, pusher } = await seed(root);
     const theirs = await pushOn(pusher, TARGET, { 'other.md': 'other, changed on target\n', 'docs/a.md': 'a\n' }, 'target edits');
     await runGit(repo, ['fetch', '-q', 'origin']);
-    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubWorkflowHooks(), testKbContext());
+    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubVersionControlHooks(), testKbContext());
 
     expect(await svc.readFileAtBranch(workspaceId, 'knowledge-base/other.md', TARGET)).toEqual({
       sha: theirs,
@@ -660,7 +660,7 @@ describe('GitService.readFileAtBranch', () => {
     const asked: string[][] = [];
     const refuse = async (commits: string[]): Promise<void> => {
       asked.push(commits);
-      throw new WorkflowDomainError('not yours to read', 403);
+      throw new VersionControlDomainError('not yours to read', 403);
     };
     await expect(svc.readFileAtBranch(workspaceId, 'docs', TARGET, refuse)).rejects.toThrow(/not yours to read/);
     await expect(svc.readFileAtBranch(workspaceId, 'other.md', TARGET, refuse)).rejects.toThrow(/not yours to read/);
@@ -673,7 +673,7 @@ describe('GitService.readFileAtBranch', () => {
 
   it('reads the PUBLISHED tip, not a local head that has moved past it', async () => {
     const { repo } = await seed(root);
-    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubWorkflowHooks(), testKbContext());
+    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubVersionControlHooks(), testKbContext());
     const published = (await gitOut(repo, ['rev-parse', `origin/${DRAFT}`])).trim();
     const local = await commitLocally(repo, { 'other.md': 'not shared yet\n' }, 'local only');
     const asked: string[][] = [];
@@ -702,7 +702,7 @@ describe('GitService.readFileAtBranch', () => {
         return inner.run(cwd, args, opts as never);
       },
     } as unknown as IGitRunner;
-    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubWorkflowHooks(), testKbContext(), undefined, null, gitRunner);
+    const svc = new GitService(stubWorkspaceService({ [workspaceId]: path.join(root, workspaceId) }), stubVersionControlHooks(), testKbContext(), undefined, null, gitRunner);
     const asked: string[][] = [];
     const authorize = async (commits: string[]): Promise<void> => { asked.push(commits); };
     for (const f of [

package/src/modules/{workflow → version-control}/git/__tests__/git.service.pendingChanges.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';
 import { parsePorcelainZ } from '../git.service.js';
 
@@ -72,7 +72,7 @@ async function makeSvc(root: string, workspaceId: string) {
   const { workspaceDir, repo } = await seedWorkspace(root, workspaceId);
   const svc = new GitService(
     stubWorkspaceService(workspaceId, workspaceDir),
-    new WorkflowHooks(),
+    new VersionControlHooks(),
     testKbContext(),
   );
   return { svc, repo };