@angelmsger/fx 0.11.0 → 0.12.0

package/dist/cli/render/status-line.js

@@ -2,7 +2,9 @@
 // how far counted work has come and for how long. It is redrawn in place, steps aside
 // for everything else that reaches the terminal and leaves nothing behind. While a child
 // that can still write to the terminal runs, nothing is redrawn: the line is then said
-// as an ordinary one every few seconds, so a question the child asks is never wiped.
+// as an ordinary one once the terminal has been quiet for a few seconds, so a question
+// the child asks is never wiped. A command whose closing view restates some outcomes and
+// notices may leave them to the line's count; that only changes what this terminal shows.
 // It runs between `start` and `stop`; outside them it lets every write through untouched.
 import { humanProgress, humanStatus } from './human.js';
 // A command that answers sooner than this never shows the line.
@@ -26,6 +28,8 @@ export class StatusLine {
     startedAt = 0;
     dueAt = 0;
     saidAt = 0;
+    wroteAt = 0;
+    folded = {};
     tick = 0;
     handed = 0;
     drawn = false;
@@ -55,6 +59,13 @@ export class StatusLine {
         this.halt = undefined;
         this.clear();
     }
+    fold(folded) {
+        this.folded = folded;
+    }
+    // Whether the closing view will say what this notice says.
+    takesNotice(notice) {
+        return this.halt !== undefined && (this.folded.notices ?? []).includes(notice.code);
+    }
     waiting({ label, mayAsk }) {
         // A question it asks has to find the cursor on a line of its own.
         if (mayAsk)
@@ -103,11 +114,12 @@ export class StatusLine {
             this.begun.set(event.id, event);
         else
             this.begun.delete(event.id);
-        return event.state === 'start';
+        return event.state === 'start' || (this.folded.outcomes ?? []).includes(event.state);
     }
     // Text that stays on the screen goes above the line, which follows it at once: more
     // is likely to come.
     above(text) {
+        this.wroteAt = Date.now();
         const cleared = this.drawn ? this.live.redraw('') : '';
         this.stream.write(`${cleared}${text}\n${this.drawn ? this.text() : ''}`);
     }
@@ -116,6 +128,7 @@ export class StatusLine {
     // its line's end leaves the cursor there, where a redraw would wipe what was written,
     // so the line then stays away.
     aside(write, ended) {
+        this.wroteAt = Date.now();
         this.clear();
         this.dueAt = ended ? Date.now() + APPEARS_AFTER_MS : Infinity;
         write();
@@ -126,7 +139,8 @@ export class StatusLine {
             return;
         this.tick += 1;
         const shared = [...this.waits.values()].some(({ mayAsk }) => mayAsk);
-        if (shared && now - this.saidAt < SAID_EVERY_MS)
+        // What the terminal just showed already says fx is working.
+        if (shared && now - Math.max(this.saidAt, this.wroteAt) < SAID_EVERY_MS)
             return;
         this.saidAt = now;
         this.drawn = !shared;

package/dist/cli/render/status-line.js.map

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

package/dist/cli/render/tone.js

@@ -1,5 +1,6 @@
 // The role a value reads as. Purely cosmetic: a word missing from this table is shown
 // unpainted, and no verdict is ever decided here.
+import { HARNESS_ACTIONS, HOOK_ACTIONS, harnessActionState, hookActionState, } from '../../domain/harness/actions.js';
 const VOCABULARY = {
     ok: [
         'ok',
@@ -12,8 +13,6 @@ const VOCABULARY = {
         'reachable',
         'available',
         'up_to_date',
-        'updated',
-        'created',
         'recorded',
     ],
     warn: [
@@ -21,23 +20,20 @@ const VOCABULARY = {
         'outdated',
         'unknown',
         'unverified',
-        'untrusted',
         'not_started',
         'incomplete',
-        'foreign',
         'diverged',
         'skip_dirty',
         'skip_diverged',
         'skip_not_git',
         'skip_remote_mismatch',
+        'no_remote_branch',
     ],
     fail: [
         'fail',
         'failed',
         'blocked',
         'missing',
-        'conflict',
-        'invalid',
         'unauthorized',
         'unreadable',
         'not_installed',
@@ -45,20 +41,43 @@ const VOCABULARY = {
     ],
     // Nothing happened, or nothing applies.
     quiet: [
-        'unchanged',
+        'current',
         'skipped',
         'skip',
         'skip_unpicked',
         'skip_manifest',
-        'unsupported',
-        'disabled',
+        'empty_remote',
         'none',
         'not_applicable',
         'not_requested',
         'not_covered',
     ],
 };
-const ROLE_OF = new Map(Object.entries(VOCABULARY).flatMap(([role, words]) => words.map((word) => [word, role])));
+// A projection action reads as its state does, unless it is named in ACTION_ROLE.
+const STATE_ROLE = {
+    ready: 'ok',
+    skipped: 'quiet',
+    blocked: 'fail',
+};
+// `null` leaves the word unpainted.
+const ACTION_ROLE = {
+    unchanged: 'quiet',
+    removed: null,
+    remove: null,
+    untrusted: 'warn',
+    foreign: 'warn',
+    missing_variables: 'warn',
+};
+function actionEntries(action, state) {
+    const named = ACTION_ROLE[action];
+    const role = named === undefined ? STATE_ROLE[state] : named;
+    return role === null ? [] : [[action, role]];
+}
+const ROLE_OF = new Map([
+    ...Object.entries(VOCABULARY).flatMap(([role, words]) => words.map((word) => [word, role])),
+    ...HARNESS_ACTIONS.flatMap((action) => actionEntries(action, harnessActionState(action))),
+    ...HOOK_ACTIONS.flatMap((action) => actionEntries(action, hookActionState(action))),
+]);
 // A zero count says nothing happened. A boolean is left alone: whether `false` is the
 // good news depends on the field.
 export function roleOf(value) {

package/dist/cli/render/tone.js.map

@@ -1 +1 @@
-{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../../src/cli/render/tone.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kDAAkD;AAIlD,MAAM,UAAU,GAAuD;IACrE,EAAE,EAAE;QACF,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;QACV,UAAU;QACV,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,YAAY;QACZ,SAAS;QACT,SAAS;QACT,UAAU;KACX;IACD,IAAI,EAAE;QACJ,MAAM;QACN,UAAU;QACV,SAAS;QACT,YAAY;QACZ,WAAW;QACX,aAAa;QACb,YAAY;QACZ,SAAS;QACT,UAAU;QACV,YAAY;QACZ,eAAe;QACf,cAAc;QACd,sBAAsB;KACvB;IACD,IAAI,EAAE;QACJ,MAAM;QACN,QAAQ;QACR,SAAS;QACT,SAAS;QACT,UAAU;QACV,SAAS;QACT,cAAc;QACd,YAAY;QACZ,eAAe;QACf,cAAc;KACf;IACD,wCAAwC;IACxC,KAAK,EAAE;QACL,WAAW;QACX,SAAS;QACT,MAAM;QACN,eAAe;QACf,eAAe;QACf,aAAa;QACb,UAAU;QACV,MAAM;QACN,gBAAgB;QAChB,eAAe;QACf,aAAa;KACd;CACF,CAAC;AAEF,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CACnD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,IAAI,EAAE,IAAY,CAAC,CAAC,CAC1D,CACF,CAAC;AAEF,sFAAsF;AACtF,kCAAkC;AAClC,MAAM,UAAU,MAAM,CAAC,KAAc;IACnC,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC"}
+{"version":3,"file":"tone.js","sourceRoot":"","sources":["../../../src/cli/render/tone.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kDAAkD;AAElD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,kBAAkB,EAClB,eAAe,GAIhB,MAAM,iCAAiC,CAAC;AAIzC,MAAM,UAAU,GAAuD;IACrE,EAAE,EAAE;QACF,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;QACV,UAAU;QACV,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,YAAY;QACZ,UAAU;KACX;IACD,IAAI,EAAE;QACJ,MAAM;QACN,UAAU;QACV,SAAS;QACT,YAAY;QACZ,aAAa;QACb,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,eAAe;QACf,cAAc;QACd,sBAAsB;QACtB,kBAAkB;KACnB;IACD,IAAI,EAAE;QACJ,MAAM;QACN,QAAQ;QACR,SAAS;QACT,SAAS;QACT,cAAc;QACd,YAAY;QACZ,eAAe;QACf,cAAc;KACf;IACD,wCAAwC;IACxC,KAAK,EAAE;QACL,SAAS;QACT,SAAS;QACT,MAAM;QACN,eAAe;QACf,eAAe;QACf,cAAc;QACd,MAAM;QACN,gBAAgB;QAChB,eAAe;QACf,aAAa;KACd;CACF,CAAC;AAIF,kFAAkF;AAClF,MAAM,UAAU,GAA4C;IAC1D,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,MAAM;CAChB,CAAC;AAEF,oCAAoC;AACpC,MAAM,WAAW,GAA6D;IAC5E,SAAS,EAAE,OAAO;IAClB,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,MAAM;IACjB,OAAO,EAAE,MAAM;IACf,iBAAiB,EAAE,MAAM;CAC1B,CAAC;AAEF,SAAS,aAAa,CAAC,MAAwB,EAAE,KAAsB;IACrE,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAe;IACpC,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CACtD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,IAAI,EAAE,IAAY,CAAC,CAAC,CAC1D;IACD,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzF,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;CACpF,CAAC,CAAC;AAEH,sFAAsF;AACtF,kCAAkC;AAClC,MAAM,UAAU,MAAM,CAAC,KAAc;IACnC,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC"}

package/dist/cli/tool-command.js

@@ -1,6 +1,7 @@
 // Installation and update are one operation over the toolchain; a command only
-// chooses the direction and the words it offers for it. Its parser metadata
-// stays on each command: see the command contracts in AGENTS.md.
+// chooses the direction and the words it offers for it. Its strict, args and
+// flags stay on each command: the parser copies a command's own static members
+// and drops inherited ones.
 import { TOOL_INSTALL_COLUMNS } from '../application/tool/install.js';
 import { assertToolSelection } from '../application/tool/select.js';
 import { toolInstall } from '../composition/tool-install.js';
@@ -22,15 +23,7 @@ export class ToolCommand extends FxCommand {
             all: flags.all,
             update: this.update,
             ...writeIntent(flags, this.posture),
-            trust: workspace === undefined
-                ? undefined
-                : {
-                    gate: this.trustGate(),
-                    workspace,
-                    commandShell: this.commandShell,
-                    yes: this.yes,
-                    posture: this.posture,
-                },
+            trust: workspace === undefined ? undefined : this.trustFor(workspace),
         });
         this.renderer.list(results, { columns: TOOL_INSTALL_COLUMNS });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"tool-command.js","sourceRoot":"","sources":["../../src/cli/tool-command.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,4EAA4E;AAC5E,iEAAiE;AAEjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC,8CAA8C,CAAC;CAC/D,CAAC;AAOF,MAAM,OAAgB,WAAY,SAAQ,SAAS;IAGjD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAkD,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAgB,CAAC;QAC/B,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK;YACL,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,KAAK,EAAE,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;YAC7C,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;YACnC,KAAK,EACH,SAAS,KAAK,SAAS;gBACrB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE;oBACtB,SAAS;oBACT,YAAY,EAAE,IAAI,CAAC,YAAY;oBAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB;SACR,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACjE,CAAC;CACF"}
+{"version":3,"file":"tool-command.js","sourceRoot":"","sources":["../../src/cli/tool-command.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AAC7E,+EAA+E;AAC/E,4BAA4B;AAE5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC,8CAA8C,CAAC;CAC/D,CAAC;AAOF,MAAM,OAAgB,WAAY,SAAQ,SAAS;IAGjD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAkD,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAgB,CAAC;QAC/B,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK;YACL,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,KAAK,EAAE,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;YAC7C,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;SACtE,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACjE,CAAC;CACF"}

package/dist/cli/workspace-write-policy.js

@@ -1,36 +1,11 @@
-// Public commands that can mutate workspace identity-dependent resources share an operation lease.
-const WORKSPACE_WRITERS = new Set([
-    'sync',
-    'login',
-    'repo:add',
-    'repo:remove',
-    'repo:fork',
-    'repo:pick',
-    'repo:unpick',
-    'repo:select',
-    'env:pick',
-    'env:unpick',
-    'env:select',
-    'hook:enable',
-    'hook:disable',
-    'hook:inject',
-    'hook:remove',
-    'manifest:record-probe',
-]);
-const SOURCE_WRITERS = new Set(['manifest:repo-set', 'manifest:set', 'manifest:render']);
-export function workspaceWriteMode(id, flags) {
-    if (!id || flags['dry-run'] || (id === 'login' && flags.list))
+// A command that changes resources tied to a workspace identity declares where it
+// writes as its static `writeScope`; the command base holds the matching operation
+// lease while the command runs.
+// A preview has no effect to serialize, so it never waits for the lease.
+export function writeScopeOf(command, flags) {
+    const declared = command.writeScope;
+    if (declared === undefined || flags['dry-run'])
         return null;
-    if (id === 'manifest:render' && flags.check)
-        return null;
-    if (id === 'where')
-        return flags.record ? 'workspace' : null;
-    if (id === 'status')
-        return flags.fetch ? 'workspace' : null;
-    if (id === 'doctor')
-        return flags.fix ? 'workspace' : null;
-    if (WORKSPACE_WRITERS.has(id))
-        return 'workspace';
-    return SOURCE_WRITERS.has(id) ? 'source' : null;
+    return typeof declared === 'function' ? declared(flags) : declared;
 }
 //# sourceMappingURL=workspace-write-policy.js.map

package/dist/cli/workspace-write-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-write-policy.js","sourceRoot":"","sources":["../../src/cli/workspace-write-policy.ts"],"names":[],"mappings":"AAAA,mGAAmG;AAEnG,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,MAAM;IACN,OAAO;IACP,UAAU;IACV,aAAa;IACb,WAAW;IACX,WAAW;IACX,aAAa;IACb,aAAa;IACb,UAAU;IACV,YAAY;IACZ,YAAY;IACZ,aAAa;IACb,cAAc;IACd,aAAa;IACb,aAAa;IACb,uBAAuB;CACxB,CAAC,CAAC;AACH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,mBAAmB,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAAC;AACzF,MAAM,UAAU,kBAAkB,CAChC,EAAsB,EACtB,KAAwC;IAExC,IAAI,CAAC,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,IAAI,EAAE,KAAK,iBAAiB,IAAI,KAAK,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACzD,IAAI,EAAE,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,EAAE,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,EAAE,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;QAAE,OAAO,WAAW,CAAC;IAClD,OAAO,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AAClD,CAAC"}
+{"version":3,"file":"workspace-write-policy.js","sourceRoot":"","sources":["../../src/cli/workspace-write-policy.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,mFAAmF;AACnF,gCAAgC;AAShC,yEAAyE;AACzE,MAAM,UAAU,YAAY,CAC1B,OAAoE,EACpE,KAAkB;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IACpC,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AACrE,CAAC"}

package/dist/composition/agent-cleanup.js

@@ -4,7 +4,11 @@ import { harnessDeps } from './harness.js';
 import { agentHookCleanup } from './hooks.js';
 export function agentResourceCleanup(command) {
     const hooks = agentHookCleanup(command.container, command.env, command.posture);
-    const harness = new CleanupAgentHarness(harnessDeps(command), command.container.config, command.container.fs, command.container.manifestDirFor);
+    const harness = new CleanupAgentHarness(harnessDeps(command), {
+        config: command.container.config,
+        fs: command.container.fs,
+        manifestDirFor: command.container.manifestDirFor,
+    });
     const run = async (ids, dryRun) => [
         ...(await (dryRun ? hooks.plan(ids) : hooks.apply(ids))),
         ...(await harness.execute({ ids, dryRun, posture: command.posture, env: command.env })),

package/dist/composition/agent-cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-cleanup.js","sourceRoot":"","sources":["../../src/composition/agent-cleanup.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,WAAW,EAA4B,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,UAAU,oBAAoB,CAAC,OAA4B;IAC/D,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,mBAAmB,CACrC,WAAW,CAAC,OAAO,CAAC,EACpB,OAAO,CAAC,SAAS,CAAC,MAAM,EACxB,OAAO,CAAC,SAAS,CAAC,EAAE,EACpB,OAAO,CAAC,SAAS,CAAC,cAAc,CACjC,CAAC;IACF,MAAM,GAAG,GAAG,KAAK,EAAE,GAAsB,EAAE,MAAe,EAAE,EAAE,CAAC;QAC7D,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;KACxF,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"agent-cleanup.js","sourceRoot":"","sources":["../../src/composition/agent-cleanup.ts"],"names":[],"mappings":"AAAA,qEAAqE;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAGxE,OAAO,EAAE,WAAW,EAA4B,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,UAAU,oBAAoB,CAAC,OAA4B;IAC/D,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QAC5D,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM;QAChC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE;QACxB,cAAc,EAAE,OAAO,CAAC,SAAS,CAAC,cAAc;KACjD,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,KAAK,EAAE,GAAsB,EAAE,MAAe,EAAE,EAAE,CAAC;QAC7D,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;KACxF,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;AAC5E,CAAC"}

package/dist/composition/bundled.js

@@ -7,8 +7,11 @@ export function bundledPackage() {
     const { name, version } = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'));
     return { name, version };
 }
+export function bundledToolsPathFrom(moduleUrl) {
+    return fileURLToPath(new URL('../../defaults/tools.yaml', moduleUrl));
+}
 export function bundledToolsPath() {
-    return fileURLToPath(new URL('../../defaults/tools.yaml', import.meta.url));
+    return bundledToolsPathFrom(import.meta.url);
 }
 export function bundledToolsText() {
     return readFileSync(bundledToolsPath(), 'utf8');

package/dist/composition/bundled.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundled.js","sourceRoot":"","sources":["../../src/composition/bundled.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,+EAA+E;AAC/E,iDAAiD;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAOzC,MAAM,UAAU,cAAc;IAC5B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAClC,YAAY,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAClD,CAAC;IACrB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,YAAY,CAAC,gBAAgB,EAAE,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC"}
+{"version":3,"file":"bundled.js","sourceRoot":"","sources":["../../src/composition/bundled.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,+EAA+E;AAC/E,iDAAiD;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAOzC,MAAM,UAAU,cAAc;IAC5B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAClC,YAAY,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAClD,CAAC;IACrB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,YAAY,CAAC,gBAAgB,EAAE,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC"}

package/dist/composition/command-wiring.js

@@ -2,20 +2,11 @@
 // resolves that context from flags and settings; this module turns it into use-case
 // inputs, and holds the instances that must stay single for the whole invocation.
 import path from 'node:path';
-import { harnessDoctor } from '../application/harness/stages.js';
-import { hookDoctor } from '../application/hook/session.js';
-import { Login } from '../application/login/run.js';
 import { loadManifestContext } from '../application/manifest/context.js';
-import { PreviewInitialization } from '../application/preview-initialization.js';
 import { replacementFor } from '../application/safety/replace-files.js';
-import { TrustGate } from '../application/safety/trust.js';
-import { SkillStage } from '../application/skill/stage.js';
-import { syncStages } from '../application/sync/stages.js';
-import { ToolInitialize } from '../application/tool/initialize.js';
-import { workspaceToolScope } from '../application/tool/scope.js';
-import { bundledToolchain, toolchainOf } from '../application/tool/toolchain.js';
-import { WorkspaceContext } from '../application/workspace-context.js';
-import { loginDeps, skillDeps, workspaceDeps } from './container.js';
+import { resolveToolchain } from '../application/tool/toolchain.js';
+import { WorkspaceContext } from '../application/workspace/context.js';
+import { loginDeps, skillDeps, trustContext, workspaceDeps, } from './container.js';
 import { harnessSession } from './harness.js';
 import { hookSession } from './hooks.js';
 import { toolInstall } from './tool-install.js';
@@ -34,19 +25,17 @@ export function resolveInputFor(container, scope) {
 }
 export class CommandWiring {
     input;
-    trust;
     replace;
     constructor(input) {
         this.input = input;
     }
     harnessInput() {
-        const { container, resolve, env, cliVersion, noInput, yes, posture } = this.input;
-        return { container, resolve, env, cliVersion, noInput, yes, posture };
+        const { container, resolve, env, cliVersion, noInput, yes, posture, commandShell } = this.input;
+        return { container, resolve, env, cliVersion, noInput, yes, posture, commandShell };
     }
-    trustGate() {
-        const { container, noInput } = this.input;
-        this.trust ??= new TrustGate(container.trust, container.prompter(noInput), container.clock);
-        return this.trust;
+    // For a command that reaches a workspace's toolchain without its dependency bundle.
+    trustFor(workspace) {
+        return trustContext(this.input.container, workspace, this.trustInvocation());
     }
     replacement() {
         const { container, noInput, reporter, yes } = this.input;
@@ -65,14 +54,21 @@ export class CommandWiring {
         });
     }
     workspaceDeps(ctx) {
-        const { container, reporter, cliVersion, user, commandShell } = this.input;
-        return workspaceDeps(container, { ctx, reporter, cliVersion, user, commandShell });
+        const { container, reporter, cliVersion, user } = this.input;
+        return workspaceDeps(container, { ctx, reporter, cliVersion, user, ...this.trustInvocation() });
     }
     skillDeps() {
         return skillDeps(this.input.container, this.input.agents);
     }
-    bundledToolchain() {
-        return bundledToolchain(this.input.container.bundledTools(), this.input.cliVersion);
+    // Tool commands work outside a workspace too, on the bundled baseline.
+    toolchain(workspace) {
+        const { container, cliVersion, reporter } = this.input;
+        return resolveToolchain({
+            workspace,
+            bundledTools: container.bundledTools,
+            cliVersion,
+            reporter,
+        });
     }
     manifestContext(dir) {
         const { container, cliVersion, reporter } = this.input;
@@ -110,97 +106,46 @@ export class CommandWiring {
             ...(env.FX_AGENTS !== undefined ? { FX_AGENTS: env.FX_AGENTS } : {}),
         };
     }
-    hookDoctorChecks() {
-        const harness = harnessSession(this.input);
-        return [
-            harnessDoctor(harness, 'mcp'),
-            harnessDoctor(harness, 'rules'),
-            hookDoctor(this.hookSessionFor(this.input.resolve.name)),
-        ];
-    }
-    hookSessionFor(name) {
-        return hookSession({
-            container: this.input.container,
-            resolve: { ...this.input.resolve, name },
-            env: this.input.env,
-            posture: this.input.posture,
-        });
+    lifecycleSessions() {
+        return { harness: harnessSession(this.input), hooks: hookSession(this.input) };
     }
     loginDeps() {
-        return loginDeps({ ...this.input, gate: this.trustGate() });
+        return loginDeps(this.input);
+    }
+    stageDeps() {
+        const { container, cliVersion } = this.input;
+        return {
+            ...this.lifecycleSessions(),
+            inventory: toolInventory(container, cliVersion),
+            replace: this.replacement(),
+            login: this.loginDeps(),
+            skills: this.skillDeps(),
+        };
     }
     initDeps() {
-        const { fs, git, config, localStore, bundledTools, providers, manifestDirFor } = this.input.container;
-        const depsFor = (ctx) => this.workspaceDeps(ctx);
+        const { container, cliVersion, reporter, commandShell } = this.input;
+        const { fs, git, config, localStore, bundledTools, providers, manifestDirFor } = container;
         return {
             fs,
-            lock: this.input.container.lock,
-            commandShell: this.input.commandShell,
+            lock: container.lock,
+            commandShell,
             git,
             config,
             localStore,
             bundledTools,
             providers,
             manifestDirFor,
-            cliVersion: this.input.cliVersion,
-            reporter: this.input.reporter,
-            workspaceDepsFor: depsFor,
-            preview: (ctx) => this.previewInit(depsFor(ctx)),
-            installTools: (ctx) => new ToolInitialize(toolInstall(this.input.container)).execute({
-                tools: toolchainOf(ctx).tools,
-                commandShell: this.input.commandShell,
-                posture: this.input.posture,
-                trust: {
-                    gate: this.trustGate(),
-                    workspace: ctx.name,
-                    commandShell: this.input.commandShell,
-                    yes: this.input.yes,
-                    posture: this.input.posture,
-                },
-            }),
-            stagesFor: (ctx) => syncStages({ ...this.stageWiring(depsFor(ctx), false), initialize: true }),
-            setupPlan: (ctx) => new Login(depsFor(ctx), this.loginDeps()).plan({
-                tools: workspaceToolScope(ctx, {}).configuredNames,
-            }),
+            cliVersion,
+            reporter,
+            workspaceDepsFor: (ctx) => this.workspaceDeps(ctx),
+            toolInstall: toolInstall(container),
+            stages: this.stageDeps(),
             settleManifest: (name, dir) => this.updateChecks().manifest.markCurrent(name, dir),
         };
     }
-    previewInit(deps) {
-        return new PreviewInitialization(deps, this.loginDeps(), toolInstall(this.input.container), new SkillStage(deps, this.skillDeps())).execute({
-            gate: this.trustGate(),
-            workspace: deps.ctx.name,
-            commandShell: deps.commandShell,
-            yes: this.input.yes,
-            posture: this.input.posture,
-            dryRun: true,
-        });
-    }
-    stages(deps, dryRun) {
-        return syncStages(this.stageWiring(deps, dryRun));
-    }
-    stageWiring(deps, dryRun) {
-        return {
-            inventory: toolInventory(this.input.container, this.input.cliVersion),
-            harness: harnessSession({
-                ...this.input,
-                resolve: { ...this.input.resolve, name: deps.ctx.name },
-            }),
-            hooks: this.hookSessionFor(deps.ctx.name),
-            deps,
-            replace: this.replacement(),
-            login: this.loginDeps(),
-            skills: this.skillDeps(),
-            process: this.input.container.process,
-            trust: {
-                gate: this.trustGate(),
-                workspace: deps.ctx.name,
-                commandShell: deps.commandShell,
-                yes: this.input.yes,
-                posture: this.input.posture,
-            },
-            dryRun,
-            posture: this.input.posture,
-        };
+    trustInvocation() {
+        const { commandShell, noInput, yes, posture } = this.input;
+        return { commandShell, noInput, yes, posture };
     }
 }
 //# sourceMappingURL=command-wiring.js.map

package/dist/composition/command-wiring.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-wiring.js","sourceRoot":"","sources":["../../src/composition/command-wiring.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,oFAAoF;AACpF,kFAAkF;AAElF,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAoB,MAAM,gCAAgC,CAAC;AAG9E,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAwB,MAAM,oCAAoC,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAuB,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAkB,MAAM,kCAAkC,CAAC;AAIjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAMvE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAE,cAAc,EAA4B,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,aAAa,CAAC;AAiB9D,MAAM,UAAU,eAAe,CAAC,SAAoB,EAAE,KAAmB;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IACrC,OAAO;QACL,GAAG,IAAI;QACP,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;QACjD,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,EAAE,EAAE,SAAS,CAAC,EAAE;QAChB,WAAW,EAAE,SAAS,CAAC,WAAW;QAClC,cAAc,EAAE,SAAS,CAAC,cAAc;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,aAAa;IAIK;IAHrB,KAAK,CAAwB;IAC7B,OAAO,CAA2B;IAE1C,YAA6B,KAAyB;QAAzB,UAAK,GAAL,KAAK,CAAoB;IAAG,CAAC;IAE1D,YAAY;QACV,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAClF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IACxE,CAAC;IAED,SAAS;QACP,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,KAAK,KAAK,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,WAAW;QACT,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACzD,IAAI,CAAC,OAAO,KAAK,cAAc,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC1F,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,eAAe;QACb,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtD,OAAO,gBAAgB,CAAC,MAAM,CAAC;YAC7B,GAAG,OAAO;YACV,GAAG,EAAE,SAAS,CAAC,GAAG;YAClB,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,GAAqB;QACjC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3E,OAAO,aAAa,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,SAAS;QACP,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,gBAAgB;QACd,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACtF,CAAC;IAED,eAAe,CAAC,GAAW;QACzB,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACvD,OAAO,mBAAmB,CAAC;YACzB,GAAG;YACH,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,UAAU;YACV,QAAQ;YACR,WAAW,EAAE,SAAS,CAAC,WAAW;SACnC,CAAC,CAAC;IACL,CAAC;IAED,YAAY;QACV,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB,EAAE,eAAwB;QAC/D,MAAM,QAAQ,GAAG,eAAe;YAC9B,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC;YACjE,CAAC,CAAC,SAAS,CAAC;QACd,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;YAC9B,WAAW;YACX,QAAQ,EAAE,QAAQ,EAAE,QAAQ,IAAI,IAAI;YACpC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC;IACJ,CAAC;IAED,kFAAkF;IAClF,WAAW;QACT,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;YACvC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;YACtC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC7C,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC;IACJ,CAAC;IAED,gBAAgB;QACd,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,OAAO;YACL,aAAa,CAAC,OAAO,EAAE,KAAK,CAAC;YAC7B,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC;YAC/B,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACzD,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAwB;QAC7C,OAAO,WAAW,CAAC;YACjB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE;YACxC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;YACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,OAAO,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,QAAQ;QACN,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,GAC5E,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACvB,MAAM,OAAO,GAAG,CAAC,GAAqB,EAAiB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAClF,OAAO;YACL,EAAE;YACF,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI;YAC/B,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YACrC,GAAG;YACH,MAAM;YACN,UAAU;YACV,YAAY;YACZ,SAAS;YACT,cAAc;YACd,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;YACjC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,gBAAgB,EAAE,OAAO;YACzB,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChD,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CACpB,IAAI,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC5D,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK;gBAC7B,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,KAAK,EAAE;oBACL,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE;oBACtB,SAAS,EAAE,GAAG,CAAC,IAAI;oBACnB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;oBACrC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;oBACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;iBAC5B;aACF,CAAC;YACJ,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CACjB,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC5E,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CACjB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC;gBAC7C,KAAK,EAAE,kBAAkB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,eAAe;aACnD,CAAC;YACJ,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC;SACnF,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,IAAmB;QACrC,OAAO,IAAI,qBAAqB,CAC9B,IAAI,EACJ,IAAI,CAAC,SAAS,EAAE,EAChB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EACjC,IAAI,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CACvC,CAAC,OAAO,CAAC;YACR,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE;YACtB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;YACxB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;YACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YAC3B,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAmB,EAAE,MAAe;QACzC,OAAO,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;IAEO,WAAW,CAAC,IAAmB,EAAE,MAAe;QACtD,OAAO;YACL,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACrE,OAAO,EAAE,cAAc,CAAC;gBACtB,GAAG,IAAI,CAAC,KAAK;gBACb,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;aACxD,CAAC;YACF,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YACzC,IAAI;YACJ,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE;YAC3B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;YACvB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE;YACxB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO;YACrC,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE;gBACtB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI;gBACxB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;gBACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;aAC5B;YACD,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;SAC5B,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"command-wiring.js","sourceRoot":"","sources":["../../src/composition/command-wiring.ts"],"names":[],"mappings":"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"}