@angelmsger/fx 0.10.1 → 0.12.0

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

package/dist/application/{refresh-manifest.js → manifest/refresh.js}

@@ -1,5 +1,8 @@
 // Refresh eligible Git manifest sources and explain any local work retained.
-import { assertWritable } from './safety/posture.js';
+import { busyError } from '../../domain/errors.js';
+import { workspaceLeaseKey } from '../../domain/lease.js';
+import { assertWritable } from '../safety/posture.js';
+import { resolveWorkspace } from '../workspace/resolve.js';
 export class RefreshManifest {
     reporter;
     constructor(reporter) {
@@ -46,4 +49,25 @@ export class RefreshManifest {
         return { ...outcome, source: source.description };
     }
 }
-//# sourceMappingURL=refresh-manifest.js.map
+export async function refreshWorkspaceManifest(deps, resolve, run) {
+    const located = await resolveWorkspace(resolve);
+    const entry = (await resolve.config.read()).workspaces?.[located.name];
+    const source = entry?.source === undefined ? undefined : await deps.sourceFor(entry.source);
+    const lease = run.dryRun || run.posture.readOnly
+        ? undefined
+        : await deps.lock.acquire({ key: workspaceLeaseKey(located.name), waitMs: 2000 });
+    if (lease === null)
+        throw busyError('LOCK_BUSY', 'The workspace', { nextSteps: ['Retry fx sync shortly.'] });
+    try {
+        return await new RefreshManifest(resolve.reporter).execute({
+            manifestDir: located.manifestDir,
+            source,
+            ...run,
+            settle: () => deps.settle(located.name, located.manifestDir),
+        });
+    }
+    finally {
+        await lease?.release();
+    }
+}
+//# sourceMappingURL=refresh.js.map

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

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

package/dist/application/manifest/set.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { DevkitError } from '../../domain/errors.js';
 import { setRepoField } from '../../domain/manifest/editor.js';
 import { loadWorkspace } from '../../domain/manifest/loader.js';
+import { isLostWrite } from '../../domain/projection.js';
 import { assertWritable } from '../safety/posture.js';
 import { MANIFEST_FILES } from './locate.js';
 export class SetRepoField {
@@ -42,7 +43,7 @@ export class SetRepoField {
             return plan;
         assertWritable(input.posture, `manifest repo-set ${input.repo} ${input.field}`);
         const result = await this.files.write({ ...target, before: snapshot, text: edit.text });
-        if (result === 'busy' || result === 'conflict')
+        if (isLostWrite(result))
             throw changedManifest();
         return { ...plan, written: result === 'written' };
     }

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

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

package/dist/application/member/list.js

@@ -1,7 +1,7 @@
 // People as rows, narrowed by area or status. An undeclared area is an error
 // rather than an empty list.
 import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
+import { nearest, suggestionHint } from '../../domain/fuzzy.js';
 import { areasOf, peopleOfArea } from '../../domain/members/owners.js';
 import { membersOf } from './source.js';
 export const MEMBER_COLUMNS = ['id', 'display', 'status', 'areas'];
@@ -16,9 +16,7 @@ export class MemberList {
         if (input.area !== undefined && !groups.includes(input.area)) {
             const suggestion = nearest(input.area, groups);
             throw new DevkitError('not_found', 'AREA_NOT_FOUND', `"${input.area}" is not an area`, {
-                hint: suggestion === undefined
-                    ? `Areas: ${groups.join(', ') || '(none)'}.`
-                    : `Did you mean "${suggestion}"?`,
+                hint: suggestionHint(suggestion, `Areas: ${groups.join(', ') || '(none)'}.`),
                 nextSteps: ['fx member list'],
             });
         }

package/dist/application/member/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6BAA6B;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAcxC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAE5E,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAsB;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,IAAI,kBAAkB,EAAE;gBACrF,IAAI,EACF,UAAU,KAAK,SAAS;oBACtB,CAAC,CAAC,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG;oBAC5C,CAAC,CAAC,iBAAiB,UAAU,IAAI;gBACrC,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GACV,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpF,OAAO,OAAO,CAAC,MAAM;aAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC;aACpF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;YAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,QAAQ;YAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;SAC9B,CAAC,CAAC,CAAC;IACR,CAAC;CACF"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/member/list.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6BAA6B;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAcxC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAE5E,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAsB;QAC5B,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,gBAAgB,EAAE,IAAI,KAAK,CAAC,IAAI,kBAAkB,EAAE;gBACrF,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC;gBAC5E,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GACV,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpF,OAAO,OAAO,CAAC,MAAM;aAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACvD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC;aACpF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;YAC1B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,QAAQ;YAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;SAC9B,CAAC,CAAC,CAAC;IACR,CAAC;CACF"}

package/dist/application/member/show.js

@@ -2,6 +2,7 @@
 // belongs to — the answer to "is this git author one of us". Several people can
 // match one query, and all of them come back.
 import { DevkitError } from '../../domain/errors.js';
+import { suggestionHint } from '../../domain/fuzzy.js';
 import { findPeople, suggestPerson } from '../../domain/members/resolve.js';
 import { membersOf } from './source.js';
 export const PERSON_COLUMNS = [
@@ -24,9 +25,7 @@ export class MemberShow {
         if (matches.length === 0) {
             const suggestion = suggestPerson(members, query);
             throw new DevkitError('not_found', 'PERSON_NOT_FOUND', `Nobody in the members document is "${query}"`, {
-                hint: suggestion === undefined
-                    ? 'fx member list shows everyone.'
-                    : `Did you mean "${suggestion}"?`,
+                hint: suggestionHint(suggestion, 'fx member list shows everyone.'),
                 nextSteps: ['fx member list'],
             });
         }

package/dist/application/member/show.js.map

@@ -1 +1 @@
-{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,iCAAiC,CAAC;AAG5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAYxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI;IACJ,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,UAAU;CACF,CAAC;AAEX,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAa;QACnB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,kBAAkB,EAClB,sCAAsC,KAAK,GAAG,EAC9C;gBACE,IAAI,EACF,UAAU,KAAK,SAAS;oBACtB,CAAC,CAAC,gCAAgC;oBAClC,CAAC,CAAC,iBAAiB,UAAU,IAAI;gBACrC,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CACF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,GAAG,IAAI,IAAI;SACjB,CAAC,CAAC,CAAC;IACN,CAAC;CACF"}
+{"version":3,"file":"show.js","sourceRoot":"","sources":["../../../src/application/member/show.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,gFAAgF;AAChF,8CAA8C;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,iCAAiC,CAAC;AAG5F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAYxC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI;IACJ,SAAS;IACT,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,UAAU;CACF,CAAC;AAEX,MAAM,OAAO,UAAU;IACQ;IAA7B,YAA6B,IAAmB;QAAnB,SAAI,GAAJ,IAAI,CAAe;IAAG,CAAC;IAEpD,OAAO,CAAC,KAAa;QACnB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,WAAW,CACnB,WAAW,EACX,kBAAkB,EAClB,sCAAsC,KAAK,GAAG,EAC9C;gBACE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,gCAAgC,CAAC;gBAClE,SAAS,EAAE,CAAC,gBAAgB,CAAC;aAC9B,CACF,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;YAClD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;YAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,GAAG,IAAI,IAAI;SACjB,CAAC,CAAC,CAAC;IACN,CAAC;CACF"}

package/dist/application/preparation.js

@@ -1,31 +1,95 @@
-// Bind preparation evidence to the registered workspace and an executable recovery action.
+// What a preparation stage and a doctor group report, and how their evidence is bound to
+// the registered workspace and an executable recovery action.
 import { preparation, preparationCheck, } from '../domain/preparation.js';
+import { toolRecoveryCommand } from './tool/check.js';
 import { workspaceToolScope } from './tool/scope.js';
-export function verifyAction(deps, tool) {
+// Approving a tool's read-only check and running it. Every check that asks for it gets
+// this command, so the actions coalesce in `preparation`; each words it for its own report.
+export function approveCheckAction(deps, tool, label) {
     return {
-        id: `approve-check:${tool}`,
-        actor: 'agent',
-        description: `Review ${tool}'s exact verification commands, then approve the read-only check`,
+        ...label,
         argv: ['fx', 'doctor', '--tool', tool, '--workspace', deps.ctx.name, '--yes'],
         cwd: deps.ctx.root,
+        actor: 'agent',
         requires_approval: true,
     };
 }
-// What an agent does about a check that gave no answer. A tool that did not start gets the
-// action a missing tool gets from its own check (toolChecks in sync/checks.ts), so the two
-// coalesce; a check that ran out of time is asked again, within its environment.
+function inspectToolAction(deps, tool, command) {
+    return {
+        id: `tool:${tool}`,
+        description: `Inspect ${tool} preparation`,
+        argv: [
+            'fx',
+            'tool',
+            command,
+            tool,
+            '--workspace',
+            deps.ctx.name,
+            ...(command === 'show' ? [] : ['--dry-run']),
+        ],
+        cwd: deps.ctx.root,
+        actor: 'agent',
+        requires_approval: false,
+    };
+}
+// What an agent does about a tool its check found unusable: approve the probe that was
+// withheld, otherwise look at what the tool's preparation would do.
+export function toolRecovery(deps, tool) {
+    if (tool.state === 'ok' || (tool.state === 'disabled' && !tool.preparation_required))
+        return [];
+    if (tool.failure?.code === 'VECTOR_UNTRUSTED')
+        return [
+            approveCheckAction(deps, tool.name, {
+                id: `tool:${tool.name}`,
+                description: `Review the exact ${tool.name} probe and approve it to continue`,
+            }),
+        ];
+    return [inspectToolAction(deps, tool.name, toolRecoveryCommand(tool.state))];
+}
+export function verifyAction(deps, tool) {
+    return approveCheckAction(deps, tool, {
+        id: `approve-check:${tool}`,
+        description: `Review ${tool}'s exact verification commands, then approve the read-only check`,
+    });
+}
+// What an agent does about a check that gave no answer: preview installing the tool that
+// did not start, or ask the check that ran out of time again, within its environment.
 export function noAnswerAction(deps, step, code) {
-    const missing = code === 'TOOL_MISSING';
-    const scope = ['--workspace', deps.ctx.name];
+    if (code === 'TOOL_MISSING')
+        return inspectToolAction(deps, step.tool, 'install');
     return {
-        id: missing ? `tool:${step.tool}` : `recheck:${step.id}`,
+        id: `recheck:${step.id}`,
+        description: `Check ${step.tool} again; its check did not finish`,
+        argv: [
+            'fx',
+            'doctor',
+            '--tool',
+            step.tool,
+            ...(step.env ? ['--env', step.env] : []),
+            '--workspace',
+            deps.ctx.name,
+        ],
+        cwd: deps.ctx.root,
         actor: 'agent',
-        description: missing
-            ? `Inspect ${step.tool} preparation`
-            : `Check ${step.tool} again; its check did not finish`,
-        argv: missing
-            ? ['fx', 'tool', 'install', step.tool, ...scope, '--dry-run']
-            : ['fx', 'doctor', '--tool', step.tool, ...(step.env ? ['--env', step.env] : []), ...scope],
+        requires_approval: false,
+    };
+}
+// What a person does about a server that did not answer from this machine: reach the
+// network it is served on, then check again.
+export function unreachableAction(deps, step) {
+    return {
+        id: `reach:${step.id}`,
+        actor: 'user',
+        description: `Connect to the network ${step.tool} is served on, then check again`,
+        argv: [
+            'fx',
+            'doctor',
+            '--tool',
+            step.tool,
+            ...(step.env ? ['--env', step.env] : []),
+            '--workspace',
+            deps.ctx.name,
+        ],
         cwd: deps.ctx.root,
         requires_approval: false,
     };
@@ -33,24 +97,27 @@ export function noAnswerAction(deps, step, code) {
 export function repairAction(deps) {
     return {
         id: 'repair-managed-resources',
-        actor: 'agent',
         description: "Repair the workspace's managed guides and Skills",
         argv: ['fx', 'doctor', '--fix', '--workspace', deps.ctx.name],
         cwd: deps.ctx.root,
+        actor: 'agent',
         requires_approval: true,
     };
 }
-export function resumeAction(deps) {
+// Initialization can fail before the workspace has a context, so the caller says where the
+// command runs.
+export function resumeAction(input) {
     return {
         id: 'resume-initialization',
-        description: 'Continue preparing this workspace after resolving the blockers',
-        argv: ['fx', 'init', '--resume', '--workspace', deps.ctx.name],
-        cwd: deps.ctx.root,
+        description: input.description ?? 'Continue preparing this workspace after resolving the blockers',
+        argv: ['fx', 'init', '--resume', '--workspace', input.workspace],
+        cwd: input.cwd,
         actor: 'agent',
         requires_approval: false,
     };
 }
-export function workspacePreparation(deps, stages, checks, preview = false, selection = {}, resume = resumeAction(deps)) {
+export function workspacePreparation(deps, input) {
+    const { stages, checks, selection = {} } = input;
     return preparation({
         scope: {
             workspace: deps.ctx.name,
@@ -67,8 +134,8 @@ export function workspacePreparation(deps, stages, checks, preview = false, sele
                 Object.keys(deps.ctx.manifest.environments?.result.doc.envs ?? {}),
         },
         checks,
-        preview,
-        resume,
+        preview: input.preview ?? false,
+        resume: input.resume ?? resumeAction({ workspace: deps.ctx.name, cwd: deps.ctx.root }),
     });
 }
 export function findingCheck(finding, required = finding.required ?? finding.level === 'fail') {

package/dist/application/preparation.js.map

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

package/dist/application/probe-record/index.js

@@ -1,13 +1,15 @@
 // Records only this invocation's definite probe evidence. Readiness prompts
 // stay outside the workspace lease; source snapshots are rechecked before writing.
 import { busyError, handoffEnvelope } from '../../domain/errors.js';
+import { withLease, workspaceLeaseKey } from '../../domain/lease.js';
 import { MANIFEST_FILES } from '../../domain/manifest/files.js';
 import { setYamlStrings } from '../../domain/manifest/path-editor.js';
 import { coordinateFingerprint } from '../../domain/obs/observation.js';
 import { confidenceForProbe } from '../../domain/obs/probe.js';
+import { isLostWrite } from '../../domain/projection.js';
 import { shellLine } from '../../domain/shell.js';
+import { Where } from '../readiness/where.js';
 import { assertWritable } from '../safety/posture.js';
-import { Where } from '../where.js';
 import { assertProbeSources, assertSafeNote, probeChangedError, planProbeRecord, recordValues, validateEdited, } from './plan.js';
 export class ProbeRecord {
     deps;
@@ -17,19 +19,16 @@ export class ProbeRecord {
     async execute(input) {
         const plan = await planProbeRecord(this.deps, input);
         if (!plan.template || !plan.output.scope)
-            return { ...plan.output, handoff: recovery(plan.output.row) };
+            return {
+                ...plan.output,
+                handoff: recovery(plan.output.row, this.deps.workspace.commandShell),
+            };
         if (input.dryRun)
             return plan.output;
         assertWritable(input.posture, 'where --probe --record');
         const where = new Where(this.deps.workspace, this.deps.login);
         const [ready] = await where.execute({ ...input, probe: false, check: input.check });
-        const lease = await this.deps.lock.acquire({
-            key: `workspace:${this.deps.workspace.ctx.name}`,
-            waitMs: 2000,
-        });
-        if (!lease)
-            throw busyError('PROBE_RECORD_BUSY', 'The workspace');
-        try {
+        return withLease(this.deps.lock, { key: workspaceLeaseKey(this.deps.workspace.ctx.name), waitMs: 2000 }, () => busyError('PROBE_RECORD_BUSY', 'The workspace'), async () => {
             await assertProbeSources(this.deps, plan);
             const [probed] = await where.execute({
                 ...input,
@@ -42,16 +41,18 @@ export class ProbeRecord {
                 JSON.stringify(probed.probe_template) !== JSON.stringify(plan.template))
                 throw probeChangedError();
             const row = { ...probed, ready: ready?.ready ?? null, handoff: ready?.handoff ?? null };
-            return await this.record(plan, row);
-        }
-        finally {
-            await lease.release();
-        }
+            return this.record(plan, row);
+        });
     }
     async record(plan, row) {
         const after = confidenceForProbe(row.outcome ?? 'unknown');
         if (!after)
-            return { ...plan.output, row, action: 'skipped', handoff: row.handoff ?? recovery(row) };
+            return {
+                ...plan.output,
+                row,
+                action: 'skipped',
+                handoff: row.handoff ?? recovery(row, this.deps.workspace.commandShell),
+            };
         await assertProbeSources(this.deps, plan);
         const note = appendNote(plan.previousNote, `${this.deps.clock.now().toISOString().slice(0, 10)} UTC: ${row.outcome}; ${shellLine(plan.template)}`);
         assertSafeNote(note);
@@ -69,7 +70,7 @@ export class ProbeRecord {
             before: plan.environmentSnapshot,
             text,
         });
-        if (result === 'conflict' || result === 'busy')
+        if (isLostWrite(result))
             throw probeChangedError();
         return {
             ...output,
@@ -85,8 +86,8 @@ function appendNote(before, line) {
         return line;
     return before + (before.endsWith('\n') ? '' : '\n') + line;
 }
-function recovery(row) {
-    const command = shellLine(['fx', 'can', row.capability, '--env', row.env]);
+function recovery(row, shell) {
+    const command = shellLine(['fx', 'can', row.capability, '--env', row.env], shell);
     return handoffEnvelope({
         summary: 'No definite, recordable coordinate probe result is available.',
         command,

package/dist/application/probe-record/index.js.map

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

package/dist/application/probe-record/plan.js

@@ -8,11 +8,11 @@ import { loadEnvironments, loadWorkspace } from '../../domain/manifest/loader.js
 import { setYamlStrings } from '../../domain/manifest/path-editor.js';
 import { coordinateFingerprint, probeScope } from '../../domain/obs/observation.js';
 import { shellLine } from '../../domain/shell.js';
-import { Where } from '../where.js';
+import { Where } from '../readiness/where.js';
 import { findKnownRepo } from '../workspace/inspect.js';
 export async function planProbeRecord(deps, input) {
     if (!input.probe || !input.env || !input.platform)
-        throw inputRequired(input.repo);
+        throw inputRequired(input.repo, deps.workspace.commandShell);
     const documents = await readDocuments(deps);
     const [row] = await new Where(deps.workspace, deps.login).execute({
         ...input,
@@ -152,9 +152,11 @@ export function assertSafeNote(text) {
             ],
         });
 }
-function inputRequired(repo) {
+function inputRequired(repo, shell) {
     return new DevkitError('usage', 'PROBE_RECORD_INPUT_REQUIRED', 'Recording requires --probe, --env and --platform', {
-        nextSteps: [`fx where ${repo} --env <env> --platform <platform> --probe --record --dry-run`],
+        nextSteps: [
+            `${shellLine(['fx', 'where', repo], shell)} --env <env> --platform <platform> --probe --record --dry-run`,
+        ],
     });
 }
 export function probeChangedError() {