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

package/src/modules/plugins/__tests__/plugins.routes.test.ts

@@ -9,7 +9,7 @@ import { NodeFs } from '../../kb-fs/node-fs.js';
 import { KbPluginSource } from '../discovery/kb-plugin-source.js';
 
 import { DEFAULT_BRANCH, joinBranchFor } from '@bevel-software/platform-shared';
-import type { ChangeRequest, IWorkflowService } from '@bevel-software/platform-shared';
+import type { ChangeRequest, IVersionControlService } from '@bevel-software/platform-shared';
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
@@ -30,7 +30,7 @@ import { testKbContext } from '../../../__tests__/kb-context.js';
  * verdicts), the fail-closed omission of plugins with no verdict at all, and
  * the join flow that rides on plain change requests.
  *
- * The plugin index is REAL over a temp KB; access control and the workflow are
+ * The plugin index is REAL over a temp KB; access control and the version-control service are
  * stubs, because what's under test here is the route's use of them.
  */
 
@@ -137,7 +137,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
     eligibleReaders: async () => ({ restricted: true, roles: ['GTM Team'], users: [OLGA] }),
   } as unknown as IAccessControl;
 
-  const workflow = {
+  const versionControl = {
     listChangeRequestsAuthoredBy: vi.fn(async () => opts.authoredCrs ?? []),
     listChangeRequests: vi.fn(async () => opts.authoredCrs ?? []),
     getChangeRequest: vi.fn(
@@ -147,7 +147,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
     listBranches: vi.fn(async () => []),
     commitChanges: vi.fn(async () => null),
     openChangeRequest: vi.fn(async () => ({ number: 42 })),
-  } as unknown as IWorkflowService;
+  } as unknown as IVersionControlService;
 
   const skillService = { listSkills: async () => opts.skills ?? [] } as unknown as ISkillService;
   const toolService = {
@@ -183,7 +183,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
   // The records half is REAL over an in-memory table, because the route's
   // whole contract now is "write a row, answer, then do the git" — a stub
   // would assert the route called something, not that the row and the change
-  // request are one-to-one. The git it eventually does is the workflow stub
+  // request are one-to-one. The git it eventually does is the version-control service stub
   // above, as it always was.
   const joinRequestStore = new FakeJoinRequestStore();
   // The change requests the store can see are the ones the listing is told
@@ -191,7 +191,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
   // telling the record it names that the request is over.
   for (const c of opts.authoredCrs ?? []) joinRequestStore.changeRequests.set(c.number, c.state);
   const joinRequestJobs = new PluginJoinRequestJobs(joinRequestStore, {
-    workflow,
+    versionControl,
     workspaceService,
     kb: testKbContext({ kbDirName: KB }),
     target: async (pluginKey) => {
@@ -224,7 +224,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
     createPluginsRoutes(
       index,
       accessControl,
-      workflow,
+      versionControl,
       joinRequests,
       joinRequestJobs,
       provision as never,
@@ -241,7 +241,7 @@ async function makeHarness(opts: HarnessOpts = {}) {
     server,
     baseUrl: `http://127.0.0.1:${addr.port}`,
     accessControl,
-    workflow,
+    versionControl,
     workspaceService,
     joinRequests,
     joinRequestJobs,
@@ -516,9 +516,9 @@ describe('/api/plugins routes', () => {
     const h = await makeHarness({ readable: { [ALI]: ['Plugins/Finance/access.md'] } });
     server = h.server;
     // The one thing the endpoint may not do any more is wait for a clone. A
-    // workflow that never settles stands in for one: the answer must arrive
+    // a version-control service that never settles stands in for one: the answer must arrive
     // anyway, and say the request is recorded and not yet carried.
-    (h.workflow.createBranch as ReturnType<typeof vi.fn>).mockReturnValue(new Promise(() => {}));
+    (h.versionControl.createBranch as ReturnType<typeof vi.fn>).mockReturnValue(new Promise(() => {}));
 
     const res = await fetch(`${h.baseUrl}/api/plugins/finance/join-request`, { method: 'POST' });
     expect(res.status).toBe(200);
@@ -526,13 +526,13 @@ describe('/api/plugins routes', () => {
     expect(h.joinRequestStore.all()).toMatchObject([
       { requesterEmail: ALI, pluginKey: 'Finance', status: 'pending', changeRequestNumber: null },
     ]);
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
   });
 
   it('join-request: the recorded request is REPORTED as requested before its CR exists', async () => {
     const h = await makeHarness({ readable: { [ALI]: ['Plugins/Finance/access.md'] } });
     server = h.server;
-    (h.workflow.createBranch as ReturnType<typeof vi.fn>).mockReturnValue(new Promise(() => {}));
+    (h.versionControl.createBranch as ReturnType<typeof vi.fn>).mockReturnValue(new Promise(() => {}));
     await fetch(`${h.baseUrl}/api/plugins/finance/join-request`, { method: 'POST' });
 
     // A reload one second after the click. No change request exists — the
@@ -557,7 +557,7 @@ describe('/api/plugins routes', () => {
     // The branch is cut from the FOLDER name, as every join branch before the
     // manifest became the identity was — so none of them is orphaned.
     const branch = joinBranchFor(ALI, 'Finance');
-    expect(h.workflow.createBranch).toHaveBeenCalledWith(wsId, branch, DEFAULT_BRANCH);
+    expect(h.versionControl.createBranch).toHaveBeenCalledWith(wsId, branch, DEFAULT_BRANCH);
     // The write went to the plugin's access.md and added the caller to the
     // BODY's read list (folder rules), leaving the discovery frontmatter alone.
     const write = (h.workspaceService.writeFile as ReturnType<typeof vi.fn>).mock.calls[0];
@@ -566,8 +566,8 @@ describe('/api/plugins routes', () => {
     expect((write[2] as string).indexOf('everyone')).toBeLessThan(
       (write[2] as string).indexOf('Ali Baba'),
     );
-    expect(h.workflow.commitChanges).toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledWith(
+    expect(h.versionControl.commitChanges).toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledWith(
       workspaceIdForBranch(branch),
       expect.objectContaining({ email: ALI }),
       expect.objectContaining({
@@ -591,7 +591,7 @@ describe('/api/plugins routes', () => {
     await h.joinRequestJobs.drain();
     const branch = joinBranchFor(ALI, 'teams/GTM');
     expect(branch).not.toBe(joinBranchFor(ALI, 'GTM'));
-    expect(h.workflow.createBranch).toHaveBeenCalledWith(wsId, branch, DEFAULT_BRANCH);
+    expect(h.versionControl.createBranch).toHaveBeenCalledWith(wsId, branch, DEFAULT_BRANCH);
   });
 
   it('join-request adopts an existing open join CR instead of opening a second one', async () => {
@@ -603,8 +603,8 @@ describe('/api/plugins routes', () => {
     const res = await fetch(`${h.baseUrl}/api/plugins/finance/join-request`, { method: 'POST' });
     expect(res.status).toBe(200);
     await h.joinRequestJobs.drain();
-    expect(h.workflow.createBranch).not.toHaveBeenCalled();
-    expect(h.workflow.openChangeRequest).not.toHaveBeenCalled();
+    expect(h.versionControl.createBranch).not.toHaveBeenCalled();
+    expect(h.versionControl.openChangeRequest).not.toHaveBeenCalled();
     // The record ends up pointing at the request that was already there.
     expect(h.joinRequestStore.all()).toMatchObject([{ status: 'opened', changeRequestNumber: 9 }]);
   });
@@ -639,13 +639,13 @@ describe('/api/plugins routes', () => {
     await h.joinRequestJobs.drain();
 
     expect(h.joinRequestStore.all()).toHaveLength(1);
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('join-request: a failure is recorded, and the listing hands the plugin back with the reason', async () => {
     const error = vi.spyOn(console, 'error').mockImplementation(() => {});
     const h = await makeHarness({ readable: { [ALI]: ['Plugins/Finance/access.md'] } });
-    (h.workflow.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValue(
+    (h.versionControl.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValue(
       new Error('the remote refused the push'),
     );
     server = h.server;
@@ -670,7 +670,7 @@ describe('/api/plugins routes', () => {
   it('join-request: a click after a failure RETRIES the recorded request rather than recording a second', async () => {
     const error = vi.spyOn(console, 'error').mockImplementation(() => {});
     const h = await makeHarness({ readable: { [ALI]: ['Plugins/Finance/access.md'] } });
-    (h.workflow.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+    (h.versionControl.openChangeRequest as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
       new Error('the remote refused the push'),
     );
     server = h.server;
@@ -685,7 +685,7 @@ describe('/api/plugins routes', () => {
     expect(rows).toHaveLength(1);
     expect(rows[0].id).toBe(failed.id);
     expect(rows[0]).toMatchObject({ status: 'opened', changeRequestNumber: 42, failureReason: null });
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(2);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(2);
     error.mockRestore();
   });
 
@@ -706,7 +706,7 @@ describe('/api/plugins routes', () => {
     await h.joinRequestJobs.sweep();
     await h.joinRequestJobs.drain();
 
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
     expect(h.joinRequestStore.all()).toMatchObject([{ status: 'opened', changeRequestNumber: 42 }]);
   });
 
@@ -761,7 +761,7 @@ describe('/api/plugins routes', () => {
     expect(rows).toHaveLength(1);
     expect(rows[0].id).toBe(answered.id);
     expect(rows[0]).toMatchObject({ status: 'opened', changeRequestNumber: 42 });
-    expect(h.workflow.openChangeRequest).toHaveBeenCalledTimes(1);
+    expect(h.versionControl.openChangeRequest).toHaveBeenCalledTimes(1);
   });
 
   it('an opened record whose request is still open counts, before the open listing knows it', async () => {
@@ -811,7 +811,7 @@ describe('/api/plugins routes', () => {
 
   it('degrades hasRequested to false when the CR lookup throws', async () => {
     const h = await makeHarness({ readable: { [ALI]: ['Plugins/Finance/access.md'] } });
-    (h.workflow.listChangeRequestsAuthoredBy as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+    (h.versionControl.listChangeRequestsAuthoredBy as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
       new Error('gh down'),
     );
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});

package/src/modules/plugins/join-request-jobs.service.ts

@@ -2,11 +2,11 @@ import {
   joinBranchFor,
   type AuthUser,
   type ChangeRequestState,
-  type IWorkflowService,
+  type IVersionControlService,
 } from '@bevel-software/platform-shared';
 import { DrizzleQueryError } from 'drizzle-orm';
 import { spliceGrant } from '../access-model/index.js';
-import { sanitizeError } from '../workflow/index.js';
+import { sanitizeError } from '../version-control/index.js';
 import { logger } from '../../shared/logging.js';
 import { printable } from '../../shared/printable.js';
 import type { KbContext } from '../../shared/kb-context.js';
@@ -139,8 +139,8 @@ export interface JoinRequestTarget {
 }
 
 export interface JoinRequestJobsDeps {
-  workflow: Pick<
-    IWorkflowService,
+  versionControl: Pick<
+    IVersionControlService,
     | 'createBranch'
     | 'listBranches'
     | 'commitChanges'
@@ -521,7 +521,7 @@ export class PluginJoinRequestJobs {
     claim: ClaimedJoinRequest,
     stillOurs: () => Promise<void>,
   ): Promise<void> {
-    const { workflow, workspaceService, kb } = this.deps;
+    const { versionControl, workspaceService, kb } = this.deps;
     const { kbDirName } = kb;
     const target = await this.deps.target(record.pluginKey);
     if (!target) throw new Error('the plugin is no longer available');
@@ -540,7 +540,7 @@ export class PluginJoinRequestJobs {
     // shows nothing to adopt. Paying a round-trip here is the point: it buys
     // the "one recorded request, one change request" promise, and it is off
     // the answer path entirely.
-    const mine = await workflow.listChangeRequestsAuthoredBy(record.requesterEmail, {
+    const mine = await versionControl.listChangeRequestsAuthoredBy(record.requesterEmail, {
       fresh: true,
     });
     const open = mine.find((cr) => cr.state === 'open' && cr.branch === branch);
@@ -596,7 +596,7 @@ export class PluginJoinRequestJobs {
       // replaced, and it left recorded requests owed forever.
       await stillOurs();
       await workspaceService.writeFile(ws.id, accessPath, spliced.text);
-      await workflow.commitChanges(ws.id, user, `Request access to ${target.displayName}`);
+      await versionControl.commitChanges(ws.id, user, `Request access to ${target.displayName}`);
     }
     // The last gate, and the one that matters most: everything above is
     // idempotent and reusable — a branch, a commit on it — but a change
@@ -619,7 +619,7 @@ export class PluginJoinRequestJobs {
     if (!still || still.id !== user.id) {
       throw new Error('the account that asked no longer exists');
     }
-    const detail = await workflow.openChangeRequest(ws.id, user, {
+    const detail = await versionControl.openChangeRequest(ws.id, user, {
       sourceBranch: branch,
       targetBranch: kb.defaultBranch,
       // People read these: the display name, not the identifier.
@@ -653,10 +653,10 @@ export class PluginJoinRequestJobs {
   private async ensureBranch(branch: string): Promise<void> {
     const wsId = this.deps.kb.defaultWorkspaceId();
     try {
-      await this.deps.workflow.createBranch(wsId, branch, this.deps.kb.defaultBranch);
+      await this.deps.versionControl.createBranch(wsId, branch, this.deps.kb.defaultBranch);
       return;
     } catch (err) {
-      const branches = await this.deps.workflow.listBranches(wsId, {
+      const branches = await this.deps.versionControl.listBranches(wsId, {
         freshFetch: true,
         strictFetch: true,
       });

package/src/modules/plugins/join-requests.service.ts

@@ -2,7 +2,7 @@ import {
   isJoinBranchFor,
   type AuthUser,
   type ChangeRequest,
-  type IWorkflowService,
+  type IVersionControlService,
 } from '@bevel-software/platform-shared';
 import { type WorkspaceService } from '../workspace/index.js';
 import { logger } from '../../shared/logging.js';
@@ -57,7 +57,7 @@ export interface JoinRequest {
 export class JoinRequestsService implements IAccessRequestLifecycle {
   constructor(
     private readonly workspaceService: WorkspaceService,
-    private readonly workflow: IWorkflowService,
+    private readonly versionControl: IVersionControlService,
     private readonly kb: Pick<KbContext, 'defaultBranch' | 'defaultWorkspaceId'>,
     /**
      * Read-only, and asked one question only: does this person already hold
@@ -284,7 +284,7 @@ export class JoinRequestsService implements IAccessRequestLifecycle {
   private async settle(cr: ChangeRequest, actor: AuthUser): Promise<void> {
     const wsId = this.kb.defaultWorkspaceId();
     try {
-      await this.workflow.rejectChangeRequest(
+      await this.versionControl.rejectChangeRequest(
         cr.number,
         actor,
         cr.state,
@@ -301,7 +301,7 @@ export class JoinRequestsService implements IAccessRequestLifecycle {
       return;
     }
     try {
-      await this.workflow.deleteBranch(wsId, cr.branch, actor);
+      await this.versionControl.deleteBranch(wsId, cr.branch, actor);
     } catch (err) {
       // The request is closed either way; a leftover branch is cosmetic and
       // the author can still delete it themselves.

package/src/modules/plugins/plugin-rename.service.ts

@@ -246,7 +246,7 @@ export class PluginRenameService {
       );
     } catch (err) {
       // One failure is NOT a failed commit: the commit landed locally and only
-      // the push did not (the typed hand-off the workflow throws). Restoring
+      // the push did not (the typed hand-off the version-control service throws). Restoring
       // the old bytes then would stack an uncommitted inverse of a real
       // commit; the recovery flow owns that state, so it is left alone — and
       // since the tree DID change, every cache keyed on the old identity is

package/src/modules/plugins/plugins.routes.ts

@@ -8,10 +8,10 @@ import {
   type AuthUser,
   type ChangeRequest,
   type ChangeRequestState,
-  type IWorkflowService,
+  type IVersionControlService,
 } from '@bevel-software/platform-shared';
 import type { IAccessControl } from '../access/index.js';
-import { WorkflowDomainError } from '../../shared/domain-errors.js';
+import { VersionControlDomainError } from '../../shared/domain-errors.js';
 import { domainErrorBody } from '../../shared/http-errors.js';
 import { pluginFolderBelowRoot } from './plugins.service.js';
 import type { KbContext } from '../../shared/kb-context.js';
@@ -209,7 +209,7 @@ export function createPluginCreationRoutes(
 export function createPluginsRoutes(
   pluginIndex: IPluginIndexService,
   accessControl: IAccessControl,
-  workflow: IWorkflowService,
+  versionControl: IVersionControlService,
   joinRequests: JoinRequestsService,
   /**
    * Where a join request is RECORDED, and what finishes it afterwards. The
@@ -257,7 +257,7 @@ export function createPluginsRoutes(
           res.status(err.status).json({ error: err.message, ...err.payload });
           return;
         }
-        if (err instanceof WorkflowDomainError) {
+        if (err instanceof VersionControlDomainError) {
           res.status(err.status).json(domainErrorBody(err));
           return;
         }
@@ -290,7 +290,7 @@ export function createPluginsRoutes(
         res.status(err.status).json({ error: err.message, ...err.payload });
         return;
       }
-      if (err instanceof WorkflowDomainError) {
+      if (err instanceof VersionControlDomainError) {
         res.status(err.status).json(domainErrorBody(err));
         return;
       }
@@ -403,7 +403,7 @@ export function createPluginsRoutes(
       // requested" and let the next load repair it.
       let mine: ChangeRequest[] = [];
       try {
-        mine = await workflow.listChangeRequestsAuthoredBy(email);
+        mine = await versionControl.listChangeRequestsAuthoredBy(email);
       } catch (err) {
         log.warn(`join-request lookup failed: ${err instanceof Error ? err.message : String(err)}`);
       }
@@ -624,7 +624,7 @@ export function createPluginsRoutes(
       // already on the wire, and the job records its own outcome on the row.
       void joinRequestJobs.start(record);
     } catch (err) {
-      if (err instanceof WorkflowDomainError) {
+      if (err instanceof VersionControlDomainError) {
         res.status(err.status).json(domainErrorBody(err));
         return;
       }
@@ -678,7 +678,7 @@ export function createPluginsRoutes(
     try {
       const ctx = await requireManager(req, res, () => res.json({ requests: [] }));
       if (!ctx) return;
-      const crs = await workflow.listChangeRequests();
+      const crs = await versionControl.listChangeRequests();
       res.json({
         requests: await joinRequests.list(joinKeyOf(ctx.plugin), folderTarget(ctx.folder), crs, ctx.user),
       });
@@ -705,7 +705,7 @@ export function createPluginsRoutes(
         res.status(400).json({ error: 'Invalid change request number' });
         return;
       }
-      const cr = await workflow.getChangeRequest(crNumber);
+      const cr = await versionControl.getChangeRequest(crNumber);
       if (!cr) {
         res.status(404).json({ error: 'Not found' });
         return;