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

package/src/modules/workspace/session-ontology.gate.ts

@@ -22,6 +22,7 @@
  */
 
 import { ontologyOf } from '../../shared/kb-layout.js';
+import type { KbContext } from '../../shared/kb-context.js';
 import type { JsonSchema } from '../tool-registry/tool.contract.js';
 import { ToolError, type ToolContext } from '../tool-helpers/tool.contract.js';
 import type { ISessionOntologyService } from '../workflow/session-ontology.service.js';
@@ -75,7 +76,8 @@ export class MissingSessionError extends ToolError {
 export interface SessionOntologyGate {
   service: ISessionOntologyService;
   enabled: boolean;
-  kbDirName: string;
+  /** The checkout folder and the layout a path is classified under. */
+  kb: Pick<KbContext, 'kbDirName' | 'layout'>;
   /** Lowercased email of the recovery/merge bot, which is exempt. */
   recoveryBotEmail: string;
   /**
@@ -103,7 +105,7 @@ function isAgentSource(ctx: ToolContext): boolean {
 function resolveGatedSession(gate: SessionOntologyGate, ctx: ToolContext, wsPath: string): string | 'skip' {
   if (!gate.enabled) return 'skip';
   // Neutral paths never pin/record/block — skip before any identity work.
-  if (ontologyOf(wsPath, gate.kbDirName) === null) return 'skip';
+  if (ontologyOf(wsPath, gate.kb.layout, gate.kb.kbDirName) === null) return 'skip';
   // Humans (UI routes) and browser-JWT callers never hit these tools; only
   // agent tool calls are gated.
   if (!isAgentSource(ctx)) return 'skip';
@@ -125,7 +127,7 @@ export async function recordOntologyRead(gate: SessionOntologyGate, ctx: ToolCon
   const sessionId = resolveGatedSession(gate, ctx, wsPath);
   if (sessionId === 'skip') return;
   // checkOperation(isWrite=false) records the touch and always allows.
-  await gate.service.checkOperation(sessionId, wsPath, false, gate.kbDirName);
+  await gate.service.checkOperation(sessionId, wsPath, false, gate.kb.kbDirName);
 }
 
 /**
@@ -155,7 +157,7 @@ export async function assertOntologyWriteAllowed(
   // Tracking stays core: record the (now-allowed) write's ontology touch.
   // A blocked write never reaches this line, so it records nothing — same as
   // before the hook split.
-  await gate.service.checkOperation(sessionId, wsPath, false, gate.kbDirName);
+  await gate.service.checkOperation(sessionId, wsPath, false, gate.kb.kbDirName);
 }
 
 /**

package/src/modules/workspace/startup/__tests__/kb-startup-runner.degraded.test.ts

@@ -6,7 +6,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { KbRemoteUnreachableError, KbStartupRunner } from '../kb-startup-runner.js';
 import { NodeGitRunner } from '../../../workflow/git/node-git-runner.js';
-import { GitRunError, type IGitRunner } from '../../../../shared/git.contract.js';
+import { GitRunError, NO_GIT_CREDENTIALS, type IGitRunner } from '../../../../shared/git.contract.js';
 import type { OnServerStart, ServerStartContext, StepResult } from '../on-server-start.js';
 
 /**
@@ -69,7 +69,6 @@ function makeRunner(steps: OnServerStart[], url: () => string, gitRunner: IGitRu
   return new KbStartupRunner({
     gitRunner,
     kbRepoUrl: url,
-    gitUsername: () => 'x-access-token',
     workspacesRoot,
     kbDirName: 'knowledge-base',
     templateDir: path.join(root, 'template'),
@@ -101,6 +100,7 @@ describe('KbStartupRunner with an unreachable remote', () => {
   it('a git that never ran is not "unreachable" either: that failure is this host, and it stops the boot', async () => {
     const noGit: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: (async () => {
         throw new GitRunError('git ls-remote failed: spawn git ENOENT');
       }) as IGitRunner['run'],
@@ -251,6 +251,7 @@ describe('KbStartupRunner with a remote that rejects the credentials', () => {
     // re-dial a host that will never accept the token.
     const rejecting: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: (async () => {
         // The shape `NodeGitRunner` throws: git's words in the message (that
         // is what the boot classifies) and again in `stderr`.
@@ -275,6 +276,7 @@ describe('KbStartupRunner retry after a boot that survived a rejected token', ()
     let dials = 0;
     const rejecting: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: (async () => {
         dials += 1;
         const said = "fatal: Authentication failed for 'https://example.com/acme/kb.git/'";
@@ -319,6 +321,7 @@ describe('KbStartupRunner retry when the token is rejected while it sleeps', ()
     let dials = 0;
     const rejecting: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: (async () => {
         dials += 1;
         const said = "fatal: Authentication failed for 'https://example.com/acme/kb.git/'";
@@ -331,6 +334,7 @@ describe('KbStartupRunner retry when the token is rejected while it sleeps', ()
     let current: IGitRunner = new NodeGitRunner();
     const switching: IGitRunner = {
       defaultTimeoutMs: 1000,
+      credentials: NO_GIT_CREDENTIALS,
       run: ((...args: Parameters<IGitRunner['run']>) => current.run(...args)) as IGitRunner['run'],
     };
     let url = path.join(root, 'nowhere.git');

package/src/modules/workspace/startup/__tests__/kb-startup-runner.test.ts

@@ -1,4 +1,5 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { testKbContext } from '../../../../__tests__/kb-context.js';
 import { NodeFs } from '../../../kb-fs/node-fs.js';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -9,8 +10,18 @@ import { KbStartupRunner } from '../kb-startup-runner.js';
 import { WorkspaceService } from '../../workspace.service.js';
 import { NodeGitRunner } from '../../../workflow/git/node-git-runner.js';
 import { ClassifiedFailure, classifyGitFailure, failureOf } from '../../../../shared/git-failure.js';
+import { gitCredentials } from '../../../../shared/git.contract.js';
 import type { OnServerStart, ServerStartContext, StepResult } from '../on-server-start.js';
 
+/**
+ * The token in effect for the runners these suites build, changed by the
+ * cases that need one — the way the setup screen changes it on a running
+ * deployment: through the provider the runner reads on every call, never
+ * through this process's environment.
+ */
+let token: string | null = null;
+const credentials = gitCredentials('x-access-token', () => token);
+
 const execFileAsync = promisify(execFile);
 
 const PROTECTED = ['current-company-state', 'target-company-state'];
@@ -65,10 +76,10 @@ function makeRunner(steps: OnServerStart[], overrides: Partial<Parameters<typeof
 
 function runnerOpts(steps: OnServerStart[], overrides: Record<string, unknown> = {}) {
   return {
-    gitRunner: new NodeGitRunner(),
+    gitRunner: new NodeGitRunner(undefined, credentials),
     kbRepoUrl: () => upstream,
-    gitUsername: () => 'x-access-token',
     workspacesRoot,
+    setAsideRoot: path.join(root, 'set-aside'),
     kbDirName: 'knowledge-base',
     templateDir: path.join(root, 'template'),
     defaultBranch: () => DEFAULT_BRANCH,
@@ -93,6 +104,216 @@ async function checkout(branch: string): Promise<string> {
   return dir;
 }
 
+/**
+ * The configured repository was replaced while working copies of the old one
+ * were still on disk. A clone fetches through its OWN stored address, so
+ * every one of them kept asking the repository that was gone: the boot
+ * stopped on "repository not found" and took the setup screen with it.
+ */
+describe('KbStartupRunner — the repository was replaced', () => {
+  const touchDefault = step('touch', async (ctx) => {
+    await (await ctx.defaultBranch()).repoDir();
+    return { outcome: 'ok' };
+  });
+  const cloneDir = (branch: string) => path.join(workspacesRoot, encodeURIComponent(branch), 'knowledge-base');
+
+  /** A second, unrelated repository with the same branch names. */
+  async function replacementUpstream(): Promise<string> {
+    const other = path.join(root, 'replacement.git');
+    await git(root, ['init', '--bare', '-b', DEFAULT_BRANCH, other]);
+    const seed = path.join(root, '.seed-replacement');
+    await fs.mkdir(seed);
+    await git(seed, ['init', '-b', DEFAULT_BRANCH]);
+    await fs.writeFile(path.join(seed, 'marker.txt'), 'replacement', 'utf8');
+    await git(seed, ['add', '-A']);
+    await git(seed, ['commit', '-m', 'init']);
+    await git(seed, ['branch', PROTECTED[1]!]);
+    await git(seed, ['remote', 'add', 'origin', other]);
+    await git(seed, ['push', 'origin', ...PROTECTED]);
+    return other;
+  }
+
+  /** Boot once against the first repository, and leave a draft's clone beside it. */
+  async function bootedOnTheOldRepository(): Promise<void> {
+    await populatedUpstream();
+    await makeRunner([touchDefault]).runAll();
+    await fs.mkdir(path.dirname(cloneDir('someone/draft')), { recursive: true });
+    await git(root, ['clone', '-b', DEFAULT_BRANCH, upstream, cloneDir('someone/draft')]);
+  }
+
+  /** Where one run set its working copies aside: the single dated folder under the root. */
+  async function setAside(): Promise<string> {
+    const runs = await fs.readdir(path.join(root, 'set-aside'));
+    expect(runs).toHaveLength(1);
+    return path.join(root, 'set-aside', runs[0]!);
+  }
+
+  it('clones the new repository in place of the old one\'s clones, even with the old one gone', async () => {
+    await bootedOnTheOldRepository();
+    const replacement = await replacementUpstream();
+    // Gone, as it was in production: any fetch through the old address fails.
+    await fs.rm(upstream, { recursive: true, force: true });
+
+    await makeRunner([touchDefault], { kbRepoUrl: () => replacement }).runAll();
+
+    const repo = cloneDir(DEFAULT_BRANCH);
+    expect((await git(repo, ['config', '--get', 'remote.origin.url'])).trim()).toBe(replacement);
+    expect(await fs.readFile(path.join(repo, 'marker.txt'), 'utf8')).toBe('replacement');
+    // A clone this boot had no reason to touch leaves the workspaces root
+    // too: the workspace service would otherwise adopt it and fetch from the
+    // old address.
+    await expect(fs.access(cloneDir('someone/draft'))).rejects.toThrow();
+  });
+
+  /**
+   * The old repository is GONE, so its clones are the last copy of what it
+   * held, and the commit nobody pushed exists nowhere else at all. They
+   * leave the workspaces root and nothing else happens to them.
+   */
+  it('sets the old repository\'s clones aside whole, unpushed work included, and deletes nothing', async () => {
+    await bootedOnTheOldRepository();
+    const old = cloneDir(DEFAULT_BRANCH);
+    await fs.writeFile(path.join(old, 'unpushed.md'), 'the only copy', 'utf8');
+    await git(old, ['add', '-A']);
+    await git(old, ['commit', '-m', 'never pushed']);
+    const head = (await git(old, ['rev-parse', 'HEAD'])).trim();
+    const replacement = await replacementUpstream();
+    await fs.rm(upstream, { recursive: true, force: true });
+
+    await makeRunner([touchDefault], { kbRepoUrl: () => replacement }).runAll();
+
+    const kept = await setAside();
+    const keptDefault = path.join(kept, encodeURIComponent(DEFAULT_BRANCH));
+    expect((await git(keptDefault, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+    expect(await fs.readFile(path.join(keptDefault, 'unpushed.md'), 'utf8')).toBe('the only copy');
+    expect(await fs.readFile(path.join(keptDefault, 'marker.txt'), 'utf8')).toBe('seeded');
+    // The draft's clone too, under its own workspace's name.
+    await expect(fs.access(path.join(kept, encodeURIComponent('someone/draft'), '.git'))).resolves.toBeUndefined();
+    // And the probe that compared the histories left no refs behind in it.
+    expect((await git(keptDefault, ['for-each-ref', 'refs/hexis-probe/'])).trim()).toBe('');
+  });
+
+  /**
+   * The shipped compose files mount the backups root as a volume of its own,
+   * where a rename across to it is refused. That is the path production
+   * takes: a copy, and the original removed only once the copy is whole.
+   */
+  it('sets a clone aside across volumes, by copying it whole', async () => {
+    await bootedOnTheOldRepository();
+    const old = cloneDir(DEFAULT_BRANCH);
+    await fs.writeFile(path.join(old, 'unpushed.md'), 'the only copy', 'utf8');
+    await git(old, ['add', '-A']);
+    await git(old, ['commit', '-m', 'never pushed']);
+    const head = (await git(old, ['rev-parse', 'HEAD'])).trim();
+    const replacement = await replacementUpstream();
+    await fs.rm(upstream, { recursive: true, force: true });
+    const crossDevice = Object.assign(new Error('EXDEV: cross-device link not permitted'), { code: 'EXDEV' });
+    const rename = vi.spyOn(fs, 'rename').mockRejectedValue(crossDevice);
+    try {
+      await makeRunner([touchDefault], { kbRepoUrl: () => replacement }).runAll();
+    } finally {
+      rename.mockRestore();
+    }
+
+    const keptDefault = path.join(await setAside(), encodeURIComponent(DEFAULT_BRANCH));
+    expect((await git(keptDefault, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+    expect(await fs.readFile(path.join(keptDefault, 'unpushed.md'), 'utf8')).toBe('the only copy');
+    expect(await fs.readFile(path.join(cloneDir(DEFAULT_BRANCH), 'marker.txt'), 'utf8')).toBe('replacement');
+  });
+
+  /**
+   * A clone that cannot be set aside stays exactly where it is, and the boot
+   * stops saying why: deleting it to get past would be the one outcome this
+   * whole path exists to rule out.
+   */
+  it('deletes nothing when a clone cannot be set aside, and says why', async () => {
+    await bootedOnTheOldRepository();
+    const old = cloneDir(DEFAULT_BRANCH);
+    const head = (await git(old, ['rev-parse', 'HEAD'])).trim();
+    const replacement = await replacementUpstream();
+    await fs.rm(upstream, { recursive: true, force: true });
+    const rename = vi.spyOn(fs, 'rename').mockRejectedValue(Object.assign(new Error('EXDEV'), { code: 'EXDEV' }));
+    const cp = vi.spyOn(fs, 'cp').mockRejectedValue(Object.assign(new Error('ENOSPC: no space left on device'), { code: 'ENOSPC' }));
+    try {
+      await expect(makeRunner([touchDefault], { kbRepoUrl: () => replacement }).runAll()).rejects.toThrow(
+        /Could not set aside the working copy.*no space left.*Nothing was deleted/s,
+      );
+    } finally {
+      rename.mockRestore();
+      cp.mockRestore();
+    }
+    expect((await git(old, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+  });
+
+  /**
+   * The one change the setup screen tells an admin to make: the same
+   * repository, moved. The clone is pointed at the new address and kept, and
+   * the commit that was never pushed goes on to be pushed there.
+   */
+  it('keeps a clone of the same repository at a new address, and points it there', async () => {
+    await bootedOnTheOldRepository();
+    const repo = cloneDir(DEFAULT_BRANCH);
+    await fs.writeFile(path.join(repo, 'unpushed.md'), 'local work', 'utf8');
+    await git(repo, ['add', '-A']);
+    await git(repo, ['commit', '-m', 'local work']);
+    const head = (await git(repo, ['rev-parse', 'HEAD'])).trim();
+    // Moved: everything the old address held is at the new one, and the old
+    // one answers nothing any more.
+    const moved = path.join(root, 'moved.git');
+    await git(root, ['clone', '--bare', upstream, moved]);
+    await fs.rm(upstream, { recursive: true, force: true });
+
+    await makeRunner([touchDefault], { kbRepoUrl: () => moved }).runAll();
+
+    expect((await git(repo, ['config', '--get', 'remote.origin.url'])).trim()).toBe(moved);
+    expect((await git(repo, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+    expect((await git(cloneDir('someone/draft'), ['config', '--get', 'remote.origin.url'])).trim()).toBe(moved);
+    expect((await git(repo, ['for-each-ref', 'refs/hexis-probe/'])).trim()).toBe('');
+    // Nothing was another repository's, so nothing was set aside.
+    await expect(fs.access(path.join(root, 'set-aside'))).rejects.toThrow();
+  });
+
+  it('leaves a clone of the configured repository alone, unpushed work included', async () => {
+    await bootedOnTheOldRepository();
+    const repo = cloneDir(DEFAULT_BRANCH);
+    await fs.writeFile(path.join(repo, 'unpushed.md'), 'local work', 'utf8');
+    await git(repo, ['add', '-A']);
+    await git(repo, ['commit', '-m', 'local work']);
+    const head = (await git(repo, ['rev-parse', 'HEAD'])).trim();
+
+    await makeRunner([touchDefault]).runAll();
+
+    expect((await git(repo, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+    await expect(fs.access(cloneDir('someone/draft'))).resolves.toBeUndefined();
+  });
+
+  it('does not take a different spelling of the same address for another repository', async () => {
+    await bootedOnTheOldRepository();
+    const repo = cloneDir(DEFAULT_BRANCH);
+    await fs.writeFile(path.join(repo, 'unpushed.md'), 'local work', 'utf8');
+    await git(repo, ['add', '-A']);
+    await git(repo, ['commit', '-m', 'local work']);
+    const head = (await git(repo, ['rev-parse', 'HEAD'])).trim();
+
+    // `upstream` ends in `.git`; the same repository without it, and with a
+    // trailing slash.
+    await makeRunner([touchDefault], { kbRepoUrl: () => `${upstream.replace(/\.git$/, '')}/` }).runAll().catch(() => {});
+
+    expect((await git(repo, ['rev-parse', 'HEAD'])).trim()).toBe(head);
+  });
+
+  it('keeps every clone when the configured repository cannot be reached', async () => {
+    // A typo in the address must not cost the working copies: the sweep runs
+    // only once the configured remote has answered.
+    await bootedOnTheOldRepository();
+    await expect(
+      makeRunner([touchDefault], { kbRepoUrl: () => path.join(root, 'no-such-repository.git') }).runAll(),
+    ).rejects.toThrow();
+    await expect(fs.access(path.join(cloneDir(DEFAULT_BRANCH), '.git'))).resolves.toBeUndefined();
+    await expect(fs.access(cloneDir('someone/draft'))).resolves.toBeUndefined();
+  });
+});
+
 describe('KbStartupRunner', () => {
   it('seeds an empty remote with every protected branch before any step runs', async () => {
     const seen: string[] = [];
@@ -486,7 +707,7 @@ describe('KbStartupRunner — what a failed phase throws', () => {
     try {
       const err = await makeRunner([step('noop', async () => ({ outcome: 'ok' }))], {
         kbRepoUrl: () => 'https://127.0.0.1:1/kb.git?X-Amz-Signature=SECRETSIG',
-        gitToken: () => 'access',
+        gitRunner: new NodeGitRunner(undefined, gitCredentials('x-access-token', 'access')),
       })
         .runAll()
         .then(
@@ -518,7 +739,7 @@ describe('KbStartupRunner redaction', () => {
             throw new Error('the host said ghp_settingsonly42 is not welcome');
           }),
         ],
-        { gitToken: () => 'ghp_settingsonly42' },
+        { gitRunner: new NodeGitRunner(undefined, gitCredentials('x-access-token', 'ghp_settingsonly42')) },
       );
       const err = await runner.runAll().then(
         () => null,
@@ -540,10 +761,8 @@ describe('KbStartupRunner credentials', () => {
   // the repo with nothing, so every later push prompts for a username, finds
   // no tty, and dies — commits pile up locally and reach the remote never.
   // Only real git tells the two spellings apart, so this drives real git.
-  const ORIGINAL = process.env.GITHUB_TOKEN;
   afterEach(() => {
-    if (ORIGINAL === undefined) delete process.env.GITHUB_TOKEN;
-    else process.env.GITHUB_TOKEN = ORIGINAL;
+    token = null;
   });
 
 
@@ -561,7 +780,7 @@ describe('KbStartupRunner credentials', () => {
   }
 
   it('leaves the boot clone able to authenticate a push of its own', async () => {
-    process.env.GITHUB_TOKEN = 'ghp_boot';
+    token = 'ghp_boot';
     await populatedUpstream();
     // The branch handle clones lazily, so a step has to actually reach for the
     // repo before there is anything on disk to inspect.
@@ -585,7 +804,7 @@ describe('KbStartupRunner credentials', () => {
     // path (`--replace-all`), so drift a second value in out of band and let
     // WorkspaceService adopt the clone — that is the code the guarantee is
     // about.
-    process.env.GITHUB_TOKEN = 'ghp_boot';
+    token = 'ghp_boot';
     await populatedUpstream();
     const repo = await materializeDefaultBranchClone();
     // App-shaped drift: a second stamp of OURS with a stale username — the
@@ -594,7 +813,7 @@ describe('KbStartupRunner credentials', () => {
     await git(repo, ['config', '--add', 'credential.helper',
       '!f() { echo "username=stale-user"; echo "password=$GITHUB_TOKEN"; }; f']);
 
-    const ws = new WorkspaceService(workspacesRoot, upstream, 'knowledge-base', new NodeFs(), () => 'x-access-token');
+    const ws = new WorkspaceService(workspacesRoot, upstream, testKbContext(), new NodeFs(), new NodeGitRunner(undefined, credentials));
     await ws.getOrCreateForBranch(DEFAULT_BRANCH);
 
     const all = (await git(repo, ['config', '--local', '--get-all', 'credential.helper'])).trim();
@@ -607,19 +826,19 @@ describe('KbStartupRunner credentials', () => {
     // git chains every configured helper, so an operator's clone-local
     // `cache`/`store`/custom helper coexists with ours — and losing it on a
     // token change would break the very fallback auth they set up.
-    process.env.GITHUB_TOKEN = 'ghp_boot';
+    token = 'ghp_boot';
     await populatedUpstream();
     const repo = await materializeDefaultBranchClone();
     await git(repo, ['config', '--add', 'credential.helper', 'cache --timeout=300']);
 
-    const ws = new WorkspaceService(workspacesRoot, upstream, 'knowledge-base', new NodeFs(), () => 'x-access-token');
+    const ws = new WorkspaceService(workspacesRoot, upstream, testKbContext(), new NodeFs(), new NodeGitRunner(undefined, credentials));
     await ws.getOrCreateForBranch(DEFAULT_BRANCH); // stamp with token
     let all = (await git(repo, ['config', '--local', '--get-all', 'credential.helper'])).trim();
     expect(all).toContain('cache --timeout=300');
     expect(all).toContain('password=$GITHUB_TOKEN');
 
-    delete process.env.GITHUB_TOKEN;
-    const ws2 = new WorkspaceService(workspacesRoot, upstream, 'knowledge-base', new NodeFs(), () => 'x-access-token');
+    token = null;
+    const ws2 =new WorkspaceService(workspacesRoot, upstream, testKbContext(), new NodeFs(), new NodeGitRunner(undefined, credentials));
     await ws2.getOrCreateForBranch(DEFAULT_BRANCH); // unset OUR helper only
     all = (await git(repo, ['config', '--local', '--get-all', 'credential.helper'])).trim();
     expect(all).toContain('cache --timeout=300');
@@ -630,12 +849,12 @@ describe('KbStartupRunner credentials', () => {
     // A deployment that lost its token must not keep a clone-local helper
     // answering with an empty password — it would shadow whatever fallback
     // auth the operator switched to.
-    process.env.GITHUB_TOKEN = 'ghp_boot';
+    token = 'ghp_boot';
     await populatedUpstream();
     const repo = await materializeDefaultBranchClone(); // stamped
-    delete process.env.GITHUB_TOKEN;
+    token = null;
 
-    const ws = new WorkspaceService(workspacesRoot, upstream, 'knowledge-base', new NodeFs(), () => 'x-access-token');
+    const ws = new WorkspaceService(workspacesRoot, upstream, testKbContext(), new NodeFs(), new NodeGitRunner(undefined, credentials));
     await ws.getOrCreateForBranch(DEFAULT_BRANCH);
 
     await expect(git(repo, ['config', '--local', '--get', 'credential.helper']))
@@ -646,13 +865,13 @@ describe('KbStartupRunner credentials', () => {
     // The rotation gap: the setup screen can supply a token AFTER a branch
     // was first opened, and the cached fast path returns before the adoption
     // re-stamp. The fingerprint check must catch the change there.
-    delete process.env.GITHUB_TOKEN;
+    token = null;
     await populatedUpstream();
     const repo = await materializeDefaultBranchClone(); // no helper
 
-    const ws = new WorkspaceService(workspacesRoot, upstream, 'knowledge-base', new NodeFs(), () => 'x-access-token');
+    const ws = new WorkspaceService(workspacesRoot, upstream, testKbContext(), new NodeFs(), new NodeGitRunner(undefined, credentials));
     await ws.getOrCreateForBranch(DEFAULT_BRANCH); // adopt, tokenless
-    process.env.GITHUB_TOKEN = 'ghp_late';
+    token = 'ghp_late';
     await ws.getOrCreateForBranch(DEFAULT_BRANCH); // cached fast path
 
     const helper = (await git(repo, ['config', '--local', '--get', 'credential.helper'])).trim();
@@ -661,7 +880,7 @@ describe('KbStartupRunner credentials', () => {
   });
 
   it('clones without a helper when the deployment has no token — an open remote still boots', async () => {
-    delete process.env.GITHUB_TOKEN;
+    token = null;
     await populatedUpstream();
     const repo = await materializeDefaultBranchClone();
     // `--get` exits 1 when the key is unset. Assert on that exit code rather

package/src/modules/workspace/startup/kb-git.ts

@@ -29,12 +29,13 @@ const STARTUP_GIT_TIMEOUT_MS = 600_000;
 
 /**
  * Per-invocation `-c` config. Long paths always (Windows checkouts of deep
- * KB trees); when a token is present, an inline credential helper that reads
- * it from the environment at call time — the secret never appears in argv.
+ * KB trees); when the runner carries a token, an inline credential helper
+ * that reads it from the child's environment at call time — the secret never
+ * appears in argv.
  */
-function credArgs(gitUsername: string): string[] {
+function credArgs(runner: IGitRunner): string[] {
   const args = ['-c', 'core.longpaths=true'];
-  const helper = credentialHelperValue(gitUsername);
+  const helper = credentialHelperValue(runner.credentials);
   if (helper) args.push('-c', `credential.helper=${helper}`);
   return args;
 }
@@ -49,18 +50,14 @@ function credArgs(gitUsername: string): string[] {
  * clone to carry its own credentials. Persist them with `clone --config` (which
  * only means "write into the new repo" after the subcommand) so it does.
  */
-function withPersistedCloneConfig(gitUsername: string, args: string[]): string[] {
+function withPersistedCloneConfig(runner: IGitRunner, args: string[]): string[] {
   if (args[0] !== 'clone') return args;
-  return [args[0], ...cloneCredentialArgs(gitUsername), ...args.slice(1)];
+  return [args[0], ...cloneCredentialArgs(runner.credentials), ...args.slice(1)];
 }
 
-export async function git(
-  runner: IGitRunner,
-  cwd: string,
-  gitUsername: string,
-  args: string[],
-): Promise<string> {
-  const argv = [...credArgs(gitUsername), ...withPersistedCloneConfig(gitUsername, args)];
+/** Run one git command of the phase, authenticated with the runner's own credentials. */
+export async function git(runner: IGitRunner, cwd: string, args: string[]): Promise<string> {
+  const argv = [...credArgs(runner), ...withPersistedCloneConfig(runner, args)];
   try {
     // A floor under the configured ceiling, not a replacement for it: an
     // operator who raised GIT_TIMEOUT_MS past ten minutes gets that here too.
@@ -83,18 +80,14 @@ export async function git(
   }
 }
 
-export async function stampIdentity(runner: IGitRunner, repo: string, gitUsername: string): Promise<void> {
-  await git(runner, repo, gitUsername, ['config', 'user.name', BOT_NAME]);
-  await git(runner, repo, gitUsername, ['config', 'user.email', BOT_EMAIL]);
+export async function stampIdentity(runner: IGitRunner, repo: string): Promise<void> {
+  await git(runner, repo, ['config', 'user.name', BOT_NAME]);
+  await git(runner, repo, ['config', 'user.email', BOT_EMAIL]);
 }
 
 /** Branch names present on the remote, from `ls-remote --heads`. */
-export async function lsRemoteHeads(
-  runner: IGitRunner,
-  repoUrl: string,
-  gitUsername: string,
-): Promise<Set<string>> {
-  const out = await git(runner, os.tmpdir(), gitUsername, ['ls-remote', '--heads', repoUrl]);
+export async function lsRemoteHeads(runner: IGitRunner, repoUrl: string): Promise<Set<string>> {
+  const out = await git(runner, os.tmpdir(), ['ls-remote', '--heads', repoUrl]);
   const heads = new Set<string>();
   for (const line of out.split('\n')) {
     const m = /\srefs\/heads\/(.+)$/.exec(line.trim());