@bevel-software/platform-core-backend 0.20.0 → 0.22.0

package/src/modules/tool-manuals/tool-manuals.tools.ts

@@ -1,11 +1,10 @@
 import type { Router, RequestHandler } from 'express';
-import { DEFAULT_BRANCH } from '@bevel-software/platform-shared';
 import type { IToolRegistry, UtcpTool } from '../tool-registry/tool.contract.js';
+import type { KbContext } from '../../shared/kb-context.js';
 import type { ToolContext } from '../tool-helpers/tool.contract.js';
 import { toolDef } from '../tool-helpers/tool-def.js';
 import type { ToolHandlerFactory } from '../tool-helpers/tool-handler.js';
 import type { IAccessControl } from '../access/access-control.interface.js';
-import { workspaceIdForBranch } from '../../shared/workspace-id.js';
 import { utcpNamespacedKey } from '../../shared/utcp-namespace.js';
 import type { IToolManualService } from './tool-manuals.contract.js';
 
@@ -42,6 +41,8 @@ export function registerToolManualsTools(
   deps: {
     accessControl: IAccessControl;
     variableStatus: VariableStatusPort;
+    /** Which branch tools are served from, and its clone. */
+    kb: Pick<KbContext, 'defaultBranch' | 'defaultWorkspaceId'>;
   },
 ): void {
   registry.registerExternalTool((ctx) => buildListLocalToolsDef(toolManualService, ctx.userEmail));
@@ -57,9 +58,9 @@ export function registerToolManualsTools(
 
   // A FUNCTION, not a constant — this factory runs at boot, and on a
   // setup-screen deployment the branch model is applied AFTER boot. Only a
-  // read inside a handler body sees the configured `DEFAULT_BRANCH`; a
+  // read inside a handler body sees the configured default branch; a
   // construction-time capture would hold the empty pre-setup id until restart.
-  const defaultWs = () => workspaceIdForBranch(DEFAULT_BRANCH);
+  const defaultWs = () => deps.kb.defaultWorkspaceId();
   const varKey = (manualName: string, varName: string) => utcpNamespacedKey(manualName, varName);
 
   const listSetupDef = toolDef({
@@ -235,9 +236,9 @@ export function registerToolManualsTools(
         onBranchOnly,
         note:
           `${onBranchOnly.map((p) => `\`${p.name}\``).join(', ')} ${onBranchOnly.length === 1 ? 'is' : 'are'} declared on ` +
-          `\`${branch}\` only. Tools are served from \`${DEFAULT_BRANCH}\`, so ${onBranchOnly.length === 1 ? 'it stays' : 'they stay'} ` +
+          `\`${branch}\` only. Tools are served from \`${deps.kb.defaultBranch}\`, so ${onBranchOnly.length === 1 ? 'it stays' : 'they stay'} ` +
           'unlisted, uncallable and without a sign-in until that branch is merged: open a change request with ' +
-          `\`open_change_request\` (target \`${DEFAULT_BRANCH}\`), then ask the user to review and merge it in the app.`,
+          `\`open_change_request\` (target \`${deps.kb.defaultBranch}\`), then ask the user to review and merge it in the app.`,
       };
     }),
   );

package/src/modules/workflow/__tests__/apply-failure.test.ts

@@ -4,6 +4,7 @@ import path from 'node:path';
 import type { AddressInfo } from 'node:net';
 import express from 'express';
 import { describe, it, expect, afterEach, vi } from 'vitest';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 import type { AuthUser, FileApprovalState, IWorkflowService, WorkflowEvent } from '@bevel-software/platform-shared';
 import type { IAccessControl } from '../../access/access-control.interface.js';
 import type { AuthService } from '../../auth/auth.service.js';
@@ -382,7 +383,7 @@ function service(
     {} as IAccessControl,
     {} as FileLockService,
     {} as PendingCommitsService,
-    'knowledge-base',
+    testKbContext(),
     openChangeGate(),
     { emit } as unknown as WorkflowEventBus,
   );
@@ -581,7 +582,7 @@ describe('WorkflowService — a refusal clears when a change makes it obsolete',
     const { svc } = service(
       store.db,
       (e) => emitted.push(e as { kind: string }),
-      {},
+      { carryApprovalsForward: vi.fn(async () => 0) },
       {
         git: {
           pull: vi.fn(async () => ({ treeChanged: false })),
@@ -590,6 +591,14 @@ describe('WorkflowService — a refusal clears when a change makes it obsolete',
             return { kind: 'merged', alreadyUpToDate: false };
           }),
           push: vi.fn(async () => undefined),
+          hasUnpushedCommits: vi.fn(async () => true),
+          pathsChangedBetween: vi.fn(async () => []),
+          // The head this test is named for: one sha before the merge,
+          // another after it.
+          resolvePrShas: vi
+            .fn()
+            .mockResolvedValueOnce({ baseSha: 'b'.repeat(40), headSha: 'a'.repeat(40) })
+            .mockResolvedValue({ baseSha: 'b'.repeat(40), headSha: 'd'.repeat(40) }),
         } as unknown as Partial<GitService>,
         prs: {
           getPrDetail: vi.fn(async () => ({ state: 'open', branch: 'bo/suggestions', base: 'main', viewerCanUpdate: true })),

package/src/modules/workflow/__tests__/merge-announces-tree.test.ts

@@ -1,10 +1,6 @@
-import { afterAll, beforeAll, describe, it, expect, vi } from 'vitest';
-import {
-  DEFAULT_BRANCH,
-  branchModelFromEnv,
-  configureBranchModel,
-  type WorkflowEvent,
-} from '@bevel-software/platform-shared';
+import { describe, it, expect, vi } from 'vitest';
+import { testKbContext } from '../../../__tests__/kb-context.js';
+import type { WorkflowEvent } from '@bevel-software/platform-shared';
 
 import type { GitService } from '../git/git.service.js';
 import type { PullRequestService } from '../git/pull-request.service.js';
@@ -47,24 +43,16 @@ const USER = { id: 'u1', email: 'someone@x.com', name: 'Someone' };
 /**
  * A default branch this deployment chose, pinned for the whole file.
  *
- * `DEFAULT_BRANCH` is a binding a deployment configures at boot (the suite's
- * `test-setup.ts` applies the environment's), so reading it here would make
- * these assertions agree with whatever that environment happens to say — and a
+ * The environment's pair (which `test-setup.ts` mirrors onto the shared
+ * bindings) is what most fixtures run under, so a service that read THAT
+ * would make these assertions agree with whatever it happens to say — and a
  * regression that hardcoded a branch name would still pass wherever the two
  * coincided. Deliberately NOT `main`, so `main` written into the emit would
- * fail here rather than slip through.
+ * fail here rather than slip through. The service is handed this model by
+ * constructor, so nothing process-wide changes for the files after this one.
  */
 const TRUNK = 'trunk';
-
-beforeAll(() => {
-  configureBranchModel({ defaultBranch: TRUNK, protectedBranches: [TRUNK] });
-});
-afterAll(() => {
-  // Back to what the suite booted with: the binding is process-wide, and a
-  // file that leaves its own branch model behind changes the meaning of
-  // anything that runs after it in the same worker.
-  configureBranchModel(branchModelFromEnv());
-});
+const kb = testKbContext({ kbDirName: KB_DIR, branchModel: { defaultBranch: TRUNK, protectedBranches: [TRUNK] } });
 
 function noopAccessControl(): IAccessControl {
   return { invalidate: vi.fn() } as unknown as IAccessControl;
@@ -120,7 +108,7 @@ function makeSvc(
     noopAccessControl(),
     { acquire: vi.fn(), release: vi.fn() } as unknown as FileLockService,
     {} as unknown as PendingCommitsService,
-    KB_DIR,
+    kb,
     openChangeGate(),
     bus,
   );
@@ -145,10 +133,10 @@ describe('applying a change request announces the tree it rewrote', () => {
     expect(treeEvents()).toEqual([
       { kind: 'fs-tree-changed', workspaceId: encodeURIComponent(TRUNK), branch: TRUNK },
     ]);
-    // The deployment's own default branch, read from the binding rather than
-    // written into the emit: these two are the same thing, and a hardcoded
-    // branch name would make them differ.
-    expect(DEFAULT_BRANCH).toBe(TRUNK);
+    // The deployment's own default branch, read from the context the service
+    // was handed rather than written into the emit: these two are the same
+    // thing, and a hardcoded branch name would make them differ.
+    expect(kb.defaultBranch).toBe(TRUNK);
   });
 
   /**

package/src/modules/workflow/__tests__/preserve-roles-yaml.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
@@ -120,7 +121,7 @@ describe('mergeChangeRequest — roles.yaml preservation guard', () => {
       {} as unknown as Database,
       git, prs, reviewWorkflow, workspaceService, ac,
       fileLocks, {} as unknown as PendingCommitsService,
-      KB_DIR,
+      testKbContext({ kbDirName: KB_DIR }),
       openChangeGate(),
     );
     // Conflicts are now surfaced by the local merge inside `reviewWorkflow.mergePr`

package/src/modules/workflow/__tests__/session-ontology.service.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 import { SessionOntologyService } from '../session-ontology.service.js';
 import type { Database } from '../../database/connection.js';
@@ -90,7 +91,7 @@ vi.mock('drizzle-orm', async (importOriginal) => {
 
 function makeService() {
   const db = makeFakeDb();
-  return { svc: new SessionOntologyService(db as unknown as Database), db };
+  return { svc: new SessionOntologyService(db as unknown as Database, testKbContext()), db };
 }
 
 describe('SessionOntologyService (touched-set model)', () => {
@@ -157,7 +158,7 @@ describe('SessionOntologyService (touched-set model)', () => {
   it('survives a "restart": a new instance re-reads the touched set from the store', async () => {
     await svc.checkOperation('s1', P_READ, false);
     await svc.checkOperation('s1', PL_READ, false);
-    const afterRestart = new SessionOntologyService(db as unknown as Database);
+    const afterRestart = new SessionOntologyService(db as unknown as Database, testKbContext());
     // The poison persists across the restart: writes still blocked.
     expect((await afterRestart.checkOperation('s1', P_READ, true)).allow).toBe(false);
   });

package/src/modules/workflow/__tests__/workflow.routes.lock-path.test.ts

@@ -2,6 +2,7 @@ import type { Server } from 'node:http';
 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, Change, IWorkflowService } from '@bevel-software/platform-shared';
 import type { Database } from '../../database/connection.js';
 import type { IAccessControl } from '../../access/access-control.interface.js';
@@ -79,7 +80,7 @@ async function makeHarness(): Promise<Harness> {
     {} as IAccessControl,
     new FileLockService(fake.db),
     pending,
-    KB,
+    testKbContext({ kbDirName: KB }),
     openChangeGate(),
     events,
   );

package/src/modules/workflow/__tests__/workflow.service.branch-in-use.test.ts

@@ -1,6 +1,6 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 import { drizzle } from 'drizzle-orm/pg-proxy';
-import { configureBranchModel } 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';
@@ -103,7 +103,7 @@ function makeService(db: Database, git: Partial<GitService>) {
     {} as IAccessControl,
     {} as FileLockService,
     {} as PendingCommitsService,
-    'knowledge-base',
+    testKbContext(),
     openChangeGate(),
   );
 }
@@ -132,13 +132,6 @@ function retire(svc: WorkflowService, number: number, base: string) {
   ).retireMergedSourceBranch(number, base, USER);
 }
 
-beforeEach(() => {
-  configureBranchModel({
-    defaultBranch: 'target-company-state',
-    protectedBranches: ['current-company-state', 'target-company-state'],
-  });
-});
-
 describe('post-merge branch retirement', () => {
   it('keeps a branch another open request proposes INTO', async () => {
     const deleted: string[] = [];

package/src/modules/workflow/__tests__/workflow.service.commitFileWhileLocked.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
+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';
@@ -113,7 +114,7 @@ function makeFacade(git: GitService, locks: FileLockService, events: WorkflowEve
     {} as IAccessControl,
     locks,
     pending,
-    'knowledge-base',
+    testKbContext(),
     openChangeGate(),
     events,
   );

package/src/modules/workflow/__tests__/workflow.service.deleted-branch-sweep.test.ts

@@ -1,5 +1,5 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { configureBranchModel } from '@bevel-software/platform-shared';
+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';
@@ -67,7 +67,7 @@ function makeService(open: OpenRow[], listBranches: () => Promise<{ name: string
     {} as IAccessControl,
     {} as FileLockService,
     {} as PendingCommitsService,
-    'knowledge-base',
+    testKbContext(),
     openChangeGate(),
   );
   (svc as unknown as { events?: { emit(e: unknown): void } }).events = {
@@ -76,13 +76,6 @@ function makeService(open: OpenRow[], listBranches: () => Promise<{ name: string
   return { svc, git, invalidated, emitted };
 }
 
-beforeEach(() => {
-  configureBranchModel({
-    defaultBranch: 'target-company-state',
-    protectedBranches: ['current-company-state', 'target-company-state'],
-  });
-});
-
 describe('closeChangeRequestsWithDeletedBranches', () => {
   it('closes a request whose source branch is gone', async () => {
     const { svc, invalidated, emitted } = makeService(