@angelmsger/fx 0.10.1 → 0.12.0

package/dist/adapters/registry/registry-policy.js

@@ -2,23 +2,13 @@
 // Shared JavaScript keeps the same registry policy available to runtime adapters
 // and pre-build publication guards. Private coordinates come only from configuration.
 import { PUBLIC_REGISTRY, packageChannel } from '../../domain/distribution.js';
+import { isPublicHttpUrl } from '../../domain/public-url.js';
 /** @param {unknown} value @returns {string | null} */
 function registryUrl(value) {
-    if (typeof value !== 'string' || !value.trim())
-        return null;
-    try {
-        const url = new URL(value.trim());
-        return ['https:', 'http:'].includes(url.protocol) &&
-            !url.username &&
-            !url.password &&
-            !url.search &&
-            !url.hash
-            ? url.href
-            : null;
-    }
-    catch {
+    if (typeof value !== 'string')
         return null;
-    }
+    const text = value.trim();
+    return isPublicHttpUrl(text) ? new URL(text).href : null;
 }
 /** @param {unknown} value @returns {string | null} */
 export function privateRegistry(value) {

package/dist/adapters/registry/registry-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry-policy.js","sourceRoot":"","sources":["../../../src/adapters/registry/registry-policy.js"],"names":[],"mappings":"AAAA,YAAY;AACZ,iFAAiF;AACjF,sFAAsF;AACtF,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE/E,sDAAsD;AACtD,SAAS,WAAW,CAAC,KAAK;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAClC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC/C,CAAC,GAAG,CAAC,QAAQ;YACb,CAAC,GAAG,CAAC,QAAQ;YACb,CAAC,GAAG,CAAC,MAAM;YACX,CAAC,GAAG,CAAC,IAAI;YACT,CAAC,CAAC,GAAG,CAAC,IAAI;YACV,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,eAAe,CAAC,KAAK;IACnC,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAC9D,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;QACjF,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,GAAG,KAAK,EAAE;IAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO;QACL,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACzD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,aAAa,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC;AACJ,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,mBAAmB,CAAC,WAAW,EAAE,UAAU;IACzD,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACnF,wFAAwF;IACxF,OAAO,UAAU,KAAK,SAAS,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3F,CAAC;AACD,8DAA8D;AAC9D,MAAM,UAAU,eAAe,CAAC,WAAW,EAAE,UAAU;IACrD,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACnF,IAAI,UAAU,KAAK,SAAS,IAAI,gBAAgB,CAAC,UAAU,CAAC;QAAE,OAAO,eAAe,CAAC;IACrF,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,6BAA6B;AAC7B,SAAS,gBAAgB,CAAC,KAAK;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"registry-policy.js","sourceRoot":"","sources":["../../../src/adapters/registry/registry-policy.js"],"names":[],"mappings":"AAAA,YAAY;AACZ,iFAAiF;AACjF,sFAAsF;AACtF,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,sDAAsD;AACtD,SAAS,WAAW,CAAC,KAAK;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1B,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,eAAe,CAAC,KAAK;IACnC,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IACpC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAC9D,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;QACjF,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,GAAG,KAAK,EAAE;IAC9E,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,OAAO;QACL,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACzD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,aAAa,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC;AACJ,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,mBAAmB,CAAC,WAAW,EAAE,UAAU;IACzD,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACnF,wFAAwF;IACxF,OAAO,UAAU,KAAK,SAAS,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3F,CAAC;AACD,8DAA8D;AAC9D,MAAM,UAAU,eAAe,CAAC,WAAW,EAAE,UAAU;IACrD,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,UAAU;QAAE,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC;IACnF,IAAI,UAAU,KAAK,SAAS,IAAI,gBAAgB,CAAC,UAAU,CAAC;QAAE,OAAO,eAAe,CAAC;IACrF,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,6BAA6B;AAC7B,SAAS,gBAAgB,CAAC,KAAK;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/application/agent/list.js

@@ -1,4 +1,6 @@
 // Resolve agent selection from explicit configuration or host detection.
+import { DevkitError } from '../../domain/errors.js';
+import { nearest, suggestionHint } from '../../domain/fuzzy.js';
 export const AGENT_COLUMNS = ['id', 'label', 'detected', 'enabled', 'skills_dir', 'note'];
 export class AgentList {
     hosts;
@@ -25,6 +27,16 @@ export class AgentList {
         return rows;
     }
 }
+export function findHost(hosts, id) {
+    const host = hosts.find((h) => h.id === id);
+    if (host !== undefined)
+        return host;
+    const suggestion = nearest(id, hosts.map((h) => h.id));
+    throw new DevkitError('not_found', 'AGENT_UNKNOWN', `"${id}" is not an agent fx knows`, {
+        hint: suggestionHint(suggestion, 'fx agent list shows the known ids.'),
+        nextSteps: ['fx agent list'],
+    });
+}
 export function isEnabled(id, detected, configured) {
     return configured === undefined ? detected : configured.includes(id);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/agent/list.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAgBzE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,CAAU,CAAC;AAMnG,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,KAA2B;QAA3B,UAAK,GAAL,KAAK,CAAsB;IAAG,CAAC;IAE5D,KAAK,CAAC,OAAO,CAAC,KAAqB;QACjC,MAAM,IAAI,GAAe,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC;gBACR,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ;gBACR,OAAO;gBACP,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;gBACpE,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACpC,IAAI,EAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,IAAI;aACzF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,UAAU,SAAS,CACvB,EAAU,EACV,QAAiB,EACjB,UAAyC;IAEzC,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAA2B,EAC3B,UAAyC;IAEzC,MAAM,OAAO,GAAgB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/application/agent/list.ts"],"names":[],"mappings":"AAAA,yEAAyE;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAehE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,CAAU,CAAC;AAMnG,MAAM,OAAO,SAAS;IACS;IAA7B,YAA6B,KAA2B;QAA3B,UAAK,GAAL,KAAK,CAAsB;IAAG,CAAC;IAE5D,KAAK,CAAC,OAAO,CAAC,KAAqB;QACjC,MAAM,IAAI,GAAe,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC;gBACR,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ;gBACR,OAAO;gBACP,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;gBACpE,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACpC,IAAI,EAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,IAAI;aACzF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,UAAU,QAAQ,CAAC,KAA2B,EAAE,EAAU;IAC9D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACpC,MAAM,UAAU,GAAG,OAAO,CACxB,EAAE,EACF,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACvB,CAAC;IACF,MAAM,IAAI,WAAW,CAAC,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,4BAA4B,EAAE;QACtF,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,oCAAoC,CAAC;QACtE,SAAS,EAAE,CAAC,eAAe,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,EAAU,EACV,QAAiB,EACjB,UAAyC;IAEzC,OAAO,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAA2B,EAC3B,UAAyC;IAEzC,MAAM,OAAO,GAAgB,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/application/agent/pick.js

@@ -1,34 +1,27 @@
 // Picking and unpicking agents writes config.agents. Under auto mode (no
 // list) the first change spells the detected set out first, so "unpick
 // codex" means exactly that and not "pick nothing".
-import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
 import { assertWritable } from '../safety/posture.js';
-import { enabledHosts } from './list.js';
+import { enabledHosts, findHost } from './list.js';
 export class AgentPick {
-    config;
-    hosts;
-    cleanup;
-    constructor(config, hosts, cleanup) {
-        this.config = config;
-        this.hosts = hosts;
-        this.cleanup = cleanup;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async execute(input) {
+        const { config, hosts, cleanup } = this.deps;
         for (const id of input.ids)
-            this.assertKnown(id);
-        const file = await this.config.read();
+            findHost(hosts, id);
+        const file = await config.read();
         const before = file.agents ?? null;
-        const base = before ?? (await enabledHosts(this.hosts, undefined)).map((h) => h.id);
+        const base = before ?? (await enabledHosts(hosts, undefined)).map((h) => h.id);
         const after = applySelection(base, input.ids, input.action);
         const changed = differs(before, after);
         const plan = {
             scope: 'global',
             affected_workspaces: Object.keys(file.workspaces ?? {}).sort(),
-            ...(input.action === 'unpick' && this.cleanup
-                ? cleanupOutput(await this.cleanup.plan(input.ids))
-                : {}),
-            path: this.config.path(),
+            ...(input.action === 'unpick' && cleanup ? cleanupOutput(await cleanup.plan(input.ids)) : {}),
+            path: config.path(),
             ids: input.ids,
             before,
             after,
@@ -43,7 +36,7 @@ export class AgentPick {
             // Both ends of the report come from the configuration the write itself
             // read, so a concurrent change cannot produce a pair that never existed.
             let observed = before;
-            const saved = await this.config.update((current) => {
+            const saved = await config.update((current) => {
                 observed = current.agents ?? null;
                 return {
                     ...current,
@@ -53,7 +46,7 @@ export class AgentPick {
             const appliedAfter = [...(saved.agents ?? after)];
             applied = { before: observed, after: appliedAfter, changed: differs(observed, appliedAfter) };
         }
-        const hooks = input.action === 'unpick' ? await this.cleanup?.apply(input.ids) : undefined;
+        const hooks = input.action === 'unpick' ? await cleanup?.apply(input.ids) : undefined;
         return {
             ...plan,
             ...applied,
@@ -61,17 +54,6 @@ export class AgentPick {
             ...(hooks === undefined ? {} : cleanupOutput(hooks)),
         };
     }
-    assertKnown(id) {
-        if (this.hosts.some((h) => h.id === id))
-            return;
-        const suggestion = nearest(id, this.hosts.map((h) => h.id));
-        throw new DevkitError('not_found', 'AGENT_UNKNOWN', `"${id}" is not an agent fx knows`, {
-            hint: suggestion === undefined
-                ? 'fx agent list shows the known ids.'
-                : `Did you mean "${suggestion}"?`,
-            nextSteps: ['fx agent list'],
-        });
-    }
 }
 function differs(before, after) {
     return (before === null ||

package/dist/application/agent/pick.js.map

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

package/dist/application/agent/workspace-cleanup.js

@@ -6,8 +6,11 @@ import { withWorkspaceOperation } from '../workspace/operation.js';
 export async function cleanupAgentWorkspaces(deps, input) {
     const rows = [];
     for (const workspace of input.workspaces) {
+        const cleanup = () => cleanupWorkspace(deps, input, workspace);
         try {
-            rows.push(...(await withWorkspaceOperation(deps.lock, workspace, input.dryRun, () => cleanupWorkspace(deps, input, workspace))));
+            rows.push(...(input.dryRun
+                ? await cleanup()
+                : await withWorkspaceOperation(deps.lock, workspace, cleanup)));
         }
         catch (error) {
             rows.push(...failureRows(input, workspace, asDevkitError(error).code));

package/dist/application/agent/workspace-cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-cleanup.js","sourceRoot":"","sources":["../../../src/application/agent/workspace-cleanup.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,6EAA6E;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAKvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAiBnE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAiB,EACjB,KAA4B;IAE5B,MAAM,IAAI,GAAsB,EAAE,CAAC;IACnC,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CACP,GAAG,CAAC,MAAM,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CACxE,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CACzC,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAiB,EACjB,KAA4B,EAC5B,SAAiB;IAEjB,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,CAAC;IACjE,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,0BAA0B,CAC9B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EACf,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CACjE,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC;QAClC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,WAAW,CAClB,KAA4B,EAC5B,SAAiB,EACjB,MAAc;IAEd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC/B,SAAS;QACT,KAAK;QACL,MAAM;QACN,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;KAC1D,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"workspace-cleanup.js","sourceRoot":"","sources":["../../../src/application/agent/workspace-cleanup.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,6EAA6E;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAKvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAqBnE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAiB,EACjB,KAA4B;IAE5B,MAAM,IAAI,GAAsB,EAAE,CAAC;IACnC,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,GAAwC,EAAE,CACxD,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CACP,GAAG,CAAC,KAAK,CAAC,MAAM;gBACd,CAAC,CAAC,MAAM,OAAO,EAAE;gBACjB,CAAC,CAAC,MAAM,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CACjE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAiB,EACjB,KAA4B,EAC5B,SAAiB;IAEjB,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,SAAS,CAAC,CAAC;IACjE,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,0BAA0B,CAC9B,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EACf,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CACjE,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC;QAClC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,WAAW,CAClB,KAA4B,EAC5B,SAAiB,EACjB,MAAc;IAEd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC/B,SAAS;QACT,KAAK;QACL,MAAM;QACN,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;KAC1D,CAAC,CAAC,CAAC;AACN,CAAC"}

package/dist/application/config/export.js

@@ -1,7 +1,8 @@
 // Writing the profile: the config file and every registered workspace's
 // personal layer, as one document stamped with the profile version.
 import { renderProfile } from '../../domain/config/codec.js';
-import { PROFILE_VERSION, profileConfig } from '../../domain/config/profile.js';
+import { configFileSchema } from '../../domain/config/file.js';
+import { PROFILE_VERSION } from '../../domain/config/profile.js';
 import { assertWritable } from '../safety/posture.js';
 export class ConfigExport {
     deps;
@@ -17,7 +18,7 @@ export class ConfigExport {
             fx_profile: PROFILE_VERSION,
             exported_at: this.deps.clock.now().toISOString(),
             // Unknown keys of config.yaml stay behind: only what the schema names travels.
-            config: profileConfig.parse(file),
+            config: configFileSchema.parse(file),
             workspaces,
         };
         const text = renderProfile(profile);

package/dist/application/config/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/application/config/export.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,oEAAoE;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAgB,MAAM,gCAAgC,CAAC;AAI9F,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAwBzE,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,IAAsB;QAAtB,SAAI,GAAJ,IAAI,CAAkB;IAAG,CAAC;IAEvD,KAAK,CAAC,OAAO,CAAC,QAA2B,EAAE;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3C,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YACnD,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAY;YACvB,UAAU,EAAE,eAAe;YAC3B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;YAChD,+EAA+E;YAC/E,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC;YACjC,UAAU;SACX,CAAC;QACF,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC1E,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC;QAC3D,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9C,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;CACF"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../src/application/config/export.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,oEAAoE;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAgB,MAAM,gCAAgC,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAwBzE,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,IAAsB;QAAtB,SAAI,GAAJ,IAAI,CAAkB;IAAG,CAAC;IAEvD,KAAK,CAAC,OAAO,CAAC,QAA2B,EAAE;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3C,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YACnD,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAY;YACvB,UAAU,EAAE,eAAe;YAC3B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;YAChD,+EAA+E;YAC/E,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;YACpC,UAAU;SACX,CAAC;QACF,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC1E,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC;QAC3D,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9C,OAAO,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;CACF"}

package/dist/application/config/import-registry.js

@@ -27,15 +27,15 @@ export async function mergeProfileConfig(current, incoming, deps) {
     };
     assertDefaultWorkspace(next);
     for (const [name, entry] of Object.entries(next.workspaces ?? {}))
-        await assertDistinctWorkspaceRoot(next, name, entry.root, deps.fs);
+        await assertDistinctWorkspaceRoot(next, name, entry.root, deps);
     return next;
 }
-export function assertImportIdentitiesUnchanged(expected, actual, names) {
+export function assertImportIdentitiesUnchanged(expected, actual, names, shell) {
     for (const name of names) {
         if (JSON.stringify(expected.workspaces?.[name]) !== JSON.stringify(actual.workspaces?.[name]))
             throw new DevkitError('conflict', 'CONFIG_IMPORT_CHANGED', `Workspace "${name}" changed while the profile import was being planned`, {
                 hint: 'Inspect its current identity and preview the profile again before retrying.',
-                nextSteps: [shellLine(['fx', 'workspace', 'show', name])],
+                nextSteps: [shellLine(['fx', 'workspace', 'show', name], shell)],
             });
     }
 }

package/dist/application/config/import-registry.js.map

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

package/dist/application/config/import.js

@@ -15,7 +15,7 @@ export class ConfigImport {
         this.deps = deps;
     }
     async execute(input) {
-        const profile = parseProfile(input.text);
+        const profile = parseProfile(await this.readProfile(input.file));
         const current = await this.deps.config.read();
         const plan = await this.plan(current, profile);
         if (input.dryRun || !changed(plan.output))
@@ -37,14 +37,14 @@ export class ConfigImport {
                 });
             }
             const latest = await this.deps.config.read();
-            assertImportIdentitiesUnchanged(current, latest, names);
+            assertImportIdentitiesUnchanged(current, latest, names, this.deps.commandShell);
             const locked = await this.plan(latest, profile);
-            assertImportIdentitiesUnchanged(plan.merged, locked.merged, names);
+            assertImportIdentitiesUnchanged(plan.merged, locked.merged, names, this.deps.commandShell);
             if (!changed(locked.output))
                 return locked.output;
             if (locked.output.config === 'changed')
                 await this.deps.config.update(async (nextCurrent) => {
-                    assertImportIdentitiesUnchanged(latest, nextCurrent, names);
+                    assertImportIdentitiesUnchanged(latest, nextCurrent, names, this.deps.commandShell);
                     return mergeProfileConfig(nextCurrent, profile.config, this.deps);
                 });
             for (const [name, layer] of Object.entries(profile.workspaces)) {
@@ -57,6 +57,14 @@ export class ConfigImport {
             await Promise.all(leases.reverse().map((lease) => lease.release()));
         }
     }
+    async readProfile(file) {
+        const text = await this.deps.fs.readText(file);
+        if (text !== undefined)
+            return text;
+        throw new DevkitError('not_found', 'CONFIG_IMPORT_NOT_FOUND', `${file} does not exist`, {
+            nextSteps: ['fx config export -o profile.yaml'],
+        });
+    }
     async plan(current, profile) {
         const merged = await mergeProfileConfig(current, profile.config, this.deps);
         for (const name of Object.keys(profile.workspaces)) {

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

@@ -1 +1 @@
-{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/application/config/import.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,mEAAmE;AAEnE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAsB,MAAM,uBAAuB,CAAC;AAItE,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAmC3F,MAAM,OAAO,YAAY;IACM;IAA7B,YAA6B,IAAsB;QAAtB,SAAI,GAAJ,IAAI,CAAkB;IAAG,CAAC;IAEvD,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QAC9D,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG;YACZ,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC/C,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;aACnC,CAAC;SACH,CAAC,IAAI,EAAE,CAAC;QACT,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,MAAM,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBACnE,MAAM,0BAA0B,CAAC,IAAI,CAAC,IAAI,EAAE;oBAC1C,IAAI;oBACJ,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7C,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAChD,+BAA+B,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACnE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAE,OAAO,MAAM,CAAC,MAAM,CAAC;YAClD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS;gBACpC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;oBAClD,+BAA+B,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;oBAC5D,OAAO,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpE,CAAC,CAAC,CAAC;YACL,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/D,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,MAAM,KAAK,WAAW;oBAC/E,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAClD,CAAC;YACD,OAAO,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC7C,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,IAAI,CAChB,OAAmB,EACnB,OAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACnD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,SAAS;gBACzC,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,iCAAiC,EACjC,qEAAqE,IAAI,GAAG,EAC5E;oBACE,SAAS,EAAE;wBACT,mBAAmB;wBACnB,6DAA6D;qBAC9D;iBACF,CACF,CAAC;QACN,CAAC;QACD,MAAM,UAAU,GAA4C,EAAE,CAAC;QAC/D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/D,MAAM,qBAAqB,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChB,IAAI;gBACJ,KAAK,EAAE,MAAM,CAAC,UAAW,CAAC,IAAI,CAAE;gBAChC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBAC3C,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;gBAChC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;gBAC9B,KAAK;aACN,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO;YACL,MAAM;YACN,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;gBACvD,UAAU;gBACV,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC;oBAC/B,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,UAAU;oBAClB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;iBACvD,CAAC,CAAC;gBACH,OAAO,EAAE,KAAK;aACf;SACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,KAK/B;QACC,MAAM,gBAAgB,GACpB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QAC7F,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAkD,EAAE,CAAC;QACxE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;YACzE,MAAM,MAAM,GAAG,kBAAkB,CAC/B,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC7B,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,SAAS,CAC9C,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,CACxE,CAAC;YACF,MAAM,OAAO,GACX,gBAAgB,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC;YAC5F,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvD,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI;gBACJ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI;gBAC5B,MAAM;gBACN,WAAW;aACZ,CAAC,CAAC;YACH,IAAI,CAAC,OAAO;gBACV,SAAS,CAAC,IAAI,CACZ,SAAS,CACP,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,EAChF,IAAI,CAAC,IAAI,CAAC,YAAY,CACvB,CACF,CAAC;iBACC,IAAI,OAAO;gBACd,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAClD,CAAC;CACF;AAED,SAAS,OAAO,CAAC,MAA0B;IACzC,OAAO,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC;AAChG,CAAC;AAED,SAAS,kBAAkB,CACzB,QAAiB,EACjB,MAAe;IAEf,IAAI,CAAC,QAAQ;QAAE,OAAO,UAAU,CAAC;IACjC,OAAO,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1C,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAgB,EAChB,OAAgB;IAEhB,IAAI,CAAC,OAAO;QAAE,OAAO,kBAAkB,CAAC;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC;AACjD,CAAC;AAED,SAAS,SAAS,CAAC,QAAoB,EAAE,IAAgB;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QAAE,OAAO,WAAW,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC;AAED,SAAS,IAAI,CAAC,CAAU,EAAE,CAAU;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC"}
+{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/application/config/import.ts"],"names":[],"mappings":"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"}

package/dist/application/config/resolve.js

@@ -1,7 +1,7 @@
 // Layered resolution of one setting: flag > env > file > default. Every layer is
 // reported, not just the winner, so `--explain` can show why a value is what it is.
 import { DevkitError } from '../../domain/errors.js';
-import { nearest } from '../../domain/fuzzy.js';
+import { nearest, suggestionHint } from '../../domain/fuzzy.js';
 import { KEYS } from './keys.js';
 import { spellValue, storedValue } from './values.js';
 export function findKey(name) {
@@ -9,9 +9,7 @@ export function findKey(name) {
     if (key !== undefined)
         return key;
     const suggestion = nearest(name, KEYS.map((k) => k.name));
-    const hint = suggestion === undefined
-        ? `Known keys: ${KEYS.map((k) => k.name).join(', ')}.`
-        : `Did you mean "${suggestion}"?`;
+    const hint = suggestionHint(suggestion, `Known keys: ${KEYS.map((k) => k.name).join(', ')}.`);
     throw new DevkitError('usage', 'CONFIG_KEY_UNKNOWN', `Unknown config key "${name}"`, {
         hint,
         nextSteps: ['fx config list'],

package/dist/application/config/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/application/config/resolve.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,oFAAoF;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,IAAI,EAAY,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAuBtD,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC9C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,UAAU,GAAG,OAAO,CACxB,IAAI,EACJ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACxB,CAAC;IACF,MAAM,IAAI,GACR,UAAU,KAAK,SAAS;QACtB,CAAC,CAAC,eAAe,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACtD,CAAC,CAAC,iBAAiB,UAAU,IAAI,CAAC;IACtC,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,IAAI,GAAG,EAAE;QACnF,IAAI;QACJ,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,KAAmB;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAY;QACtB,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAe,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9E,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE;QAC7D,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE;QAC1F,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;KAC9D,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtF,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,EAAE,CAAC;AACpF,CAAC"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/application/config/resolve.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,oFAAoF;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGhE,OAAO,EAAE,IAAI,EAAY,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAuBtD,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC9C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC;IAClC,MAAM,UAAU,GAAG,OAAO,CACxB,IAAI,EACJ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACxB,CAAC;IACF,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9F,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,IAAI,GAAG,EAAE;QACnF,IAAI;QACJ,SAAS,EAAE,CAAC,gBAAgB,CAAC;KAC9B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,KAAmB;IAC1D,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAY;QACtB,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAe,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9E,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE;QAC7D,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE;QAC1F,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE;KAC9D,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtF,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,EAAE,CAAC;AACpF,CAAC"}

package/dist/application/contribution/identity.js

@@ -4,7 +4,7 @@ import { samePath } from '../../domain/path.js';
 import { shellLine } from '../../domain/shell.js';
 import { assertNoWorkspaceOperation } from '../workspace/health.js';
 export async function assertContributionIdentity(deps) {
-    const { config, fs, expected, physicalRoot, logicalSourceDir } = deps.registration;
+    const { config, fs, commandShell, expected, physicalRoot, logicalSourceDir } = deps.registration;
     const current = (await config.read()).workspaces?.[deps.source.workspace];
     if (!current ||
         current.root !== expected.root ||
@@ -16,8 +16,8 @@ export async function assertContributionIdentity(deps) {
         !samePath(await fs.realpath(deps.source.dir), deps.source.dir))
         throw new DevkitError('conflict', 'WORKSPACE_PLAN_CHANGED', 'The registered source identity changed after contribution planning', {
             hint: 'Inspect the current workspace and preview the contribution again before retrying.',
-            nextSteps: [shellLine(['fx', 'workspace', 'show', deps.source.workspace])],
+            nextSteps: [shellLine(['fx', 'workspace', 'show', deps.source.workspace], commandShell)],
         });
-    await assertNoWorkspaceOperation({ fs }, { name: deps.source.workspace, manifestDir: logicalSourceDir });
+    await assertNoWorkspaceOperation({ fs, commandShell }, { name: deps.source.workspace, manifestDir: logicalSourceDir });
 }
 //# sourceMappingURL=identity.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/application/contribution/identity.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAE3F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAIpE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,IAAqD;IAErD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;IACnF,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC1E,IACE,CAAC,OAAO;QACR,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAClC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;QACxD,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,KAAK,SAAS;QACnD,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;QAC/D,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS;QAClD,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;QAE9D,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,wBAAwB,EACxB,oEAAoE,EACpE;YACE,IAAI,EAAE,mFAAmF;YACzF,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;SAC3E,CACF,CAAC;IACJ,MAAM,0BAA0B,CAC9B,EAAE,EAAE,EAAE,EACN,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAC/D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/application/contribution/identity.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAE3F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAIpE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,IAAqD;IAErD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;IACjG,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC1E,IACE,CAAC,OAAO;QACR,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;QAClC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;QACxD,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,KAAK,SAAS;QACnD,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;QAC/D,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS;QAClD,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;QAE9D,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,wBAAwB,EACxB,oEAAoE,EACpE;YACE,IAAI,EAAE,mFAAmF;YACzF,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;SACzF,CACF,CAAC;IACJ,MAAM,0BAA0B,CAC9B,EAAE,EAAE,EAAE,YAAY,EAAE,EACpB,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAC/D,CAAC;AACJ,CAAC"}

package/dist/application/contribution/push-registered.js

@@ -0,0 +1,77 @@
+// Push the source of the workspace a command selected. What the command line left
+// out is asked first. Only the registry is read before Git, and the code host is the
+// one the committed baseline binds, never what a dirty working tree says.
+import { DevkitError } from '../../domain/errors.js';
+import { MANIFEST_FILES } from '../../domain/manifest/files.js';
+import { loadWorkspace } from '../../domain/manifest/loader.js';
+import { bindProviders, codeHostBinding, } from '../../domain/manifest/providers.js';
+import { resolveWorkspace } from '../workspace/resolve.js';
+import { CollectContributionInput } from './collect-input.js';
+import { PushSource } from './push.js';
+export class PushRegisteredSource {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async execute(supplied) {
+        const { push, validatorAt } = this.deps;
+        const input = await new CollectContributionInput(push.prompter).execute(supplied);
+        const located = await this.locate();
+        return new PushSource({
+            ...push,
+            ...located,
+            validator: validatorAt(located.source.dir),
+            hostFor: (baseFiles) => this.committedHost(baseFiles, input.cliVersion),
+        }).execute(input);
+    }
+    // A contribution leaves from the registration's own checkout: a copied directory or
+    // stdin text has no remotes, and a link would publish someone else's repository.
+    async locate() {
+        const { resolve, git, sourceFor } = this.deps;
+        const { config, fs, commandShell } = resolve;
+        const located = await resolveWorkspace(resolve);
+        const expected = (await config.read()).workspaces?.[located.name];
+        if (!expected?.source)
+            throw notOwnCheckout();
+        const { kind } = await sourceFor(expected.source);
+        if (kind !== 'repo' || (await fs.readLink(located.manifestDir)) !== undefined)
+            throw notOwnCheckout();
+        const dir = await fs.realpath(located.manifestDir);
+        if (!(await git.isToplevel(dir)))
+            throw notOwnCheckout();
+        return {
+            registration: {
+                expected,
+                physicalRoot: located.root,
+                logicalSourceDir: located.manifestDir,
+                config,
+                fs,
+                commandShell,
+            },
+            source: { workspace: located.name, dir, kind },
+        };
+    }
+    committedHost(baseFiles, cliVersion) {
+        const { providers, codeHost } = this.deps;
+        const workspace = committedWorkspace(baseFiles, { cliVersion, providers });
+        return codeHost(codeHostBinding(bindProviders(workspace, providers)));
+    }
+}
+function committedWorkspace(baseFiles, options) {
+    try {
+        return loadWorkspace(baseFiles[MANIFEST_FILES.workspace] ?? '', { ...options, strict: true })
+            .doc;
+    }
+    catch {
+        throw new DevkitError('config', 'SOURCE_BASE_MANIFEST_INVALID', 'The committed source cannot supply valid provider configuration', {
+            nextSteps: [
+                'fx manifest validate',
+                'Fix the committed manifest on the upstream default branch before contributing.',
+            ],
+        });
+    }
+}
+function notOwnCheckout() {
+    return new DevkitError('config', 'SOURCE_NOT_GIT', 'The registered source must be its own Git checkout, not a directory source or foreign link', { nextSteps: ['Register the workspace from its manifest repository URL.'] });
+}
+//# sourceMappingURL=push-registered.js.map

package/dist/application/contribution/push-registered.js.map

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

package/dist/application/contribution/push.js

@@ -1,8 +1,9 @@
 // Source pushes plan before their write gate and prompt outside leases. The
 // locked plan is re-read before journal, object, ref or network writes begin.
 import { busyError, DevkitError } from '../../domain/errors.js';
+import { withLease, workspaceLeaseKey } from '../../domain/lease.js';
 import { assertWritable } from '../safety/posture.js';
-import { acquireWorkspaceOperation } from '../workspace/operation.js';
+import { withWorkspaceOperation } from '../workspace/operation.js';
 import { applySource } from './apply-source.js';
 import { assertContributionIdentity } from './identity.js';
 import { sourceChangedError, planSource } from './plan-source.js';
@@ -41,25 +42,17 @@ export class PushSource {
     }
 }
 async function withLeases(deps, work) {
-    const leases = [];
-    try {
-        leases.push(await acquireWorkspaceOperation(deps.lock, deps.source.workspace));
-        await assertContributionIdentity(deps);
-        for (const key of [`workspace:${deps.source.workspace}`, `source:${deps.source.dir}`]) {
-            const lease = await deps.lock.acquire({ key, waitMs: 2000 });
-            if (!lease)
-                throw busyError('SOURCE_BUSY', 'The contribution source');
-            leases.push(lease);
-        }
-        // Again, now that every lease is held: waiting for one can outlast the identity
-        // checked before it.
+    const { lock, source } = deps;
+    const busy = () => busyError('SOURCE_BUSY', 'The contribution source');
+    return withWorkspaceOperation(lock, source.workspace, async () => {
         await assertContributionIdentity(deps);
-        return await work();
-    }
-    finally {
-        for (const lease of leases.reverse())
-            await lease.release();
-    }
+        return withLease(lock, { key: workspaceLeaseKey(source.workspace), waitMs: 2000 }, busy, () => withLease(lock, { key: `source:${source.dir}`, waitMs: 2000 }, busy, async () => {
+            // Again, now that every lease is held: waiting for one can outlast the identity
+            // checked before it.
+            await assertContributionIdentity(deps);
+            return work();
+        }));
+    });
 }
 async function confirm(deps, plan) {
     try {

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

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