@angelmsger/fx 0.11.0 → 0.13.0

package/dist/application/safety/trust.js.map

@@ -1 +1 @@
-{"version":3,"file":"trust.js","sourceRoot":"","sources":["../../../src/application/safety/trust.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trust.js","sourceRoot":"","sources":["../../../src/application/safety/trust.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,wEAAwE;AACxE,0EAA0E;AAC1E,wEAAwE;AACxE,2EAA2E;AAC3E,0EAA0E;AAE1E,OAAO,EAAE,WAAW,EAAE,eAAe,EAAwB,MAAM,wBAAwB,CAAC;AAG5F,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,GAEb,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAqB,MAAM,cAAc,CAAC;AA8BjE,MAAM,OAAO,SAAS;IAED;IACA;IAFnB,YACmB,KAAiB,EACjB,QAAkB;QADlB,UAAK,GAAL,KAAK,CAAY;QACjB,aAAQ,GAAR,QAAQ,CAAU;IAClC,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,KAAiB;QAC5B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,6EAA6E;IAC7E,KAAK,CAAC,SAAS,CAAC,KAAiB;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACvC,MAAM,IAAI,CAAC,MAAM,CACf,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAC3E,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACjE,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,KAAiB,EAAE,KAAa;QACnD,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,OAAO;QACxC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,SAAS,CACb,KAAwE;QAExE,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,KAAiB,EAAE,OAAe;QACtD,MAAM,KAAK,GAAG,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,EAAW,CAAC;QAChB,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAC9B,wCAAwC,KAAK,CAAC,KAAK,QAAQ,KAAK,kEAAkE,EAClI,EAAE,QAAQ,EAAE,CAAC,oCAAoC,CAAC,EAAE,CACrD,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAChE,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,kBAAkB,EAClB,4BAA4B,KAAK,CAAC,KAAK,8BAA8B,KAAK,EAAE,EAC5E;oBACE,IAAI,EAAE,sEAAsE;oBAC5E,SAAS,EAAE;wBACT,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC3E,sGAAsG;qBACvG;iBACF,CACF,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,WAAW,CACnB,YAAY,EACZ,iBAAiB,EACjB,mBAAmB,KAAK,CAAC,KAAK,qBAAqB,KAAK,EAAE,EAC1D;gBACE,IAAI,EAAE,8DAA8D;gBACpE,SAAS,EAAE,KAAK,CAAC,IAAI;oBACnB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBACtD,CAAC,CAAC,CAAC,qDAAqD,CAAC;aAC5D,CACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,UAAU,mBAAmB,CACjC,KAAmE,EACnE,IAAY;IAEZ,MAAM,OAAO,GAAG,eAAe,CAC7B,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACtD,CAAC;IACF,OAAO,eAAe,CAAC;QACrB,OAAO,EAAE,GAAG,IAAI,iDAAiD;QACjE,SAAS,EAAE;YACT;gBACE,EAAE,EAAE,GAAG,IAAI,QAAQ;gBACnB,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,UAAU,IAAI,oBAAoB;gBACzC,YAAY,EACV,8EAA8E;aACjF;SACF;QACD,OAAO;QACP,YAAY,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;KAC/F,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAY;IAC1C,OAAO,GAAG,YAAY,WAAW,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrE,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,OAAO,IAAI,KAAK,kBAAkB,IAAI,IAAI,KAAK,kBAAkB,CAAC;AACpE,CAAC"}

package/dist/application/self/update.js

@@ -1,17 +1,17 @@
 // Update fx through its distribution registry after confirmation and the write gate.
-// Capture installer output so machine-readable results remain valid on stdout.
+// Capture installer output so machine-readable results remain valid on stdout. A
+// completed install settles the update-check window on the version it installed.
 import { DevkitError } from '../../domain/errors.js';
 import { stderrReason } from '../../domain/toolchain/stderr.js';
 import { assertWritable } from '../safety/posture.js';
 import { REGISTRY_HANDOFF } from './registry.js';
+export function isUpdated(output) {
+    return output.ran && output.code === 0;
+}
 export class SelfUpdate {
-    process;
-    prompter;
-    installer;
-    constructor(process, prompter, installer) {
-        this.process = process;
-        this.prompter = prompter;
-        this.installer = installer;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async execute(input) {
         if (input.registry === null) {
@@ -21,7 +21,7 @@ export class SelfUpdate {
                 handoff: REGISTRY_HANDOFF,
             });
         }
-        const vector = this.installer.vector(input.packageName, {
+        const vector = this.deps.installer.vector(input.packageName, {
             registry: input.registry,
             update: true,
             registryScope: 'package',
@@ -33,7 +33,7 @@ export class SelfUpdate {
         if (input.dryRun)
             return { vector, ran: false, code: null, reason: 'dry run' };
         assertWritable(input.posture, 'self update');
-        if (!(await this.installer.available()))
+        if (!(await this.deps.installer.available()))
             throw new DevkitError('config', 'TOOL_MISSING', 'The self-update installer is unavailable', {
                 nextSteps: ['Install npm or add it to PATH, then retry.'],
                 handoff: {
@@ -45,17 +45,27 @@ export class SelfUpdate {
                 },
             });
         if (!input.yes) {
-            const go = await this.prompter.confirm(`Run \`${vector.join(' ')}\`?`, { defaultYes: true });
+            const go = await this.deps.prompter.confirm(`Run \`${vector.join(' ')}\`?`, {
+                defaultYes: true,
+            });
             if (!go)
                 return { vector, ran: false, code: null, reason: 'declined' };
         }
-        const result = await this.process.run(vector, { interactive: false });
-        return {
+        const result = await this.deps.process.run(vector, { interactive: false });
+        const output = {
             vector,
             ran: true,
             code: result.code,
             reason: result.code === 0 ? null : stderrReason(result.stderr, result.code),
         };
+        if (isUpdated(output))
+            await this.settleCheck(input);
+        return output;
+    }
+    async settleCheck(input) {
+        const { latest } = await this.deps.check.execute(input);
+        if (latest !== null)
+            await this.deps.check.markCurrent(input, latest);
     }
 }
 //# sourceMappingURL=update.js.map

package/dist/application/self/update.js.map

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

package/dist/application/services/command.js

@@ -16,8 +16,8 @@ export async function prepareCommand(deps, login, step, dryRun) {
     const changes = plan.changes;
     if (dryRun)
         return { status: 'planned', detail: 'Public service settings would be prepared', changes };
-    assertWritable(login.trust.posture, step.id);
-    await login.trust.gate.ensure(trustOf(preset, vector, step.id));
+    assertWritable(deps.trust.posture, step.id);
+    await deps.trust.gate.ensure(trustOf(preset, vector, step.id));
     const applied = await runPreset(preset, vector, 'prepare');
     if (applied.code !== 0)
         return commandFailure(login.serviceProtocol.failure(applied.stderr), vector, deps);
@@ -27,13 +27,13 @@ export async function prepareCommand(deps, login, step, dryRun) {
 async function consult(preset, vector) {
     const { deps, login } = preset;
     const preview = [...vector, '--dry-run'];
-    if (preset.dryRun && !(await login.trust.gate.isTrusted(trustOf(preset, preview))))
+    if (preset.dryRun && !(await deps.trust.gate.isTrusted(trustOf(preset, preview))))
         return {
             status: 'blocked',
             detail: 'Service preview command is not trusted',
             next_steps: [shellLine(preview, deps.commandShell)],
         };
-    await login.trust.gate.ensure(trustOf(preset, preview));
+    await deps.trust.gate.ensure(trustOf(preset, preview));
     const result = await runPreset(preset, preview, 'preview');
     if (result.code !== 0)
         return commandFailure(login.serviceProtocol.failure(result.stderr), vector, deps);
@@ -46,16 +46,14 @@ async function consult(preset, vector) {
 }
 function trustOf(preset, vector, label) {
     return {
-        ...preset.login.trust,
-        workspace: preset.deps.ctx.name,
-        commandShell: preset.deps.commandShell,
+        ...preset.deps.trust,
         vector,
         origin: preset.step.origin,
         label: label ?? `${preset.step.id} preview`,
     };
 }
 function runPreset(preset, vector, phase) {
-    return preset.deps.processRun(vector, {
+    return preset.deps.process.run(vector, {
         timeoutMs: 5000,
         cwd: preset.deps.ctx.root,
         diagnostic: { phase: `${preset.step.id} ${phase}` },

package/dist/application/services/command.js.map

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

package/dist/application/services/operation.js

@@ -4,8 +4,8 @@ import path from 'node:path';
 import { asDevkitError, DevkitError, toEnvelope } from '../../domain/errors.js';
 import { atLeast } from '../../domain/semver.js';
 import { matchesPublicDefaults } from '../../domain/setup/public-defaults.js';
+import { toolRecovery } from '../preparation.js';
 import { assertWritable } from '../safety/posture.js';
-import { toolChecks } from '../sync/checks.js';
 import { ToolCheck } from '../tool/check.js';
 import { toolchainOf } from '../tool/toolchain.js';
 import { workspaceCommand } from '../workspace/guidance.js';
@@ -17,7 +17,8 @@ export class ServiceOperation {
         this.deps = deps;
         this.login = login;
     }
-    async execute(step, dryRun) {
+    async execute(step, options) {
+        const { dryRun } = options;
         const base = { id: step.id, tool: step.tool, env: step.env ?? null };
         try {
             const preparation = step.preparation;
@@ -33,17 +34,9 @@ export class ServiceOperation {
                     ? tool.minVersion
                     : preparation.minVersion,
             }));
-            const [version] = await new ToolCheck({
-                run: this.deps.processRun,
-                which: this.deps.processWhich,
-            }).execute({
+            const [version] = await new ToolCheck(this.deps.process).execute({
                 tools,
-                trust: {
-                    ...this.login.trust,
-                    workspace: this.deps.ctx.name,
-                    commandShell: this.deps.commandShell,
-                    dryRun,
-                },
+                trust: { ...this.deps.trust, dryRun },
             });
             if (version?.state !== 'ok')
                 return {
@@ -52,8 +45,10 @@ export class ServiceOperation {
                     detail: `${step.tool} is ${version?.state ?? 'unknown'}; requires ${version?.min_version ?? preparation.minVersion} for public service settings`,
                     ...(version
                         ? {
-                            actions: toolChecks([{ ...version, preparation_required: step.required }], this.deps)[0]
-                                ?.actions ?? [],
+                            actions: toolRecovery(this.deps, {
+                                ...version,
+                                preparation_required: step.required,
+                            }),
                         }
                         : {}),
                     next_steps: [
@@ -101,11 +96,9 @@ export class ServiceOperation {
                     { before: null, after: value },
                 ])),
             };
-        assertWritable(this.login.trust.posture, step.id);
-        await this.login.trust.gate.ensure({
-            ...this.login.trust,
-            workspace: this.deps.ctx.name,
-            commandShell: this.deps.commandShell,
+        assertWritable(this.deps.trust.posture, step.id);
+        await this.deps.trust.gate.ensure({
+            ...this.deps.trust,
             vector: ['fx', 'sync', '--only', 'services'],
             origin: step.origin,
             label: step.id,

package/dist/application/services/operation.js.map

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

package/dist/application/services/recipes.js

@@ -1,5 +1,6 @@
 // Expand service configuration and personal login separately from one binding.
 import { serviceVars } from '../../domain/manifest/service.schema.js';
+import { SERVICE_RECIPE_ID } from '../../domain/setup/names.js';
 export function serviceRecipes(input) {
     const { descriptor, settings } = input;
     const definition = descriptor.service?.(settings);
@@ -17,7 +18,7 @@ export function serviceRecipes(input) {
             ...common,
             preparation: prep,
             recipe: {
-                id: 'service',
+                id: SERVICE_RECIPE_ID,
                 tool,
                 perEnv: false,
                 kind: 'run',
@@ -32,7 +33,11 @@ export function serviceRecipes(input) {
         },
         ...definition.recipes.map((recipe) => ({
             ...common,
-            recipe: { ...recipe, perEnv: false, requires: ['service', ...(recipe.requires ?? [])] },
+            recipe: {
+                ...recipe,
+                perEnv: false,
+                requires: [SERVICE_RECIPE_ID, ...(recipe.requires ?? [])],
+            },
         })),
     ];
 }

package/dist/application/services/recipes.js.map

@@ -1 +1 @@
-{"version":3,"file":"recipes.js","sourceRoot":"","sources":["../../../src/application/services/recipes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAwB,MAAM,yCAAyC,CAAC;AAI5F,MAAM,UAAU,cAAc,CAAC,KAK9B;IACC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;IAClC,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAC;IACF,OAAO;QACL;YACE,GAAG,MAAM;YACT,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,SAAS;gBACb,IAAI;gBACJ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,kBAAkB,IAAI,mBAAmB;gBAChD,YAAY,EACV,6HAA6H;gBAC/H,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,MAAM,EACJ,IAAI,CAAC,IAAI,KAAK,SAAS;oBACrB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;oBACtF,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;aAC9B;SACF;QACD,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,MAAM;YACT,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,EAAE;SACxF,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"recipes.js","sourceRoot":"","sources":["../../../src/application/services/recipes.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAwB,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKhE,MAAM,UAAU,cAAc,CAAC,KAK9B;IACC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;IAClC,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAC;IACF,OAAO;QACL;YACE,GAAG,MAAM;YACT,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE;gBACN,EAAE,EAAE,iBAAiB;gBACrB,IAAI;gBACJ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,kBAAkB,IAAI,mBAAmB;gBAChD,YAAY,EACV,6HAA6H;gBAC/H,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,MAAM,EACJ,IAAI,CAAC,IAAI,KAAK,SAAS;oBACrB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;oBACtF,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;aAC9B;SACF;QACD,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrC,GAAG,MAAM;YACT,MAAM,EAAE;gBACN,GAAG,MAAM;gBACT,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;aAC1D;SACF,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC"}

package/dist/application/services/stage.js

@@ -1,16 +1,18 @@
 // Explicit setup runs only public preparation, never login or credential acquisition.
 import { preparationCheck } from '../../domain/preparation.js';
+import { problemsOfRecipe, SERVICE_RECIPE_ID } from '../../domain/setup/names.js';
 import { buildPlan } from '../login/collect.js';
 import { workspaceToolScope } from '../tool/scope.js';
 import { ServiceOperation } from './operation.js';
-export async function prepareServices(deps, login, dryRun) {
+import { SERVICE_STATUSES } from './types.js';
+export async function prepareServices(deps, login, options) {
     const plan = buildPlan(deps, login, { scopeEnvs: deps.ctx.local.scope?.envs });
-    const problems = plan.problems.filter((problem) => /\.service(?:@|$)/.test(problem.step));
+    const problems = problemsOfRecipe(plan.problems, SERVICE_RECIPE_ID);
     const operation = new ServiceOperation(deps, login);
     const items = [];
     for (const step of plan.steps.filter((step) => step.preparation))
-        items.push(await operation.execute(step, dryRun));
-    const summary = Object.fromEntries(['unchanged', 'configured', 'planned', 'blocked', 'failed'].map((status) => [
+        items.push(await operation.execute(step, options));
+    const summary = Object.fromEntries(SERVICE_STATUSES.map((status) => [
         status,
         items.filter((item) => item.status === status).length,
     ]));

package/dist/application/services/stage.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../src/application/services/stage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stage.js","sourceRoot":"","sources":["../../../src/application/services/stage.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAgD,MAAM,YAAY,CAAC;AAE5F,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAmB,EACnB,KAAgB,EAChB,OAAqC;IAErC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAC/B,MAAM;QACN,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM;KACtD,CAAC,CACH,CAAC;IACF,OAAO;QACL,MAAM,EAAE;YACN,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACpB,gBAAgB,CACd,WAAW,IAAI,CAAC,EAAE,EAAE,EACpB,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAC3E,IAAI,CAAC,MAAM,EACX;gBACE,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClE,KAAK,EAAE,MAAM;gBACb,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD,CACF,CACF;YACD,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1B,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CACnF;SACF;QACD,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE;QAClD,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;KAC7B,CAAC;AACJ,CAAC"}

package/dist/application/services/types.js

@@ -1,4 +1,10 @@
 // What preparing one declared service reports back: the same row whether the
 // work was a native command or an owned workspace file.
-export {};
+export const SERVICE_STATUSES = [
+    'unchanged',
+    'configured',
+    'planned',
+    'blocked',
+    'failed',
+];
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/services/types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wDAAwD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/application/services/types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wDAAwD;AAMxD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,WAAW;IACX,YAAY;IACZ,SAAS;IACT,SAAS;IACT,QAAQ;CACA,CAAC"}

package/dist/application/skill/copies.js

@@ -1,6 +1,7 @@
 // Share locked, recoverable bundled Skill replacement between explicit installation and sync.
 import path from 'node:path';
 import { busyError, DevkitError } from '../../domain/errors.js';
+import { withLease } from '../../domain/lease.js';
 import { pathKey } from '../../domain/path.js';
 import { decideCopy } from '../../domain/skills/projection.js';
 import { assertWritable } from '../safety/posture.js';
@@ -26,36 +27,26 @@ export async function withSkillLock(fs, lock, target, work) {
 }
 async function lockedSkillWork(fs, lock, target, work) {
     const canonical = await canonicalSkillPath(fs, target);
-    const lease = await lock.acquire({ key: `skill:${pathKey(canonical)}`, waitMs: 2000 });
-    if (lease === null)
-        throw busyError('SKILL_BUSY', 'The Skill', {
-            nextSteps: ['Retry the Skill command after the other update completes.'],
-        });
-    try {
+    return withLease(lock, { key: `skill:${pathKey(canonical)}`, waitMs: 2000 }, () => busyError('SKILL_BUSY', 'The Skill', {
+        nextSteps: ['Retry the Skill command after the other update completes.'],
+    }), async () => {
         if (pathKey(await canonicalSkillPath(fs, target)) !== pathKey(canonical))
             throw new DevkitError('conflict', 'SKILL_TARGET_CHANGED', 'The Skill target changed', {
                 nextSteps: ['Inspect the target directory and retry.'],
             });
-        return await work(canonical);
-    }
-    finally {
-        await lease?.release();
-    }
+        return work(canonical);
+    });
 }
 export class SkillCopies {
-    fs;
-    version;
-    skills;
-    constructor(fs, version, skills) {
-        this.fs = fs;
-        this.version = version;
-        this.skills = skills;
+    deps;
+    constructor(deps) {
+        this.deps = deps;
     }
     async install(target, input = {}) {
-        return withSkillLock(this.fs, this.skills.globalLock, target, async (canonical) => {
+        return withSkillLock(this.deps.fs, this.deps.skills.globalLock, target, async (canonical) => {
             await input.validate?.(canonical);
-            const observed = await observeCopy(this.fs, canonical);
-            let action = decideCopy(observed, this.version);
+            const observed = await observeCopy(this.deps.fs, canonical);
+            let action = decideCopy(observed, this.deps.version);
             if (input.refresh && observed.kind === 'ours')
                 action = 'upgrade';
             if (input.posture &&
@@ -64,7 +55,7 @@ export class SkillCopies {
             if (action === 'foreign' && input.replace && (await input.replace([canonical])))
                 action = 'install';
             if (action === 'install' || action === 'upgrade')
-                await this.fs.replaceDir(this.skills.bundledSkillDir, canonical);
+                await this.deps.fs.replaceDir(this.deps.skills.bundledSkillDir, canonical);
             return action;
         });
     }

package/dist/application/skill/copies.js.map

@@ -1 +1 @@
-{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAE9F,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAmB,MAAM,mCAAmC,CAAC;AAIhF,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAc,EAAE,MAAc;IACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAc,EACd,IAAU,EACV,MAAc,EACd,IAAuC;IAEvC,IAAI,CAAC;QACH,OAAO,MAAM,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,EAAc,EACd,IAAU,EACV,MAAc,EACd,IAAuC;IAEvC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACvF,IAAI,KAAK,KAAK,IAAI;QAChB,MAAM,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE;YACzC,SAAS,EAAE,CAAC,2DAA2D,CAAC;SACzE,CAAC,CAAC;IACL,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,KAAK,OAAO,CAAC,SAAS,CAAC;YACtE,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,sBAAsB,EAAE,0BAA0B,EAAE;gBACpF,SAAS,EAAE,CAAC,yCAAyC,CAAC;aACvD,CAAC,CAAC;QACL,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;YAAS,CAAC;QACT,MAAM,KAAK,EAAE,OAAO,EAAE,CAAC;IACzB,CAAC;AACH,CAAC;AASD,MAAM,OAAO,WAAW;IAEH;IACA;IACA;IAHnB,YACmB,EAAc,EACd,OAAe,EACf,MAAyD;QAFzD,OAAE,GAAF,EAAE,CAAY;QACd,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAmD;IACzE,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,QAAwB,EAAE;QACtD,OAAO,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;YAChF,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YACvD,IAAI,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;gBAAE,MAAM,GAAG,SAAS,CAAC;YAClE,IACE,KAAK,CAAC,OAAO;gBACb,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;gBAEzF,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;YAC3D,IAAI,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC7E,MAAM,GAAG,SAAS,CAAC;YACrB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;gBAC9C,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"copies.js","sourceRoot":"","sources":["../../../src/application/skill/copies.ts"],"names":[],"mappings":"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"}

package/dist/application/skill/fx-copies.js

@@ -16,7 +16,7 @@ export async function planCopies(deps, skills, agents) {
     return items;
 }
 export async function applyCopies(deps, skills, items, input) {
-    const copies = new SkillCopies(deps.fs, deps.cliVersion, skills);
+    const copies = new SkillCopies({ fs: deps.fs, version: deps.cliVersion, skills });
     for (const [index, item] of items.entries()) {
         await applyItem(items, index, async () => {
             const action = await copies.install(item.path, {

package/dist/application/skill/fx-copies.js.map

@@ -1 +1 @@
-{"version":3,"file":"fx-copies.js","sourceRoot":"","sources":["../../../src/application/skill/fx-copies.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,sEAAsE;AAEtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAmB,EACnB,MAAiB,EACjB,MAAqC;IAErC,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAmB,EACnB,MAAiB,EACjB,KAAoB,EACpB,KAAsB;IAEtB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACjE,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC7C,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;aACvF,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CAAC,GAAG;gBACb,GAAG,IAAI;gBACP,MAAM;gBACN,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAkB,EAAE,CAAC;aACxF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"fx-copies.js","sourceRoot":"","sources":["../../../src/application/skill/fx-copies.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,sEAAsE;AAEtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAA8C,EAC9C,MAAiB,EACjB,MAAqC;IAErC,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,KAAK,MAAM,MAAM,IAAI,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QACxD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3E,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAA8C,EAC9C,MAAiB,EACjB,KAAoB,EACpB,KAAsB;IAEtB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAClF,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5C,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;YACvC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC7C,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;aACvF,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CAAC,GAAG;gBACb,GAAG,IAAI;gBACP,MAAM;gBACN,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAkB,EAAE,CAAC;aACxF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/application/skill/stage.js

@@ -1,11 +1,13 @@
 // Runs the three Skill product lines as one stage: plan them all, then write
 // links and copies before any external tool process, and summarize the outcome.
 import { withPartialResult } from '../../domain/errors.js';
+import { isUnfinished } from '../../domain/outcome.js';
+import { countBy } from '../../domain/values.js';
 import { assertWritable } from '../safety/posture.js';
 import { applyCopies, planCopies } from './fx-copies.js';
 import { observeCopy, observeLink } from './observe.js';
 import { applyLinks, planLinks, replaceConflicts, reportForeign } from './team-links.js';
-import { planTools, runTools, trustAll, trustedTools } from './tool-skills.js';
+import { awaitsApproval, planTools, runTools, trustAll, trustedTools } from './tool-skills.js';
 export class SkillStage {
     deps;
     skills;
@@ -19,7 +21,7 @@ export class SkillStage {
         const fx = (await planCopies(this.deps, this.skills, input.agents)).map((item) => ({ ...item, status }));
         const plannedTools = (await planTools(this.deps, this.skills, input)).map((item) => ({ ...item, status }));
         let tools = input.background
-            ? await trustedTools(plannedTools, input.toolchain, input.trust)
+            ? await trustedTools(plannedTools, input.toolchain, this.deps.trust)
             : plannedTools;
         try {
             const writes = links.some((i) => i.action === 'create' || i.action === 'prune') ||
@@ -29,7 +31,7 @@ export class SkillStage {
                 assertWritable(input.posture, 'sync');
             if (!input.dryRun) {
                 if (!input.background)
-                    tools = await trustAll(tools, input.toolchain, input.trust);
+                    tools = await trustAll(tools, input.toolchain, this.deps.trust);
                 await replaceConflicts(this.deps, input, links);
                 await applyLinks(this.deps, links);
                 await applyCopies(this.deps, this.skills, fx, input);
@@ -78,7 +80,13 @@ const COPY_KEY = {
     foreign: 'foreign',
 };
 function summarize(links, fx, tools) {
-    const summary = {
+    const finished = (item) => !isUnfinished(item.status);
+    const keys = [
+        ...links.filter(finished).map((item) => item.action),
+        ...fx.filter(finished).map((item) => COPY_KEY[item.action]),
+        ...tools.map(toolSummaryKey),
+    ];
+    return {
         create: 0,
         unchanged: 0,
         prune: 0,
@@ -91,28 +99,18 @@ function summarize(links, fx, tools) {
         tools_failed: 0,
         tools_skipped: 0,
         tools_blocked: 0,
+        ...countBy(keys, (key) => key),
     };
-    const bump = (key) => {
-        summary[key] = (summary[key] ?? 0) + 1;
-    };
-    for (const item of links)
-        if (item.status !== 'not_started' && item.status !== 'failed')
-            bump(item.action);
-    for (const item of fx)
-        if (item.status !== 'not_started' && item.status !== 'failed')
-            bump(COPY_KEY[item.action]);
-    for (const item of tools) {
-        if (item.status === 'failed')
-            bump('tools_failed');
-        else if (item.status === 'not_started')
-            bump('tools_not_started');
-        else if (item.note === 'approval required')
-            bump('tools_blocked');
-        else if (item.vector === null)
-            bump('tools_skipped');
-        else
-            bump(item.code === null || item.code === 0 ? 'tools_run' : 'tools_failed');
-    }
-    return summary;
+}
+function toolSummaryKey(item) {
+    if (item.status === 'failed')
+        return 'tools_failed';
+    if (item.status === 'not_started')
+        return 'tools_not_started';
+    if (awaitsApproval(item))
+        return 'tools_blocked';
+    if (item.vector === null)
+        return 'tools_skipped';
+    return item.code === null || item.code === 0 ? 'tools_run' : 'tools_failed';
 }
 //# sourceMappingURL=stage.js.map

package/dist/application/skill/stage.js.map

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

package/dist/application/skill/standalone.js

@@ -79,7 +79,7 @@ export class StandaloneSkill {
     }
     async apply(operation, row, posture) {
         if (operation === 'install') {
-            const action = await new SkillCopies(this.deps.fs, this.deps.version, this.deps.skills).install(row.path, {
+            const action = await new SkillCopies(this.deps).install(row.path, {
                 posture,
                 refresh: true,
                 replace: this.deps.replace,