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

package/src/modules/marketplace/__tests__/marketplace-repo.head.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { MarketplaceRepoService, type MarketplaceCompiler } from '../marketplace-repo.service.js';
-import { GitRunError, type IGitRunner } from '../../../shared/git.contract.js';
+import { GitRunError, NO_GIT_CREDENTIALS, type IGitRunner } from '../../../shared/git.contract.js';
 
 const SHA = 'a'.repeat(40);
 
@@ -8,6 +8,7 @@ const SHA = 'a'.repeat(40);
 function runnerFailingRevParse(failure: GitRunError): IGitRunner {
   return {
     defaultTimeoutMs: 1_000,
+    credentials: NO_GIT_CREDENTIALS,
     run: (async (_cwd: string, args: string[]) => {
       if (args.includes('rev-parse')) throw failure;
       return { stdout: '', stderr: '' };

package/src/modules/mcp/mcp.service.ts

@@ -93,6 +93,13 @@ export interface McpProxyOptions {
   readAgentPreamble?: AgentPreambleReader;
   /** Bounds of the downstream (`mcp.json`) connection pool; defaults are 4h idle / 5000 entries. */
   downstreamPool?: Pick<DownstreamPoolOptions<unknown>, 'idleTtlMs' | 'maxEntries' | 'now'>;
+  /**
+   * The scope this knowledge base's secrets vault was registered under (see
+   * `secrets-variable-loader.ts`), so the UTCP clients built here resolve a
+   * caller's `${VAR}`s from that vault and no other's. Default: the single
+   * knowledge base's.
+   */
+  secretsScope?: string;
 }
 
 /** Who a request is from — everything the proxy needs, resolved from that request's own bearer. */
@@ -727,7 +734,7 @@ export class McpService {
    */
   private async buildClient(bearer: string, userId: string, manuals: CallTemplate[]): Promise<CodeModeUtcpClient> {
     const variables = seedBevelHostedManualVars(manuals, this.opts.loopbackBaseUrl, bearer);
-    return CodeModeUtcpClient.create(process.cwd(), utcpClientConfig(userId, variables));
+    return CodeModeUtcpClient.create(process.cwd(), utcpClientConfig(userId, variables, this.opts.secretsScope));
   }
 
   /**
@@ -959,7 +966,7 @@ export class McpService {
   private async connectDownstream(userId: string, template: CallTemplate): Promise<PooledDownstream> {
     // Third-party manuals are never seeded loopback credentials (see
     // `buildClient`), so a pooled client carries no request-scoped bearer.
-    const client = await CodeModeUtcpClient.create(process.cwd(), utcpClientConfig(userId, {}));
+    const client = await CodeModeUtcpClient.create(process.cwd(), utcpClientConfig(userId, {}, this.opts.secretsScope));
     // Our own copy: registration renames the template in place, and recovery
     // re-registers from exactly what discovery used.
     const own = structuredClone(template);
@@ -1240,10 +1247,10 @@ function isErrorResult(result: CallToolResult): boolean {
  * request clients and pooled downstream clients, so both resolve a manual's
  * variables through exactly the same tiers.
  */
-function utcpClientConfig(userId: string, variables: Record<string, string>) {
+function utcpClientConfig(userId: string, variables: Record<string, string>, secretsScope?: string) {
   return new UtcpClientConfigSerializer().validateDict({
     variables,
-    load_variables_from: [bevelSecretsLoaderConfig(userId)],
+    load_variables_from: [bevelSecretsLoaderConfig(userId, secretsScope)],
   });
 }
 

package/src/modules/plugins/__tests__/bundle-dialect.e2e.test.ts

@@ -3,7 +3,8 @@ import { NodeFs } from '../../kb-fs/node-fs.js';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { DEFAULT_BRANCH, DEFAULT_KB_LAYOUT, configureKbLayout } from '@bevel-software/platform-shared';
+import { DEFAULT_BRANCH } from '@bevel-software/platform-shared';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 import type { WorkspaceService } from '../../workspace/workspace.service.js';
 import { AccessControlService } from '../../access/access-control.service.js';
@@ -46,7 +47,8 @@ describe('bundle dialect, end to end', () => {
   };
 
   beforeEach(async () => {
-    configureKbLayout({ knowledgeBaseDir: 'docs', skillsDir: 'skills', pluginsDir: 'plugins' });
+    // The customer's root names, read by every consumer through one context.
+    const kb = testKbContext({ kbDirName: KB_DIR, layout: { knowledgeBaseDir: 'docs', skillsDir: 'skills', pluginsDir: 'plugins' } });
     root = await fs.mkdtemp(path.join(os.tmpdir(), 'bevel-dialect-'));
     repo = path.join(root, wsId, KB_DIR);
     const workspaceService = {
@@ -94,17 +96,16 @@ describe('bundle dialect, end to end', () => {
     );
 
     const disk = new NodeFs();
-    const source = new KbPluginSource(disk);
-    access = new AccessControlService(workspaceService, KB_DIR, disk);
-    skills = new SkillService(workspaceService, access, KB_DIR, disk);
-    tools = new ToolManualService(workspaceService, access, KB_DIR, disk, source);
-    links = new PluginLinkIndex(workspaceService, skills, access, KB_DIR, source);
-    index = new PluginIndexService(workspaceService, access, skills, tools, KB_DIR, source, Date.now, links);
-    compiler = new MarketplaceCompilerService(workspaceService, access, skills, links, KB_DIR, { name: 'acme', owner: 'Acme' }, source, disk, new NodeGitRunner());
-    linkService = new PluginLinksService(workspaceService, { runPendingCommit: async () => undefined }, access, skills, links, KB_DIR);
+    const source = new KbPluginSource(disk, kb);
+    access = new AccessControlService(workspaceService, KB_DIR, disk, [], new NodeGitRunner(), kb);
+    skills = new SkillService(workspaceService, access, kb, disk);
+    tools = new ToolManualService(workspaceService, access, kb, disk, source);
+    links = new PluginLinkIndex(workspaceService, skills, access, kb, source);
+    index = new PluginIndexService(workspaceService, access, skills, tools, kb, source, Date.now, links);
+    compiler = new MarketplaceCompilerService(workspaceService, access, skills, links, kb, { name: 'acme', owner: 'Acme' }, source, disk, new NodeGitRunner());
+    linkService = new PluginLinksService(workspaceService, { runPendingCommit: async () => undefined }, access, skills, links, kb);
   });
   afterEach(async () => {
-    configureKbLayout({ ...DEFAULT_KB_LAYOUT });
     await fs.rm(root, { recursive: true, force: true });
   });
 

package/src/modules/plugins/__tests__/bundle-dialect.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest';
+import { DEFAULT_KB_LAYOUT } from '@bevel-software/platform-shared';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
@@ -147,7 +148,7 @@ describe('bundle: what it says about itself survives', () => {
         }),
       );
       const warnings: string[] = [];
-      const plugin = await readBundlePlugin(dir, 'plugins/ado', 'ado', null, warnings, []);
+      const plugin = await readBundlePlugin(dir, 'plugins/ado', 'ado', null, warnings, [], DEFAULT_KB_LAYOUT);
       expect(plugin?.manifest).toEqual({
         name: 'ado',
         version: '1.3.5',

package/src/modules/plugins/__tests__/compile-marketplace.test.ts

@@ -16,6 +16,7 @@ import { NodeGitRunner } from '../../workflow/git/node-git-runner.js';
 import express from 'express';
 import { ToolRegistry } from '../../tool-registry/tool-registry.js';
 import { registerSkillsTools } from '../../skills/skills.tools.js';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 /**
  * Source in, distribution out — for one caller. The real resolver decides
@@ -90,17 +91,18 @@ describe('compileMarketplace', () => {
     await write('Skills/Sales/pitch/SKILL.md', '---\ndescription: Pitch.\n---\n');
 
     const disk = new NodeFs();
-    const source = new KbPluginSource(disk);
+    const kb = testKbContext({ kbDirName: KB_DIR });
+    const source = new KbPluginSource(disk, kb);
     const access = new AccessControlService(workspaceService, KB_DIR, disk);
-    const skills = new SkillService(workspaceService, access, KB_DIR, disk);
+    const skills = new SkillService(workspaceService, access, kb, disk);
     catalog = skills;
-    const links = new PluginLinkIndex(workspaceService, skills, access, KB_DIR, source);
+    const links = new PluginLinkIndex(workspaceService, skills, access, kb, source);
     compiler = new MarketplaceCompilerService(
       workspaceService,
       access,
       skills,
       links,
-      KB_DIR,
+      kb,
       {
         name: 'acme-hexis',
         owner: 'Acme',

package/src/modules/plugins/__tests__/join-proposals.test.ts

@@ -2,8 +2,13 @@ import { describe, it, expect } from 'vitest';
 import { pendingProposals } from '../join-proposals.js';
 
 /**
- * What a join branch proposes, relative to the default branch. This diff IS
- * the request's lifecycle: non-empty ⇒ open, empty ⇒ settled and closed.
+ * What a request's branch proposes, relative to the default branch. This diff
+ * IS the request's lifecycle: non-empty ⇒ open, empty ⇒ settled and closed,
+ * null ⇒ the branch could not be read and nothing may be concluded.
+ *
+ * Which grammar reads it follows the ITEM, and the second describe below is
+ * why: a folder's rules are block lists in an access.md body, a file's are its
+ * own frontmatter, where a single grant is a scalar.
  */
 const PATH = 'Plugins/GTM/access.md';
 
@@ -17,7 +22,7 @@ describe('pendingProposals', () => {
     const branch = base(
       'read:\n  - GTM Team\n  - Olga Ivanova <olga@bevel.software>\n  - Ali Baba <ali@bevel.software>\n',
     );
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([
       {
         verb: 'read',
         id: 'user:ali@bevel.software',
@@ -31,7 +36,7 @@ describe('pendingProposals', () => {
     // A branch asking for `write` must be visible AS a write request rather
     // than hiding behind "asked to join".
     const branch = base('read:\n  - GTM Team\n  - Olga Ivanova <olga@bevel.software>\nwrite:\n  - Finance Team\n');
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([
       {
         verb: 'write',
         id: 'role:finance team',
@@ -42,12 +47,12 @@ describe('pendingProposals', () => {
   });
 
   it('is EMPTY when the branch is identical — the settled state', () => {
-    expect(pendingProposals(DEFAULT_MD, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(DEFAULT_MD, DEFAULT_MD, PATH, 'folder')).toEqual([]);
   });
 
   it('is EMPTY when the branch grants a SUBSET (its proposal already landed)', () => {
     const branch = base('read:\n  - Olga Ivanova <olga@bevel.software>\n');
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([]);
   });
 
   it('ignores a REMOVAL — a branch that drops one grant but keeps the rest proposes nothing', () => {
@@ -55,36 +60,38 @@ describe('pendingProposals', () => {
     // ordinary change request in the review UI. (Distinct from the subset
     // case above: here GTM Team survives and only Olga is dropped.)
     const branch = base('read:\n  - GTM Team\n');
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([]);
   });
 
   it('ignores a `deny` entry — a denial is not something to accept', () => {
     const branch = base(
       'read:\n  - GTM Team\n  - Olga Ivanova <olga@bevel.software>\n  - deny Ali Baba <ali@bevel.software>\n',
     );
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([]);
   });
 
   it('matches principals canonically (case-insensitive email, canonical role)', () => {
     const branch = base('read:\n  - gtm team\n  - Olga I <OLGA@Bevel.Software>\n');
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([]);
   });
 
-  it('treats a MALFORMED branch file as proposing nothing (fail-closed)', () => {
-    // A body naming a verb but shaped wrong is a hard parse error; there is
-    // nothing to offer a manager, and merging is not how this settles anyway.
-    expect(pendingProposals(base('read: GTM Team\n'), DEFAULT_MD, PATH)).toEqual([]);
+  it('says NOTHING about a malformed branch file — not "nothing to propose"', () => {
+    // A body naming a verb but shaped wrong is a hard parse error. The
+    // difference matters because an empty answer CLOSES the request: it has
+    // to mean the branch asks for nothing more, never that it would not say.
+    expect(pendingProposals(base('read: GTM Team\n'), DEFAULT_MD, PATH, 'folder')).toBeNull();
   });
 
-  it('treats a missing branch file as proposing nothing', () => {
-    expect(pendingProposals(null, DEFAULT_MD, PATH)).toEqual([]);
+  it('says NOTHING about a missing branch file either', () => {
+    expect(pendingProposals(null, DEFAULT_MD, PATH, 'folder')).toBeNull();
   });
 
   it('surfaces every branch grant when the DEFAULT file is missing or unreadable', () => {
-    // The safe direction: show the manager proposals to consider rather than
-    // silently swallowing them against an unreadable baseline.
+    // The safe direction on THAT side: show the editor proposals to consider
+    // rather than swallowing them against a baseline nobody could read.
     const branch = base('read:\n  - Ali Baba <ali@bevel.software>\n');
-    expect(pendingProposals(branch, null, PATH)).toHaveLength(1);
+    expect(pendingProposals(branch, null, PATH, 'folder')).toHaveLength(1);
+    expect(pendingProposals(branch, base('read: broken\n'), PATH, 'folder')).toHaveLength(1);
   });
 
   it('does not confuse the SELF-frontmatter with folder rules', () => {
@@ -96,6 +103,80 @@ describe('pendingProposals', () => {
     const branch =
       '---\nread:\n  - everyone\n  - Ali Baba <ali@bevel.software>\n---\n' +
       'read:\n  - GTM Team\n  - Olga Ivanova <olga@bevel.software>\n';
-    expect(pendingProposals(branch, DEFAULT_MD, PATH)).toEqual([]);
+    expect(pendingProposals(branch, DEFAULT_MD, PATH, 'folder')).toEqual([]);
+  });
+});
+
+/**
+ * A FILE's rules are not an access.md. They live in the node's own
+ * frontmatter, and `spliceGrant` writes one grant there as the scalar form
+ * the resolver accepts — `write: Rita <rita@x.io>`, not a list.
+ *
+ * Read with the FOLDER grammar that is a hard parse error ("'write:' must be
+ * a list"), the whole file yields no grants, and a branch with a perfectly
+ * good proposal on it looks like a branch with nothing left to propose. Every
+ * request whose target was a file was closed on the editors' first listing
+ * because of it — before anyone saw the line, let alone pressed Accept.
+ */
+describe('pendingProposals on a FILE, whose rules are its own frontmatter', () => {
+  const FILE = 'Research/Notes.md';
+  const LIVE = '---\nnodeType: "[Note](../NodeTypes/Note.md)"\n---\n# Notes\n\nbody\n';
+  /** Exactly what `spliceGrant(..., { allowScalar: true, target: 'node' })` writes. */
+  const ASKS_WRITE =
+    '---\nnodeType: "[Note](../NodeTypes/Note.md)"\nwrite: Rita Reader <rita@x.io>\n---\n# Notes\n\nbody\n';
+
+  it('reads the scalar grant the splice actually writes', () => {
+    expect(pendingProposals(ASKS_WRITE, LIVE, FILE, 'file')).toEqual([
+      {
+        verb: 'write',
+        id: 'user:rita@x.io',
+        principal: { kind: 'user', email: 'rita@x.io', displayName: 'Rita Reader' },
+        label: 'Rita Reader',
+      },
+    ]);
+  });
+
+  it('is not fooled by the FOLDER grammar, which cannot read it at all', () => {
+    // The regression guard. Before, this answered `[]` — indistinguishable
+    // from a finished request, which is what closed them.
+    expect(pendingProposals(ASKS_WRITE, LIVE, FILE, 'folder')).toBeNull();
+  });
+
+  it('ignores the non-access keys a node legitimately carries', () => {
+    expect(pendingProposals(LIVE, LIVE, FILE, 'file')).toEqual([]);
+    // `nodeType` is not a grant, and its presence is not a parse failure.
+    expect(pendingProposals(LIVE, null, FILE, 'file')).toEqual([]);
+  });
+
+  it('reads a file with no frontmatter as granting nothing, not as unreadable', () => {
+    // Nothing to say is a real answer here; a node need not declare rules.
+    expect(pendingProposals('# Just a note\n', LIVE, FILE, 'file')).toEqual([]);
+  });
+
+  it('says NOTHING about a file whose frontmatter is broken — not "nothing to propose"', () => {
+    // The same rule the folder side keeps: an empty answer closes somebody's
+    // request, so a block that could not be read must not produce one.
+    const neverClosed = '---\nnodeType: "[Note](x)"\nwrite: Rita Reader <rita@x.io>\n# Notes\n\nbody\n';
+    expect(pendingProposals(neverClosed, LIVE, FILE, 'file')).toBeNull();
+    const notAMapping = '---\n- just\n- a list\n---\n# Notes\n';
+    expect(pendingProposals(notAMapping, LIVE, FILE, 'file')).toBeNull();
+    // An empty block is readable, and says nothing.
+    expect(pendingProposals('---\n---\n# Notes\n', LIVE, FILE, 'file')).toEqual([]);
+    // A broken copy on LIVE stays the safe direction: every grant looks incoming.
+    expect(pendingProposals(ASKS_WRITE, neverClosed, FILE, 'file')).toEqual([
+      expect.objectContaining({ verb: 'write', id: 'user:rita@x.io' }),
+    ]);
+  });
+
+  it('reads the list form too, and an Owner request', () => {
+    const asksOwner =
+      '---\nnodeType: "[Note](x)"\nowner:\n  - Rita Reader <rita@x.io>\n---\n# Notes\n';
+    expect(pendingProposals(asksOwner, LIVE, FILE, 'file')).toEqual([
+      expect.objectContaining({ verb: 'owner', id: 'user:rita@x.io' }),
+    ]);
+  });
+
+  it('still settles a file request once the grant is on live', () => {
+    expect(pendingProposals(ASKS_WRITE, ASKS_WRITE, FILE, 'file')).toEqual([]);
   });
 });

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

@@ -8,6 +8,7 @@ import {
 } from '../join-request-jobs.service.js';
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import { FakeJoinRequestStore } from './fake-join-request-store.js';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 /**
  * The git half of a join request, on its own: what it does to the row it was
@@ -40,7 +41,7 @@ function harness(over: Partial<JoinRequestJobsDeps> = {}, sharedStore?: FakeJoin
   const jobs = new PluginJoinRequestJobs(store, {
     workflow: workflow as never,
     workspaceService: workspaceService as never,
-    kbDirName: KB,
+    kb: testKbContext({ kbDirName: KB }),
     target: async () => ({ folder: 'Plugins/Finance', displayName: 'Finance' }),
     requester: async (mail) => ({ ...ALI_USER, email: mail }),
     ...over,

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

@@ -7,8 +7,11 @@ import {
   type IWorkflowService,
 } from '@bevel-software/platform-shared';
 import { type WorkspaceService } from '../../workspace/workspace.service.js';
+import type { IAccessControl } from '../../access/access-control.interface.js';
 import { workspaceIdForBranch } from '../../../shared/workspace-id.js';
 import { JoinRequestsService } from '../join-requests.service.js';
+import { folderTarget } from '../../access/access-requests.contract.js';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 /**
  * The derived lifecycle: a join request is open exactly while its branch's
@@ -43,7 +46,7 @@ function cr(over: Partial<ChangeRequest> = {}): ChangeRequest {
 }
 
 /** `byRef[ref]` is the access.md content at that ref (undefined ⇒ absent). */
-function makeHarness(byRef: Record<string, string>) {
+function makeHarness(byRef: Record<string, string>, holds: Record<string, unknown> = {}) {
   const workspaceService = {
     ensureRemotesFetched: vi.fn(async () => undefined),
     readFileAtRef: vi.fn(async (_ws: string, ref: string, path: string) =>
@@ -54,7 +57,21 @@ function makeHarness(byRef: Record<string, string>) {
     rejectChangeRequest: vi.fn(async () => ({ number: 7, state: 'closed' })),
     deleteBranch: vi.fn(async () => undefined),
   } as unknown as IWorkflowService;
-  return { svc: new JoinRequestsService(workspaceService, workflow), workflow, workspaceService };
+  // Nobody holds anything by default: every proposal stands on the file diff
+  // alone, which is what these cases are about.
+  const accessControl = {
+    canRead: vi.fn(async () => false),
+    canWrite: vi.fn(async () => false),
+    canOwner: vi.fn(async () => false),
+    canDownload: vi.fn(async () => false),
+    ...holds,
+  } as unknown as IAccessControl;
+  return {
+    svc: new JoinRequestsService(workspaceService, workflow, testKbContext(), accessControl),
+    workflow,
+    workspaceService,
+    accessControl,
+  };
 }
 
 const refs = (branchMd: string | undefined, defaultMd = DEFAULT_MD) => ({
@@ -65,7 +82,7 @@ const refs = (branchMd: string | undefined, defaultMd = DEFAULT_MD) => ({
 describe('JoinRequestsService.list', () => {
   it('reports a request with its pending proposals, and leaves it open', async () => {
     const h = makeHarness(refs(PROPOSING_MD));
-    const out = await h.svc.list('GTM', FOLDER, [cr()], ACTOR);
+    const out = await h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR);
     expect(out).toHaveLength(1);
     expect(out[0]).toMatchObject({ number: 7, requesterName: 'Ali Baba' });
     expect(out[0].proposals.map((p) => p.label)).toEqual(['Ali Baba']);
@@ -75,7 +92,7 @@ describe('JoinRequestsService.list', () => {
   it('SETTLES a request whose proposals have all landed: closes it, deletes the branch, omits it', async () => {
     // The grant is on the default branch now, so the branch adds nothing.
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
-    const out = await h.svc.list('GTM', FOLDER, [cr()], ACTOR);
+    const out = await h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR);
     expect(out).toEqual([]);
     expect(h.workflow.rejectChangeRequest).toHaveBeenCalledWith(
       7,
@@ -113,7 +130,7 @@ describe('JoinRequestsService.list', () => {
       new Error('gh down'),
     );
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
-    await expect(h.svc.list('GTM', FOLDER, [cr()], ACTOR)).resolves.toEqual([]);
+    await expect(h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR)).resolves.toEqual([]);
     expect(warn).toHaveBeenCalled();
     warn.mockRestore();
   });
@@ -124,7 +141,7 @@ describe('JoinRequestsService.list', () => {
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
     // The request still settles (omitted from the list) — the leftover branch
     // is cosmetic, and the failure is logged rather than swallowed.
-    await expect(h.svc.list('GTM', FOLDER, [cr()], ACTOR)).resolves.toEqual([]);
+    await expect(h.svc.list('GTM', folderTarget(FOLDER), [cr()], ACTOR)).resolves.toEqual([]);
     expect(h.workflow.rejectChangeRequest).toHaveBeenCalled();
     expect(warn).toHaveBeenCalledWith(expect.stringContaining('could not delete'));
     warn.mockRestore();
@@ -141,10 +158,10 @@ describe('JoinRequestsService.list', () => {
       [`origin/${DEFAULT_BRANCH}`]: DEFAULT_MD,
       [`origin/${joinBranchFor(ALI, 'Finance!')}`]: DEFAULT_MD,
     });
-    await expect(h.svc.list('finance', 'Plugins/finance', [other], ACTOR)).resolves.toEqual([]);
+    await expect(h.svc.list('finance', folderTarget('Plugins/finance'), [other], ACTOR)).resolves.toEqual([]);
     expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
     expect(h.workflow.deleteBranch).not.toHaveBeenCalled();
-    await expect(h.svc.reconcile('finance', 'Plugins/finance', other, ACTOR)).resolves.toBe(false);
+    await expect(h.svc.reconcile('finance', folderTarget('Plugins/finance'), other, ACTOR)).resolves.toBe(false);
     expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
   });
 });
@@ -152,21 +169,21 @@ describe('JoinRequestsService.list', () => {
 describe('JoinRequestsService.reconcile', () => {
   it('settles and reports true once nothing is pending', async () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
-    await expect(h.svc.reconcile('GTM', FOLDER, cr(), ACTOR)).resolves.toBe(true);
+    await expect(h.svc.reconcile('GTM', folderTarget(FOLDER), cr(), ACTOR)).resolves.toBe(true);
     expect(h.workflow.rejectChangeRequest).toHaveBeenCalled();
     expect(h.workflow.deleteBranch).toHaveBeenCalled();
   });
 
   it('leaves a request alone while proposals remain', async () => {
     const h = makeHarness(refs(PROPOSING_MD));
-    await expect(h.svc.reconcile('GTM', FOLDER, cr(), ACTOR)).resolves.toBe(false);
+    await expect(h.svc.reconcile('GTM', folderTarget(FOLDER), cr(), ACTOR)).resolves.toBe(false);
     expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
   });
 
   it('refuses a change request that is not this plugin\'s join branch', async () => {
     const h = makeHarness(refs(PROPOSING_MD, PROPOSING_MD));
     await expect(
-      h.svc.reconcile('GTM', FOLDER, cr({ branch: 'ali/some-draft' }), ACTOR),
+      h.svc.reconcile('GTM', folderTarget(FOLDER), cr({ branch: 'ali/some-draft' }), ACTOR),
     ).resolves.toBe(false);
     expect(h.workflow.rejectChangeRequest).not.toHaveBeenCalled();
   });