@angelmsger/fx 0.10.1 → 0.12.0

package/dist/application/contribution/validate.js

@@ -6,17 +6,12 @@ import { MANIFEST_FILES } from '../../domain/manifest/files.js';
 import { LintManifest } from '../manifest/lint.js';
 import { ValidateManifest } from '../manifest/validate.js';
 export class ValidateContribution {
-    views;
-    bundledTools;
-    providers;
-    describeProvider;
-    constructor(views, bundledTools, providers, describeProvider = () => undefined) {
-        this.views = views;
-        this.bundledTools = bundledTools;
-        this.providers = providers;
-        this.describeProvider = describeProvider;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async execute(input) {
+        const { views, bundledTools, providers, describeProvider } = this.deps;
         const names = input.changes.flatMap((file, index) => scanBoundary({ text: file.path, policy: 'manifest' }).map((item) => ({
             ...item,
             path: `(protected path ${index + 1})`,
@@ -32,11 +27,11 @@ export class ValidateContribution {
         })));
         if (findings.length > 0)
             return { ok: false, findings };
-        const view = this.views.open(input.files);
+        const view = views.open(input.files);
         if (!(await view.reader.exists(path.join(view.root, MANIFEST_FILES.workspace))))
             return { ok: false, findings: [finding(MANIFEST_FILES.workspace, 'manifest-missing')] };
-        const options = { dir: view.root, cliVersion: input.cliVersion, providers: this.providers };
-        const validation = await new ValidateManifest(view.reader, this.bundledTools).execute({
+        const options = { dir: view.root, cliVersion: input.cliVersion, providers };
+        const validation = await new ValidateManifest(view.reader, bundledTools).execute({
             ...options,
             strict: true,
         });
@@ -48,7 +43,11 @@ export class ValidateContribution {
         }
         if (findings.length > 0)
             return { ok: false, findings };
-        const lint = await new LintManifest(view.reader, this.bundledTools, this.describeProvider).execute(options);
+        const lint = await new LintManifest({
+            fs: view.reader,
+            bundledTools,
+            describeProvider,
+        }).execute(options);
         for (const item of lint)
             findings.push(finding(item.kind, 'manifest-lint'));
         return { ok: findings.length === 0, findings };

package/dist/application/contribution/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/application/contribution/validate.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,8EAA8E;AAE9E,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIhE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAoB3D,MAAM,OAAO,oBAAoB;IAEZ;IACA;IACA;IACA;IAJnB,YACmB,KAAoB,EACpB,YAA0B,EAC1B,SAA0B,EAC1B,mBAE+C,GAAG,EAAE,CAAC,SAAS;QAL9D,UAAK,GAAL,KAAK,CAAe;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAiB;QAC1B,qBAAgB,GAAhB,gBAAgB,CAE8C;IAC9E,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,KAAkC;QAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAClD,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnE,GAAG,IAAI;YACP,IAAI,EAAE,mBAAmB,KAAK,GAAG,CAAC,GAAG;SACtC,CAAC,CAAC,CACJ,CAAC;QACF,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACxD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CACjC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,CAC5D,CAAC;QACF,IAAI,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,QAAQ,GAA0B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACrE,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC/E,GAAG,OAAO;YACV,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,CACJ,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7E,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QAC5F,MAAM,UAAU,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YACpF,GAAG,OAAO;YACV,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QACH,KAAK,MAAM,QAAQ,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YAC5C,IACE,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAC5B,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBAC3B,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBAE3B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,IAAI,YAAY,CACjC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,gBAAgB,CACtB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,IAAI;YAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAC5E,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACjD,CAAC;CACF;AAED,SAAS,OAAO,CAAC,IAAY,EAAE,IAAY;IACzC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAClD,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/application/contribution/validate.ts"],"names":[],"mappings":"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"}

package/dist/application/docs/derive.js

@@ -54,16 +54,25 @@ export class DeriveDocs {
             });
         return output;
     }
+    // A relative link means a file of the manifest source, as long as one is there;
+    // the derived guide sits elsewhere, so it gets the resolved path.
     async sourceLinks(text) {
-        const links = [
-            ...text.matchAll(/\]\((<?)((?:\.\/)?(?:README\.md|(?:docs|skills)\/[^)#>]+))([^)]*)\)/g),
-        ];
+        const { manifestDir } = this.deps.ctx;
+        const links = [...text.matchAll(/\]\((<?)((?![#/~]|[a-z][\w+.-]*:)[^)#>]+)([^)]*)\)/gi)];
         for (const match of links) {
-            const target = path.resolve(this.deps.ctx.manifestDir, decodeLink(match[2]));
+            const target = path.resolve(manifestDir, decodeLink(match[2]));
+            const relative = path.relative(manifestDir, target);
+            const outside = relative === '..' || relative.startsWith(`..${path.sep}`);
+            if (relative === '' || outside || path.isAbsolute(relative))
+                continue;
             if (!(await this.deps.fs.exists(target)))
                 continue;
             const suffix = match[3].replace(/>$/, '');
-            text = text.replace(match[0], `](<${target}${suffix}>)`);
+            // Markdown reads a backslash before punctuation as an escape (`\.fx` loses
+            // its backslash), so a Windows path is linked with forward slashes, which
+            // Windows also accepts.
+            const link = target.split(path.sep).join('/');
+            text = text.replace(match[0], `](<${link}${suffix}>)`);
         }
         return text;
     }

package/dist/application/docs/derive.js.map

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

package/dist/application/docs/rendered.js

@@ -3,6 +3,7 @@
 import path from 'node:path';
 import { begin, end } from '../../domain/docs/regions.js';
 import { asDevkitError, DevkitError, toEnvelope, withPartialResult, } from '../../domain/errors.js';
+import { isLostWrite } from '../../domain/projection.js';
 import { assertWritable } from '../safety/posture.js';
 const CHANGES = new Set(['created', 'updated', 'removed']);
 export function actionFor(current, next) {
@@ -61,7 +62,7 @@ export async function finish(store, input, files) {
                 before: f.before,
                 text: f.text,
             });
-            if (result === 'busy' || result === 'conflict')
+            if (isLostWrite(result))
                 throw documentConflict(f.file.path);
             output.files[index] = { ...f.file, result: result === 'written' ? 'done' : 'skipped' };
         }

package/dist/application/docs/rendered.js.map

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

package/dist/application/doctor/index.js

@@ -2,9 +2,12 @@
 import { asDevkitError, toEnvelope } from '../../domain/errors.js';
 import { report } from '../../domain/report.js';
 import { DeriveDocs } from '../docs/derive.js';
-import { handoffOf, setupActions } from '../init/setup.js';
+import { harnessDoctor } from '../harness/stages.js';
+import { hookDoctor } from '../hook/session.js';
+import { checkLogin } from '../login/check.js';
 import { Login } from '../login/run.js';
 import { validateSetupSelection } from '../login/selection.js';
+import { handoffOf, setupActions } from '../login/stage.js';
 import { findingCheck, workspacePreparation } from '../preparation.js';
 import { assertWritable } from '../safety/posture.js';
 import { SkillStage } from '../skill/stage.js';
@@ -12,19 +15,29 @@ import { Tally } from '../tally.js';
 import { workspaceToolScope } from '../tool/scope.js';
 import { checkAgents } from './agents.js';
 import { checkInstallations } from './installations.js';
-import { checkLogin } from './login.js';
 import { checkManifest } from './manifest.js';
 import { checkRepos } from './repos.js';
 import { checkRoot } from './root.js';
 import { checkSelf } from './self.js';
 import { checkTools } from './tools.js';
 import { GROUPS, } from './types.js';
+// The lifecycle resources doctor answers for after its own groups, in report order.
+function lifecycleExtensions({ harness, hooks }) {
+    return [
+        ...(harness === undefined
+            ? []
+            : [harnessDoctor(harness, 'mcp'), harnessDoctor(harness, 'rules')]),
+        ...(hooks === undefined ? [] : [hookDoctor(hooks)]),
+    ];
+}
 export class Doctor {
     deps;
     doctor;
+    extensions;
     constructor(deps, doctor) {
         this.deps = deps;
         this.doctor = doctor;
+        this.extensions = lifecycleExtensions(doctor);
     }
     async execute(input) {
         validateSetupSelection(this.deps.ctx, input, this.deps.commandShell);
@@ -41,7 +54,7 @@ export class Doctor {
             group('repos', () => checkRepos(this.deps)),
             group('root', () => checkRoot(this.deps, { hosts: this.doctor.skills.hosts, login: this.doctor.login })),
             group('installations', () => checkInstallations(this.doctor.inventory, input.tools)),
-            checkTools(this.deps, { ...toolScope, trust: this.doctor.login.trust }, checks),
+            checkTools(this.deps, toolScope, checks),
             checkLogin(this.deps, this.doctor.login, {
                 tools: toolScope.configuredNames,
                 requiredTools: toolScope.required,
@@ -51,14 +64,11 @@ export class Doctor {
             group('agents', () => checkAgents(this.deps, this.doctor.skills)),
             group('manifest', () => checkManifest(this.deps, this.doctor.login, this.doctor.bundledTools, this.doctor.updates)),
             group('self', () => checkSelf(this.doctor.updates)),
-            ...(this.doctor.extensions ?? []).map((extension) => group(extension.group, () => extension.check())),
+            ...this.extensions.map((extension) => group(extension.group, () => extension.check())),
         ]);
     }
     async summarize(input, toolScope, findings, repairs) {
-        const groupOrder = [
-            ...GROUPS,
-            ...(this.doctor.extensions ?? []).map((extension) => extension.group),
-        ];
+        const groupOrder = [...GROUPS, ...this.extensions.map((extension) => extension.group)];
         const diagnostic = report(groupOrder, findings);
         const plan = await new Login(this.deps, this.doctor.login).plan({
             tools: toolScope.configuredNames,
@@ -69,24 +79,30 @@ export class Doctor {
             findings: diagnostic.findings,
             summary: diagnostic.summary,
             coverage: diagnostic.complete ? 'complete' : 'incomplete',
-            preparation: workspacePreparation(this.deps, groupOrder, checks, input.dryRun, {
-                tools: toolScope.configuredNames,
-                ...(input.envs ? { environments: input.envs } : {}),
-            }, {
-                id: 'recheck-preparation',
-                description: 'Recheck the same workspace and selected tools after the prerequisites change',
-                argv: [
-                    'fx',
-                    'doctor',
-                    '--workspace',
-                    this.deps.ctx.name,
-                    ...(input.tools ? input.tools.flatMap((tool) => ['--tool', tool]) : []),
-                    ...(input.envs ? input.envs.flatMap((env) => ['--env', env]) : []),
-                    ...(input.fix ? ['--fix'] : []),
-                ],
-                cwd: this.deps.ctx.root,
-                actor: 'agent',
-                requires_approval: input.dryRun,
+            preparation: workspacePreparation(this.deps, {
+                stages: groupOrder,
+                checks,
+                preview: input.dryRun,
+                selection: {
+                    tools: toolScope.configuredNames,
+                    ...(input.envs ? { environments: input.envs } : {}),
+                },
+                resume: {
+                    id: 'recheck-preparation',
+                    description: 'Recheck the same workspace and selected tools after the prerequisites change',
+                    argv: [
+                        'fx',
+                        'doctor',
+                        '--workspace',
+                        this.deps.ctx.name,
+                        ...(input.tools ? input.tools.flatMap((tool) => ['--tool', tool]) : []),
+                        ...(input.envs ? input.envs.flatMap((env) => ['--env', env]) : []),
+                        ...(input.fix ? ['--fix'] : []),
+                    ],
+                    cwd: this.deps.ctx.root,
+                    actor: 'agent',
+                    requires_approval: input.dryRun,
+                },
             }),
             repairs,
         };
@@ -119,7 +135,7 @@ export class Doctor {
                 repairs.push({ group, status: 'failed', failure: toEnvelope(failure).error });
             }
         };
-        for (const extension of this.doctor.extensions ?? []) {
+        for (const extension of this.extensions) {
             if (extension.fix)
                 await attempt(extension.group, () => extension.fix(input));
         }

package/dist/application/doctor/index.js.map

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

package/dist/application/doctor/manifest.js

@@ -35,7 +35,11 @@ export async function checkManifest(deps, login, bundledTools, upstream) {
                 fix: workspaceCommand(deps, 'manifest', 'providers'),
             }));
     }
-    for (const lint of await new LintManifest(deps.fs, bundledTools, login.describeProvider).execute(input))
+    for (const lint of await new LintManifest({
+        fs: deps.fs,
+        bundledTools,
+        describeProvider: login.describeProvider,
+    }).execute(input))
         findings.push(finding('manifest', `${lint.kind}:${lint.path}`, 'warn', `${lint.code}: ${lint.message}`, {
             fix: workspaceCommand(deps, 'manifest', 'lint'),
         }));

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

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/application/doctor/manifest.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,wFAAwF;AAExF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAmB,EACnB,KAA0C,EAC1C,YAA0B,EAC1B,QAAuB;IAEvB,MAAM,KAAK,GAAG;QACZ,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG;QAC1B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS;KAC9B,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC;QACvE,GAAG,KAAK;QACR,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACxC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACnC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,QAAQ;YAC1B,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;gBAC9D,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC;aACpD,CAAC,CACH,CAAC;QACJ,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO;YACzB,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjF,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC;aACpD,CAAC,CACH,CAAC;IACN,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;YAC9B,QAAQ,CAAC,IAAI,CACX,OAAO,CACL,UAAU,EACV,0BAA0B,OAAO,CAAC,QAAQ,EAAE,EAC5C,MAAM,EACN,kCAAkC,EAClC;gBACE,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC;aACrD,CACF,CACF,CAAC;IACN,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAC9F,KAAK,CACN;QACC,QAAQ,CAAC,IAAI,CACX,OAAO,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,OAAO,EAAE,EAAE;YACxF,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC;SAChD,CAAC,CACH,CAAC;IACJ,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;QAC9C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAC5E,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAOD,KAAK,UAAU,aAAa,CAAC,IAAmB,EAAE,KAAoB;IACpE,IAAI,CAAC,KAAK,CAAC,OAAO;QAChB,OAAO,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC5F,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;QACrC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;QAC/B,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IACH,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS;QACxB,OAAO,OAAO,CACZ,UAAU,EACV,UAAU,EACV,IAAI,EACJ,kDAAkD,EAClD,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAC/B,CAAC;IACJ,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS;QACvB,OAAO,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,6BAA6B,CAAC,CAAC,KAAK,EAAE,EAAE;YACrF,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;IACL,IAAI,CAAC,CAAC,MAAM;QACV,OAAO,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,6CAA6C,EAAE;YAC5F,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC;SACpC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,0BAA0B,CAAC,CAAC;AAC3E,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,IAAmB,EACnB,KAA0C;IAE1C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAI,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE;SAC/C,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBACpF,QAAQ,EAAE,IAAI;gBACd,GAAG,EAAE,6BAA6B,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;aACrF,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC;IACtF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,sBAAsB;YACnE,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE;gBACtD,QAAQ,EAAE,IAAI;gBACd,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;aACtB,CAAC,CAAC;QACL,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;YAAE,MAAM,GAAG,CAAC;QAC1E,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE;YACtD,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAmB;IAC3C,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IACpE,OAAO;QACL,OAAO,CACL,UAAU,EACV,oBAAoB,EACpB,MAAM,EACN,2GAA2G,EAC3G,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,uBAAuB,EAAE,CAC7D;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../../src/application/doctor/manifest.ts"],"names":[],"mappings":"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"}

package/dist/application/doctor/repos.js

@@ -1,7 +1,7 @@
 // A checkout that is not there or points elsewhere is broken; one with work
 // in progress is merely busy.
-import { Status } from '../status.js';
 import { workspaceCommand } from '../workspace/guidance.js';
+import { Status } from '../workspace/status.js';
 import { finding } from './types.js';
 export async function checkRepos(deps) {
     const rows = await new Status(deps).execute({ fetch: false, dirtyOnly: false });

package/dist/application/doctor/repos.js.map

@@ -1 +1 @@
-{"version":3,"file":"repos.js","sourceRoot":"","sources":["../../../src/application/doctor/repos.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,8BAA8B;AAE9B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAmB;IAClD,MAAM,IAAI,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM;YACb,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE;gBACtD,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC;aACpC,CAAC,CAAC;QACL,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU;YACxC,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,oBAAoB,EAAE;gBAC1E,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;QACL,IAAI,CAAC,GAAG,CAAC,UAAU;YACjB,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,yBAAyB,EAAE;gBAC/E,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;QACL,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,WAAW;YAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,KAAK,WAAW,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;QACnE,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,cAAc,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,cAAc;YACzF,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,cAAc,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC;YACtB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,8BAA8B,CAAC;YAClE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAClD,QAAQ,EACN,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACvF,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"repos.js","sourceRoot":"","sources":["../../../src/application/doctor/repos.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,8BAA8B;AAG9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAmB;IAClD,MAAM,IAAI,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM;YACb,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE;gBACtD,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC;aACpC,CAAC,CAAC;QACL,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU;YACxC,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,oBAAoB,EAAE;gBAC1E,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;QACL,IAAI,CAAC,GAAG,CAAC,UAAU;YACjB,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,IAAI,yBAAyB,EAAE;gBAC/E,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;QACL,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,WAAW;YAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,KAAK,WAAW,GAAG,CAAC,MAAM,UAAU,CAAC,CAAC;QACnE,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,IAAI,GAAG,CAAC,cAAc,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,cAAc;YACzF,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,cAAc,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC;YACtB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,8BAA8B,CAAC;YAClE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAClD,QAAQ,EACN,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACvF,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC;aACtD,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/application/doctor/tools.js

@@ -1,28 +1,30 @@
 // A required tool that is missing or too old breaks the workspace; an
 // optional one only narrows what can be done.
 import { DevkitError } from '../../domain/errors.js';
+import { approveCheckAction, toolRecovery } from '../preparation.js';
 import { commandTrustHandoff, isTrustRequired } from '../safety/trust.js';
-import { toolChecks } from '../sync/checks.js';
-import { ToolCheck } from '../tool/check.js';
+import { ToolCheck, toolRecoveryCommand } from '../tool/check.js';
 import { workspaceCommand } from '../workspace/guidance.js';
 import { finding } from './types.js';
 export async function checkTools(deps, options, checks) {
-    const check = new ToolCheck({ run: deps.processRun, which: deps.processWhich });
+    const check = new ToolCheck(deps.process);
     const tools = options.covered;
     const findings = [];
-    const trust = { ...options.trust, workspace: deps.ctx.name, commandShell: deps.commandShell };
     checks.plan(tools.length);
     for (const tool of tools) {
         try {
             const [status] = await checks.unit(tool.name, () => check.execute({
                 tools: [{ ...tool, required: options.required.has(tool.name) }],
-                trust,
+                trust: deps.trust,
             }));
             if (status !== undefined)
                 findings.push({
                     ...fromStatus(status, options.dependencies.has(tool.name), deps),
                     required: options.required.has(tool.name),
-                    actions: toolChecks([{ ...status, preparation_required: options.required.has(tool.name) }], deps)[0].actions ?? [],
+                    actions: toolRecovery(deps, {
+                        ...status,
+                        preparation_required: options.required.has(tool.name),
+                    }),
                     evidence: {
                         binary: status.binary,
                         binary_path: status.binary_path ?? null,
@@ -50,55 +52,42 @@ function toolCheckFailure(deps, options, name, error) {
             required,
             fix: workspaceCommand(deps, 'tool', 'show', name),
         });
-    const handoff = commandTrustHandoff({
-        tool: name,
-        workspace: deps.ctx.name,
-        posture: options.trust.posture,
-        commandShell: deps.commandShell,
-    });
+    const handoff = commandTrustHandoff(deps.trust, name);
     return finding('tools', name, 'warn', error.message, {
         coverage: 'incomplete',
         required,
         fix: handoff.command,
         handoff,
         actions: [
-            {
+            approveCheckAction(deps, name, {
                 id: `approve:${name}`,
                 description: `Review ${name}'s exact probe arguments, then approve the check`,
-                argv: ['fx', 'doctor', '--tool', name, '--workspace', deps.ctx.name, '--yes'],
-                cwd: deps.ctx.root,
-                actor: 'agent',
-                requires_approval: true,
-            },
+            }),
         ],
     });
 }
 function fromStatus(status, activeDependency, deps) {
-    const { name } = status;
-    switch (status.state) {
-        case 'ok':
-            return finding('tools', name, 'ok', `${status.installed} installed`);
+    const { name, state } = status;
+    if (state === 'ok')
+        return finding('tools', name, 'ok', `${status.installed} installed`);
+    const fix = workspaceCommand(deps, 'tool', toolRecoveryCommand(state), name);
+    switch (state) {
         case 'disabled':
             return status.required || activeDependency
                 ? finding('tools', name, status.required ? 'fail' : 'warn', status.required
                     ? 'disabled by the manifest but required by the workspace'
-                    : 'disabled by the manifest but used by an active provider', {
-                    coverage: 'incomplete',
-                    fix: workspaceCommand(deps, 'tool', 'show', name),
-                })
+                    : 'disabled by the manifest but used by an active provider', { coverage: 'incomplete', fix })
                 : finding('tools', name, 'ok', 'disabled by the manifest; not checked', {
                     coverage: 'not_applicable',
                 });
         case 'missing':
-            return finding('tools', name, status.required ? 'fail' : 'warn', 'not installed', {
-                fix: workspaceCommand(deps, 'tool', 'install', name),
-            });
+            return finding('tools', name, status.required ? 'fail' : 'warn', 'not installed', { fix });
         case 'outdated':
-            return finding('tools', name, status.required ? 'fail' : 'warn', `${status.installed} installed, ${status.min_version} required`, { fix: workspaceCommand(deps, 'tool', 'update', name) });
+            return finding('tools', name, status.required ? 'fail' : 'warn', `${status.installed} installed, ${status.min_version} required`, { fix });
         case 'unknown':
             return finding('tools', name, 'warn', 'installed but its version could not be read', {
                 coverage: 'incomplete',
-                fix: workspaceCommand(deps, 'tool', 'show', name),
+                fix,
             });
     }
 }

package/dist/application/doctor/tools.js.map

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

package/dist/application/doctor/types.js

@@ -1,14 +1,6 @@
 // Doctor combines built-in and extension findings with preparation and repair results.
 import { finding as anyFinding } from '../../domain/report.js';
 export const GROUPS = ['repos', 'root', 'tools', 'login', 'agents', 'manifest', 'self'];
-export const DOCTOR_FINDING_COLUMNS = [
-    'group',
-    'level',
-    'coverage',
-    'id',
-    'message',
-    'fix',
-];
 export function finding(group, id, level, message, extra = {}) {
     return anyFinding(group, id, level, message, extra);
 }

package/dist/application/doctor/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/doctor/types.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAKvF,OAAO,EAAE,OAAO,IAAI,UAAU,EAAqB,MAAM,wBAAwB,CAAC;AAGlF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAU,CAAC;AAgBjG,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,OAAO;IACP,OAAO;IACP,UAAU;IACV,IAAI;IACJ,SAAS;IACT,KAAK;CACG,CAAC;AAEX,MAAM,UAAU,OAAO,CACrB,KAAY,EACZ,EAAU,EACV,KAAuB,EACvB,OAAe,EACf,QAAsB,EAAE;IAExB,OAAO,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/doctor/types.ts"],"names":[],"mappings":"AAAA,uFAAuF;AAKvF,OAAO,EAAE,OAAO,IAAI,UAAU,EAAqB,MAAM,wBAAwB,CAAC;AAGlF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAU,CAAC;AAgBjG,MAAM,UAAU,OAAO,CACrB,KAAY,EACZ,EAAU,EACV,KAAuB,EACvB,OAAe,EACf,QAAsB,EAAE;IAExB,OAAO,UAAU,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AACtD,CAAC"}

package/dist/application/env/names.js.map

@@ -1 +1 @@
-{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/env/names.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GAEtB,MAAM,0BAA0B,CAAC;AAGlC,MAAM,UAAU,cAAc,CAAC,GAAqB,EAAE,YAA4B;IAChF,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;IAClD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,sBAAsB,EACtB,kDAAkD,EAClD;YACE,IAAI,EAAE,qFAAqF;YAC3F,SAAS,EAAE;gBACT,gBAAgB,CACd,EAAE,GAAG,EAAE,YAAY,EAAE,EACrB,UAAU,EACV,SAAS,EACT,MAAM,EACN,QAAQ,EACR,cAAc,CACf;aACF;SACF,CACF,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAA0B,EAC1B,IAAY,EACZ,KAAwB;IAExB,OAAO,qBAAqB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/env/names.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GAEtB,MAAM,0BAA0B,CAAC;AAElC,MAAM,UAAU,cAAc,CAAC,GAAqB,EAAE,YAA4B;IAChF,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;IAClD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,sBAAsB,EACtB,kDAAkD,EAClD;YACE,IAAI,EAAE,qFAAqF;YAC3F,SAAS,EAAE;gBACT,gBAAgB,CACd,EAAE,GAAG,EAAE,YAAY,EAAE,EACrB,UAAU,EACV,SAAS,EACT,MAAM,EACN,QAAQ,EACR,cAAc,CACf;aACF;SACF,CACF,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAA0B,EAC1B,IAAY,EACZ,KAAwB;IAExB,OAAO,qBAAqB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACtE,CAAC"}

package/dist/application/harness/apply.js

@@ -1,6 +1,7 @@
 // Applies planned resource changes under the caller's workspace lease.
 import { DevkitError } from '../../domain/errors.js';
 import { recoverHarnessState, snapshotDigest } from '../../domain/harness/state-recovery.js';
+import { isLostWrite } from '../../domain/projection.js';
 export async function applyHarnessChange(deps, input, state, change) {
     const pending = {
         key: change.key,
@@ -17,7 +18,7 @@ export async function applyHarnessChange(deps, input, state, change) {
         before: change.before,
         text: change.text,
     });
-    if (result === 'busy' || result === 'conflict')
+    if (isLostWrite(result))
         throw harnessConflict();
     const observed = await deps.files.read({ root: input.root, relative: change.relative });
     const recovery = recoverHarnessState({ state: prepared, snapshot: observed });
@@ -26,7 +27,7 @@ export async function applyHarnessChange(deps, input, state, change) {
     await deps.state.write(input.workspace, recovery.state);
     return recovery.state;
 }
-export async function readHarnessState(deps, input, persist) {
+export async function readHarnessState(deps, input, options) {
     const state = (await deps.state.read(input.workspace)) ?? {
         root: input.root,
         receipts: [],
@@ -40,7 +41,7 @@ export async function readHarnessState(deps, input, persist) {
     const recovery = recoverHarnessState({ state, snapshot });
     if (recovery.action === 'conflict')
         throw harnessConflict();
-    if (persist)
+    if (options.persist)
         await deps.state.write(input.workspace, recovery.state);
     return recovery.state;
 }

package/dist/application/harness/apply.js.map

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