windows-development-sandbox 1.4.1 → 1.4.3

package/dist/selftest/projects.test.js

@@ -3,34 +3,37 @@
 // environment, history sync and the repo guard for every project. Offline: temp folders only.
 import fs from 'node:fs';
 import path from 'node:path';
-import { LocalOverrides } from '../core/schema.js';
-import { checkJoin, describeMissing, missingAtBoot, missingTip, nothingMissing, protectionsOf } from '../core/project-policy.js';
-import { allowStorePath, saveAllowed } from '../core/local-config.js';
-import { sessionsFirstIn } from '../host/channel.js';
-import { buildWsb } from '../host/launch/wsb.js';
-import { projectSpec, joinRunning } from '../host/join.js';
-import { allProjectsToMap, forgetProject, NeedsRestart, parseWsbBoot, projectHere, projectMapper, readKnown, readRegistry, rememberProject, startRegistry } from '../host/projects.js';
-import { checkRepo, saveRepoSnapshot } from '../host/repo-guard.js';
-import { findWsb, parseCommands, parseIp, parseList, parseVersion } from '../host/wsb.js';
-import { baseEnvFor } from '../guest/project-env.js';
-import { guestDirFor, hostDirFor, hubName, insideProjects, isBelow, isWithin, planProjectMappings, projectForGuestDir, projectForHostDir, PROJECTS_GUEST, rootGuestDir } from '../shared/projects.js';
-import { GuestRequest, ProjectSpec } from '../shared/schema.js';
-import { projectFolderName } from '../shared/paths.js';
-import { syncHistoryOut } from '../sync/history.js';
+import { LocalOverridesSchema } from '../core/schema/index.js';
+import { allowStorePath, checkJoin, describeMissing, missingAtBoot, missingTip, nothingMissing, protectionsOf, saveAllowed, } from '../core/local-config/index.js';
+import { sessionsFirstIn } from '../host/channel/index.js';
+import { buildWsb } from '../host/launch/index.js';
+import { projectSpec, joinRunning } from '../host/projects/index.js';
+import { allProjectsToMap, KnownProjects } from '../host/projects/index.js';
+import { NeedsRestart, projectMapper } from '../host/projects/index.js';
+import { parseWsbBoot, ProjectRegistry } from '../host/projects/index.js';
+import { RepoGuardStore } from '../host/guard/index.js';
+import { findWsb, parseCommands, parseIp, parseList, parseVersion } from '../host/sandbox/index.js';
+import { baseEnvFor } from '../guest/boot/project-env.js';
+import { guestDirFor, hostDirFor, hubName, insideProjects, isBelow, isWithin, planProjectMappings, projectForGuestDir, projectForHostDir, PROJECTS_GUEST, rootGuestDir, } from '../shared/paths/index.js';
+import { GuestRequestSchema, ProjectSpecSchema } from '../shared/channel/index.js';
+import { projectFolderName } from '../shared/paths/index.js';
+import { syncHistoryOut } from '../sync/index.js';
 import { validateOptions, validateProjectsArgs } from '../cli/validate.js';
 import { parseCli, parseSessionWant } from '../cli/args.js';
 import { candidateFolders, severalAgentsArgv } from '../cli/menu/index.js';
-import { generateSandbox } from '../host/generate.js';
+import { generateSandbox } from '../host/launch/index.js';
 import { askedWhen } from '../cli/manifest.js';
-import { describeSessions } from '../cli/commands/restart.js';
+import { describeSessions } from '../cli/commands/projects/index.js';
 /** The error `fn` throws, or null. */
-const caught = (fn) => { try {
-    fn();
-    return null;
-}
-catch (e) {
-    return e;
-} };
+const caught = (fn) => {
+    try {
+        fn();
+        return null;
+    }
+    catch (e) {
+        return e;
+    }
+};
 export const projectsSuite = {
     name: 'projects',
     title: 'several projects in one sandbox (paths, joining, policy, specs, --session)',
@@ -42,7 +45,10 @@ export const projectsSuite = {
         t.equal(hubName('F:\\Code\\api', ['API', 'api-2']), 'api-3', 'project ids are unique (case-insensitive)');
         t.equal(hubName('F:\\Code\\...', []), 'project', 'project ids are never empty');
         t.equal(hubName('F:\\' + 'x'.repeat(80), []).length, 48, 'project ids are capped at 48 characters');
-        const projects = [{ host: 'F:\\Code', guest: 'C:\\Projects\\Code' }, { host: 'F:\\Code\\api', guest: 'C:\\Projects\\api' }];
+        const projects = [
+            { host: 'F:\\Code', guest: 'C:\\Projects\\Code' },
+            { host: 'F:\\Code\\api', guest: 'C:\\Projects\\api' },
+        ];
         t.equal(projectForHostDir(projects, 'f:\\code\\api\\src')?.guest, 'C:\\Projects\\api', 'the most specific mapped folder wins');
         t.equal(projectForHostDir(projects, 'F:\\Code\\web')?.guest, 'C:\\Projects\\Code', 'a folder inside a mapped folder belongs to it');
         t.equal(projectForHostDir(projects, 'F:\\Other'), null, 'unrelated folders belong to no project');
@@ -59,9 +65,9 @@ export const projectsSuite = {
         const plan = planProjectMappings(['F:\\Code', 'E:\\Work\\Code', 'C:\\Users\\me\\src'], ['D:\\x\\api', 'D:\\y\\api'], false);
         t.equal(plan.roots.map((r) => r.guest), ['C:\\Projects\\Code', 'C:\\Projects\\Code-2', 'C:\\Projects\\src'], 'roots get unique C:\\Projects\\<name> folders');
         t.equal(plan.projects.map((p) => p.guest), ['C:\\Workspace\\api', 'C:\\Workspace\\api-2'], 'projects mapped on their own get unique C:\\Workspace\\<name> folders (where they are as the launch folder)');
-        t.equal(planProjectMappings([], ['D:\\x\\app'], false, ['C:\\Workspace\\app']).projects[0].guest, 'C:\\Workspace\\app-2', 'a project mapped on its own never lands on the launch folder\'s place');
+        t.equal(planProjectMappings([], ['D:\\x\\app'], false, ['C:\\Workspace\\app']).projects[0].guest, 'C:\\Workspace\\app-2', "a project mapped on its own never lands on the launch folder's place");
         t.equal(planProjectMappings(['F:\\Code'], ['D:\\x\\api'], true).projects[0].guest, 'D:\\x\\api', 'with "mirror" a project mapped on its own appears at its PC path, as it would as the launch folder');
-        t.equal(rootGuestDir(['F:\\Code'], false, 'F:\\Code\\web\\src'), 'C:\\Projects\\Code\\web\\src', 'a folder inside a root is placed under the root\'s guest folder');
+        t.equal(rootGuestDir(['F:\\Code'], false, 'F:\\Code\\web\\src'), 'C:\\Projects\\Code\\web\\src', "a folder inside a root is placed under the root's guest folder");
         t.equal(rootGuestDir(['F:\\Code'], false, 'F:\\Other'), null, 'a folder in no root has no root place');
         const mirror = planProjectMappings(['F:\\Code', 'C:\\Users\\me\\src'], [], true);
         t.equal(mirror.roots.map((r) => r.guest), ['F:\\Code', 'C:\\Projects\\src'], 'with "mirror" a root appears at its PC path when the sandbox can show it there (C:\\Users\\... cannot)');
@@ -69,18 +75,21 @@ export const projectsSuite = {
         const base = protectionsOf(f.baseConfig);
         const same = checkJoin(base, base);
         t.equal({ stricter: same.stricter, looser: same.looser }, { stricter: [], looser: [] }, 'the same settings join without notes');
-        const readonlyGit = protectionsOf({ ...f.baseConfig, provisioning: { ...f.baseConfig.provisioning, git: { ...f.baseConfig.provisioning.git, access: 'readonly' } } });
+        const readonlyGit = protectionsOf({
+            ...f.baseConfig,
+            provisioning: { ...f.baseConfig.provisioning, git: { ...f.baseConfig.provisioning.git, access: 'readonly' } },
+        });
         t.check(checkJoin(base, readonlyGit).stricter.some((s) => s.startsWith('provisioning.git.access')), 'a project needing stricter git access than the running sandbox is refused (git access is machine-wide)');
         const loosening = checkJoin(readonlyGit, base);
         t.equal(loosening.stricter.length, 0, 'a project asking for less git access is not refused...');
-        t.check(loosening.looser.some((s) => s.includes('provisioning.git.access stays "readonly"')), '... it gets the sandbox\'s stricter value, with a note: never loosened', JSON.stringify(loosening.looser));
+        t.check(loosening.looser.some((s) => s.includes('provisioning.git.access stays "readonly"')), "... it gets the sandbox's stricter value, with a note: never loosened", JSON.stringify(loosening.looser));
         const offline = protectionsOf({ ...f.baseConfig, sandbox: { ...f.baseConfig.sandbox, networking: false } });
         t.check(checkJoin(base, offline).stricter.some((s) => s.startsWith('sandbox.networking')), 'networking off is stricter than a sandbox with networking');
         t.check(checkJoin(offline, base).looser.some((s) => s.startsWith('sandbox.networking')), 'networking on is looser than an offline sandbox');
         const readOnly = protectionsOf({ ...f.baseConfig, readOnly: true });
         t.check(checkJoin(readOnly, readOnly).stricter.some((s) => s.startsWith('readOnly')), 'a read-only project cannot join (other projects are mapped read/write), even when the launch folder was read-only');
-        t.check(!LocalOverrides.safeParse({ projects: { roots: ['C:\\'] } }).success, 'a project\'s .sandbox-config.json can never set projects.roots (they map folders of this PC)');
-        t.check(!LocalOverrides.safeParse({ projects: { all: true } }).success, 'a project\'s .sandbox-config.json can never set projects.all');
+        t.check(!LocalOverridesSchema.safeParse({ projects: { roots: ['C:\\'] } }).success, "a project's .sandbox-config.json can never set projects.roots (they map folders of this PC)");
+        t.check(!LocalOverridesSchema.safeParse({ projects: { all: true } }).success, "a project's .sandbox-config.json can never set projects.all");
         // A project file that loosens git access is clamped by keepStrictest first, then joins without being refused.
         const strictUser = structuredClone(f.baseConfig);
         strictUser.provisioning.git.access = 'readonly';
@@ -99,24 +108,35 @@ export const projectsSuite = {
         const root = t.at('proj-root');
         const inRoot = t.dir('proj-root', 'web');
         const outside = t.dir('proj-outside');
-        const primary = startRegistry(storage, { launchId: '1700000000000-abcdef', protections: base, primary: { host: f.workA, guest: 'C:\\Workspace\\work-a' }, roots: [{ host: root, guest: 'C:\\Projects\\proj-root' }], boot: [{ host: f.workB, guest: 'C:\\Projects\\work-b' }] });
-        const registry = readRegistry(storage);
+        const primary = new ProjectRegistry(storage).start({
+            launchId: '1700000000000-abcdef',
+            protections: base,
+            primary: { host: f.workA, guest: 'C:\\Workspace\\work-a' },
+            roots: [{ host: root, guest: 'C:\\Projects\\proj-root' }],
+            boot: [{ host: f.workB, guest: 'C:\\Projects\\work-b' }],
+        });
+        const registry = new ProjectRegistry(storage).read();
         t.check(primary.primary, 'at launch the launch folder is the primary project');
         t.equal(registry?.projects.length, 2, 'at launch the registry holds the launch folder and the projects mapped with it');
         t.equal({ mechanism: registry?.projects[1].mechanism, name: registry?.projects[1].name }, { mechanism: 'boot', name: 'work-b' }, 'a project mapped at boot is registered by its mechanism and name');
-        t.equal(projectHere(storage, path.join(f.workA, 'src'))?.guestDir, 'C:\\Workspace\\work-a\\src', 'projectHere: a folder inside the launch folder');
-        t.equal(projectHere(storage, f.workB)?.project.mechanism, 'boot', 'projectHere: a project mapped at boot');
-        t.equal(projectHere(storage, outside), null, 'projectHere: a folder in no project');
+        t.equal(new ProjectRegistry(storage).here(path.join(f.workA, 'src'))?.guestDir, 'C:\\Workspace\\work-a\\src', 'projectHere: a folder inside the launch folder');
+        t.equal(new ProjectRegistry(storage).here(f.workB)?.project.mechanism, 'boot', 'projectHere: a project mapped at boot');
+        t.equal(new ProjectRegistry(storage).here(outside), null, 'projectHere: a folder in no project');
         const noWsb = projectMapper({ storageRoot: storage, packageRoot: f.install, wsbShare: true, detect: () => null });
         const web = noWsb.register(inRoot);
         t.equal({ mechanism: web.mechanism, guest: web.guest }, { mechanism: 'root', guest: 'C:\\Projects\\proj-root\\web' }, 'a folder inside a root joins at once (also one created after boot)');
         t.equal(noWsb.register(inRoot).name, web.name, 'registering the same folder again gives the same project');
-        t.equal(readRegistry(storage)?.projects.filter((p) => p.host === inRoot).length, 1, 'a folder is registered once');
+        t.equal(new ProjectRegistry(storage).read()?.projects.filter((p) => p.host === inRoot).length, 1, 'a folder is registered once');
         const needs = caught(() => noWsb.register(outside));
         t.check(needs instanceof NeedsRestart && needs.reason.includes('wsb share needs Windows 11 24H2'), 'a folder outside every root without the Windows Sandbox CLI needs a restart (and says why)');
         const shareOff = caught(() => projectMapper({ storageRoot: storage, packageRoot: f.install, wsbShare: false }).register(outside));
         t.check(shareOff instanceof NeedsRestart && shareOff.reason.includes('projects.wsbShare'), 'projects.wsbShare off goes straight to the restart offer');
-        const fakeWsb = { exe: t.at('no-such-wsb.exe'), version: '0.1.0', commands: ['share', 'list'], has: (c) => c === 'share' || c === 'list' };
+        const fakeWsb = {
+            exe: t.at('no-such-wsb.exe'),
+            version: '0.1.0',
+            commands: ['share', 'list'],
+            has: (c) => c === 'share' || c === 'list',
+        };
         const listFails = caught(() => projectMapper({ storageRoot: storage, packageRoot: f.install, wsbShare: true, detect: () => fakeWsb }).register(outside));
         t.check(listFails instanceof NeedsRestart && listFails.reason.includes('wsb share could not find the running sandbox'), 'when wsb cannot tell which sandbox is ours, it falls back to the restart offer with the reason');
         await t.throws(() => noWsb.register(storage), 'cannot be the workspace', 'joining uses the launch-folder safety checks: not the storage folder');
@@ -128,17 +148,40 @@ export const projectsSuite = {
         const webRun = await f.run({ cwd: inRoot, trustConfig: true });
         const joined = await join(inRoot, resolveFor(webRun));
         t.equal(joined.spec?.workspace, 'C:\\Projects\\proj-root\\web', 'joining a project builds a spec with its guest folder...');
-        t.check(ProjectSpec.safeParse(joined.spec).success && joined.spec?.harnesses.claude !== undefined, '... that is valid and carries the agent');
-        t.check(readKnown(storage).some((k) => k.host === inRoot), 'joined projects are remembered (projects.all, sandbox projects)');
+        t.check(ProjectSpecSchema.safeParse(joined.spec).success && joined.spec?.harnesses.claude !== undefined, '... that is valid and carries the agent');
+        t.check(new KnownProjects(storage).list().some((k) => k.host === inRoot), 'joined projects are remembered (projects.all, sandbox projects)');
         const launchFolder = await join(path.join(f.workA, 'sub'), () => Promise.reject(new Error('must not resolve')));
         t.equal(launchFolder.spec, null, 'the launch folder (and below) needs no spec: its sessions use the boot environment');
-        await t.throws(() => join(tightDir, resolveFor(tight)), 'stricter protection than the running sandbox', 'a project whose .sandbox-config.json tightens git access beyond the running sandbox is refused, with the reason');
-        t.check(readRegistry(storage)?.projects.every((p) => p.host !== tightDir) === true, 'a refused project is not registered');
+        await t.throws(() => join(tightDir, resolveFor(tight)), 'stricter than the running sandbox', 'a project whose .sandbox-config.json tightens git access beyond the running sandbox is refused without your consent, with the reason');
+        t.check(new ProjectRegistry(storage).read()?.projects.every((p) => p.host !== tightDir) === true, 'a refused project is not registered');
+        let asked = [];
+        const agreed = await t.thrownMessage(() => joinRunning({
+            storageRoot: storage,
+            dataPath: data,
+            packageRoot: f.install,
+            hostDir: tightDir,
+            wsbShare: false,
+            resolve: resolveFor(tight),
+            acceptStricter: async (_name, stricter) => {
+                asked = stricter;
+                return true;
+            },
+        }));
+        t.check(asked.some((s) => s.startsWith('provisioning.git.access')) &&
+            !agreed.includes('stricter than the running sandbox'), 'with your consent it is not refused for its stricter settings (it goes on to joining: here a restart, as its folder is outside every root)', agreed);
         const outsideRun = await f.run({ cwd: outside });
         await t.throws(() => join(outside, resolveFor(outsideRun)), 'projects.wsbShare', 'a folder that cannot be shown lets NeedsRestart reach the caller');
         t.section('projects: the spec and request the guest gets');
         const spec = projectSpec(webRun, web, false);
-        const sessionRequest = (extra) => GuestRequest.safeParse({ kind: 'session', id: 'r1', harness: 'claude', args: [], cwd: spec.workspace, createdAt: new Date().toISOString(), ...extra });
+        const sessionRequest = (extra) => GuestRequestSchema.safeParse({
+            kind: 'session',
+            id: 'r1',
+            harness: 'claude',
+            args: [],
+            cwd: spec.workspace,
+            createdAt: new Date().toISOString(),
+            ...extra,
+        });
         t.check(sessionRequest({ project: spec }).success, 'a session request carries a project spec');
         t.check(sessionRequest({ project: spec, harnessSpec: f.baseConfig.harnesses.codex }).success, 'a session request carries an agent definition');
         t.check(!sessionRequest({ project: { ...spec, name: '..\\evil' } }).success, 'specs are validated: project ids are file-name safe');
@@ -147,24 +190,36 @@ export const projectsSuite = {
         t.check(!sessionRequest({ project: { ...spec, databases: manyDatabases } }).success, 'specs are validated: lists are capped');
         const manyAgents = Object.fromEntries(Array.from({ length: 9 }, (_, i) => ['a' + i, f.baseConfig.harnesses.codex]));
         t.check(!sessionRequest({ project: { ...spec, harnesses: manyAgents } }).success, 'at most 8 agent definitions in one spec');
-        t.check(GuestRequest.safeParse({ kind: 'project', id: 'p1', project: spec, createdAt: 'x' }).success, '"project" requests (set up without an agent) carry a spec');
-        t.check(!GuestRequest.safeParse({ kind: 'project', id: 'p1', createdAt: 'x' }).success, '"project" requests need a spec');
-        t.check(GuestRequest.safeParse({ kind: 'restart', id: 'x', harness: null, cwd: 'C:\\Projects\\a', createdAt: 'x' }).success, 'restart can be scoped to one project\'s folder');
-        t.check(GuestRequest.safeParse({ kind: 'restart', id: 'x', harness: null, createdAt: 'x' }).success, 'restart still works without a folder');
+        t.check(GuestRequestSchema.safeParse({ kind: 'project', id: 'p1', project: spec, createdAt: 'x' }).success, '"project" requests (set up without an agent) carry a spec');
+        t.check(!GuestRequestSchema.safeParse({ kind: 'project', id: 'p1', createdAt: 'x' }).success, '"project" requests need a spec');
+        t.check(GuestRequestSchema.safeParse({ kind: 'restart', id: 'x', harness: null, cwd: 'C:\\Projects\\a', createdAt: 'x' })
+            .success, "restart can be scoped to one project's folder");
+        t.check(GuestRequestSchema.safeParse({ kind: 'restart', id: 'x', harness: null, createdAt: 'x' }).success, 'restart still works without a folder');
         t.section('projects: which projects are mapped at boot');
-        const toMap = allProjectsToMap(['C:\\a', 'C:\\a\\b', 'C:\\work-a\\x', 'C:\\r\\p', 'C:\\ex\\y', 'C:\\gone'], { primary: 'C:\\work-a', roots: ['C:\\r'], exclude: ['C:\\ex'], exists: (p) => p !== 'C:\\gone' });
-        t.equal(toMap, ['C:\\a'], 'projects.all: known projects except excluded, missing, nested, the launch folder\'s and the roots\'');
+        const toMap = allProjectsToMap(['C:\\a', 'C:\\a\\b', 'C:\\work-a\\x', 'C:\\r\\p', 'C:\\ex\\y', 'C:\\gone'], {
+            primary: 'C:\\work-a',
+            roots: ['C:\\r'],
+            exclude: ['C:\\ex'],
+            exists: (p) => p !== 'C:\\gone',
+        });
+        t.equal(toMap, ['C:\\a'], "projects.all: known projects except excluded, missing, nested, the launch folder's and the roots'");
         const rootConfig = structuredClone(f.baseConfig);
         rootConfig.projects = { ...rootConfig.projects, roots: [root, t.at('no-such-root')], all: true };
-        rememberProject(f.baseConfig.storage.root, outside);
+        new KnownProjects(f.baseConfig.storage.root).remember(outside);
         const gen = f.generate(await f.run({}, rootConfig));
         const session = f.readJson(gen.sessionPath);
         const wsb = fs.readFileSync(gen.wsbPath, 'utf8');
         t.equal(gen.projects.roots.map((r) => r.guest), ['C:\\Projects\\proj-root'], 'roots are mapped as C:\\Projects\\<name>');
         t.check(gen.projects.notes.some((n) => n.includes('no-such-root')), 'a missing root is skipped with a note', JSON.stringify(gen.projects.notes));
         t.check(gen.projects.projects.some((p) => p.host === outside), 'projects.all maps the known projects too');
-        t.includes(wsb, '<HostFolder>' + root + '</HostFolder><SandboxFolder>C:\\Projects\\proj-root</SandboxFolder><ReadOnly>false</ReadOnly>', 'roots are mapped read/write in the .wsb');
-        t.equal({ projectsDir: session.projectsDir, roots: session.roots, projectId: session.projectId }, { projectsDir: PROJECTS_GUEST, roots: ['C:\\Projects\\proj-root', 'C:\\Workspace\\proj-outside'], projectId: 'work-a' }, 'session.json tells the guest where other projects can be');
+        t.includes(wsb, '<HostFolder>' +
+            root +
+            '</HostFolder><SandboxFolder>C:\\Projects\\proj-root</SandboxFolder><ReadOnly>false</ReadOnly>', 'roots are mapped read/write in the .wsb');
+        t.equal({ projectsDir: session.projectsDir, roots: session.roots, projectId: session.projectId }, {
+            projectsDir: PROJECTS_GUEST,
+            roots: ['C:\\Projects\\proj-root', 'C:\\Workspace\\proj-outside'],
+            projectId: 'work-a',
+        }, 'session.json tells the guest where other projects can be');
         // The same project is at the same place whether it started the sandbox or joined one another project started.
         const fromRoot = f.generate(await f.run({ cwd: inRoot }, rootConfig));
         const joinedAt = guestDirFor(gen.projects.roots[0], inRoot);
@@ -184,8 +239,8 @@ export const projectsSuite = {
         const badRoot = structuredClone(f.baseConfig);
         badRoot.projects = { ...badRoot.projects, roots: [f.baseConfig.storage.root] };
         await t.throws(async () => f.generate(await f.run({}, badRoot)), 'projects.roots', 'a root that would expose the storage folder is refused');
-        t.check(forgetProject(f.baseConfig.storage.root, outside), '`sandbox projects remove` forgets a project...');
-        t.check(!readKnown(f.baseConfig.storage.root).some((k) => k.host === outside), '... so it is no longer known (its folder is untouched)');
+        t.check(new KnownProjects(f.baseConfig.storage.root).forget(outside), '`sandbox projects remove` forgets a project...');
+        t.check(!new KnownProjects(f.baseConfig.storage.root).list().some((k) => k.host === outside), '... so it is no longer known (its folder is untouched)');
         t.includes(buildWsb(f.baseConfig, 4096, []), '<MappedFolders></MappedFolders>', 'no projects: nothing extra mapped');
         t.section('projects: repo guard for every project the sandbox can write');
         const guardData = t.at('guard-data');
@@ -193,13 +248,13 @@ export const projectsSuite = {
         const old = path.join(rootG, 'old');
         t.write(path.join(old, '.git', 'hooks', 'pre-commit'), 'mine');
         t.write(path.join(old, '.git', 'config'), '[core]\n\tbare = false\n');
-        saveRepoSnapshot(guardData, f.workA, [], [rootG]);
+        new RepoGuardStore(guardData).save(f.workA, [], [rootG]);
         t.write(path.join(old, '.git', 'hooks', 'post-checkout'), 'planted');
         const fresh = path.join(rootG, 'created-later');
         t.write(path.join(fresh, '.git', 'hooks', 'pre-push'), 'planted');
         t.write(path.join(fresh, '.git', 'config'), '[core]\n\tfsmonitor = evil.exe\n\tbare = false\n');
         t.write(path.join(fresh, 'node.exe'), 'planted');
-        const found = checkRepo(guardData);
+        const found = new RepoGuardStore(guardData).check();
         t.check(fs.existsSync(path.join(old, '.git', 'hooks', 'pre-commit')), 'a hook that was there before the sandbox ran stays');
         t.check(!fs.existsSync(path.join(old, '.git', 'hooks', 'post-checkout')), 'a hook added inside the sandbox to a project in a root is quarantined');
         t.check(!fs.existsSync(path.join(fresh, '.git', 'hooks', 'pre-push')), 'a project that appeared in a root after the start has its planted hooks removed');
@@ -211,17 +266,61 @@ export const projectsSuite = {
         const guestClaude = t.at('hist-guest');
         const bHost = t.at('hist-b');
         t.write(path.join(guestClaude, 'projects', projectFolderName('C:\\Projects\\hist-b'), 's.jsonl'), JSON.stringify({ cwd: 'C:\\Projects\\hist-b\\src' }) + '\n');
-        syncHistoryOut({ hostClaudeDir: hostClaude, guestClaudeDir: guestClaude, hostWorkspace: f.workA, guestWorkspace: 'C:\\Workspace\\work-a', extra: [{ hostWorkspace: bHost, guestWorkspace: 'C:\\Projects\\hist-b' }] });
+        syncHistoryOut({
+            hostClaudeDir: hostClaude,
+            guestClaudeDir: guestClaude,
+            hostWorkspace: f.workA,
+            guestWorkspace: 'C:\\Workspace\\work-a',
+            extra: [{ hostWorkspace: bHost, guestWorkspace: 'C:\\Projects\\hist-b' }],
+        });
         const back = path.join(hostClaude, 'projects', projectFolderName(bHost), 's.jsonl');
-        t.check(fs.existsSync(back), 'a joined project\'s history goes back to ITS folder on this PC');
-        t.includes(fs.existsSync(back) ? fs.readFileSync(back, 'utf8') : '', JSON.stringify(bHost + '\\src').slice(1, -1), 'a joined project\'s history paths are translated');
-        const env = baseEnvFor({ basePath: 'C:\\Windows', toolVars: ['NVM_HOME', 'CARGO_HOME'], steps: {}, summary: [], lan: 'blocked' }, { Path: 'C:\\tools\\a;C:\\Windows', NVM_HOME: 'x', CARGO_HOME: 'y', CARGO_TARGET_DIR: 'C:\\Workspace\\a\\target', AGENT_WORKSPACE: 'C:\\Workspace\\a', TEMP: 'C:\\t' });
-        t.equal({ PATH: env.PATH, Path: env.Path, NVM_HOME: env.NVM_HOME, CARGO_TARGET_DIR: env.CARGO_TARGET_DIR, AGENT_WORKSPACE: env.AGENT_WORKSPACE, TEMP: env.TEMP }, { PATH: 'C:\\Windows', Path: undefined, NVM_HOME: undefined, CARGO_TARGET_DIR: undefined, AGENT_WORKSPACE: undefined, TEMP: 'C:\\t' }, 'a joined project starts from the boot\'s base environment: none of the first project\'s tools, workspace or target folder');
+        t.check(fs.existsSync(back), "a joined project's history goes back to ITS folder on this PC");
+        t.includes(fs.existsSync(back) ? fs.readFileSync(back, 'utf8') : '', JSON.stringify(bHost + '\\src').slice(1, -1), "a joined project's history paths are translated");
+        const env = baseEnvFor({ basePath: 'C:\\Windows', toolVars: ['NVM_HOME', 'CARGO_HOME'], steps: {}, summary: [], lan: 'blocked' }, {
+            Path: 'C:\\tools\\a;C:\\Windows',
+            NVM_HOME: 'x',
+            CARGO_HOME: 'y',
+            CARGO_TARGET_DIR: 'C:\\Workspace\\a\\target',
+            AGENT_WORKSPACE: 'C:\\Workspace\\a',
+            TEMP: 'C:\\t',
+        });
+        t.equal({
+            PATH: env.PATH,
+            Path: env.Path,
+            NVM_HOME: env.NVM_HOME,
+            CARGO_TARGET_DIR: env.CARGO_TARGET_DIR,
+            AGENT_WORKSPACE: env.AGENT_WORKSPACE,
+            TEMP: env.TEMP,
+        }, {
+            PATH: 'C:\\Windows',
+            Path: undefined,
+            NVM_HOME: undefined,
+            CARGO_TARGET_DIR: undefined,
+            AGENT_WORKSPACE: undefined,
+            TEMP: 'C:\\t',
+        }, "a joined project starts from the boot's base environment: none of the first project's tools, workspace or target folder");
         t.section('projects: commands');
-        const status = (id, cwd, startedAt) => ({ id, launchId: 'l', harness: 'claude', cwd, phase: 'running', message: '', updatedAt: startedAt, startedAt });
-        const sessions = [status('a1', 'C:\\Workspace\\a', '1'), status('b1', 'C:\\Projects\\b', '2'), status('a2', 'C:\\Workspace\\a\\x', '3'), status('b2', 'C:\\Projects\\b\\y', '4')];
-        t.equal(sessionsFirstIn(sessions, 'C:\\Projects\\b').map((x) => x.id), ['b2', 'b1', 'a2', 'a1'], 'attach and sessions put this project\'s sessions first, newest first');
-        t.equal(describeSessions([{ harness: 'claude', cwd: 'C:\\Workspace\\api', project: 'api' }, { harness: 'codex', cwd: 'C:\\Projects\\web' }]), '2 sessions (claude in api, codex in web)', 'the restart offer lists the sessions that would end');
+        const status = (id, cwd, startedAt) => ({
+            id,
+            launchId: 'l',
+            harness: 'claude',
+            cwd,
+            phase: 'running',
+            message: '',
+            updatedAt: startedAt,
+            startedAt,
+        });
+        const sessions = [
+            status('a1', 'C:\\Workspace\\a', '1'),
+            status('b1', 'C:\\Projects\\b', '2'),
+            status('a2', 'C:\\Workspace\\a\\x', '3'),
+            status('b2', 'C:\\Projects\\b\\y', '4'),
+        ];
+        t.equal(sessionsFirstIn(sessions, 'C:\\Projects\\b').map((x) => x.id), ['b2', 'b1', 'a2', 'a1'], "attach and sessions put this project's sessions first, newest first");
+        t.equal(describeSessions([
+            { harness: 'claude', cwd: 'C:\\Workspace\\api', project: 'api' },
+            { harness: 'codex', cwd: 'C:\\Projects\\web' },
+        ]), '2 sessions (claude in api, codex in web)', 'the restart offer lists the sessions that would end');
         await t.throws(() => validateProjectsArgs(['bogus']), 'projects action', '`sandbox projects` rejects an unknown action');
         await t.throws(() => validateProjectsArgs(['add']), 'Which folder', '`sandbox projects add` needs a folder');
         await t.throws(() => validateProjectsArgs(['all', 'maybe']), 'on', '`sandbox projects all` needs on or off');
@@ -229,7 +328,10 @@ export const projectsSuite = {
         validateProjectsArgs([]);
         validateProjectsArgs(['roots']);
         validateProjectsArgs(['all', 'on']);
-        t.check(askedWhen(['add', 'remove'], 'add') && !askedWhen(['add'], 'list') && askedWhen(undefined, 'x') && askedWhen('save', 'save'), 'the menu asks an argument only for the actions it belongs to');
+        t.check(askedWhen(['add', 'remove'], 'add') &&
+            !askedWhen(['add'], 'list') &&
+            askedWhen(undefined, 'x') &&
+            askedWhen('save', 'save'), 'the menu asks an argument only for the actions it belongs to');
         t.section('projects: several sessions at once (--session agent@folder)');
         const want = parseSessionWant('claude@C:\\code\\a@b', 'C:\\here');
         t.equal({ harness: want.harness, folder: want.folder }, { harness: 'claude', folder: 'C:\\code\\a@b' }, '--session: the first @ splits agent from folder');
@@ -237,21 +339,63 @@ export const projectsSuite = {
         t.equal(parseSessionWant('gemini@sub', 'C:\\here').folder, 'C:\\here\\sub', '--session: relative folders become absolute');
         await t.throws(() => parseSessionWant('@C:\\x'), 'names no agent', '--session without an agent is refused');
         const own = parseSessionWant('codex@C:\\code\\web|--model o3 "two words"', 'C:\\here');
-        t.equal({ harness: own.harness, folder: own.folder, args: own.args }, { harness: 'codex', folder: 'C:\\code\\web', args: ['--model', 'o3', 'two words'] }, '--session: after | come that agent\'s own arguments (quotes keep words together)');
+        t.equal({ harness: own.harness, folder: own.folder, args: own.args }, { harness: 'codex', folder: 'C:\\code\\web', args: ['--model', 'o3', 'two words'] }, "--session: after | come that agent's own arguments (quotes keep words together)");
         t.equal(parseSessionWant('claude@C:\\x').args, undefined, '--session: no | means no own arguments');
-        const both = parseCli(['launch', '--session', 'claude@C:\\a|--continue', '--session', 'codex@C:\\b', '--', '--verbose']);
+        const both = parseCli([
+            'launch',
+            '--session',
+            'claude@C:\\a|--continue',
+            '--session',
+            'codex@C:\\b',
+            '--',
+            '--verbose',
+        ]);
         t.equal(both.passthrough, ['--verbose'], 'arguments after -- go to every session...');
         t.equal(both.sessions.map((s) => s.args ?? []), [['--continue'], []], '... arguments after | only to that one');
-        const multi = parseCli(['launch', '--session', 'claude@' + f.workA, '--session', 'codex@' + f.workB, '--session', 'claude@' + f.workB, '-t', '--', '--continue']);
-        t.equal({ command: multi.command, sessions: multi.sessions.length, terminal: multi.terminal, second: multi.sessions[1].harness, passthrough: multi.passthrough }, { command: 'launch', sessions: 3, terminal: true, second: 'codex', passthrough: ['--continue'] }, 'several --session options parse in order, with -t and agent arguments');
-        const validationContext = (options) => ({ packageRoot: f.install, entry: '', options, loaded: { config: f.baseConfig, configPath: null, base: t.temp }, storageRoot: f.baseConfig.storage.root, dataPath: t.at('vdata') });
+        const multi = parseCli([
+            'launch',
+            '--session',
+            'claude@' + f.workA,
+            '--session',
+            'codex@' + f.workB,
+            '--session',
+            'claude@' + f.workB,
+            '-t',
+            '--',
+            '--continue',
+        ]);
+        t.equal({
+            command: multi.command,
+            sessions: multi.sessions.length,
+            terminal: multi.terminal,
+            second: multi.sessions[1].harness,
+            passthrough: multi.passthrough,
+        }, { command: 'launch', sessions: 3, terminal: true, second: 'codex', passthrough: ['--continue'] }, 'several --session options parse in order, with -t and agent arguments');
+        const validationContext = (options) => ({
+            packageRoot: f.install,
+            entry: '',
+            options,
+            loaded: { config: f.baseConfig, configPath: null, base: t.temp },
+            storageRoot: f.baseConfig.storage.root,
+            dataPath: t.at('vdata'),
+        });
         await t.throws(() => validateOptions(validationContext(parseCli(['launch', '--session', 'claud@' + f.workA]))), 'Did you mean', 'an unknown agent in --session suggests the closest one');
         await t.throws(() => validateOptions(validationContext(parseCli(['launch', '--session', 'claude@' + t.at('nope')]))), 'does not exist', 'a missing --session folder is refused before anything starts');
         await t.throws(() => validateOptions(validationContext(parseCli(['launch', '--session', 'claude@' + f.workA, '--harness', 'codex']))), 'do not apply', '--session cannot be mixed with --harness/--workspace');
         validateOptions(validationContext(multi));
-        t.equal(severalAgentsArgv([{ harness: 'claude', folder: 'C:\\a' }, { harness: 'codex', folder: 'C:\\b c' }], { headless: true, attachFirst: true }).join(' '), 'launch --session claude@C:\\a --session codex@C:\\b c --headless -t', 'the menu builds the same command line (so repeat-last works)');
+        t.equal(severalAgentsArgv([
+            { harness: 'claude', folder: 'C:\\a' },
+            { harness: 'codex', folder: 'C:\\b c' },
+        ], { headless: true, attachFirst: true }).join(' '), 'launch --session claude@C:\\a --session codex@C:\\b c --headless -t', 'the menu builds the same command line (so repeat-last works)');
         t.equal(candidateFolders(validationContext(parseCli(['launch'])), f.workA)[0], path.resolve(f.workA), 'the menu offers this folder first, then known projects and the folders in your roots');
-        const multiGen = generateSandbox({ packageRoot: t.packageRoot, run: await f.run(), harnessArgs: [], probe: f.probe, extraProjects: [f.workB, path.join(f.workA, 'sub'), f.workB], autoSession: false });
+        const multiGen = generateSandbox({
+            packageRoot: t.packageRoot,
+            run: await f.run(),
+            harnessArgs: [],
+            probe: f.probe,
+            extraProjects: [f.workB, path.join(f.workA, 'sub'), f.workB],
+            autoSession: false,
+        });
         const multiSession = f.readJson(multiGen.sessionPath);
         const multiWsb = fs.readFileSync(multiGen.wsbPath, 'utf8');
         t.equal(multiGen.projects.projects.map((p) => p.guest), ['C:\\Workspace\\work-b'], 'a multi-project launch maps every other project once (folders inside the launch folder and duplicates need nothing)');
@@ -261,20 +405,36 @@ export const projectsSuite = {
         // A games project: its approved file asks for vGPU (you allowed it for this project) and maps a folder of its own.
         const games = t.dir('proj-games');
         t.dir('proj-games', 'assets');
-        f.writeLocal(games, { sandbox: { vGpu: true }, mappings: [{ host: 'assets', guest: 'F:\\GameAssets', readOnly: true }] });
+        f.writeLocal(games, {
+            sandbox: { vGpu: true },
+            mappings: [{ host: 'assets', guest: 'F:\\GameAssets', readOnly: true }],
+        });
         saveAllowed(allowStorePath(f.baseConfig.storage.root), path.join(games, '.sandbox-config.json'), 'sandbox.vGpu', true, true);
         const gamesRun = await f.run({ cwd: games, trustConfig: true });
         t.equal(gamesRun.config.sandbox.vGpu, true, 'the vGPU you allowed for the project is in its effective config');
         const launchedRun = await f.run();
-        const runningBoot = { memoryMb: 8192, mappings: [{ host: f.workA, guest: 'C:\\Workspace\\work-a', readOnly: false }] };
+        const runningBoot = {
+            memoryMb: 8192,
+            mappings: [{ host: f.workA, guest: 'C:\\Workspace\\work-a', readOnly: false }],
+        };
         const wanted = missingAtBoot(protectionsOf(launchedRun.config), runningBoot, gamesRun.config, fs.existsSync);
-        t.equal({ settings: wanted.settings, memoryMb: wanted.memoryMb, mappings: wanted.mappings.map((m) => m.guest) }, { settings: ['sandbox.vGpu'], memoryMb: null, mappings: ['F:\\GameAssets'] }, 'missingAtBoot: vGPU and the project\'s folder are missing from a sandbox started without them (the missing optional mapping is no wish)');
-        const mappedMirror = missingAtBoot(protectionsOf(gamesRun.config), { memoryMb: 8192, mappings: [{ host: path.join(games, 'assets'), guest: 'C:\\Mirror\\F\\GameAssets', readOnly: true }] }, gamesRun.config, fs.existsSync);
+        t.equal({ settings: wanted.settings, memoryMb: wanted.memoryMb, mappings: wanted.mappings.map((m) => m.guest) }, { settings: ['sandbox.vGpu'], memoryMb: null, mappings: ['F:\\GameAssets'] }, "missingAtBoot: vGPU and the project's folder are missing from a sandbox started without them (the missing optional mapping is no wish)");
+        const mappedMirror = missingAtBoot(protectionsOf(gamesRun.config), {
+            memoryMb: 8192,
+            mappings: [{ host: path.join(games, 'assets'), guest: 'C:\\Mirror\\F\\GameAssets', readOnly: true }],
+        }, gamesRun.config, fs.existsSync);
         t.check(nothingMissing(mappedMirror), 'missingAtBoot: nothing missing when the sandbox has vGPU and the folder (F:\\x is C:\\Mirror\\F\\x in the .wsb)', JSON.stringify(mappedMirror));
         const bigger = structuredClone(launchedRun.config);
         bigger.sandbox.memoryMb = 16384;
         t.equal(missingAtBoot(protectionsOf(launchedRun.config), runningBoot, bigger).memoryMb, 16384, 'missingAtBoot: a larger fixed memory size is missing too');
-        const twoFolders = { settings: ['sandbox.vGpu'], memoryMb: null, mappings: [{ host: 'C:\\Steam\\common', guest: 'C:\\Steam', readOnly: true }, { host: 'F:\\SteamLibrary', guest: 'F:\\SteamLibrary', readOnly: true }] };
+        const twoFolders = {
+            settings: ['sandbox.vGpu'],
+            memoryMb: null,
+            mappings: [
+                { host: 'C:\\Steam\\common', guest: 'C:\\Steam', readOnly: true },
+                { host: 'F:\\SteamLibrary', guest: 'F:\\SteamLibrary', readOnly: true },
+            ],
+        };
         t.equal(describeMissing('mw2-agent', twoFolders), 'mw2-agent wants vGPU and 2 folders (C:\\Steam\\common, F:\\SteamLibrary), but this sandbox started without them.', 'the message names each missing item');
         t.equal(missingTip(twoFolders), 'Set sandbox.vGpu (or the mappings) in your own settings to have them in every sandbox.', 'the tip names the settings');
         t.equal(describeMissing('api', { settings: ['sandbox.vGpu'], memoryMb: null, mappings: [] }), 'api wants vGPU, but this sandbox started without it.', 'one item reads naturally');
@@ -285,25 +445,60 @@ export const projectsSuite = {
         // joinRunning asks before anything is registered: restart (NeedsRestart with what is missing), or continue without.
         const storage2 = t.dir('proj-storage2');
         const data2 = t.dir('proj-storage2', 'data', 'testdata');
-        startRegistry(storage2, { launchId: '1700000000001-abcdef', protections: protectionsOf(launchedRun.config), primary: { host: f.workA, guest: 'C:\\Workspace\\work-a' }, roots: [{ host: path.dirname(games), guest: 'C:\\Projects\\temp' }], boot: [], atBoot: { ...runningBoot, widened: {} } });
-        const joinGames = (choice) => joinRunning({ storageRoot: storage2, dataPath: data2, packageRoot: f.install, hostDir: games, wsbShare: false, resolve: resolveFor(gamesRun), decide: async () => choice });
+        new ProjectRegistry(storage2).start({
+            launchId: '1700000000001-abcdef',
+            protections: protectionsOf(launchedRun.config),
+            primary: { host: f.workA, guest: 'C:\\Workspace\\work-a' },
+            roots: [{ host: path.dirname(games), guest: 'C:\\Projects\\temp' }],
+            boot: [],
+            atBoot: { ...runningBoot, widened: {} },
+        });
+        const joinGames = (choice) => joinRunning({
+            storageRoot: storage2,
+            dataPath: data2,
+            packageRoot: f.install,
+            hostDir: games,
+            wsbShare: false,
+            resolve: resolveFor(gamesRun),
+            decide: async () => choice,
+        });
         const restartFor = await joinGames('restart').then(() => null, (e) => e);
-        t.check(restartFor instanceof NeedsRestart && restartFor.missing?.settings.includes('sandbox.vGpu') === true && restartFor.missing.mappings.length === 1, 'choosing "Restart with them" hands the restart offer what is missing');
+        t.check(restartFor instanceof NeedsRestart &&
+            restartFor.missing?.settings.includes('sandbox.vGpu') === true &&
+            restartFor.missing.mappings.length === 1, 'choosing "Restart with them" hands the restart offer what is missing');
         await t.throws(() => joinGames('cancel'), 'Cancelled', '"Cancel" stops with a short line');
-        t.check(!readRegistry(storage2)?.projects.some((p) => p.host === games), 'neither registers the project');
+        t.check(!new ProjectRegistry(storage2).read()?.projects.some((p) => p.host === games), 'neither registers the project');
         const continued = await joinGames('continue');
         t.equal(continued.missing?.settings, ['sandbox.vGpu'], '"Continue anyway" joins without them and says what is missing');
         // The restart that adds it (and any launch with it mapped at boot) boots with the union.
-        const unionGen = generateSandbox({ packageRoot: t.packageRoot, run: launchedRun, harnessArgs: [], probe: f.probe, extraProjects: [games], autoSession: false, bootWants: { projects: [{ name: 'proj-games', config: gamesRun.config }], keepOff: [] } });
+        const unionGen = generateSandbox({
+            packageRoot: t.packageRoot,
+            run: launchedRun,
+            harnessArgs: [],
+            probe: f.probe,
+            extraProjects: [games],
+            autoSession: false,
+            bootWants: { projects: [{ name: 'proj-games', config: gamesRun.config }], keepOff: [] },
+        });
         const unionWsb = fs.readFileSync(unionGen.wsbPath, 'utf8');
         t.includes(unionWsb, '<vGPU>Enable</vGPU>', 'the restart plan: vGPU on because the added project asks for it (and you allowed it)');
-        t.includes(unionWsb, '<HostFolder>' + path.join(games, 'assets') + '</HostFolder><SandboxFolder>C:\\Mirror\\F\\GameAssets</SandboxFolder><ReadOnly>true</ReadOnly>', 'the restart plan: the added project\'s mapping is mapped');
+        t.includes(unionWsb, '<HostFolder>' +
+            path.join(games, 'assets') +
+            '</HostFolder><SandboxFolder>C:\\Mirror\\F\\GameAssets</SandboxFolder><ReadOnly>true</ReadOnly>', "the restart plan: the added project's mapping is mapped");
         t.includes(unionWsb, '<HostFolder>' + games + '</HostFolder><SandboxFolder>C:\\Workspace\\proj-games</SandboxFolder>', 'the restart plan: the added project itself is mapped (where it is as the launch folder)');
         t.equal(unionGen.widened, { 'sandbox.vGpu': 'proj-games' }, 'the registry learns which boot setting was turned on for which project');
         t.check(unionGen.projects.notes.some((n) => n.startsWith('vGPU is on in this sandbox')), 'the launch says vGPU is on for every project and why', JSON.stringify(unionGen.projects.notes));
         t.check(nothingMissing(missingAtBoot(protectionsOf(unionGen.bootConfig), { memoryMb: unionGen.memoryMb, mappings: unionGen.mappings }, gamesRun.config, fs.existsSync)), 'after that restart the project joins with nothing missing');
-        const keptOff = generateSandbox({ packageRoot: t.packageRoot, run: launchedRun, harnessArgs: [], probe: f.probe, extraProjects: [games], autoSession: false, bootWants: { projects: [{ name: 'proj-games', config: gamesRun.config }], keepOff: ['sandbox.vGpu'] } });
-        t.includes(fs.readFileSync(keptOff.wsbPath, 'utf8'), '<vGPU>Disable</vGPU>', 'a device the launch folder\'s own file switched off stays off');
+        const keptOff = generateSandbox({
+            packageRoot: t.packageRoot,
+            run: launchedRun,
+            harnessArgs: [],
+            probe: f.probe,
+            extraProjects: [games],
+            autoSession: false,
+            bootWants: { projects: [{ name: 'proj-games', config: gamesRun.config }], keepOff: ['sandbox.vGpu'] },
+        });
+        t.includes(fs.readFileSync(keptOff.wsbPath, 'utf8'), '<vGPU>Disable</vGPU>', "a device the launch folder's own file switched off stays off");
         t.includes(fs.readFileSync(f.generate(launchedRun).wsbPath, 'utf8'), '<vGPU>Disable</vGPU>', 'without other projects nothing changes');
         t.section('projects: wsb (Windows Sandbox command line) adapter');
         t.equal([parseVersion('Windows Sandbox CLI version 0.4.1.0\n'), parseVersion('nothing')], ['0.4.1.0', null], 'wsb --version');

package/dist/selftest/repair.test.d.ts

@@ -1,2 +1,2 @@
-import type { Suite } from './suite.js';
+import type { Suite } from './support/suite.js';
 export declare const repairSuite: Suite;

package/dist/selftest/repair.test.js

@@ -1,6 +1,6 @@
 // `sandbox repair`: finding half-installed toolchains, interrupted downloads, stale pid files and broken state.
 import path from 'node:path';
-import { deadPidFiles, findHalfInstalled, findStagingLeftovers, globalPackages, resolvedVersionsValid } from '../cli/commands/repair/finders.js';
+import { deadPidFiles, findHalfInstalled, findStagingLeftovers, globalPackages, resolvedVersionsValid, } from '../cli/commands/repair/finders.js';
 export const repairSuite = {
     name: 'repair',
     title: 'repair detection (half-installed tools, leftovers, stale pids)',
@@ -20,10 +20,20 @@ export const repairSuite = {
         t.dir('repair', 'tools', 'go', '1.24.0.staging-ab12cd');
         t.dir('repair', 'tools', 'node-staging');
         t.dir('repair', 'tools', 'rust.staging-0f');
-        const half = findHalfInstalled(tools).map((h) => path.relative(tools, h.path)).sort();
-        const expectedHalf = [path.join('go', '1.22.8'), path.join('java', 'jdk-17'), 'dotnet', 'nvm', path.join('nvm', 'v20.18.0')].sort();
+        const half = findHalfInstalled(tools)
+            .map((h) => path.relative(tools, h.path))
+            .sort();
+        const expectedHalf = [
+            path.join('go', '1.22.8'),
+            path.join('java', 'jdk-17'),
+            'dotnet',
+            'nvm',
+            path.join('nvm', 'v20.18.0'),
+        ].sort();
         t.equal(half, expectedHalf, 'half-installed toolchains are folders without their program');
-        const leftovers = findStagingLeftovers(tools).map((p) => path.relative(tools, p)).sort();
+        const leftovers = findStagingLeftovers(tools)
+            .map((p) => path.relative(tools, p))
+            .sort();
         t.equal(leftovers, [path.join('go', '1.24.0.staging-ab12cd'), 'node-staging', 'rust.staging-0f'].sort(), 'interrupted downloads are found in tools and one level down');
         t.section('state files');
         t.check(resolvedVersionsValid('{"go":"1.23.2"}') && resolvedVersionsValid('{}'), 'resolved-versions.json: a JSON object is valid (a byte-order mark is fine)');
@@ -36,7 +46,9 @@ export const repairSuite = {
         t.write(path.join(run, 'watcher-other.pid'), String(process.pid));
         t.write(path.join(run, 'watcher-junk.pid'), 'not a pid');
         t.write(path.join(run, 'hidden-windows.json'), '[]');
-        const dead = deadPidFiles(run, (pid) => pid === process.pid).map((file) => path.basename(file)).sort();
+        const dead = deadPidFiles(run, (pid) => pid === process.pid)
+            .map((file) => path.basename(file))
+            .sort();
         t.equal(dead, ['watcher-default.pid', 'watcher-junk.pid'], 'stale watcher pid files (dead process or junk) are found; a live one is kept');
     },
 };

package/dist/selftest/repo-guard.test.d.ts

@@ -1,2 +1,2 @@
-import type { Suite } from './suite.js';
+import type { Suite } from './support/suite.js';
 export declare const repoGuardSuite: Suite;