@angelmsger/fx 0.11.0 → 0.13.0

package/dist/cli/commands/self/update.js

@@ -1,4 +1,5 @@
-import { SelfUpdate } from '../../../application/self/update.js';
+import { isUpdated } from '../../../application/self/update.js';
+import { selfUpdate } from '../../../composition/update.js';
 import { FxCommand } from '../../base.js';
 import { dryRunFlag, writeIntent } from '../../flags.js';
 export default class SelfUpdateCommand extends FxCommand {
@@ -10,25 +11,21 @@ export default class SelfUpdateCommand extends FxCommand {
     static flags = { 'dry-run': dryRunFlag };
     async run() {
         const { flags } = await this.parse(SelfUpdateCommand);
-        const pjson = this.config.pjson;
         const update = await this.fxUpdateInput();
-        const out = await new SelfUpdate(this.container.process, this.container.prompter(this.noInput), this.container.installers.find((installer) => installer.id === 'npm')).execute({
-            packageName: pjson.name,
+        const out = await selfUpdate(this.container, this.noInput).execute({
+            current: update.current,
+            packageName: update.packageName,
             registry: update.registry,
             ...writeIntent(flags, this.posture),
             yes: this.yes,
         });
         this.renderer.record(out);
-        if (!out.ran || out.code !== 0)
-            return;
-        const { latest } = await this.updateChecks().fx.execute(update);
-        if (latest !== null)
-            await this.updateChecks().fx.markCurrent(update, latest);
-        this.renderer.notice({
-            code: 'SELF_UPDATED',
-            message: 'fx was updated',
-            nextSteps: ['fx --version'],
-        });
+        if (isUpdated(out))
+            this.renderer.notice({
+                code: 'SELF_UPDATED',
+                message: 'fx was updated',
+                nextSteps: ['fx --version'],
+            });
     }
 }
 //# sourceMappingURL=update.js.map

package/dist/cli/commands/self/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/self/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,SAAS;IACtD,MAAM,CAAU,WAAW,GACzB,iFAAiF,CAAC;IACpF,MAAM,CAAU,QAAQ,GAAG;QACzB,yCAAyC;QACzC,qCAAqC;KACtC,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;IAElD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAyB,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,IAAI,UAAU,CAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EACrC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,KAAK,CAAE,CACvE,CAAC,OAAO,CAAC;YACR,WAAW,EAAE,KAAK,CAAC,IAAI;YACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QACvC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,MAAM,KAAK,IAAI;YAAE,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,gBAAgB;YACzB,SAAS,EAAE,CAAC,cAAc,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/cli/commands/self/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,SAAS;IACtD,MAAM,CAAU,WAAW,GACzB,iFAAiF,CAAC;IACpF,MAAM,CAAU,QAAQ,GAAG;QACzB,yCAAyC;QACzC,qCAAqC;KACtC,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;IAElD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACjE,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;YACnC,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,SAAS,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,gBAAgB;gBACzB,SAAS,EAAE,CAAC,cAAc,CAAC;aAC5B,CAAC,CAAC;IACP,CAAC"}

package/dist/cli/commands/source/push.js

@@ -1,5 +1,6 @@
 import { Args } from '@oclif/core';
-import { runSourcePush } from '../../../composition/contributions.js';
+import { PushRegisteredSource } from '../../../application/contribution/push-registered.js';
+import { sourcePushDeps } from '../../../composition/contributions.js';
 import { FxCommand } from '../../base.js';
 import { writeIntent } from '../../flags.js';
 import { sourcePushFlags } from '../../source-flags.js';
@@ -20,22 +21,22 @@ export default class SourcePushCommand extends FxCommand {
         const { args, flags } = await this.parse(SourcePushCommand);
         if (flags['dry-run'])
             this.skipUpdateChecks();
-        const result = await runSourcePush({
+        const deps = sourcePushDeps({
             container: this.container,
             resolve: this.resolveInput(),
             noInput: this.noInput,
             user: this.user,
-            request: {
-                paths: args.paths ?? [],
-                issue: flags.issue,
-                title: flags.title,
-                ...(flags.message === undefined ? {} : { message: flags.message }),
-                ...(flags.pr === undefined ? {} : { prRef: flags.pr }),
-                cliVersion: this.config.version,
-                ...writeIntent(flags, this.posture),
-                forceNew: flags.new,
-                yes: this.yes,
-            },
+        });
+        const result = await new PushRegisteredSource(deps).execute({
+            paths: args.paths ?? [],
+            issue: flags.issue,
+            title: flags.title,
+            ...(flags.message === undefined ? {} : { message: flags.message }),
+            ...(flags.pr === undefined ? {} : { prRef: flags.pr }),
+            cliVersion: this.config.version,
+            ...writeIntent(flags, this.posture),
+            forceNew: flags.new,
+            yes: this.yes,
         });
         this.renderer.record(result);
     }

package/dist/cli/commands/source/push.js.map

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/cli/commands/source/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,SAAS;IACtD,MAAM,CAAU,WAAW,GACzB,+RAA+R,CAAC;IAClS,MAAM,CAAU,QAAQ,GAAG;QACzB,2HAA2H;KAC5H,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,8DAA8D;SAC5E,CAAC;KACH,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,eAAe,CAAC;IAExC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;gBACvB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClE,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;gBACtD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC/B,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;gBACnC,QAAQ,EAAE,KAAK,CAAC,GAAG;gBACnB,GAAG,EAAE,IAAI,CAAC,GAAG;aACd;SACF,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../src/cli/commands/source/push.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,SAAS;IACtD,MAAM,CAAU,WAAW,GACzB,+RAA+R,CAAC;IAClS,MAAM,CAAU,QAAQ,GAAG;QACzB,2HAA2H;KAC5H,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,8DAA8D;SAC5E,CAAC;KACH,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,eAAe,CAAC;IAExC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,cAAc,CAAC;YAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;YAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC1D,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;YAClE,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YACtD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC/B,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;YACnC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC"}

package/dist/cli/commands/status.js

@@ -1,7 +1,5 @@
 import { Flags } from '@oclif/core';
-import { Status } from '../../application/status.js';
-import { strayRootEntries } from '../../application/workspace/root-entries.js';
-import { shellLine } from '../../domain/shell.js';
+import { WorkspaceStatus } from '../../application/workspace/status.js';
 import { FxCommand } from '../base.js';
 import { jobsFlag, writeIntent } from '../flags.js';
 export default class StatusCommand extends FxCommand {
@@ -24,6 +22,7 @@ export default class StatusCommand extends FxCommand {
         }),
         jobs: jobsFlag,
     };
+    static writeScope = (flags) => flags['fetch'] ? 'workspace' : null;
     async run() {
         const { flags } = await this.parse(StatusCommand);
         const input = flags.fetch
@@ -34,16 +33,11 @@ export default class StatusCommand extends FxCommand {
                 jobs: flags.jobs,
             }
             : { fetch: false, dirtyOnly: flags.dirty, jobs: flags.jobs };
-        const deps = await this.workspaceDeps();
-        const rows = await new Status(deps).execute(input);
-        const selected = deps.ctx.workspace.repos.length;
-        const declared = deps.ctx.manifest.workspace.result.doc.repos.length;
-        const emptyReason = statusEmptyReason(rows.length, selected, declared, flags.dirty);
-        const strays = await strayRootEntries(deps, {
+        const { items, ...summary } = await new WorkspaceStatus(await this.workspaceDeps(), {
             hosts: this.skillDeps().hosts,
             login: this.loginDeps(),
-        });
-        this.renderer.list(rows, {
+        }).execute(input);
+        this.renderer.list(items, {
             columns: [
                 'name',
                 'branch',
@@ -55,32 +49,8 @@ export default class StatusCommand extends FxCommand {
                 ...(flags.fetch ? ['fetch'] : []),
                 'note',
             ],
-            trailer: {
-                workspace: deps.ctx.name,
-                root: deps.ctx.root,
-                selection: deps.ctx.selection,
-                selected_repositories: selected,
-                stray_entries: strays.map((entry) => entry.name),
-                ...(emptyReason === null
-                    ? {}
-                    : {
-                        empty_reason: emptyReason,
-                        next_steps: emptyReason === 'no_repositories_selected'
-                            ? [
-                                shellLine(['fx', 'repo', 'list', '--workspace', deps.ctx.name], this.commandShell),
-                                shellLine(['fx', 'repo', 'select', '--all', '--workspace', deps.ctx.name], this.commandShell),
-                            ]
-                            : [],
-                    }),
-            },
+            trailer: summary,
         });
     }
 }
-function statusEmptyReason(rows, selected, declared, dirtyOnly) {
-    if (rows > 0)
-        return null;
-    if (selected === 0)
-        return declared === 0 ? 'no_repositories_declared' : 'no_repositories_selected';
-    return dirtyOnly ? 'no_uncommitted_changes' : 'no_repositories';
-}
 //# sourceMappingURL=status.js.map

package/dist/cli/commands/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,eAAe,EAAoB,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,SAAS;IAClD,MAAM,CAAU,WAAW,GACzB,+EAA+E,CAAC;IAClF,MAAM,CAAU,QAAQ,GAAG;QACzB,0BAA0B;QAC1B,0CAA0C;KAC3C,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;YACvB,SAAS,EAAE,CAAC,OAAO,CAAC;YACpB,WAAW,EAAE,6CAA6C;SAC3D,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,WAAW,EAAE,yDAAyD;SACvE,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,WAAW,EACT,oFAAoF;SACvF,CAAC;QACF,IAAI,EAAE,QAAQ;KACf,CAAC;IACF,MAAM,CAAU,UAAU,GAA0B,CAAC,KAAK,EAAE,EAAE,CAC5D,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAEtC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,KAAK,GAAgB,KAAK,CAAC,KAAK;YACpC,CAAC,CAAC;gBACE,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,KAAK,CAAC,KAAK;gBACtB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;gBACnC,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;YACH,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QAC/D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE;YAClF,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK;YAC7B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;SACxB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;YACxB,OAAO,EAAE;gBACP,MAAM;gBACN,QAAQ;gBACR,aAAa;gBACb,OAAO;gBACP,WAAW;gBACX,OAAO;gBACP,QAAQ;gBACR,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjC,MAAM;aACP;YACD,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC"}

package/dist/cli/commands/sync.js

@@ -21,18 +21,20 @@ export default class SyncCommand extends FxCommand {
             description: 'pull the manifest repository first; --no-refresh-manifest skips it',
         }),
     };
+    static writeScope = 'workspace';
     async run() {
         const { flags } = await this.parse(SyncCommand);
         const only = selectSyncStages(flags.only?.join(','), syncStageIds());
         const run = { ...writeIntent(flags, this.posture) };
-        if (flags['refresh-manifest'])
-            await refreshManifestBeforeSync(this.container, this.resolveInput(), run);
-        const deps = await this.workspaceDeps();
-        const out = await new Sync(deps).execute({
+        this.foldRestatedOutcomes();
+        const manifest = flags['refresh-manifest']
+            ? await refreshManifestBeforeSync(this.container, this.resolveInput(), run)
+            : undefined;
+        const out = await new Sync(await this.workspaceDeps(), this.stageDeps()).execute({
             ...run,
+            manifest,
             jobs: flags.jobs,
             only,
-            stages: this.stages(deps, run.dryRun),
         });
         await this.renderPreparation(out);
     }

package/dist/cli/commands/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,MAAM,CAAU,WAAW,GACzB,yYAAyY,CAAC;IAC5Y,MAAM,CAAU,QAAQ,GAAG;QACzB,wBAAwB;QACxB,gDAAgD;KACjD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,UAAU;QACrB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,EAAE,YAAY,EAAE,CAAC;QACrD,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,KAAK,CAAC,OAAO,CAAC;YAChC,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,oEAAoE;SAClF,CAAC;KACH,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,KAAK,CAAC,kBAAkB,CAAC;YAC3B,MAAM,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACvC,GAAG,GAAG;YACN,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;SACtC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/cli/commands/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD,MAAM,CAAU,WAAW,GACzB,yYAAyY,CAAC;IAC5Y,MAAM,CAAU,QAAQ,GAAG;QACzB,wBAAwB;QACxB,gDAAgD;KACjD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,UAAU;QACrB,IAAI,EAAE,QAAQ,CAAC,qBAAqB,EAAE,YAAY,EAAE,CAAC;QACrD,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,KAAK,CAAC,OAAO,CAAC;YAChC,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,oEAAoE;SAClF,CAAC;KACH,CAAC;IACF,MAAM,CAAU,UAAU,GAA0B,WAAW,CAAC;IAEhE,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,kBAAkB,CAAC;YACxC,CAAC,CAAC,MAAM,yBAAyB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC;YAC3E,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC;YAC/E,GAAG,GAAG;YACN,QAAQ;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI;SACL,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC"}

package/dist/cli/commands/tool/history.js

@@ -1,3 +1,4 @@
+import { ToolHistory } from '../../../application/tool/history.js';
 import { FxCommand } from '../../base.js';
 import { argument } from '../../flags.js';
 export default class ToolHistoryCommand extends FxCommand {
@@ -12,8 +13,7 @@ export default class ToolHistoryCommand extends FxCommand {
     static flags = {};
     async run() {
         const { args } = await this.parse(ToolHistoryCommand);
-        const history = await this.container.toolHistory.read();
-        this.renderer.list(history.filter((entry) => args.tool === undefined || entry.name === args.tool), {
+        this.renderer.list(await new ToolHistory(this.container.toolHistory).execute({ name: args.tool }), {
             columns: [
                 'at',
                 'name',

package/dist/cli/commands/tool/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/cli/commands/tool/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,SAAS;IACvD,MAAM,CAAU,WAAW,GACzB,sHAAsH,CAAC;IACzH,MAAM,CAAU,QAAQ,GAAG;QACzB,gCAAgC;QAChC,4DAA4D;KAC7D,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,QAAQ,CAAC,kCAAkC,CAAC;KACnD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,EAAE,CAAC;IAE3B,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,EAC9E;YACE,OAAO,EAAE;gBACP,IAAI;gBACJ,MAAM;gBACN,WAAW;gBACX,qBAAqB;gBACrB,WAAW;gBACX,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,MAAM;gBACN,eAAe;gBACf,cAAc;aACf;YACD,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;SAC7B,CACF,CAAC;IACJ,CAAC"}
+{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../../src/cli/commands/tool/history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,SAAS;IACvD,MAAM,CAAU,WAAW,GACzB,sHAAsH,CAAC;IACzH,MAAM,CAAU,QAAQ,GAAG;QACzB,gCAAgC;QAChC,4DAA4D;KAC7D,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,QAAQ,CAAC,kCAAkC,CAAC;KACnD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,EAAE,CAAC;IAE3B,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAC9E;YACE,OAAO,EAAE;gBACP,IAAI;gBACJ,MAAM;gBACN,WAAW;gBACX,qBAAqB;gBACrB,WAAW;gBACX,KAAK;gBACL,MAAM;gBACN,OAAO;gBACP,MAAM;gBACN,eAAe;gBACf,cAAc;aACf;YACD,OAAO,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;SAC7B,CACF,CAAC;IACJ,CAAC"}

package/dist/cli/commands/where.js

@@ -1,4 +1,4 @@
-import { Where } from '../../application/where.js';
+import { Where } from '../../application/readiness/where.js';
 import { recordProbe } from '../../composition/probe-record.js';
 import { DevkitError } from '../../domain/errors.js';
 import { FxCommand } from '../base.js';
@@ -14,6 +14,7 @@ export default class WhereCommand extends FxCommand {
         repo: requiredArgument('repository name'),
     };
     static flags = whereFlags;
+    static writeScope = (flags) => flags['record'] ? 'workspace' : null;
     async run() {
         const { args, flags } = await this.parse(WhereCommand);
         if (flags['dry-run'])

package/dist/cli/commands/where.js.map

@@ -1 +1 @@
-{"version":3,"file":"where.js","sourceRoot":"","sources":["../../../src/cli/commands/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,MAAM,CAAU,WAAW,GACzB,yUAAyU,CAAC;IAC5U,MAAM,CAAU,QAAQ,GAAG;QACzB,iEAAiE;QACjE,iGAAiG;KAClG,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,CAAC;KAC1C,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,UAAU,CAAC;IAEnC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACrC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;gBACvB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;aACzD,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,CAAC;YAClB,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,6BAA6B,EAC7B,sFAAsF,EACtF;gBACE,SAAS,EAAE;oBACT,YAAY,IAAI,CAAC,IAAI,+DAA+D;oBACpF,YAAY,IAAI,CAAC,IAAI,aAAa;iBACnC;aACF,CACF,CAAC;QACJ,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1F,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC"}
+{"version":3,"file":"where.js","sourceRoot":"","sources":["../../../src/cli/commands/where.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGnE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,MAAM,CAAU,WAAW,GACzB,yUAAyU,CAAC;IAC5U,MAAM,CAAU,QAAQ,GAAG;QACzB,iEAAiE;QACjE,iGAAiG;KAClG,CAAC;IACF,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,CAAC;KAC1C,CAAC;IACF,MAAM,CAAU,KAAK,GAAG,UAAU,CAAC;IACnC,MAAM,CAAU,UAAU,GAA0B,CAAC,KAAK,EAAE,EAAE,CAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAEvC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACvD,IAAI,KAAK,CAAC,SAAS,CAAC;YAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,MAAM,IAAI,CAAC,aAAa,EAAE;gBACrC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;gBACvB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;aACzD,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,CAAC;YAClB,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,6BAA6B,EAC7B,sFAAsF,EACtF;gBACE,SAAS,EAAE;oBACT,YAAY,IAAI,CAAC,IAAI,+DAA+D;oBACpF,YAAY,IAAI,CAAC,IAAI,aAAa;iBACnC;aACF,CACF,CAAC;QACJ,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1F,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC"}

package/dist/cli/commands/workspace/rebind.js

@@ -19,10 +19,7 @@ export default class WorkspaceRebind extends FxCommand {
     async run() {
         const { args, flags } = await this.parse(WorkspaceRebind);
         const source = await manifestSourceFor(flags.from, this.container, readStdin);
-        this.renderer.record(await workspaceManagement({
-            ...this.harnessInput(),
-            commandShell: this.commandShell,
-        }).execute({
+        this.renderer.record(await workspaceManagement(this.harnessInput()).execute({
             name: args.name,
             action: 'rebind',
             source,

package/dist/cli/commands/workspace/rebind.js.map

@@ -1 +1 @@
-{"version":3,"file":"rebind.js","sourceRoot":"","sources":["../../../../src/cli/commands/workspace/rebind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,CAAU,WAAW,GACzB,6JAA6J,CAAC;IAChK,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,gBAAgB,CAAC,2BAA2B,CAAC;KACpD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,gDAAgD;SAC9D,CAAC;QACF,SAAS,EAAE,UAAU;KACtB,CAAC;IACF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,MAAM,mBAAmB,CAAC;YACxB,GAAG,IAAI,CAAC,YAAY,EAAE;YACtB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC,OAAO,CAAC;YACT,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,QAAQ;YAChB,MAAM;YACN,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;SACpC,CAAC,CACH,CAAC;IACJ,CAAC"}
+{"version":3,"file":"rebind.js","sourceRoot":"","sources":["../../../../src/cli/commands/workspace/rebind.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,MAAM,CAAU,WAAW,GACzB,6JAA6J,CAAC;IAChK,MAAM,CAAU,IAAI,GAAG;QACrB,IAAI,EAAE,gBAAgB,CAAC,2BAA2B,CAAC;KACpD,CAAC;IACF,MAAM,CAAU,KAAK,GAAG;QACtB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,gDAAgD;SAC9D,CAAC;QACF,SAAS,EAAE,UAAU;KACtB,CAAC;IACF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,MAAM,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC;YACrD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,QAAQ;YAChB,MAAM;YACN,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;SACpC,CAAC,CACH,CAAC;IACJ,CAAC"}

package/dist/cli/completion.js

@@ -1,7 +1,7 @@
 // Generate shell completion from command and flag metadata. Scanners retain the
 // command after positional arguments and skip option values before routing words.
 import { DevkitError } from '../domain/errors.js';
-import { nearest } from '../domain/fuzzy.js';
+import { nearest, suggestionHint } from '../domain/fuzzy.js';
 export const SHELLS = ['bash', 'zsh', 'fish', 'powershell'];
 export function completionFlags(definitions) {
     return Object.entries(definitions).flatMap(([name, flag]) => {
@@ -23,9 +23,7 @@ export function completionScript(shell, commands, globals) {
     if (!SHELLS.includes(shell)) {
         const suggestion = nearest(shell, SHELLS);
         throw new DevkitError('usage', 'SHELL_UNKNOWN', `"${shell}" is not a shell fx can complete`, {
-            hint: suggestion === undefined
-                ? `Choose one of ${SHELLS.join(', ')}.`
-                : `Did you mean "${suggestion}"?`,
+            hint: suggestionHint(suggestion, `Choose one of ${SHELLS.join(', ')}.`),
             nextSteps: SHELLS.map((s) => `fx completion ${s}`),
         });
     }

package/dist/cli/completion.js.map

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

package/dist/cli/hook-command.js

@@ -1,7 +1,7 @@
 // The three hook commands differ only in the action they ask for; what they
 // report about the workspace projection is one view.
-import { HARNESS_COLUMNS } from '../application/harness/types.js';
 import { manageHooks } from '../application/hook/session.js';
+import { HOOK_COLUMNS } from '../application/hook/types.js';
 import { hookSession } from '../composition/hooks.js';
 import { FxCommand } from './base.js';
 export class HookCommand extends FxCommand {
@@ -17,7 +17,7 @@ export class HookCommand extends FxCommand {
             dryRun,
         });
         this.renderer.list(out.items, {
-            columns: HARNESS_COLUMNS,
+            columns: HOOK_COLUMNS,
             trailer: {
                 workspace: out.workspace,
                 root: out.root,

package/dist/cli/hook-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"hook-command.js","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,qDAAqD;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAMtC,MAAM,OAAgB,WAAY,SAAQ,SAAS;IACvC,KAAK,CAAC,SAAS,CAAC,MAAgC,EAAE,MAAe;QACzE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC;YAC5B,GAAG,WAAW,CAAC;gBACb,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YACF,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YAC5B,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE;gBACP,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,YAAY,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAgB,qBAAsB,SAAQ,WAAW;IAG7D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAkC,CAAC;QACrE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;CACF"}
+{"version":3,"file":"hook-command.js","sourceRoot":"","sources":["../../src/cli/hook-command.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,qDAAqD;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAMtC,MAAM,OAAgB,WAAY,SAAQ,SAAS;IACvC,KAAK,CAAC,SAAS,CAAC,MAAgC,EAAE,MAAe;QACzE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC;YAC5B,GAAG,WAAW,CAAC;gBACb,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YACF,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YAC5B,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACP,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,YAAY,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAgB,qBAAsB,SAAQ,WAAW;IAG7D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAkC,CAAC;QACrE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;CACF"}

package/dist/cli/main.js

@@ -3,15 +3,16 @@
 // still leaves through the family error contract.
 import { Errors, flush, run } from '@oclif/core';
 import { createContainer } from '../composition/container.js';
-import { traceFor } from '../composition/trace.js';
+import { traceSinkFor } from '../composition/trace.js';
 import { asDevkitError, DevkitError, exitCodeFor } from '../domain/errors.js';
 import { commandIds } from './commands/index.js';
 import { readInvocationFormat } from './invocation-format.js';
 import { createRenderer, FORMATS, processIo } from './render/index.js';
 import { normalizeArgv, routeArgv } from './route/index.js';
-import { invocation } from './trace.js';
+import { invocation, Trace } from './trace.js';
 export async function main(argv) {
-    invocation.trace = traceFor(process.env, Date.now());
+    const sink = traceSinkFor(process.env);
+    invocation.trace = sink === undefined ? undefined : new Trace(sink, Date.now());
     const normalized = normalizeArgv(argv, commandIds());
     await dispatch(normalized);
     await invocation.trace?.end(normalized, process.exitCode === undefined ? 0 : Number(process.exitCode), Date.now());

package/dist/cli/main.js.map

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

package/dist/cli/notices.js

@@ -1,25 +1,6 @@
-// What a command says on stderr once its rows are out: stage outcomes, plan
-// problems, a summary line. Data went to stdout already; these are for the
-// person reading along.
-export function syncNotices(out, dryRun) {
-    const stages = Object.entries(out.stages).map(([stage, state]) => typeof state === 'string'
-        ? { code: 'SYNC_STAGE_UNAVAILABLE', message: `${stage}: ${state} in this version` }
-        : { code: 'SYNC_STAGE', message: `${stage}: ${describe(state)}` });
-    const { done, skipped, failed, unreadable } = out.summary;
-    let preparation = 'Preparation preview';
-    if (!dryRun)
-        preparation =
-            out.preparation.state === 'ready'
-                ? 'Preparation complete for the selected stages'
-                : 'Preparation incomplete';
-    return [
-        ...stages,
-        {
-            code: 'SYNC_SUMMARY',
-            message: `${preparation}; repositories: ${done} done, ${skipped} skipped, ${failed} failed, ${unreadable} unreadable`,
-        },
-    ];
-}
+// What a command says on stderr once its rows are out: plan problems and a
+// summary line. Data went to stdout already; these are for the person reading
+// along.
 export function loginNotices(problems, summary) {
     const notices = problems.map((p) => ({
         code: 'LOGIN_PLAN_PROBLEM',
@@ -30,7 +11,28 @@ export function loginNotices(problems, summary) {
         notices.push({ code: 'LOGIN_SUMMARY', message: describe(nonZero(summary)) });
     return notices;
 }
-export const DOCTOR_CODES = { ok: 'DOCTOR_OK', failures: 'DOCTOR_FAILURES' };
+// A step that ran off the terminal and failed with its companion's own error: the table
+// shows only the message, so a person reading along is told what the companion advised.
+// The generic code means fx captured no such error, as from a step given the terminal.
+export function stepRecoveryNotices(rows) {
+    return rows.flatMap((row) => {
+        const { failure } = row;
+        if (row.result !== 'failed' || failure === undefined)
+            return [];
+        if (failure.code === 'SETUP_COMMAND_FAILED')
+            return [];
+        const advice = [...(failure.hint ? [failure.hint] : []), ...failure.next_steps];
+        if (advice.length === 0)
+            return [];
+        return [
+            {
+                code: 'LOGIN_STEP_FAILED',
+                message: `${row.id}: ${failure.message}`,
+                nextSteps: advice,
+            },
+        ];
+    });
+}
 export const RELEASE_CODES = { ok: 'RELEASE_OK', failures: 'RELEASE_FAILURES' };
 // One line of counts; when something failed, the fixes the findings named
 // and whatever the command adds for reading the evidence.
@@ -49,7 +51,7 @@ function describe(summary) {
     const parts = Object.entries(summary).map(([key, value]) => `${value} ${key}`);
     return parts.length === 0 ? 'nothing to do' : parts.join(', ');
 }
-function nonZero(summary) {
+export function nonZero(summary) {
     return Object.fromEntries(Object.entries(summary).filter(([, n]) => n > 0));
 }
 //# sourceMappingURL=notices.js.map

package/dist/cli/notices.js.map

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