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

package/src/modules/secrets-vault/__tests__/secrets-variable-loader.test.ts

@@ -1,7 +1,11 @@
 import { describe, test, expect } from 'vitest';
+import { UtcpClientConfigSerializer } from '@utcp/sdk';
 import {
   BevelSecretsVariableLoader,
+  DEFAULT_SECRETS_SCOPE,
+  bevelSecretsLoaderConfig,
   registerBevelSecretsVariableLoader,
+  unregisterBevelSecretsVariableLoader,
 } from '../secrets-variable-loader.js';
 import type { ISecretsVaultService } from '../secrets-vault.contract.js';
 
@@ -51,4 +55,40 @@ describe('BevelSecretsVariableLoader', () => {
     const loader = new BevelSecretsVariableLoader('');
     expect(await loader.get('m_X')).toBeNull();
   });
+
+  test('two knowledge bases in one process resolve the same user and key from their own vaults', async () => {
+    // One process, two vaults, one user id in each (ids are only unique
+    // within a knowledge base): a loader reads the vault registered under
+    // ITS scope, and a scope nobody registered resolves nothing.
+    registerBevelSecretsVariableLoader(fakeVault('user-1', { weather_WEATHER_KEY: 'sk-acme' }), 'acme');
+    registerBevelSecretsVariableLoader(fakeVault('user-1', { weather_WEATHER_KEY: 'sk-globex' }), 'globex');
+    expect(await new BevelSecretsVariableLoader('user-1', 'acme').get('weather_WEATHER_KEY')).toBe('sk-acme');
+    expect(await new BevelSecretsVariableLoader('user-1', 'globex').get('weather_WEATHER_KEY')).toBe('sk-globex');
+    expect(await new BevelSecretsVariableLoader('user-1', 'nobody').get('weather_WEATHER_KEY')).toBeNull();
+  });
+
+  test('the descriptor round-trips the scope through the serializer registry', async () => {
+    registerBevelSecretsVariableLoader(fakeVault('user-1', { weather_WEATHER_KEY: 'sk-acme' }), 'acme');
+    const config = new UtcpClientConfigSerializer().validateDict({
+      variables: {},
+      load_variables_from: [bevelSecretsLoaderConfig('user-1', 'acme')],
+    });
+    const [loader] = config.load_variables_from as BevelSecretsVariableLoader[];
+    expect(loader.scope).toBe('acme');
+    expect(await loader.get('weather_WEATHER_KEY')).toBe('sk-acme');
+    // Without a scope the descriptor names the single knowledge base's.
+    const [plain] = new UtcpClientConfigSerializer().validateDict({
+      variables: {},
+      load_variables_from: [bevelSecretsLoaderConfig('user-1')],
+    }).load_variables_from as BevelSecretsVariableLoader[];
+    expect(plain.scope).toBe(DEFAULT_SECRETS_SCOPE);
+  });
+
+  test('unregistering a scope makes its loaders resolve nothing', async () => {
+    registerBevelSecretsVariableLoader(fakeVault('user-1', { weather_WEATHER_KEY: 'sk-acme' }), 'evicted');
+    const loader = new BevelSecretsVariableLoader('user-1', 'evicted');
+    expect(await loader.get('weather_WEATHER_KEY')).toBe('sk-acme');
+    unregisterBevelSecretsVariableLoader('evicted');
+    expect(await loader.get('weather_WEATHER_KEY')).toBeNull();
+  });
 });

package/src/modules/secrets-vault/__tests__/tool-owner-gate.route.test.ts

@@ -2,6 +2,7 @@ import type { Server as HttpServer } from 'node:http';
 import express from 'express';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { createSecretsVaultRoutes } from '../secrets-vault.routes.js';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 /**
  * THE OWNER GATE: a tool's shared (admin) secrets — plain values and OAuth
@@ -91,6 +92,7 @@ async function baseUrlAs(email: string): Promise<string> {
   app.use(
     '/api',
     createSecretsVaultRoutes({
+      kb: testKbContext(),
       secretsVault,
       toolManualService,
       accessControl,

package/src/modules/secrets-vault/index.ts

@@ -21,6 +21,8 @@ export {
 } from './secrets-vault.contract.js';
 export {
   registerBevelSecretsVariableLoader,
+  unregisterBevelSecretsVariableLoader,
   bevelSecretsLoaderConfig,
   BEVEL_SECRETS_LOADER_TYPE,
+  DEFAULT_SECRETS_SCOPE,
 } from './secrets-variable-loader.js';

package/src/modules/secrets-vault/secrets-variable-loader.ts

@@ -18,29 +18,43 @@ const log = logger('secrets-vault');
  * The `UtcpClient.create` path re-validates the whole config through the
  * serializer registry, so a loader can't be handed in as a bare live object — it
  * must round-trip through a registered serializer. We therefore put a plain
- * descriptor `{ variable_loader_type, user_id }` in `load_variables_from` (via
- * {@link bevelSecretsLoaderConfig}) and let the registered serializer rebuild a
- * live loader bound to the process-wide vault. Swapping the vault backend (e.g.
- * to a client's external secret manager) is just a different
- * `ISecretsVaultService` passed to {@link registerBevelSecretsVariableLoader}.
+ * descriptor `{ variable_loader_type, user_id, scope }` in `load_variables_from`
+ * (via {@link bevelSecretsLoaderConfig}) and let the registered serializer
+ * rebuild a live loader bound to the vault registered under that scope.
+ *
+ * ONE VAULT PER SCOPE, NOT PER PROCESS. The serializer registry is UTCP's and
+ * process-wide, but a process can host several knowledge bases, each with a
+ * vault of its own, and a user id is only unique within one of them. So the
+ * descriptor names the scope its vault was registered under, and a loader
+ * reads through that vault alone: two knowledge bases whose users both stored
+ * `weather_WEATHER_KEY` never see each other's value. A single-tenant
+ * deployment registers under {@link DEFAULT_SECRETS_SCOPE} and names nothing.
+ * Swapping the vault backend (e.g. to a client's external secret manager) is
+ * just a different `ISecretsVaultService` passed to
+ * {@link registerBevelSecretsVariableLoader}.
  */
 export const BEVEL_SECRETS_LOADER_TYPE = 'bevel_secrets';
 
+/** The scope a deployment that hosts one knowledge base registers under. */
+export const DEFAULT_SECRETS_SCOPE = 'default';
+
 /**
- * Process-wide vault the reconstructed loaders read through. Set once at
- * composition time (before any client is built) so the serializer — which only
- * receives a plain dict — can bind live loaders to it.
+ * The vaults the reconstructed loaders read through, by scope. A composition
+ * root registers its vault before any client is built; a graph that is torn
+ * down unregisters it so a stale descriptor resolves nothing.
  */
-let sharedSecretsVault: ISecretsVaultService | null = null;
+const vaults = new Map<string, ISecretsVaultService>();
 
 export class BevelSecretsVariableLoader implements VariableLoader {
   readonly variable_loader_type = BEVEL_SECRETS_LOADER_TYPE;
   readonly user_id: string;
+  readonly scope: string;
   // VariableLoader is an open shape; allow arbitrary extra props.
   [key: string]: unknown;
 
-  constructor(userId: string) {
+  constructor(userId: string, scope: string = DEFAULT_SECRETS_SCOPE) {
     this.user_id = userId;
+    this.scope = scope;
   }
 
   /**
@@ -52,9 +66,10 @@ export class BevelSecretsVariableLoader implements VariableLoader {
    * harvest a secret the user configured for a different manual.
    */
   async get(effectiveKey: string): Promise<string | null> {
-    if (!sharedSecretsVault || !this.user_id) return null;
+    const vault = vaults.get(this.scope);
+    if (!vault || !this.user_id) return null;
     try {
-      return await sharedSecretsVault.resolve(this.user_id, effectiveKey);
+      return await vault.resolve(this.user_id, effectiveKey);
     } catch (err) {
       // Log the fault so a backend failure is distinguishable from a merely
       // unset secret (resolve returning null) when troubleshooting.
@@ -66,15 +81,18 @@ export class BevelSecretsVariableLoader implements VariableLoader {
 
 class BevelSecretsVariableLoaderSerializer extends Serializer<VariableLoader> {
   toDict(obj: VariableLoader): Record<string, unknown> {
+    const loader = obj as BevelSecretsVariableLoader;
     return {
       variable_loader_type: BEVEL_SECRETS_LOADER_TYPE,
-      user_id: (obj as BevelSecretsVariableLoader).user_id ?? '',
+      user_id: loader.user_id ?? '',
+      scope: loader.scope ?? DEFAULT_SECRETS_SCOPE,
     };
   }
 
   validateDict(obj: Record<string, unknown>): VariableLoader {
     const userId = typeof obj.user_id === 'string' ? obj.user_id : '';
-    return new BevelSecretsVariableLoader(userId);
+    const scope = typeof obj.scope === 'string' && obj.scope ? obj.scope : DEFAULT_SECRETS_SCOPE;
+    return new BevelSecretsVariableLoader(userId, scope);
   }
 }
 
@@ -91,14 +109,26 @@ VariableLoaderSerializer.registerVariableLoader(
 );
 
 /**
- * Bind the process-wide vault the reconstructed loaders read through. Called
- * once at composition time; before it runs, loaders resolve to null.
+ * Bind the vault the loaders of `scope` read through. Called once per
+ * knowledge base at composition time; before it runs, loaders of that scope
+ * resolve to null.
  */
-export function registerBevelSecretsVariableLoader(secretsVault: ISecretsVaultService): void {
-  sharedSecretsVault = secretsVault;
+export function registerBevelSecretsVariableLoader(
+  secretsVault: ISecretsVaultService,
+  scope: string = DEFAULT_SECRETS_SCOPE,
+): void {
+  vaults.set(scope, secretsVault);
+}
+
+/** Forget a scope's vault — the last step of tearing a knowledge base's graph down. */
+export function unregisterBevelSecretsVariableLoader(scope: string = DEFAULT_SECRETS_SCOPE): void {
+  vaults.delete(scope);
 }
 
-/** The plain descriptor to place in a `UtcpClientConfig.load_variables_from` for a given user. */
-export function bevelSecretsLoaderConfig(userId: string): Record<string, unknown> {
-  return { variable_loader_type: BEVEL_SECRETS_LOADER_TYPE, user_id: userId };
+/**
+ * The plain descriptor to place in a `UtcpClientConfig.load_variables_from`
+ * for a given user of the knowledge base registered under `scope`.
+ */
+export function bevelSecretsLoaderConfig(userId: string, scope: string = DEFAULT_SECRETS_SCOPE): Record<string, unknown> {
+  return { variable_loader_type: BEVEL_SECRETS_LOADER_TYPE, user_id: userId, scope };
 }

package/src/modules/secrets-vault/secrets-vault.routes.ts

@@ -3,7 +3,6 @@ import { logger } from '../../shared/logging.js';
 
 const log = logger('secrets');
 import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
-import { DEFAULT_BRANCH } from '@bevel-software/platform-shared';
 import {
   InvalidSecretError,
   SecretNotFoundError,
@@ -17,11 +16,13 @@ import type { IToolManualService, ToolManualSummary, ToolVariable } from '../too
 import type { IConnectionProbeService } from '../connection-probe/connection-probe.contract.js';
 import { utcpNamespacedKey } from '../../shared/utcp-namespace.js';
 import type { IAccessControl } from '../access/access-control.interface.js';
-import { workspaceIdForBranch } from '../../shared/workspace-id.js';
+import type { KbContext } from '../../shared/kb-context.js';
 import '../auth/auth.middleware.js'; // Express Request augmentation (req.userId / req.userEmail)
 
 export interface SecretsVaultRoutesDeps {
   secretsVault: ISecretsVaultService;
+  /** The released branch's clone — where the `.tool` files the access verdicts are read from live. */
+  kb: Pick<KbContext, 'defaultWorkspaceId'>;
   /** Source of `.tool` manuals + their declared variable scopes (default-branch catalog). */
   toolManualService: IToolManualService;
   /** Gates who may set a tool's ADMIN (shared) secrets — writers of the `.tool` file. */
@@ -79,16 +80,16 @@ export function isSafeReturnPath(returnTo: unknown): returnTo is string {
  * `req.userId` — secrets are private per user. Mounted behind the JWT middleware.
  */
 export function createSecretsVaultRoutes(deps: SecretsVaultRoutesDeps): express.Router {
-  const { secretsVault, toolManualService, accessControl, connectionProbe } = deps;
+  const { secretsVault, toolManualService, accessControl, connectionProbe, kb } = deps;
   const router = express.Router();
   // A FUNCTION, not a constant. Routers are constructed at boot, and on a
   // deployment configured through the setup screen the branch model does not
-  // exist yet at that moment — `DEFAULT_BRANCH` is still ''. The live binding
-  // updates when setup applies the model, but only reads INSIDE a function
+  // exist yet at that moment — the default branch is still ''. The context
+  // learns it when setup applies the model, but only reads INSIDE a function
   // body see it; a construction-time capture would keep handing an empty
   // workspace id to the access resolver until the next restart ("Invalid
   // workspace ID" on every /secrets/tools call).
-  const defaultWs = () => workspaceIdForBranch(DEFAULT_BRANCH);
+  const defaultWs = () => kb.defaultWorkspaceId();
 
   // The vault key = the exact key UTCP looks the var up under (doubles underscores
   // in the manual namespace), so storage and resolution agree for snake_case ids.

package/src/modules/settings/__tests__/deployment-settings.service.test.ts

@@ -149,20 +149,12 @@ describe('DeploymentSettingsService — secrets', () => {
     expect(token).not.toHaveProperty('value');
   });
 
-  it('publishes a stored token as GITHUB_TOKEN, which is what git reads', async () => {
+  it('keeps a stored token out of the process environment: git reads it per call', async () => {
     const { db } = makeDb();
     const settings = new DeploymentSettingsService(db, ENC_KEY);
     await settings.save({ gitToken: 'ghp_fromsetup' }, null);
-    expect(process.env.GITHUB_TOKEN).toBe('ghp_fromsetup');
-  });
-
-  it('does not overwrite a git token the environment supplied', async () => {
-    process.env.GIT_TOKEN = 'ghp_fromenv';
-    process.env.GITHUB_TOKEN = 'ghp_fromenv';
-    const { db } = makeDb();
-    const settings = new DeploymentSettingsService(db, ENC_KEY);
-    settings.syncGitTokenEnv();
-    expect(process.env.GITHUB_TOKEN).toBe('ghp_fromenv');
+    expect(process.env.GITHUB_TOKEN).toBeUndefined();
+    expect(settings.resolve('gitToken')).toBe('ghp_fromsetup');
   });
 
   it('refuses to store a secret with no encryption key rather than writing plaintext', async () => {
@@ -528,3 +520,24 @@ describe('DeploymentSettingsService — validation', () => {
     ).toEqual([]);
   });
 });
+
+describe('DeploymentSettingsService — an environment of its own', () => {
+  it('resolves the env-first layer from the environment it was given, not the process\'s', async () => {
+    process.env.KB_REPO_URL = 'https://host.example/leaks-into-every-tenant.git';
+    const { db } = makeDb();
+    const own = new DeploymentSettingsService(db, ENC_KEY, undefined, {
+      env: { KB_REPO_URL: 'https://github.com/acme/kb.git', GIT_USERNAME: 'oauth2' },
+    });
+    await own.load();
+    expect(own.resolve('kbRepoUrl')).toBe('https://github.com/acme/kb.git');
+    expect(own.sourceOf('kbRepoUrl')).toBe('env');
+    expect(own.resolve('gitUsername')).toBe('oauth2');
+    // What the given environment leaves out is not taken from the process either.
+    expect(own.resolve('gitToken')).toBe('');
+    expect(own.sourceOf('gitToken')).toBe('unset');
+    // A service built without one keeps reading the process, as before.
+    const shared = new DeploymentSettingsService(db, ENC_KEY);
+    await shared.load();
+    expect(shared.resolve('kbRepoUrl')).toBe('https://host.example/leaks-into-every-tenant.git');
+  });
+});

package/src/modules/settings/__tests__/git-root-folders.test.ts

@@ -10,7 +10,7 @@ import {
   rootFolderListerFor,
   type GitRunner,
 } from '../git-root-folders.js';
-import type { IGitRunner } from '../../../shared/git.contract.js';
+import { NO_GIT_CREDENTIALS, type IGitRunner } from '../../../shared/git.contract.js';
 
 const LISTING = {
   url: 'https://example.com/acme/kb.git',
@@ -226,6 +226,7 @@ describe('rootFolderListerFor — the listing runs through the deployment git po
     const outcomes = ['', 'KnowledgeBase\0Plugins\0'];
     const port: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: (async (cwd: string, args: string[], opts: { env?: NodeJS.ProcessEnv; timeoutMs?: number } = {}) => {
         calls.push({ cwd, args, opts });
         return { stdout: outcomes.shift() ?? '', stderr: '' };

package/src/modules/settings/__tests__/repository-source.test.ts

@@ -0,0 +1,191 @@
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { NodeGitRunner } from '../../workflow/git/node-git-runner.js';
+import { ManagedRepository, MANAGED_REPOSITORY_DIR } from '../managed-repository.js';
+import { RepositorySource, type GitHubAppRepository } from '../repository-source.js';
+
+let root: string;
+
+beforeEach(async () => {
+  root = await fs.mkdtemp(path.join(os.tmpdir(), 'hexis-managed-'));
+});
+
+afterEach(async () => {
+  await fs.rm(root, { recursive: true, force: true });
+});
+
+const reading = (values: Record<string, string>) => (key: string) => values[key] ?? '';
+
+function source(values: Record<string, string>, extra: { fallbackToken?: string; githubApp?: GitHubAppRepository } = {}) {
+  const managed = new ManagedRepository(path.join(root, 'managed-repository'));
+  return {
+    managed,
+    source: new RepositorySource({
+      read: reading(values),
+      fallback: { username: 'x-access-token', token: extra.fallbackToken ?? '' },
+      managed,
+      ...(extra.githubApp ? { githubApp: extra.githubApp } : {}),
+    }),
+  };
+}
+
+const HOSTED = { kbRepoUrl: 'https://git.example.com/acme/kb.git', gitToken: 'the-token', gitUsername: 'oauth2' };
+
+describe('RepositorySource: which way a deployment has its repository', () => {
+  it('has none while nothing is configured', () => {
+    const { source: s } = source({});
+    expect(s.mode()).toBeNull();
+    expect(s.url()).toBe('');
+    expect(s.answered()).toBe(false);
+    expect(s.credentials.token()).toBeNull();
+  });
+
+  it('reads a deployment configured before there was a choice as what it has: an address and a token', () => {
+    const { source: s } = source(HOSTED);
+    expect(s.mode()).toBe('token');
+    expect(s.url()).toBe(HOSTED.kbRepoUrl);
+    expect(s.credentials.token()).toBe('the-token');
+    expect(s.credentials.username()).toBe('oauth2');
+    expect(s.answered()).toBe(true);
+  });
+
+  it('reads a token the environment spells the old way', () => {
+    const { source: s } = source({ kbRepoUrl: HOSTED.kbRepoUrl }, { fallbackToken: 'from-GITHUB_TOKEN' });
+    expect(s.mode()).toBe('token');
+    expect(s.credentials.token()).toBe('from-GITHUB_TOKEN');
+    expect(s.answered()).toBe(true);
+  });
+
+  it('is not answered by half of an address and a token', () => {
+    expect(source({ kbRepoUrl: HOSTED.kbRepoUrl }).source.answered()).toBe(false);
+    expect(source({ gitToken: 'the-token' }).source.answered()).toBe(false);
+  });
+
+  it('ignores a mode it does not know, and reads what is configured', () => {
+    expect(source({ ...HOSTED, gitMode: 'carrier-pigeon' }).source.mode()).toBe('token');
+  });
+
+  it('answers for the values a save would put in effect, without the save', () => {
+    const { source: s, managed } = source(HOSTED);
+    const after = reading({ ...HOSTED, gitMode: 'managed' });
+    expect(s.mode(after)).toBe('managed');
+    expect(s.url(after)).toBe(managed.path);
+    // What is in effect has not moved.
+    expect(s.mode()).toBe('token');
+  });
+});
+
+describe('RepositorySource: a repository the deployment keeps', () => {
+  it('is reached by its path, and presented nothing', () => {
+    const { source: s, managed } = source({ gitMode: 'managed' });
+    expect(s.url()).toBe(managed.path);
+    expect(s.url()).toBe(path.join(root, 'managed-repository', MANAGED_REPOSITORY_DIR));
+    expect(s.answered()).toBe(true);
+    expect(s.credentials.token()).toBeNull();
+  });
+
+  /**
+   * One mode's credential is never presented to another mode's repository.
+   * A deployment that moved still has its old token stored, and it must not
+   * ride along in the environment of every git call made against a folder.
+   */
+  it('is never presented the token of the repository the deployment had before', () => {
+    const { source: s } = source({ ...HOSTED, gitMode: 'managed' }, { fallbackToken: 'from-the-environment' });
+    expect(s.credentials.token()).toBeNull();
+    expect(s.credentials.username()).toBe('x-access-token');
+  });
+});
+
+describe('RepositorySource: a repository reached through a GitHub App', () => {
+  const app = (overrides: Partial<GitHubAppRepository> = {}): GitHubAppRepository => ({
+    url: () => 'https://github.com/acme/kb.git',
+    token: () => 'an-installation-token',
+    prepare: async () => undefined,
+    answered: () => true,
+    ...overrides,
+  });
+
+  it('asks the app for the address and the token', () => {
+    const { source: s } = source({ gitMode: 'github-app', gitToken: 'a-leftover' }, { githubApp: app() });
+    expect(s.url()).toBe('https://github.com/acme/kb.git');
+    expect(s.credentials.token()).toBe('an-installation-token');
+    expect(s.credentials.username()).toBe('x-access-token');
+    expect(s.answered()).toBe(true);
+  });
+
+  it('renews the token before git is run, and only in this mode', async () => {
+    let renewed = 0;
+    const githubApp = app({ prepare: async () => void (renewed += 1) });
+    await source({ gitMode: 'github-app' }, { githubApp }).source.credentials.prepare?.();
+    await source(HOSTED, { githubApp }).source.credentials.prepare?.();
+    await source({ gitMode: 'managed' }, { githubApp }).source.credentials.prepare?.();
+    expect(renewed).toBe(1);
+  });
+
+  it('is unanswered on a deployment that has no such app', () => {
+    const { source: s } = source({ gitMode: 'github-app' });
+    expect(s.answered()).toBe(false);
+    expect(s.url()).toBe('');
+    expect(s.credentials.token()).toBeNull();
+  });
+});
+
+describe('ManagedRepository', () => {
+  const runner = new NodeGitRunner(30_000);
+  const git = async (cwd: string, ...args: string[]) => (await runner.run(cwd, args)).stdout.trim();
+
+  it('is created empty, bare, on the branch it is given', async () => {
+    const managed = new ManagedRepository(path.join(root, 'managed-repository'));
+    expect(await managed.exists()).toBe(false);
+    await managed.ensure(runner, 'trunk');
+    expect(await managed.exists()).toBe(true);
+    expect(await git(managed.path, 'rev-parse', '--is-bare-repository')).toBe('true');
+    expect(await git(managed.path, 'symbolic-ref', 'HEAD')).toBe('refs/heads/trunk');
+    expect(await git(managed.path, 'for-each-ref')).toBe('');
+  });
+
+  it('is cloned from, pushed to and fetched from like any remote', async () => {
+    const managed = new ManagedRepository(path.join(root, 'managed-repository'));
+    await managed.ensure(runner);
+    const one = path.join(root, 'one');
+    await fs.mkdir(one);
+    await git(one, 'init', '--initial-branch=main');
+    await fs.writeFile(path.join(one, 'README.md'), 'hello\n');
+    await git(one, 'add', '.');
+    await git(one, '-c', 'user.name=t', '-c', 'user.email=t@example.test', 'commit', '-m', 'first');
+    await git(one, 'push', managed.path, 'main');
+
+    const two = path.join(root, 'two');
+    await git(root, 'clone', '-b', 'main', managed.path, two);
+    // Whatever this machine's git makes of line endings on checkout.
+    expect((await fs.readFile(path.join(two, 'README.md'), 'utf8')).replace(/\r\n/g, '\n')).toBe('hello\n');
+    expect(await git(two, 'config', '--get', 'remote.origin.url')).toBe(managed.path);
+  });
+
+  it('is left exactly as it is when it already exists', async () => {
+    const managed = new ManagedRepository(path.join(root, 'managed-repository'));
+    await managed.ensure(runner);
+    const work = path.join(root, 'work');
+    await fs.mkdir(work);
+    await git(work, 'init', '--initial-branch=main');
+    await fs.writeFile(path.join(work, 'a.md'), 'a\n');
+    await git(work, 'add', '.');
+    await git(work, '-c', 'user.name=t', '-c', 'user.email=t@example.test', 'commit', '-m', 'first');
+    await git(work, 'push', managed.path, 'main');
+    const before = await git(managed.path, 'for-each-ref');
+
+    await managed.ensure(runner, 'another-branch');
+    expect(await git(managed.path, 'for-each-ref')).toBe(before);
+    expect(await git(managed.path, 'symbolic-ref', 'HEAD')).toBe('refs/heads/main');
+  });
+
+  it('refuses a folder that holds something that is not a repository', async () => {
+    const managed = new ManagedRepository(path.join(root, 'managed-repository'));
+    await fs.mkdir(managed.path, { recursive: true });
+    await fs.writeFile(path.join(managed.path, 'somebody.txt'), 'theirs');
+    await expect(managed.ensure(runner)).rejects.toThrow(/is not a git repository/);
+    expect(await fs.readFile(path.join(managed.path, 'somebody.txt'), 'utf8')).toBe('theirs');
+  });
+});

package/src/modules/settings/__tests__/setup.routes.boot-failure.test.ts

@@ -6,6 +6,7 @@ import { createSetupRoutes } from '../setup.routes.js';
 import { DeploymentSettingsService } from '../deployment-settings.service.js';
 import type { Database } from '../../database/connection.js';
 import type { IAdminAccessService } from '../../admin/admin.interface.js';
+import { testKbContext } from '../../../__tests__/kb-context.js';
 
 /**
  * A boot that survived an unreachable remote leaves the RUNNER standing on a
@@ -68,7 +69,7 @@ function listen(runner: { runAll(): Promise<void>; lastFailure(): string | null
   });
   app.use(
     '/api',
-    createSetupRoutes(settings, { isAdmin: async () => true } as IAdminAccessService, runner),
+    createSetupRoutes(settings, { isAdmin: async () => true } as IAdminAccessService, runner, testKbContext()),
   );
   server = app.listen(0);
   const { port } = server.address() as AddressInfo;