@angelmsger/fx 0.11.0 → 0.13.0

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":"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"}
+{"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":"AAAA,sEAAsE;AACtE,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAmB,MAAM,kBAAkB,CAAC;AAGnF,OAAO,EAAE,gBAAgB,EAA0B,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,OAAO,EAAgB,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAmB,EACnB,OAA2B,EAC3B,MAAa;IAEb,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CACjD,KAAK,CAAC,OAAO,CAAC;gBACZ,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/D,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB,CAAC,CACH,CAAC;YACF,IAAI,MAAM,KAAK,SAAS;gBACtB,QAAQ,CAAC,IAAI,CAAC;oBACZ,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;oBAChE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;oBACzC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE;wBAC1B,GAAG,MAAM;wBACT,oBAAoB,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;qBACtD,CAAC;oBACF,QAAQ,EAAE;wBACR,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI;wBACvC,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;wBACtD,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;qBAChC;iBACF,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,WAAW,CAAC;gBAAE,MAAM,GAAG,CAAC;YAC7C,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAmB,EACnB,OAA2B,EAC3B,IAAY,EACZ,KAAkB;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE;YACnD,QAAQ,EAAE,YAAY;YACtB,QAAQ;YACR,GAAG,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;SAClD,CAAC,CAAC;IACL,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtD,OAAO,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE;QACnD,QAAQ,EAAE,YAAY;QACtB,QAAQ;QACR,GAAG,EAAE,OAAO,CAAC,OAAO;QACpB,OAAO;QACP,OAAO,EAAE;YACP,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE;gBAC7B,EAAE,EAAE,WAAW,IAAI,EAAE;gBACrB,WAAW,EAAE,UAAU,IAAI,kDAAkD;aAC9E,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CACjB,MAAkB,EAClB,gBAAyB,EACzB,IAAuB;IAEvB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAC/B,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,SAAS,YAAY,CAAC,CAAC;IACzF,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7E,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,UAAU;YACb,OAAO,MAAM,CAAC,QAAQ,IAAI,gBAAgB;gBACxC,CAAC,CAAC,OAAO,CACL,OAAO,EACP,IAAI,EACJ,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EACjC,MAAM,CAAC,QAAQ;oBACb,CAAC,CAAC,wDAAwD;oBAC1D,CAAC,CAAC,yDAAyD,EAC7D,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,EAAE,CAChC;gBACH,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,uCAAuC,EAAE;oBACpE,QAAQ,EAAE,gBAAgB;iBAC3B,CAAC,CAAC;QACT,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7F,KAAK,UAAU;YACb,OAAO,OAAO,CACZ,OAAO,EACP,IAAI,EACJ,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EACjC,GAAG,MAAM,CAAC,SAAS,eAAe,MAAM,CAAC,WAAW,WAAW,EAC/D,EAAE,GAAG,EAAE,CACR,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,6CAA6C,EAAE;gBACnF,QAAQ,EAAE,YAAY;gBACtB,GAAG;aACJ,CAAC,CAAC;IACP,CAAC;AACH,CAAC"}

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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"}

package/dist/application/harness/cleanup.js

@@ -5,24 +5,15 @@ import { readSettings } from '../config/settings.js';
 import { ReconcileHarness } from './reconcile.js';
 export class CleanupAgentHarness {
     deps;
-    config;
-    fs;
-    manifestDirFor;
-    constructor(deps, config, fs, manifestDirFor) {
+    registered;
+    constructor(deps, registered) {
         this.deps = deps;
-        this.config = config;
-        this.fs = fs;
-        this.manifestDirFor = manifestDirFor;
+        this.registered = registered;
     }
     async execute(input) {
-        const config = await this.config.read();
+        const config = await this.registered.config.read();
         const selected = await this.selected(input, config);
-        return cleanupAgentWorkspaces({
-            config: this.config,
-            fs: this.fs,
-            lock: this.deps.lock,
-            manifestDirFor: this.manifestDirFor,
-        }, {
+        return cleanupAgentWorkspaces({ ...this.registered, lock: this.deps.lock }, {
             ...input,
             workspaces: Object.keys(config.workspaces ?? {}),
             kind: 'harness',

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

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/harness/cleanup.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAMpF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGlD,MAAM,OAAO,mBAAmB;IAEX;IACA;IACA;IACA;IAJnB,YACmB,IAAiB,EACjB,MAAmB,EACnB,EAAc,EACd,cAAwC;QAHxC,SAAI,GAAJ,IAAI,CAAa;QACjB,WAAM,GAAN,MAAM,CAAa;QACnB,OAAE,GAAF,EAAE,CAAY;QACd,mBAAc,GAAd,cAAc,CAA0B;IACxD,CAAC;IACJ,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,sBAAsB,CAC3B;YACE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,EACD;YACE,GAAG,KAAK;YACR,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;YAChD,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;oBAC3D,SAAS;oBACT,IAAI;oBACJ,OAAO,EAAE,SAAS;oBAClB,QAAQ;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,GAAG,EAAE,KAAK;oBACV,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,aAAa,EAAE,KAAK,CAAC,GAAG;iBACzB,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAClC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CACrF,CAAC;YACJ,CAAC;SACF,CACF,CAAC;IACJ,CAAC;IACO,KAAK,CAAC,QAAQ,CACpB,KAAwB,EACxB,MAAgD;QAEhD,OAAO,CACL,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAC3F;aACE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/application/harness/cleanup.ts"],"names":[],"mappings":"AAAA,oFAAoF;AAKpF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAA6B,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGlD,MAAM,OAAO,mBAAmB;IAEX;IACA;IAFnB,YACmB,IAAiB,EACjB,UAAgC;QADhC,SAAI,GAAJ,IAAI,CAAa;QACjB,eAAU,GAAV,UAAU,CAAsB;IAChD,CAAC;IACJ,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,sBAAsB,CAC3B,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAC5C;YACE,GAAG,KAAK;YACR,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;YAChD,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;oBAC3D,SAAS;oBACT,IAAI;oBACJ,OAAO,EAAE,SAAS;oBAClB,QAAQ;oBACR,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,GAAG,EAAE,KAAK;oBACV,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,aAAa,EAAE,KAAK,CAAC,GAAG;iBACzB,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAClC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CACrF,CAAC;YACJ,CAAC;SACF,CACF,CAAC;IACJ,CAAC;IACO,KAAK,CAAC,QAAQ,CACpB,KAAwB,EACxB,MAAgD;QAEhD,OAAO,CACL,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAC3F;aACE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;aACtB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;CACF"}

package/dist/application/harness/mcp-readiness.js

@@ -1,4 +1,5 @@
 // Checks MCP prerequisites without starting servers or exposing command output.
+import { categoryOfExitCode } from '../../domain/errors.js';
 import { assessMcpSupport, referencedVariables } from '../../domain/harness/mcp.js';
 import { matchesJson } from '../../domain/setup/json-check.js';
 import { mcpTrust, mcpCheckTrust } from './plan.js';
@@ -63,7 +64,8 @@ export class McpReadiness {
                 return verdict(input, 'unconfigured', 'The companion response did not satisfy the declared readiness check.');
             return verdict(input, 'ready', null, 'checked');
         }
-        return verdict(input, result.code === 4 || result.code === 5 ? 'unconfigured' : 'unknown', 'The companion check did not establish readiness; resolve access or connectivity and retry.');
+        const category = categoryOfExitCode(result.code);
+        return verdict(input, category === 'auth' || category === 'permission' ? 'unconfigured' : 'unknown', 'The companion check did not establish readiness; resolve access or connectivity and retry.');
     }
 }
 function verdict(input, status, message, evidence = 'unverified') {

package/dist/application/harness/mcp-readiness.js.map

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

package/dist/application/harness/names.js

@@ -1,15 +1,13 @@
 // Resolves declared MCP resources with shared typo recovery.
 import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
+import { nearest, suggestionHint } from '../../domain/fuzzy.js';
 export function findMcpResource(harness, name) {
     const resource = harness?.mcp.find((item) => item.name === name);
     if (resource)
         return resource;
     const suggestion = nearest(name, harness?.mcp.map((item) => item.name) ?? []);
     throw new DevkitError('not_found', 'MCP_UNKNOWN', 'The MCP resource is not declared', {
-        hint: suggestion
-            ? `Did you mean "${suggestion}"?`
-            : 'The optional harness manifest declares MCP resources.',
+        hint: suggestionHint(suggestion, 'The optional harness manifest declares MCP resources.'),
         nextSteps: ['fx mcp list', 'fx manifest explain --kind harness mcp'],
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/harness/names.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,MAAM,UAAU,eAAe,CAAC,OAA4B,EAAE,IAAY;IACxE,MAAM,QAAQ,GAAG,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACjE,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9E,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,aAAa,EAAE,kCAAkC,EAAE;QACpF,IAAI,EAAE,UAAU;YACd,CAAC,CAAC,iBAAiB,UAAU,IAAI;YACjC,CAAC,CAAC,uDAAuD;QAC3D,SAAS,EAAE,CAAC,aAAa,EAAE,wCAAwC,CAAC;KACrE,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"names.js","sourceRoot":"","sources":["../../../src/application/harness/names.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGhE,MAAM,UAAU,eAAe,CAAC,OAA4B,EAAE,IAAY;IACxE,MAAM,QAAQ,GAAG,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACjE,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9E,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,aAAa,EAAE,kCAAkC,EAAE;QACpF,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,uDAAuD,CAAC;QACzF,SAAS,EAAE,CAAC,aAAa,EAAE,wCAAwC,CAAC;KACrE,CAAC,CAAC;AACL,CAAC"}

package/dist/application/harness/plan.js

@@ -104,19 +104,10 @@ async function finishTarget({ deps, input, target, before, receipt, row, project
         if (!(await deps.trust.isTrusted(request)))
             trusts.push(request);
     const trusted = trusts.length === 0;
-    let action = 'unchanged';
-    if (change)
-        action = receipt === undefined ? 'created' : 'updated';
-    if (change && target.remove)
-        action = 'removed';
-    // Last, so it wins: an unapproved vector is what the row has to say, whatever the
-    // change would otherwise have been called.
-    if (!trusted)
-        action = 'untrusted';
     return {
         row: {
             ...row,
-            action,
+            action: plannedAction({ trusted, changed: change !== null, target, receipt }),
             handoff: trusted
                 ? null
                 : harnessHandoff('Review the MCP startup vector and environment references before projection.'),
@@ -125,6 +116,17 @@ async function finishTarget({ deps, input, target, before, receipt, row, project
         trusts,
     };
 }
+function plannedAction(input) {
+    // An unapproved vector is what the row has to say, whatever the change would
+    // otherwise have been called.
+    if (!input.trusted)
+        return 'untrusted';
+    if (!input.changed)
+        return 'unchanged';
+    if (input.target.remove)
+        return 'removed';
+    return input.receipt === undefined ? 'created' : 'updated';
+}
 export function mcpTrust(input, resource) {
     return {
         ...input,

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

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

package/dist/application/harness/reconcile.js

@@ -1,5 +1,6 @@
 // Coordinates trust, workspace locking and recoverable harness writes.
 import { busyError } from '../../domain/errors.js';
+import { withLease, workspaceLeaseKey } from '../../domain/lease.js';
 import { assertWritable } from '../safety/posture.js';
 import { applyHarnessChange, harnessConflict, readHarnessState } from './apply.js';
 import { planHarness } from './plan.js';
@@ -9,7 +10,7 @@ export class ReconcileHarness {
         this.deps = deps;
     }
     async execute(input) {
-        const preview = await planHarness(this.deps, input, await readHarnessState(this.deps, input, false));
+        const preview = await planHarness(this.deps, input, await readHarnessState(this.deps, input, { persist: false }));
         if (input.dryRun || input.action === 'inspect')
             return { items: preview.items, written: false };
         const pending = (await this.deps.state.read(input.workspace))?.pending;
@@ -18,18 +19,7 @@ export class ReconcileHarness {
         assertWritable(input.posture, 'project workspace harness');
         for (const trust of preview.trusts)
             await this.deps.trust.ensure(trust);
-        const lease = await this.deps.lock.acquire({
-            key: `workspace:${input.workspace}`,
-            waitMs: 2000,
-        });
-        if (!lease)
-            throw busyError('LOCK_BUSY', 'The workspace projection state');
-        try {
-            return await this.apply(input, preview);
-        }
-        finally {
-            await lease.release();
-        }
+        return withLease(this.deps.lock, { key: workspaceLeaseKey(input.workspace), waitMs: 2000 }, () => busyError('LOCK_BUSY', 'The workspace projection state'), () => this.apply(input, preview));
     }
     async apply(input, preview) {
         if (input.source) {
@@ -38,7 +28,7 @@ export class ReconcileHarness {
                 throw harnessConflict();
         }
         const recovered = Boolean((await this.deps.state.read(input.workspace))?.pending);
-        let state = await readHarnessState(this.deps, input, true);
+        let state = await readHarnessState(this.deps, input, { persist: true });
         const current = await planHarness(this.deps, input, state);
         if (JSON.stringify(current.changes) !== JSON.stringify(preview.changes))
             throw harnessConflict();

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

@@ -1 +1 @@
-{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/application/harness/reconcile.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,OAAO,gBAAgB;IACE;IAA7B,YAA6B,IAAiB;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAAG,CAAC;IAClD,KAAK,CAAC,OAAO,CAAC,KAAmB;QAC/B,MAAM,OAAO,GAAG,MAAM,WAAW,CAC/B,IAAI,CAAC,IAAI,EACT,KAAK,EACL,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAChD,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAChG,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC;QACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,OAAO;YAC/D,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAClD,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;QAC3D,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACzC,GAAG,EAAE,aAAa,KAAK,CAAC,SAAS,EAAE;YACnC,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QACH,IAAI,CAAC,KAAK;YAAE,MAAM,SAAS,CAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;QAC3E,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;gBAAS,CAAC;YACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IACO,KAAK,CAAC,KAAK,CAAC,KAAmB,EAAE,OAAoB;QAC3D,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAE,MAAM,eAAe,EAAE,CAAC;QAChG,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAClF,IAAI,KAAK,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;YACrE,MAAM,eAAe,EAAE,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO;YAClC,KAAK,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACpE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,EAAE,CAAC;IACpF,CAAC;CACF"}
+{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../../src/application/harness/reconcile.ts"],"names":[],"mappings":"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"}

package/dist/application/harness/session.js

@@ -1,9 +1,8 @@
 // Loads a validated harness snapshot and evaluates workspace MCP queries through ports.
 import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
 import { MANIFEST_FILES } from '../../domain/manifest/files.js';
 import { loadHarness } from '../../domain/manifest/loader.js';
-import { enabledHosts } from '../agent/list.js';
+import { enabledHosts, findHost } from '../agent/list.js';
 import { readSettings } from '../config/settings.js';
 import { resolveWorkspace } from '../workspace/resolve.js';
 import { InspectMcp } from './inspect.js';
@@ -47,7 +46,7 @@ export async function canMcp(command) {
         throw new DevkitError('usage', 'MCP_ENV_UNSUPPORTED', 'MCP resources are workspace-scoped; omit --env', { nextSteps: ['fx mcp list'] });
     const { deps, input } = await loadHarnessCommand(command);
     const resource = findMcpResource(input.harness, command.name);
-    const agent = command.agent === undefined ? null : findAgent(command.deps.hosts, command.agent);
+    const agent = command.agent === undefined ? null : findHost(command.deps.hosts, command.agent);
     const projection = agent
         ? (await new ReconcileHarness(deps).execute({
             ...input,
@@ -62,16 +61,6 @@ export async function canMcp(command) {
         env: command.env,
     }).execute({ workspace: input.workspace, resource, agent, posture: command.posture, projection });
 }
-function findAgent(hosts, id) {
-    const host = hosts.find((item) => item.id === id);
-    if (host)
-        return host;
-    const suggestion = nearest(id, hosts.map((item) => item.id));
-    throw new DevkitError('not_found', 'AGENT_UNKNOWN', 'The agent is not registered', {
-        hint: suggestion ? `Did you mean "${suggestion}"?` : 'Use an agent ID from fx agent list.',
-        nextSteps: ['fx agent list'],
-    });
-}
 export async function inspectMcp(command) {
     const { deps, input } = await loadHarnessCommand(command);
     return new InspectMcp({ ...deps, process: command.process }).execute({

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

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