@angelmsger/fx 0.11.0 → 0.13.0

package/dist/adapters/manifest-source/git-repo.js

@@ -1,7 +1,8 @@
 // Materialize and safely refresh Git manifest checkouts, preserving local work.
-import { realpath } from 'node:fs/promises';
 import path from 'node:path';
 import { DevkitError } from '../../domain/errors.js';
+import { messageOf } from '../../domain/values.js';
+import { lastLine, runGit } from '../git/run.js';
 import { PAYLOAD_PATHS } from './payload.js';
 export class GitRepoSource {
     url;
@@ -37,8 +38,7 @@ export class GitRepoSource {
         const head = await this.git.sha(dir, 'HEAD');
         if (head === undefined)
             return undefined;
-        const ancestor = await this.process.run([
-            'git',
+        const ancestor = await runGit(this.process, [
             '-C',
             this.localDirectory,
             'merge-base',
@@ -58,9 +58,8 @@ export class GitRepoSource {
         if (state.untracked > 0)
             return 'untracked files in the manifest source';
         const [untracked, ignored] = await Promise.all([
-            this.process.run(['git', '-C', dir, 'ls-files', '--others', '--exclude-standard']),
-            this.process.run([
-                'git',
+            runGit(this.process, ['-C', dir, 'ls-files', '--others', '--exclude-standard']),
+            runGit(this.process, [
                 '-C',
                 dir,
                 'ls-files',
@@ -90,7 +89,7 @@ export class GitRepoSource {
             root: `${dir}@${ref}`,
             contents: 'commit',
             readText: async (file) => {
-                const result = await this.process.run(['git', '-C', dir, 'show', `${ref}:${file}`]);
+                const result = await runGit(this.process, ['-C', dir, 'show', `${ref}:${file}`]);
                 if (result.code === 0)
                     return result.stdout;
                 if (file !== 'manifest/workspace.yaml')
@@ -104,16 +103,14 @@ export class GitRepoSource {
         };
     }
     async materialize(dir) {
-        const top = await this.git.toplevel(dir);
-        if (top !== undefined && top === (await realpath(dir))) {
+        if (await this.git.isToplevel(dir)) {
             const remotes = await this.git.remotes(dir);
             if (remotes['upstream'] !== this.url)
                 throw new DevkitError('conflict', 'SOURCE_MISMATCH', 'Existing manifest checkout has a different upstream', { nextSteps: ['Inspect the existing source checkout before retrying.'] });
             await this.refresh(dir);
             return;
         }
-        const result = await this.process.run([
-            'git',
+        const result = await runGit(this.process, [
             'clone',
             '--quiet',
             '--origin',
@@ -133,7 +130,7 @@ export class GitRepoSource {
             await this.git.fetch(dir, 'upstream');
         }
         catch (err) {
-            throw new DevkitError('network', 'MANIFEST_REFRESH_FAILED', `Could not fetch the manifest repository into ${dir}: ${err instanceof Error ? err.message : String(err)}`, {
+            throw new DevkitError('network', 'MANIFEST_REFRESH_FAILED', `Could not fetch the manifest repository into ${dir}: ${messageOf(err)}`, {
                 hint: 'The manifest repository must be reachable with your git credentials.',
                 nextSteps: [`git -C ${dir} fetch upstream`],
             });
@@ -144,19 +141,42 @@ export class GitRepoSource {
         const onBranch = state.branch === branch;
         const protection = await this.worktreeProtection(dir, state);
         if (protection !== undefined)
-            return kept(protection);
+            return kept(protection + (await this.landed(dir, state, branch)));
         const outcome = await this.git.fastForward(dir, 'upstream', branch);
         if (outcome === 'diverged') {
             const suffix = onBranch ? '' : '; its ref was not moved';
             return kept(`local commits on ${branch} diverge from upstream${suffix}`);
         }
+        if (outcome === 'empty_remote')
+            return kept('upstream has no branches yet');
+        if (outcome === 'no_remote_branch')
+            return kept(`upstream has no ${branch} branch`);
         if (!onBranch)
-            return kept(`on ${state.branch ?? 'a detached HEAD'}, not ${branch}; only the ${branch} ref moved`);
+            return kept(`on ${state.branch ?? 'a detached HEAD'}, not ${branch}; only the ${branch} ref moved` +
+                (await this.landed(dir, state, branch)));
         return { result: outcome };
     }
-}
-function lastLine(text) {
-    const lines = text.trim().split('\n');
-    return lines[lines.length - 1] ?? '';
+    // Whether the commits of a checkout kept on another branch already reached upstream,
+    // so the person knows returning to the default branch loses nothing committed.
+    async landed(dir, state, branch) {
+        if (state.branch === branch)
+            return '';
+        const target = `upstream/${branch}`;
+        const merged = await runGit(this.process, [
+            '-C',
+            dir,
+            'merge-base',
+            '--is-ancestor',
+            'HEAD',
+            target,
+        ]);
+        if (merged.code === 0)
+            return `; its commits are already in ${target}`;
+        const [head, upstream] = await Promise.all([
+            this.git.sha(dir, 'HEAD^{tree}'),
+            this.git.sha(dir, `${target}^{tree}`),
+        ]);
+        return head !== undefined && head === upstream ? `; its content matches ${target}` : '';
+    }
 }
 //# sourceMappingURL=git-repo.js.map

package/dist/adapters/manifest-source/git-repo.js.map

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

package/dist/adapters/manifest-source/stdin.js

@@ -4,6 +4,7 @@ import { randomUUID } from 'node:crypto';
 import YAML from 'yaml';
 import { DevkitError } from '../../domain/errors.js';
 import { MANIFEST_FILES } from '../../domain/manifest/files.js';
+import { isRecord } from '../../domain/values.js';
 import { FileSource } from './file.js';
 import { assertPayloadPath } from './payload.js';
 export class StdinSource {
@@ -47,9 +48,9 @@ export class StdinSource {
         catch {
             throw invalid('stdin must contain valid YAML or JSON');
         }
-        if (!record(value) || !('source_version' in value))
+        if (!isRecord(value) || !('source_version' in value))
             return [{ name: MANIFEST_FILES.workspace, bytes: Buffer.from(this.text), executable: false }];
-        if (value['source_version'] !== 1 || !record(value['files']))
+        if (value['source_version'] !== 1 || !isRecord(value['files']))
             throw invalid('Expected source_version: 1 and a files mapping');
         const files = Object.entries(value['files']).map(([name, content]) => decode(name, content));
         if (!files.some((file) => file.name === MANIFEST_FILES.workspace))
@@ -60,16 +61,13 @@ export class StdinSource {
         return files;
     }
 }
-function record(value) {
-    return value !== null && typeof value === 'object' && !Array.isArray(value);
-}
 function decode(name, content) {
     assertPayloadPath(name);
     if (name === 'docs' || name === 'skills')
         throw invalid(`${name} must contain files`);
     if (typeof content === 'string')
         return { name, bytes: Buffer.from(content), executable: false };
-    if (!record(content) ||
+    if (!isRecord(content) ||
         typeof content['base64'] !== 'string' ||
         (content['executable'] !== undefined && typeof content['executable'] !== 'boolean'))
         throw invalid(`${name} must be text or {base64, executable?}`);

package/dist/adapters/manifest-source/stdin.js.map

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

package/dist/adapters/metrics/prometheus-cli/provider.js

@@ -25,7 +25,7 @@ export const prometheusCliProvider = {
         id: BINARY,
         capability: 'metrics',
         label: 'Prometheus job {job}',
-        optionalFlags: { base_url: '--base-url', auth_scheme: '--auth-scheme' },
+        optionalFlags: { base_url: '--base-url' },
         command: [
             BINARY,
             'query',

package/dist/adapters/metrics/prometheus-cli/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/provider.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,yFAAyF;AACzF,yFAAyF;AACzF,wEAAwE;AAIxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAgC;IAChE,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,SAAS;IACrB,iBAAiB,EAAE,CAAC,YAAY,CAAC;IACjC,QAAQ,EAAE;QACR,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC;QAChE,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;KACzC;IACD,KAAK,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,kBAAkB;IAC3B,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,kDAAkD,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7F,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,oCAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5E;IACD,MAAM,EAAE,GAAG,EAAE,CACX,IAAI,gBAAgB,CAAC;QACnB,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,SAAS;QACrB,KAAK,EAAE,sBAAsB;QAC7B,aAAa,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE;QACvE,OAAO,EAAE;YACP,MAAM;YACN,OAAO;YACP,SAAS;YACT,eAAe;YACf,WAAW;YACX,SAAS;YACT,iBAAiB;SAClB;KACF,CAAC;CACL,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/provider.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,yFAAyF;AACzF,yFAAyF;AACzF,wEAAwE;AAIxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAgC;IAChE,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,SAAS;IACrB,iBAAiB,EAAE,CAAC,YAAY,CAAC;IACjC,QAAQ,EAAE;QACR,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC;QAChE,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;KACzC;IACD,KAAK,EAAE,CAAC,MAAM,CAAC;IACf,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,kBAAkB;IAC3B,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,kDAAkD,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7F,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,oCAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC5E;IACD,MAAM,EAAE,GAAG,EAAE,CACX,IAAI,gBAAgB,CAAC;QACnB,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,SAAS;QACrB,KAAK,EAAE,sBAAsB;QAC7B,aAAa,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE;QACzC,OAAO,EAAE;YACP,MAAM;YACN,OAAO;YACP,SAAS;YACT,eAAe;YACf,WAAW;YACX,SAAS;YACT,iBAAiB;SAClB;KACF,CAAC;CACL,CAAC"}

package/dist/adapters/metrics/prometheus-cli/service.js

@@ -5,11 +5,19 @@ import { familyService, serviceScope } from '../../family/service.js';
 export const BINARY = 'prometheus-cli';
 // `auth status` exits zero when the server does not answer, so only `authenticated` tells.
 // Its own request timeout stays under fx's check deadline: a server that never answers is
-// then the companion's verdict rather than a check fx had to abandon.
+// then the companion's verdict rather than a check fx had to abandon. prometheus-cli says
+// `request to <url> failed` only when no HTTP answer came back at all.
 export function answers(scope) {
     return {
         command: [...scope, '--timeout', '10s', 'auth', 'status', '--format', 'json'],
         json: { path: 'authenticated', equals: true, reason: 'error' },
+        failures: [
+            {
+                cause: 'network',
+                stdout: '"error":\\s*"request to [^"]* failed"',
+                instructions: 'The server did not answer from this machine. Connect to the network it is served on, then check again; no sign-in is involved.',
+            },
+        ],
     };
 }
 export function prometheusService(settings) {

package/dist/adapters/metrics/prometheus-cli/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/service.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,0FAA0F;AAC1F,6FAA6F;AAK7F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEvC,2FAA2F;AAC3F,0FAA0F;AAC1F,sEAAsE;AACtE,MAAM,UAAU,OAAO,CAAC,KAAwB;IAC9C,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,IAAI,QAAQ,CAAC,WAAW,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,6BAA6B;gBACpC,YAAY,EACV,2GAA2G;gBAC7G,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aACxC;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/adapters/metrics/prometheus-cli/service.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,0FAA0F;AAC1F,6FAA6F;AAK7F,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAEvC,2FAA2F;AAC3F,0FAA0F;AAC1F,0FAA0F;AAC1F,uEAAuE;AACvE,MAAM,UAAU,OAAO,CAAC,KAAwB;IAC9C,OAAO;QACL,OAAO,EAAE,CAAC,GAAG,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC;QAC7E,IAAI,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;QAC9D,QAAQ,EAAE;YACR;gBACE,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,uCAAuC;gBAC/C,YAAY,EACV,gIAAgI;aACnI;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAyB;IACzD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IACzE,IAAI,QAAQ,CAAC,WAAW,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACnD,OAAO;QACL,GAAG,MAAM;QACT,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,QAAQ;gBACZ,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,6BAA6B;gBACpC,YAAY,EACV,2GAA2G;gBAC7G,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aACxC;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/adapters/process/deadline-process.js

@@ -1,21 +1,47 @@
-// A lifecycle worker lends every companion command the remaining task budget.
-// The underlying process adapter retains responsibility for cancellation.
+// A lifecycle worker lends every companion command the remaining task budget, and tells
+// a command that takes a deadline of its own what it was lent. The underlying process
+// adapter retains responsibility for cancellation.
+import { DevkitError } from '../../domain/errors.js';
+// A command is told at least this much less than it is lent, so it answers before it is ended.
+const ANSWER_MS = 1000;
 export class DeadlineProcess {
     process;
-    deadline = performance.now() + 29000;
-    constructor(process) {
+    budget;
+    deadline;
+    constructor(process, budget) {
         this.process = process;
+        this.budget = budget;
+        this.deadline = performance.now() + budget.totalMs;
     }
     which(binary, options) {
         return this.process.which(binary, options);
     }
-    run(vector, options = {}) {
-        return this.process.run(vector, {
+    async run(vector, options = {}) {
+        const { commandMs } = this.budget;
+        const lentMs = Math.max(1, Math.min(options.timeoutMs ?? commandMs, commandMs, this.deadline - performance.now()));
+        const told = options.deadline === undefined ? vector : tell(vector, options.deadline, lentMs);
+        return this.process.run(told, {
             ...options,
             interactive: false,
-            timeoutMs: Math.max(1, Math.min(options.timeoutMs ?? 15000, 15000, this.deadline - performance.now())),
+            timeoutMs: lentMs,
             env: { ...options.env, GIT_TERMINAL_PROMPT: '0', GCM_INTERACTIVE: 'Never' },
         });
     }
 }
+// The flag goes before an end-of-options separator, where the command still reads flags.
+function tell(vector, deadline, lentMs) {
+    const seconds = Math.floor((lentMs - ANSWER_MS) / 1000);
+    if (seconds * 1000 < deadline.minimumMs)
+        throw shortOf(vector, lentMs, deadline);
+    const separator = vector.indexOf('--');
+    const at = separator < 0 ? vector.length : separator;
+    return [...vector.slice(0, at), deadline.flag, `${seconds}s`, ...vector.slice(at)];
+}
+function shortOf(vector, lentMs, deadline) {
+    const needs = Math.ceil((deadline.minimumMs + ANSWER_MS) / 1000);
+    return new DevkitError('internal', 'PROCESS_TIMEOUT', `${vector[0] ?? ''} was not started with ${Math.floor(lentMs / 1000)}s of the run left`, {
+        hint: `It needs ${needs}s to answer, so the run left it unasked rather than end it early.`,
+        nextSteps: [`Run \`${vector.join(' ')}\` by hand to see its answer.`],
+    });
+}
 //# sourceMappingURL=deadline-process.js.map

package/dist/adapters/process/deadline-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"deadline-process.js","sourceRoot":"","sources":["../../../src/adapters/process/deadline-process.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,0EAA0E;AAI1E,MAAM,OAAO,eAAe;IAEG;IADZ,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IACtD,YAA6B,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IACjD,KAAK,CAAC,MAAc,EAAE,OAAyC;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,GAAG,CAAC,MAAyB,EAAE,UAAsB,EAAE;QACrD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;YAC9B,GAAG,OAAO;YACV,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,CACjB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,CAC/E;YACD,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"deadline-process.js","sourceRoot":"","sources":["../../../src/adapters/process/deadline-process.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,sFAAsF;AACtF,mDAAmD;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAWrD,+FAA+F;AAC/F,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,MAAM,OAAO,eAAe;IAGP;IACA;IAHF,QAAQ,CAAS;IAClC,YACmB,OAAgB,EAChB,MAAsB;QADtB,YAAO,GAAP,OAAO,CAAS;QAChB,WAAM,GAAN,MAAM,CAAgB;QAEvC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,MAAc,EAAE,OAAyC;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,MAAyB,EAAE,UAAsB,EAAE;QAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CACrB,CAAC,EACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,CACvF,CAAC;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9F,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE;YAC5B,GAAG,OAAO;YACV,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,MAAM;YACjB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;CACF;AAED,yFAAyF;AACzF,SAAS,IAAI,CAAC,MAAyB,EAAE,QAAyB,EAAE,MAAc;IAChF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IACxD,IAAI,OAAO,GAAG,IAAI,GAAG,QAAQ,CAAC,SAAS;QAAE,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACrD,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,OAAO,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,OAAO,CACd,MAAyB,EACzB,MAAc,EACd,QAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IACjE,OAAO,IAAI,WAAW,CACpB,UAAU,EACV,iBAAiB,EACjB,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,yBAAyB,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,EACvF;QACE,IAAI,EAAE,YAAY,KAAK,mEAAmE;QAC1F,SAAS,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,+BAA+B,CAAC;KACtE,CACF,CAAC;AACJ,CAAC"}

package/dist/adapters/process/diagnostic-process.js

@@ -1,6 +1,7 @@
 // Process diagnostics decorate the one subprocess port, preserving its result
 // while emitting a bounded, credential-free account of each completed call.
 import { redactText, redactVector, summarizeDiagnostic } from '../../domain/diagnostics.js';
+import { messageOf } from '../../domain/values.js';
 export class DiagnosticProcess {
     inner;
     diagnostics;
@@ -15,9 +16,7 @@ export class DiagnosticProcess {
             return result;
         }
         catch (err) {
-            const stderr = options.sensitiveOutput
-                ? undefined
-                : summarizeDiagnostic(err instanceof Error ? err.message : String(err));
+            const stderr = options.sensitiveOutput ? undefined : summarizeDiagnostic(messageOf(err));
             this.diagnostics.emit({
                 ...baseEvent(vector, options),
                 ...(stderr === undefined ? {} : { stderr }),

package/dist/adapters/process/diagnostic-process.js.map

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

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":"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"}
+{"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"}