@angelmsger/fx 0.11.0 → 0.13.0

package/dist/application/login/verify.js

@@ -2,15 +2,16 @@
 // something doctor, login, can and where can all do freely; only a patch-supplied
 // command vector has to be trusted first.
 import path from 'node:path';
-import { DevkitError } from '../../domain/errors.js';
+import { toolMissingError } from '../../domain/errors.js';
 import { failureCaseOf } from '../../domain/setup/failure-case.js';
 import { matchesJson, statedReason } from '../../domain/setup/json-check.js';
 import { stderrReason } from '../../domain/toolchain/stderr.js';
+import { messageOf } from '../../domain/values.js';
 import { ServiceOperation } from '../services/operation.js';
 import { workspaceCommand } from '../workspace/guidance.js';
 // Identity and access checks may contact a remote service or unlock native storage.
 // Local binary and public-setting probes retain their separate short deadlines.
-const CHECK_TIMEOUT_MS = 30_000;
+export const CHECK_TIMEOUT_MS = 30_000;
 export class Verifier {
     deps;
     setup;
@@ -20,7 +21,9 @@ export class Verifier {
     }
     async verify(step, options = {}) {
         if (step.preparation) {
-            const result = await new ServiceOperation(this.deps, this.setup).execute(step, true);
+            const result = await new ServiceOperation(this.deps, this.setup).execute(step, {
+                dryRun: true,
+            });
             return {
                 ok: result.status === 'unchanged',
                 detail: result.detail,
@@ -40,34 +43,21 @@ export class Verifier {
                 return { ok: true, detail: `authenticated as ${user}` };
             }
             catch (err) {
-                return { ok: false, detail: err instanceof Error ? err.message : String(err) };
+                return { ok: false, detail: messageOf(err) };
             }
         }
-        const trust = {
-            tool: step.tool,
-            workspace: this.deps.ctx.name,
-            commandShell: this.deps.commandShell,
+        const { gate } = this.deps.trust;
+        const trust = stepTrust(this.deps.trust, step, {
             vector: verify.command,
             label: `${step.id} check`,
-            origin: step.origin,
-            yes: this.setup.trust.yes,
-            posture: this.setup.trust.posture,
-            ...(step.executionEnv
-                ? {
-                    execution: {
-                        purpose: 'service authentication',
-                        resource: step.id,
-                        bindings: step.executionEnv,
-                    },
-                }
-                : {}),
-        };
-        if (options.dryRun && !(await this.setup.trust.gate.isTrusted(trust)))
+        });
+        if (options.dryRun && !(await gate.isTrusted(trust)))
             return { ok: false, detail: 'manifest command is not trusted', withheld: true };
-        await this.setup.trust.gate.ensure(trust);
+        await gate.ensure(trust);
         const vector = expandHomeIn(verify.command, this.setup.home);
-        const result = await this.deps.processRun(vector, {
+        const result = await this.deps.process.run(vector, {
             timeoutMs: CHECK_TIMEOUT_MS,
+            deadline: verify.deadline,
             cwd: this.deps.ctx.root,
             env: step.executionEnv,
             diagnostic: { phase: `${step.id} check` },
@@ -78,7 +68,7 @@ export class Verifier {
         return commandVerdict(verify, result);
     }
     toolMissing(tool, binary) {
-        return new DevkitError('config', 'TOOL_MISSING', `${binary} is not installed or not on PATH`, {
+        return toolMissingError(binary, {
             hint: 'The check did not run, so it says nothing about this step.',
             nextSteps: [
                 workspaceCommand(this.deps, 'tool', 'show', tool),
@@ -87,23 +77,40 @@ export class Verifier {
         });
     }
 }
-// A check that gave no answer: its tool did not start, or it outlived its deadline.
-// Nothing about the step follows from it, so nobody is handed the step for it.
-export function gaveNoAnswer(code) {
-    return code === 'TOOL_MISSING' || code === 'PROCESS_TIMEOUT';
+// What the trust gate is asked about one of a step's vectors, its check's or its command's.
+export function stepTrust(trust, step, asked) {
+    return {
+        tool: step.tool,
+        workspace: trust.workspace,
+        commandShell: trust.commandShell,
+        vector: asked.vector,
+        label: asked.label,
+        origin: step.origin,
+        yes: trust.yes,
+        posture: asked.posture ?? trust.posture,
+        ...(step.executionEnv
+            ? {
+                execution: {
+                    purpose: 'service authentication',
+                    resource: step.id,
+                    bindings: step.executionEnv,
+                },
+            }
+            : {}),
+    };
 }
-function commandVerdict(verify, result) {
+// Init without a workspace reads a tool's sign-in status through the same verdict.
+export function commandVerdict(verify, result) {
     const unmet = verify.json !== undefined && !matchesJson(result.stdout, verify.json)
         ? (statedReason(result.stdout, verify.json) ??
             verify.json.unmet ??
             `expected ${verify.json.path} to be ${String(verify.json.equals)}`)
         : undefined;
-    if (result.code === 0)
-        return unmet === undefined
-            ? { ok: true, detail: `${verify.command.join(' ')} succeeded` }
-            : { ok: false, detail: unmet };
-    // A tool that fails silently still answered the declared expectation on stdout.
-    const silent = result.stderr.trim() === '';
+    if (result.code === 0 && unmet === undefined)
+        return { ok: true, detail: passed(verify) };
+    // A tool that fails silently, or answers without failing, still answered the declared
+    // expectation on stdout.
+    const silent = result.code === 0 || result.stderr.trim() === '';
     const read = failureCaseOf(result, verify.failures);
     return {
         ok: false,
@@ -119,6 +126,12 @@ function commandVerdict(verify, result) {
             }),
     };
 }
+// What a passing check established; the command itself is in the step's plan.
+function passed(verify) {
+    return verify.json === undefined
+        ? 'the check passed'
+        : `${verify.json.path} is ${String(verify.json.equals)}`;
+}
 // Manifest paths say `~` the way a person would; a tool receiving them
 // through a vector does not go through a shell, so fx expands it.
 export function expandHome(target, home) {

package/dist/application/login/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/application/login/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../src/application/login/verify.ts"],"names":[],"mappings":"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"}

package/dist/application/manifest/context.js

@@ -4,7 +4,11 @@
 import { bindPlatforms, bindProviders, } from '../../domain/manifest/providers.js';
 import { LoadManifest } from './load.js';
 export async function loadManifestContext(input) {
-    const bundle = await new LoadManifest(input.fs, input.bundledTools, input.diagnostics).execute({
+    const bundle = await new LoadManifest({
+        fs: input.fs,
+        bundledTools: input.bundledTools,
+        diagnostics: input.diagnostics,
+    }).execute({
         dir: input.dir,
         cliVersion: input.cliVersion,
         providers: input.providers,

package/dist/application/manifest/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/application/manifest/context.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,gEAAgE;AAEhE,OAAO,EACL,aAAa,EACb,aAAa,GAId,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAsB9D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAwB;IAChE,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QAC7F,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG;QACd,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO;QAClC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;KAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,mDAAmD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpJ,SAAS,EAAE,CAAC,sBAAsB,EAAE,cAAc,CAAC;YACnD,IAAI,EAAE,EAAE,OAAO,EAAE;SAClB,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;QACrE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;KAC3E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/application/manifest/context.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,4EAA4E;AAC5E,gEAAgE;AAEhE,OAAO,EACL,aAAa,EACb,aAAa,GAId,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,YAAY,EAAuB,MAAM,WAAW,CAAC;AAsB9D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAAwB;IAChE,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC;QACpC,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC,CAAC,OAAO,CAAC;QACT,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,MAAM,OAAO,GAAG;QACd,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO;QAClC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;KAC1C,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,iBAAiB,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,mDAAmD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpJ,SAAS,EAAE,CAAC,sBAAsB,EAAE,cAAc,CAAC;YACnD,IAAI,EAAE,EAAE,OAAO,EAAE;SAClB,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;QACrE,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC;KAC3E,CAAC;AACJ,CAAC"}

package/dist/application/{import.js → manifest/import.js}

@@ -1,17 +1,20 @@
 // Inspect existing checkouts and write only a candidate manifest, retaining unresolved inference for review.
 import path from 'node:path';
-import { DevkitError } from '../domain/errors.js';
-import { foldDefaults } from '../domain/import/fold.js';
-import { parseGitmodules } from '../domain/import/gitmodules.js';
-import { hostOf, inferRepo, isPersonal, } from '../domain/import/infer.js';
-import { renderManifest } from '../domain/import/render.js';
-import { isAtOrInside } from '../domain/path.js';
-import { assertWritable } from './safety/posture.js';
+import { DevkitError } from '../../domain/errors.js';
+import { foldDefaults } from '../../domain/import/fold.js';
+import { parseGitmodules } from '../../domain/import/gitmodules.js';
+import { hostOf, inferRepo, isPersonal, } from '../../domain/import/infer.js';
+import { renderManifest } from '../../domain/import/render.js';
+import { isAtOrInside } from '../../domain/path.js';
+import { shellLine } from '../../domain/shell.js';
+import { assertWritable } from '../safety/posture.js';
 const SKIP = new Set(['node_modules']);
-function insideRoot(root, target) {
+function insideRoot(root, target, shell) {
     return new DevkitError('conflict', 'IMPORT_INSIDE_ROOT', `${target} lies inside ${root}, the directory being described`, {
         hint: 'The imported directory is a workspace of checkouts; the manifest belongs in a checkout of the manifest repository.',
-        nextSteps: [`fx manifest import ${root} -o <manifest repository>/manifest/workspace.yaml`],
+        nextSteps: [
+            `${shellLine(['fx', 'manifest', 'import', root], shell)} -o <manifest repository>/manifest/workspace.yaml`,
+        ],
     });
 }
 export class Import {
@@ -23,12 +26,12 @@ export class Import {
         const root = path.resolve(input.dir);
         const target = input.out === undefined ? null : path.resolve(input.out);
         if (target !== null && isAtOrInside(await this.physical(target), await this.physical(root)))
-            throw insideRoot(root, target);
-        const skipped = [];
-        const observed = await this.observe(root, skipped);
-        const repos = await this.identify(await this.infer(observed, skipped));
+            throw insideRoot(root, target, this.deps.commandShell);
+        const observed = await this.observe(root);
+        const inferred = await this.infer(observed.repos);
+        const repos = await this.identify(inferred.repos);
         const manifest = renderManifest(foldDefaults(repos));
-        const report = summarize(repos, skipped);
+        const report = summarize(repos, [...observed.skipped, ...inferred.skipped]);
         if (target === null || input.dryRun)
             return { path: target, written: false, manifest, report };
         assertWritable(input.posture, 'import');
@@ -70,19 +73,20 @@ export class Import {
     // A directory is a repository only when git's toplevel is the directory
     // itself; a plain directory inside a repository would otherwise inherit
     // the enclosing remotes. Containers are entered one level, no deeper.
-    async observe(root, skipped) {
+    async observe(root) {
         const gitmodules = parseGitmodules((await this.deps.fs.readText(path.join(root, '.gitmodules'))) ?? '');
         const found = [];
+        const skipped = [];
         for (const name of await this.children(root)) {
             const dir = path.join(root, name);
-            if (await this.isRepoRoot(dir)) {
+            if (await this.deps.git.isToplevel(dir)) {
                 found.push(await this.observeRepo(root, dir, gitmodules[name]?.branch));
                 continue;
             }
             const inside = [];
             for (const child of await this.children(dir)) {
                 const sub = path.join(dir, child);
-                if (await this.isRepoRoot(sub)) {
+                if (await this.deps.git.isToplevel(sub)) {
                     inside.push(child);
                     found.push(await this.observeRepo(root, sub, gitmodules[`${name}/${child}`]?.branch));
                 }
@@ -90,7 +94,7 @@ export class Import {
             if (inside.length === 0)
                 skipped.push({ path: name, reason: 'not a repository' });
         }
-        return found;
+        return { repos: found, skipped };
     }
     async children(dir) {
         const names = [];
@@ -102,12 +106,6 @@ export class Import {
         }
         return names;
     }
-    async isRepoRoot(dir) {
-        const top = await this.deps.git.toplevel(dir);
-        if (top === undefined)
-            return false;
-        return (await this.deps.fs.realpath(top)) === (await this.deps.fs.realpath(dir));
-    }
     async observeRepo(root, dir, gitmodulesBranch) {
         const remotes = await this.deps.git.remotes(dir);
         const remoteHeads = {};
@@ -127,8 +125,9 @@ export class Import {
     }
     // Two passes: the projects named by rungs 1 and 2 are the candidate
     // list rung 3 searches for the fork-only checkouts.
-    async infer(observed, skipped) {
+    async infer(observed) {
         const repos = [];
+        const skipped = [];
         const later = [];
         for (const obs of observed) {
             const origin = obs.remotes['origin'];
@@ -160,7 +159,7 @@ export class Import {
                         : `${result.skipped}; ${unsettledNote(unsettled)}`,
                 });
         }
-        return repos;
+        return { repos, skipped };
     }
     // The ladder is synchronous; the code host is not. Every candidate pair is
     // asked once, up front, and every host is resolved once however many
@@ -170,7 +169,7 @@ export class Import {
         const hosts = new Map();
         for (const obs of later) {
             const host = hostOf(obs.remotes['origin'] ?? '');
-            const pending = hosts.get(host) ?? this.deps.codeHost(host);
+            const pending = hosts.get(host) ?? this.codeHostAt(host);
             hosts.set(host, pending);
             const codeHost = await pending;
             for (const project of seen) {
@@ -182,6 +181,14 @@ export class Import {
         }
         return answers;
     }
+    // An import runs before any workspace binds a provider, so only a host that is a
+    // directory on this machine can be asked; every other host stays unasked. A local
+    // host that will not resolve is a configuration failure the caller must see.
+    async codeHostAt(host) {
+        if (!path.isAbsolute(host) || !(await this.deps.fs.exists(host)))
+            return undefined;
+        return this.deps.localCodeHost(host);
+    }
 }
 async function probe(codeHost, project, name) {
     try {

package/dist/application/manifest/import.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/application/manifest/import.ts"],"names":[],"mappings":"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"}

package/dist/application/manifest/lint.js

@@ -4,22 +4,20 @@ import path from 'node:path';
 import { lintManifest } from '../../domain/manifest/lint.js';
 import { loadToolsDocument, loadToolsPatchDocument } from '../../domain/manifest/loader.js';
 import { bindPlatforms } from '../../domain/manifest/providers.js';
+import { setupKeyOf } from '../../domain/setup/names.js';
 import { lintSkill } from '../../domain/skills/lint.js';
 import { placeholders } from '../../domain/template.js';
 import { teamSkillsRoot } from '../skill/observe.js';
 import { LoadManifest } from './load.js';
 import { ValidateManifest } from './validate.js';
 export class LintManifest {
-    fs;
-    bundledTools;
-    describeProvider;
-    constructor(fs, bundledTools, describeProvider = () => undefined) {
-        this.fs = fs;
-        this.bundledTools = bundledTools;
-        this.describeProvider = describeProvider;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async execute(input) {
-        const validation = await new ValidateManifest(this.fs, this.bundledTools).execute({
+        const { fs, bundledTools, describeProvider } = this.deps;
+        const validation = await new ValidateManifest(fs, bundledTools).execute({
             ...input,
             strict: false,
         });
@@ -31,9 +29,7 @@ export class LintManifest {
         })));
         if (invalid.length > 0)
             return [...invalid, ...(await this.skills(input.dir))];
-        const bundle = await new LoadManifest(this.fs, this.bundledTools).execute({
-            ...input,
-        });
+        const bundle = await new LoadManifest({ fs, bundledTools }).execute({ ...input });
         const patch = bundle.tools.patchText;
         const members = bundle.members?.result.doc;
         const environmentDoc = bundle.environments?.result.doc;
@@ -49,12 +45,7 @@ export class LintManifest {
                 ? []
                 : bindPlatforms(environmentDoc, input.providers)).flatMap((binding) => binding.provider === null
                 ? []
-                : [
-                    [
-                        binding.provider,
-                        setupHints(this.describeProvider(binding.provider)?.recipes ?? []),
-                    ],
-                ])),
+                : [[binding.provider, setupHints(describeProvider?.(binding.provider)?.recipes ?? [])]])),
             ...(bundle.environments === undefined
                 ? {}
                 : { environments: bundle.environments.result.doc }),
@@ -62,7 +53,7 @@ export class LintManifest {
                 ? {}
                 : {
                     tools: {
-                        base: loadToolsDocument(this.bundledTools(), input).doc,
+                        base: loadToolsDocument(bundledTools(), input).doc,
                         patch: loadToolsPatchDocument(patch, input).doc,
                     },
                 }),
@@ -70,12 +61,13 @@ export class LintManifest {
         return [...documents, ...(await this.skills(input.dir))];
     }
     async skills(dir) {
+        const { fs } = this.deps;
         const root = teamSkillsRoot(dir);
         const findings = [];
-        for (const name of (await this.fs.readDir(root)).sort()) {
-            if (!(await this.fs.isDirectory(path.join(root, name))))
+        for (const name of (await fs.readDir(root)).sort()) {
+            if (!(await fs.isDirectory(path.join(root, name))))
                 continue;
-            findings.push(...lintSkill(name, await this.fs.readText(path.join(root, name, 'SKILL.md'))));
+            findings.push(...lintSkill(name, await fs.readText(path.join(root, name, 'SKILL.md'))));
         }
         return findings;
     }
@@ -86,8 +78,8 @@ function setupHints(recipes) {
             .filter((recipe) => recipe.perEnv && (recipe.kind === 'file' || recipe.kind === 'manual'))
             .flatMap((recipe) => [recipe.open ?? '', recipe.instructions ?? '']
             .flatMap(placeholders)
-            .filter((key) => key.startsWith('setup.') && !recipe.defaults?.[key]?.trim())
-            .map((key) => key.slice('setup.'.length)))),
+            .filter((name) => !recipe.defaults?.[name]?.trim())
+            .flatMap((name) => setupKeyOf(name) ?? []))),
     ];
 }
 //# sourceMappingURL=lint.js.map

package/dist/application/manifest/lint.js.map

@@ -1 +1 @@
-{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../src/application/manifest/lint.ts"],"names":[],"mappings":"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"}

package/dist/application/manifest/load.js

@@ -7,17 +7,13 @@ import { DevkitError } from '../../domain/errors.js';
 import { loadEnvironments, loadHarness, loadMembers, loadTools, loadWorkspace, } from '../../domain/manifest/loader.js';
 import { MANIFEST_FILES } from './locate.js';
 export class LoadManifest {
-    fs;
-    bundledTools;
-    diagnostics;
-    constructor(fs, bundledTools, diagnostics) {
-        this.fs = fs;
-        this.bundledTools = bundledTools;
-        this.diagnostics = diagnostics;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async execute(input) {
         const { dir, ...opts } = input;
-        const read = (file) => this.fs.readText(path.join(dir, file));
+        const read = (file) => this.deps.fs.readText(path.join(dir, file));
         const workspaceText = (await read(MANIFEST_FILES.workspace)) ?? '';
         const workspace = {
             path: MANIFEST_FILES.workspace,
@@ -29,13 +25,13 @@ export class LoadManifest {
         const tools = {
             path: patchText === undefined ? undefined : MANIFEST_FILES.tools,
             patchText,
-            result: this.load(dir, MANIFEST_FILES.tools, () => loadTools(this.bundledTools(), patchText, opts)),
+            result: this.load(dir, MANIFEST_FILES.tools, () => loadTools(this.deps.bundledTools(), patchText, opts)),
         };
         const members = await this.optional(dir, MANIFEST_FILES.members, (text) => loadMembers(text, opts));
         return { dir, workspace, environments, tools, members, harness };
     }
     async optional(dir, file, load) {
-        const text = await this.fs.readText(path.join(dir, file));
+        const text = await this.deps.fs.readText(path.join(dir, file));
         if (text === undefined)
             return undefined;
         return { path: file, result: this.load(dir, file, () => load(text)) };
@@ -47,7 +43,7 @@ export class LoadManifest {
         catch (err) {
             if (err instanceof DevkitError) {
                 for (const event of err.diagnostics)
-                    this.diagnostics?.emit({ ...event, file: path.join(dir, file) });
+                    this.deps.diagnostics?.emit({ ...event, file: path.join(dir, file) });
             }
             throw err;
         }

package/dist/application/manifest/load.js.map

@@ -1 +1 @@
-{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/application/manifest/load.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/application/manifest/load.ts"],"names":[],"mappings":"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"}

package/dist/application/manifest/prepare.js

@@ -1,5 +1,6 @@
 // Discovery may quarantine invalid entries; preparation must preserve the declared scope.
 import { DevkitError } from '../../domain/errors.js';
+import { droppedEntryOf, mapEntryIndex } from '../../domain/manifest/quarantine.js';
 export function requireUsableManifest(bundle) {
     const documents = [
         bundle.workspace,
@@ -9,12 +10,12 @@ export function requireUsableManifest(bundle) {
         bundle.members,
     ];
     const problems = documents.flatMap((document) => document?.result.problems.map((problem) => {
-        const entry = document.result.dropped.find((entry) => entry.reason.includes(`${problem.path}: ${problem.message}`));
+        const entry = droppedEntryOf(problem, document.result.dropped);
         return {
             file: document.path ?? 'manifest/tools.yaml',
             ...problem,
             ...(entry
-                ? { entry: entry.name, path: problem.path.replace(/^(tools|repos|mcp)\[\d+\]/, '$1[]') }
+                ? { entry: entry.name, path: mapEntryIndex(problem.path, entry.collection, () => '') }
                 : {}),
         };
     }) ?? []);

package/dist/application/manifest/prepare.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/application/manifest/prepare.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IAC1D,MAAM,SAAS,GAAG;QAChB,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,OAAO;KACf,CAAC;IACF,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAChC,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAC7D,CAAC;QACF,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,qBAAqB;YAC5C,GAAG,OAAO;YACV,GAAG,CAAC,KAAK;gBACP,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,MAAM,CAAC,EAAE;gBACxF,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC,CAAC,IAAI,EAAE,CACX,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAClC,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,kBAAkB,EAClB,oDAAoD,EACpD;QACE,IAAI,EAAE,QAAQ;aACX,GAAG,CACF,CAAC,OAAO,EAAE,EAAE,CACV,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CACrG;aACA,IAAI,CAAC,IAAI,CAAC;QACb,SAAS,EAAE;YACT,uFAAuF;SACxF;QACD,aAAa,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;KACvD,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../src/application/manifest/prepare.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpF,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IAC1D,MAAM,SAAS,GAAG;QAChB,MAAM,CAAC,SAAS;QAChB,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,OAAO;KACf,CAAC;IACF,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAChC,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,OAAO;YACL,IAAI,EAAE,QAAQ,CAAC,IAAI,IAAI,qBAAqB;YAC5C,GAAG,OAAO;YACV,GAAG,CAAC,KAAK;gBACP,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE;gBACtF,CAAC,CAAC,EAAE,CAAC;SACR,CAAC;IACJ,CAAC,CAAC,IAAI,EAAE,CACX,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAClC,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,kBAAkB,EAClB,oDAAoD,EACpD;QACE,IAAI,EAAE,QAAQ;aACX,GAAG,CACF,CAAC,OAAO,EAAE,EAAE,CACV,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CACrG;aACA,IAAI,CAAC,IAAI,CAAC;QACb,SAAS,EAAE;YACT,uFAAuF;SACxF;QACD,aAAa,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;KACvD,CACF,CAAC;AACJ,CAAC"}

package/dist/application/manifest/providers.js

@@ -18,7 +18,10 @@ export class ProvidersManifest {
         this.bundledTools = bundledTools;
     }
     async execute(input) {
-        const bundle = await new LoadManifest(this.fs, this.bundledTools).execute(input);
+        const bundle = await new LoadManifest({
+            fs: this.fs,
+            bundledTools: this.bundledTools,
+        }).execute(input);
         return [
             ...bindProviders(bundle.workspace.result.doc, input.providers).map((b) => ({
                 scope: 'workspace',

package/dist/application/manifest/providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/application/manifest/providers.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,8DAA8D;AAE9D,OAAO,EACL,aAAa,EACb,aAAa,GAGd,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAazC,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO;IACP,YAAY;IACZ,UAAU;IACV,UAAU;IACV,QAAQ;IACR,MAAM;CACE,CAAC;AAEX,MAAM,OAAO,iBAAiB;IAET;IACA;IAFnB,YACmB,EAAc,EACd,YAA0B;QAD1B,OAAE,GAAF,EAAE,CAAY;QACd,iBAAY,GAAZ,YAAY,CAAc;IAC1C,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,KAA6B;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjF,OAAO;YACL,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzE,KAAK,EAAE,WAAoB;gBAC3B,QAAQ,EAAE,IAAI;gBACd,GAAG,CAAC;aACL,CAAC,CAAC;YACH,GAAG,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CACpE,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvB,KAAK,EAAE,aAAsB;gBAC7B,QAAQ;gBACR,GAAG,CAAC;aACL,CAAC,CACH;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/application/manifest/providers.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,8DAA8D;AAE9D,OAAO,EACL,aAAa,EACb,aAAa,GAGd,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAazC,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,OAAO;IACP,YAAY;IACZ,UAAU;IACV,UAAU;IACV,QAAQ;IACR,MAAM;CACE,CAAC;AAEX,MAAM,OAAO,iBAAiB;IAET;IACA;IAFnB,YACmB,EAAc,EACd,YAA0B;QAD1B,OAAE,GAAF,EAAE,CAAY;QACd,iBAAY,GAAZ,YAAY,CAAc;IAC1C,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,KAA6B;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,YAAY,CAAC;YACpC,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClB,OAAO;YACL,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzE,KAAK,EAAE,WAAoB;gBAC3B,QAAQ,EAAE,IAAI;gBACd,GAAG,CAAC;aACL,CAAC,CAAC;YACH,GAAG,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CACpE,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvB,KAAK,EAAE,aAAsB;gBAC7B,QAAQ;gBACR,GAAG,CAAC;aACL,CAAC,CACH;SACF,CAAC;IACJ,CAAC;CACF"}