@bevel-software/platform-core-backend 0.19.0 → 0.21.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,9 +76,8 @@ 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,
     kbDirName: 'knowledge-base',
     templateDir: path.join(root, 'template'),
@@ -486,7 +496,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 +528,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 +550,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 +569,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 +593,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 +602,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 +615,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 +638,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 +654,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 +669,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());

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

@@ -1,6 +1,5 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { isBranchModelConfigured } from '@bevel-software/platform-shared';
 import { logger } from '../../../shared/logging.js';
 
 // `startupLog` rather than `log`: `retryUntilMaintained` takes a `log`
@@ -44,16 +43,13 @@ import { redactSecret, urlQuerySecrets } from '../../../shared/redact-secret.js'
  */
 
 export interface KbStartupRunnerOptions {
-  /** How git is run — see `shared/git.contract.ts`. */
-  gitRunner: IGitRunner;
-  kbRepoUrl: () => string;
-  gitUsername: () => string;
   /**
-   * The git token in effect (settings-stored or environment), scrubbed from
-   * every message the phase throws or logs. Optional: `GITHUB_TOKEN` and its
-   * aliases are scrubbed regardless.
+   * How git is run — see `shared/git.contract.ts`. It carries the credentials
+   * every command of the phase authenticates with, and the token the phase
+   * scrubs from every message it throws or logs.
    */
-  gitToken?: () => string;
+  gitRunner: IGitRunner;
+  kbRepoUrl: () => string;
   workspacesRoot: string;
   kbDirName: string;
   templateDir: string;
@@ -131,7 +127,7 @@ export class KbStartupRunner {
    * them without the URL around them.
    */
   private redact(text: string): string {
-    return redactSecret(text, [this.opts.gitToken?.(), ...urlQuerySecrets(this.opts.kbRepoUrl())]);
+    return redactSecret(text, [this.opts.gitRunner.credentials.token(), ...urlQuerySecrets(this.opts.kbRepoUrl())]);
   }
 
   /**
@@ -260,7 +256,8 @@ export class KbStartupRunner {
   }
 
   private async runAllOnce(): Promise<void> {
-    if (!isBranchModelConfigured()) {
+    // An empty default branch IS the unconfigured model (see `KbContext`).
+    if (!this.opts.defaultBranch()) {
       startupLog.info('branch model not configured yet — phase skipped until setup completes.');
       return;
     }
@@ -389,13 +386,12 @@ export class KbStartupRunner {
    */
   private async ensureRemote(): Promise<Set<string>> {
     const url = this.opts.kbRepoUrl();
-    const user = this.opts.gitUsername();
     // The first question asked of the remote, and the one that answers
     // "can we get there at all". Everything after it — seeding, pushing —
     // fails for reasons of ours; this fails for reasons of the host's.
     let heads: Set<string>;
     try {
-      heads = await lsRemoteHeads(this.opts.gitRunner, url, user);
+      heads = await lsRemoteHeads(this.opts.gitRunner, url);
       this.remoteContact = { at: Date.now(), ok: true };
     } catch (err) {
       // Git that never ran — no executable, a spawn refused — is a fact about
@@ -423,23 +419,23 @@ export class KbStartupRunner {
         );
       }
       const seededByOther = await withTempDir(async (dir) => {
-        await git(this.opts.gitRunner, dir, user,['init', '-b', defaultBranch]);
-        await stampIdentity(this.opts.gitRunner, dir, user);
+        await git(this.opts.gitRunner, dir, ['init', '-b', defaultBranch]);
+        await stampIdentity(this.opts.gitRunner, dir);
         const generated = await this.opts.buildSeedTree(dir);
-        await git(this.opts.gitRunner, dir, user,['add', '-A']);
+        await git(this.opts.gitRunner, dir, ['add', '-A']);
         // The template may ship a `.gitignore` whose rules happen to match a
         // GENERATED seed file (roles.yaml, a reserved root's .gitkeep) —
         // `add -A` would silently drop it from the seed commit. Force-add
         // exactly what the builder generated; `-f` on an already-staged path
         // is a no-op.
-        if (generated.length > 0) await git(this.opts.gitRunner, dir, user,['add', '-f', '--', ...generated]);
-        await git(this.opts.gitRunner, dir, user,['commit', '-m', 'Seed knowledge base from Bevel template']);
+        if (generated.length > 0) await git(this.opts.gitRunner, dir, ['add', '-f', '--', ...generated]);
+        await git(this.opts.gitRunner, dir, ['commit', '-m', 'Seed knowledge base from Bevel template']);
         for (const b of protectedBranches) {
-          if (b !== defaultBranch) await git(this.opts.gitRunner, dir, user,['branch', b]);
+          if (b !== defaultBranch) await git(this.opts.gitRunner, dir, ['branch', b]);
         }
-        await git(this.opts.gitRunner, dir, user,['remote', 'add', 'origin', url]);
+        await git(this.opts.gitRunner, dir, ['remote', 'add', 'origin', url]);
         try {
-          await git(this.opts.gitRunner, dir, user,['push', '-u', 'origin', ...protectedBranches]);
+          await git(this.opts.gitRunner, dir, ['push', '-u', 'origin', ...protectedBranches]);
           return null;
         } catch (err) {
           // Two replicas racing to seed the same empty remote: both saw it
@@ -452,7 +448,7 @@ export class KbStartupRunner {
           // who seeded. A foreign seed is just an "existing remote"
           // discovered late, the same contract as a repo populated before
           // boot.
-          const reread = await lsRemoteHeads(this.opts.gitRunner, url, user);
+          const reread = await lsRemoteHeads(this.opts.gitRunner, url);
           if (protectedBranches.every((b) => reread.has(b))) return reread;
           throw err;
         }
@@ -473,8 +469,8 @@ export class KbStartupRunner {
     for (const b of protectedBranches) {
       if (heads.has(b)) continue;
       await withTempDir(async (dir) => {
-        await git(this.opts.gitRunner, dir, user,['clone', '--depth', '1', '-b', base, url, 'seed']);
-        await git(this.opts.gitRunner, path.join(dir, 'seed'), user,['push', 'origin', `HEAD:refs/heads/${b}`]);
+        await git(this.opts.gitRunner, dir, ['clone', '--depth', '1', '-b', base, url, 'seed']);
+        await git(this.opts.gitRunner, path.join(dir, 'seed'), ['push', 'origin', `HEAD:refs/heads/${b}`]);
       });
       heads.add(b);
       startupLog.info(`created missing protected branch "${b}" from "${base}"`);
@@ -515,25 +511,24 @@ export class KbStartupRunner {
    * commit recovery owns that work, not this phase.
    */
   private async ensureClone(branch: string): Promise<string> {
-    const user = this.opts.gitUsername();
     const workspaceDir = path.join(this.opts.workspacesRoot, workspaceIdForBranch(branch));
     const repoDir = path.join(workspaceDir, this.opts.kbDirName);
     const hasGit = await fs.access(path.join(repoDir, '.git')).then(() => true, () => false);
     if (!hasGit) {
       await fs.mkdir(workspaceDir, { recursive: true });
       await fs.rm(repoDir, { recursive: true, force: true });
-      await git(this.opts.gitRunner, workspaceDir, user,['clone', '-b', branch, this.opts.kbRepoUrl(), repoDir]);
-      await git(this.opts.gitRunner, repoDir, user,['config', 'core.longpaths', 'true']);
-      await stampIdentity(this.opts.gitRunner, repoDir, user);
+      await git(this.opts.gitRunner, workspaceDir, ['clone', '-b', branch, this.opts.kbRepoUrl(), repoDir]);
+      await git(this.opts.gitRunner, repoDir, ['config', 'core.longpaths', 'true']);
+      await stampIdentity(this.opts.gitRunner, repoDir);
       return repoDir;
     }
-    await git(this.opts.gitRunner, repoDir, user,['fetch', 'origin', branch]);
-    const local = (await git(this.opts.gitRunner, repoDir, user,['rev-parse', 'HEAD'])).trim();
-    const remote = (await git(this.opts.gitRunner, repoDir, user,['rev-parse', `origin/${branch}`])).trim();
+    await git(this.opts.gitRunner, repoDir, ['fetch', 'origin', branch]);
+    const local = (await git(this.opts.gitRunner, repoDir, ['rev-parse', 'HEAD'])).trim();
+    const remote = (await git(this.opts.gitRunner, repoDir, ['rev-parse', `origin/${branch}`])).trim();
     if (local !== remote) {
-      const mergeBase = (await git(this.opts.gitRunner, repoDir, user,['merge-base', 'HEAD', `origin/${branch}`])).trim();
+      const mergeBase = (await git(this.opts.gitRunner, repoDir, ['merge-base', 'HEAD', `origin/${branch}`])).trim();
       if (mergeBase === local) {
-        await git(this.opts.gitRunner, repoDir, user,['reset', '--hard', `origin/${branch}`]);
+        await git(this.opts.gitRunner, repoDir, ['reset', '--hard', `origin/${branch}`]);
       }
       // Ahead or diverged: committed-but-unpushed work lives here; not ours to discard.
     }
@@ -544,13 +539,12 @@ export class KbStartupRunner {
   private async finalize(h: BranchHandle): Promise<void> {
     if (!h.dirty) return;
     const repoDir = await h.repoDir();
-    const user = this.opts.gitUsername();
-    await stampIdentity(this.opts.gitRunner, repoDir, user);
+    await stampIdentity(this.opts.gitRunner, repoDir);
     // Drop any PRE-EXISTING index state first (a crashed tool may have left
     // edits staged): `git commit` publishes the whole index, and the phase
     // must commit exactly its own staged set. The edits stay in the working
     // tree, unstaged and unpublished — preserved, not adopted.
-    await git(this.opts.gitRunner, repoDir, user,['reset', '-q']);
+    await git(this.opts.gitRunner, repoDir, ['reset', '-q']);
     // Stage ONLY the paths the phase's ops touched — sources and targets both
     // (a move's `from` and a remove's path stage as deletions; `add -A -- <path>`
     // handles a deleted path, `-f` handles one a branch `.gitignore` matches).
@@ -566,7 +560,7 @@ export class KbStartupRunner {
     for (const rel of h.appliedPaths()) {
       const onDisk = await fs.access(path.join(repoDir, rel)).then(() => true, () => false);
       if (!onDisk) {
-        const known = (await git(this.opts.gitRunner, repoDir, user,['ls-files', '--', `:(literal)${rel}`])).trim();
+        const known = (await git(this.opts.gitRunner, repoDir, ['ls-files', '--', `:(literal)${rel}`])).trim();
         if (known === '') continue;
       }
       touched.push(rel);
@@ -574,7 +568,7 @@ export class KbStartupRunner {
     // `:(literal)` — these are file paths, not pathspecs; chunked so a large
     // migration cannot overflow the platform's argv limit.
     for (let i = 0; i < touched.length; i += 100) {
-      await git(this.opts.gitRunner, repoDir, user,[
+      await git(this.opts.gitRunner, repoDir, [
         'add',
         '-A',
         '-f',
@@ -585,7 +579,7 @@ export class KbStartupRunner {
     // Exit 0 = nothing staged: the ops converged to no byte changes. (An
     // errored diff reads as "something staged"; a genuinely broken repo then
     // fails loudly at commit rather than being silently skipped here.)
-    const nothingStaged = await git(this.opts.gitRunner, repoDir, user,['diff', '--cached', '--quiet']).then(
+    const nothingStaged = await git(this.opts.gitRunner, repoDir, ['diff', '--cached', '--quiet']).then(
       () => true,
       () => false,
     );
@@ -594,10 +588,10 @@ export class KbStartupRunner {
     // can undo exactly it — and ONLY it. Resetting to origin/<name> instead
     // would also nuke a pre-existing committed-but-unpushed (AHEAD) commit
     // that ensureClone deliberately preserved.
-    const preCommit = (await git(this.opts.gitRunner, repoDir, user,['rev-parse', 'HEAD'])).trim();
-    await git(this.opts.gitRunner, repoDir, user,['commit', '-m', h.commitMessage()]);
+    const preCommit = (await git(this.opts.gitRunner, repoDir, ['rev-parse', 'HEAD'])).trim();
+    await git(this.opts.gitRunner, repoDir, ['commit', '-m', h.commitMessage()]);
     try {
-      await git(this.opts.gitRunner, repoDir, user,['push', 'origin', `HEAD:refs/heads/${h.name}`]);
+      await git(this.opts.gitRunner, repoDir, ['push', 'origin', `HEAD:refs/heads/${h.name}`]);
       startupLog.info(`${h.name}: ${h.commitSubject()}`);
       // Committed AND pushed: nothing of the phase remains uncommitted here,
       // so a LATER branch's failure under KB_SAFE_BOOT must not rewind this
@@ -621,7 +615,7 @@ export class KbStartupRunner {
       startupLog.warn(`${h.name}: push rejected (concurrent replica?) — rolling back local commit.`, {
         detail: this.redact(msg),
       });
-      await git(this.opts.gitRunner, repoDir, user, ['reset', '--hard', preCommit]).catch(() => {});
+      await git(this.opts.gitRunner, repoDir, ['reset', '--hard', preCommit]).catch(() => {});
     }
   }
 }
@@ -655,7 +649,7 @@ class BranchHandle implements KbBranch {
       // resetUncommitted resets to THIS sha rather than HEAD, so a finalize
       // commit that was created but failed to push rolls back too instead of
       // surviving as a stranded local commit no later boot would ever push.
-      this.prePhaseSha = (await git(this.gitRunner, dir, 'x-access-token',['rev-parse', 'HEAD'])).trim();
+      this.prePhaseSha = (await git(this.gitRunner, dir, ['rev-parse', 'HEAD'])).trim();
       return dir;
     });
   }
@@ -777,12 +771,12 @@ class BranchHandle implements KbBranch {
   async resetUncommitted(): Promise<void> {
     if (!this.dirty) return;
     const repoDir = await this.repoDir();
-    await git(this.gitRunner, repoDir, 'x-access-token',['reset', '--hard', this.prePhaseSha ?? 'HEAD']).catch(() => {});
+    await git(this.gitRunner, repoDir, ['reset', '--hard', this.prePhaseSha ?? 'HEAD']).catch(() => {});
     if (this.applied.size > 0) {
       // `:(literal)` — these are file paths, not pathspecs: a name that
       // happens to contain glob or magic characters must match itself only,
       // never broaden the cleanup.
-      await git(this.gitRunner, repoDir, 'x-access-token',[
+      await git(this.gitRunner, repoDir, [
         'clean',
         '-fdx',
         '--',