@angelmsger/fx 0.10.1 → 0.12.0

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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"}

package/dist/cli/preparation-view.js

@@ -1,22 +1,46 @@
+import { isSettled } from '../application/login/run.js';
 import { shellEnvironmentLine, shellLine } from '../domain/shell.js';
+import { roleOf } from './render/tone.js';
 import { gap, widthOf } from './render/width.js';
 // Below this a wrapped reason is a column of fragments; the terminal may wrap it instead.
 const NARROWEST_REASON = 24;
+// More names than this say less than their number does.
+const NAMES_SHOWN = 4;
+// What each cause asks of the person, in the order a person can act on them.
+const CAUSES = [
+    ['credential', 'Sign-in or credentials:'],
+    ['permission', 'Access refused:'],
+    ['network', 'Not reachable from this machine:'],
+    [undefined, 'Other:'],
+];
+// Codes that say no more than the message they come with.
+const GENERIC_CODES = new Set(['PREPARATION_REQUIRED', 'SETUP_COMMAND_FAILED']);
+const STAGE_LABELS = {
+    services: 'Services',
+    setup: 'Logins',
+    docs: 'Guides',
+    go: 'Go workspace',
+    skills: 'Skills',
+    hooks: 'Hooks',
+    mcp: 'MCP',
+    tools: 'Tools',
+};
 const VERDICT = {
     ready: 'ok',
     planned: undefined,
     incomplete: 'fail',
 };
-export function preparationText(value, view) {
+export function preparationText(report, view) {
     const { display } = view;
-    const data = record(value);
-    const preparation = value.preparation;
-    const target = typeof data['root'] === 'string' ? data['root'] : preparation.scope.workspace;
-    const initialization = 'manifest_dir' in data;
+    const { preparation } = report;
+    const target = report.root ?? preparation.scope.workspace;
+    const initialization = report.manifest_dir !== undefined;
+    const groups = blockerRows(preparation.blockers).length;
+    const grouping = groups < preparation.blockers.length ? `, in ${groups} groups` : '';
     const headline = {
         ready: `${initialization ? 'Ready to work' : 'Required preparation verified'}: ${target}`,
         planned: `Preparation preview; no changes made: ${target}`,
-        incomplete: `${target} needs attention: ${count(preparation.blockers.length, 'required check')} not ready`,
+        incomplete: `${target} needs attention: ${count(preparation.blockers.length, 'required check')} not ready${grouping}`,
     }[preparation.state];
     const verdict = VERDICT[preparation.state];
     const lines = [
@@ -24,12 +48,15 @@ export function preparationText(value, view) {
     ];
     if (!initialization && preparation.state !== 'incomplete')
         lines.push(display.paint('quiet', `Scope: ${preparation.scope.stages.join(', ')}`));
+    if (preparation.state !== 'planned')
+        lines.push(...stageLines(report, display));
     if (preparation.state === 'planned')
-        lines.push(...previewLines(data, view));
-    const setup = record(record(record(data['sync'])['stage_details'])['setup']);
-    const verified = records(setup['items']).filter((item) => ['done', 'verified'].includes(String(item['result'])));
+        lines.push(...previewLines(report, view));
+    const setup = report.sync?.stage_details?.setup;
+    const steps = setup === undefined || 'failure' in setup ? [] : setup.items;
+    const verified = steps.filter((step) => isSettled(step.result));
     if (verified.length)
-        lines.push(`Setup already verified: ${verified.map((item) => String(item['title'])).join(', ')}`);
+        lines.push(`Setup already verified: ${verified.map((step) => step.title).join(', ')}`);
     if (preparation.state === 'incomplete')
         lines.push(...attentionLines(preparation, view));
     return lines.join('\n') + '\n';
@@ -59,31 +86,132 @@ function attentionLines(preparation, view) {
             : []),
     ];
 }
-// Checks that say the same thing and are resolved by the same commands share a row; a
-// check that could not run is marked apart from one that ran and failed. A reason too
-// long for the line continues under its own column, not under the check id.
-function blockerLines(blockers, display) {
+// Checks that say the same thing and are resolved by the same commands share a row, and a
+// check waiting on a listed one is named under the row its chain of waits leads to rather
+// than as a row of its own.
+function blockerRows(blockers) {
+    const listed = new Map(blockers.map((check) => [check.id, check]));
+    const waits = (check) => check.waits_on !== undefined && listed.has(check.waits_on);
+    const origin = (check) => {
+        const seen = new Set();
+        let current = check;
+        while (waits(current) && !seen.has(current.id)) {
+            seen.add(current.id);
+            current = listed.get(current.waits_on);
+        }
+        return current.id;
+    };
     const rows = new Map();
-    for (const check of blockers) {
+    for (const check of blockers.filter((check) => !waits(check))) {
         const resolution = (check.actions ?? []).map((action) => selections(action.argv).command);
         const key = JSON.stringify([check.state, check.message, resolution]);
-        const row = rows.get(key) ?? { check, label: check.id, more: -1 };
-        row.more += 1;
-        row.label = row.more > 0 ? `${row.check.id} (+${row.more} more)` : row.check.id;
+        const row = rows.get(key) ?? { check, ids: [] };
+        row.ids.push(check.id);
         rows.set(key, row);
     }
-    const width = Math.max(...[...rows.values()].map((row) => widthOf(row.label)));
+    return [...rows.values()].map(({ check, ids }) => ({
+        check,
+        label: ids.length > 1 ? `${check.id} (+${ids.length - 1} more)` : check.id,
+        holding: blockers
+            .filter((other) => waits(other) && ids.includes(origin(other)))
+            .map((other) => other.id),
+    }));
+}
+// Grouped by what the person is to do once any check says why it failed; a check that
+// could not run is marked apart from one that ran and failed. A reason too long for the
+// line continues under its own column, not under the check id.
+function blockerLines(blockers, display) {
+    const rows = blockerRows(blockers);
+    const width = Math.max(...rows.map((row) => widthOf(row.label)));
     const lead = 2 + widthOf(display.mark()) + width + 2;
     const room = Math.max(display.room(lead), NARROWEST_REASON);
-    return [...rows.values()].flatMap(({ check, label }) => {
-        const [first = '', ...rest] = display.wrap(check.message, room);
+    const line = ({ check, label, holding }) => {
+        const [first = '', ...rest] = display.wrap(reasonOf(check), room);
         const mark = display.mark(check.state === 'unknown' ? 'step' : 'fail');
+        const quiet = (text) => display.wrap(text, room).map((part) => display.paint('quiet', part));
+        const held = holding.length ? quiet(`holds back ${holding.join(', ')}`) : [];
         return [
             `  ${mark}${display.paint('strong', label)}${gap(label, width)}  ${first}`,
-            ...rest.map((line) => `${' '.repeat(lead)}${line}`),
+            ...[...rest, ...adviceOf(check).flatMap(quiet), ...held].map((text) => `${' '.repeat(lead)}${text}`),
         ];
+    };
+    if (!rows.some((row) => row.check.cause !== undefined))
+        return rows.flatMap(line);
+    return CAUSES.flatMap(([cause, title]) => {
+        const group = rows.filter((row) => row.check.cause === cause);
+        return group.length ? [display.paint('strong', title), ...group.flatMap(line)] : [];
     });
 }
+// A check no fx command resolves keeps the recovery its own failure advises, which would
+// otherwise reach only a machine reader.
+function adviceOf(check) {
+    if (check.actions?.length || check.failure === undefined)
+        return [];
+    if (GENERIC_CODES.has(check.failure.code))
+        return [];
+    const { hint, next_steps } = check.failure;
+    return [...(hint ? [hint] : []), ...next_steps];
+}
+function reasonOf(check) {
+    const said = check.failure !== undefined && !GENERIC_CODES.has(check.code);
+    return said && !check.message.includes(check.code)
+        ? `${check.message} (${check.code})`
+        : check.message;
+}
+// What each stage did, one line each: repositories by what became of them, the manifest
+// checkout by what its refresh did, any other stage by the counts that say something
+// happened. A stage with nothing to say is left out.
+function stageLines(report, display) {
+    const sync = (report.manifest_dir === undefined ? report : report.sync) ?? {};
+    const items = (sync.items ?? []).filter((item) => item.action !== 'skip_unpicked');
+    const rows = [];
+    const repositories = items.filter((item) => item.action !== 'skip_manifest');
+    if (repositories.length)
+        rows.push(['Repositories', repositoryLine(repositories)]);
+    const manifest = items.find((item) => item.action === 'skip_manifest');
+    if (manifest?.reason !== undefined)
+        rows.push(['Manifest', manifest.reason]);
+    for (const [stage, summary] of Object.entries(sync.stages ?? {})) {
+        const said = stageSummary(summary);
+        if (said !== undefined)
+            rows.push([STAGE_LABELS[stage] ?? stage, said]);
+    }
+    const width = Math.max(0, ...rows.map(([label]) => widthOf(label)));
+    return rows.map(([label, text]) => `${display.paint('quiet', label)}${gap(label, width)}  ${text}`);
+}
+function repositoryLine(items) {
+    const outcome = (value) => items.filter((item) => item.outcome === value).length;
+    const named = (result) => items.filter((item) => item.result === result).map((item) => item.name);
+    const cloned = items.filter((item) => item.action === 'clone' && item.result === 'done');
+    const parts = [
+        cloned.length ? `${cloned.length} cloned` : '',
+        outcome('updated') ? `${outcome('updated')} updated` : '',
+        outcome('up_to_date') ? `${outcome('up_to_date')} up to date` : '',
+        names(named('skipped'), 'skipped'),
+        names(named('failed'), 'failed'),
+    ].filter(Boolean);
+    return `${items.length}${parts.length ? `: ${parts.join(', ')}` : ''}`;
+}
+function names(list, what) {
+    if (list.length === 0)
+        return '';
+    const shown = list.slice(0, NAMES_SHOWN).join(', ');
+    const more = list.length > NAMES_SHOWN ? ` (+${list.length - NAMES_SHOWN} more)` : '';
+    return `${list.length} ${what} (${shown}${more})`;
+}
+// A count of zero, or of what tone reads as nothing happening, says nothing.
+function stageSummary(summary) {
+    if (summary === 'not_implemented')
+        return 'not available in this version';
+    if (summary['status'] === 'failed')
+        return 'failed';
+    const said = Object.entries(summary).flatMap(([key, value]) => {
+        if (typeof value === 'number')
+            return value > 0 && roleOf(key) !== 'quiet' ? [`${value} ${key.replaceAll('_', ' ')}`] : [];
+        return roleOf(value) !== 'quiet' ? [`${key.replaceAll('_', ' ')} ${value}`] : [];
+    });
+    return said.length ? said.join(', ') : undefined;
+}
 const SELECTIONS = ['--env', '--tool'];
 // A command apart from the environments or tools it selects.
 function selections(argv) {
@@ -125,51 +253,41 @@ function mergeSelections(actions) {
 function count(total, noun) {
     return `${total} ${noun}${total === 1 ? ' is' : 's are'}`;
 }
-function previewLines(data, view) {
+function previewLines(report, view) {
     const { display, shell } = view;
-    const plan = record(data['plan']);
-    const resources = record(plan['resources']);
-    const prepared = record(resources['preparation']);
-    const repositories = records(plan['repositories'] ?? data['items']).filter((item) => item['action'] !== 'skip_unpicked');
+    const { plan } = report;
+    const resources = plan?.resources;
+    const prepared = resources?.preparation;
+    const repositories = (plan?.repositories ?? report.items ?? []).filter((item) => item.action !== 'skip_unpicked');
     const counts = new Map();
-    for (const item of repositories) {
-        const action = String(item['action']);
+    for (const { action } of repositories)
         counts.set(action, (counts.get(action) ?? 0) + 1);
-    }
     const lines = [
         `Repositories: ${repositories.length} selected${counts.size ? ` (${[...counts].map(([action, count]) => `${count} ${action}`).join(', ')})` : ''}`,
     ];
-    const tools = records(resources['tools']).map((tool) => String(tool['name']));
+    const tools = (resources?.tools ?? []).map((tool) => tool.name);
     if (tools.length)
         lines.push(`Install if missing: ${tools.join(', ')}`);
-    if (resources['workspace_guides'])
+    if (resources?.workspace_guides)
         lines.push('Prepare the workspace guides and selected Agent Skills.');
-    for (const item of records(resources['guide_conflicts']))
-        lines.push(`Replacement approval: ${String(item['path'])}; preserve a backup.`);
+    for (const conflict of resources?.guide_conflicts ?? [])
+        lines.push(`Replacement approval: ${conflict.path}; preserve a backup.`);
     const commands = [
-        ...records(prepared['tool_install']).map((item) => item['vector']),
-        ...records(record(prepared['skills'])['tools']).map((item) => item['vector']),
-        ...records(resources['tool_checks']).map((item) => item['command']),
-        ...records(resources['setup']).flatMap((item) => [
-            ...(item['phase'] === 'prepare' ? [item['command']] : []),
-            record(item['verify'])['command'],
+        ...(prepared?.tool_install ?? []).map((install) => install.vector),
+        ...(prepared?.skills.tools ?? []).map((skill) => skill.vector),
+        ...(resources?.tool_checks ?? []).map((check) => check.command),
+        ...(resources?.setup ?? []).flatMap((step) => [
+            ...(step.phase === 'prepare' ? [step.command] : []),
+            'command' in step.verify ? step.verify.command : null,
         ]),
-    ].filter(vector);
+    ].filter(isVector);
     for (const command of new Set(commands.map((command) => shellLine(command, shell))))
         lines.push(`Review command: ${display.paint('accent', command)}`);
-    if (plan['source_inspected'] === false)
+    if (plan?.source_inspected === false)
         lines.push('The source has not been inspected; its requirements will be validated before preparation.');
     return lines;
 }
-function record(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value)
-        ? value
-        : {};
-}
-function records(value) {
-    return Array.isArray(value) ? value.map(record) : [];
-}
-function vector(value) {
-    return (Array.isArray(value) && value.length > 0 && value.every((part) => typeof part === 'string'));
+function isVector(command) {
+    return command !== null && command.length > 0;
 }
 //# sourceMappingURL=preparation-view.js.map

package/dist/cli/preparation-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"preparation-view.js","sourceRoot":"","sources":["../../src/cli/preparation-view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"preparation-view.js","sourceRoot":"","sources":["../../src/cli/preparation-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAKxD,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAsB,MAAM,oBAAoB,CAAC;AAGzF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAejD,0FAA0F;AAC1F,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B,wDAAwD;AACxD,MAAM,WAAW,GAAG,CAAC,CAAC;AAEtB,6EAA6E;AAC7E,MAAM,MAAM,GAA2D;IACrE,CAAC,YAAY,EAAE,yBAAyB,CAAC;IACzC,CAAC,YAAY,EAAE,iBAAiB,CAAC;IACjC,CAAC,SAAS,EAAE,kCAAkC,CAAC;IAC/C,CAAC,SAAS,EAAE,QAAQ,CAAC;CACtB,CAAC;AAEF,0DAA0D;AAC1D,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,sBAAsB,EAAE,sBAAsB,CAAC,CAAC,CAAC;AAEhF,MAAM,YAAY,GAAqC;IACrD,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,QAAQ;IACf,IAAI,EAAE,QAAQ;IACd,EAAE,EAAE,cAAc;IAClB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,MAAM,OAAO,GAA6D;IACxE,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,MAAM;CACnB,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,MAAyB,EAAE,IAAqB;IAC9E,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;IAC1D,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC;IACzD,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IACxD,MAAM,QAAQ,GAAG,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACrF,MAAM,QAAQ,GAAG;QACf,KAAK,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,+BAA+B,KAAK,MAAM,EAAE;QACzF,OAAO,EAAE,yCAAyC,MAAM,EAAE;QAC1D,UAAU,EAAE,GAAG,MAAM,qBAAqB,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,aAAa,QAAQ,EAAE;KACtH,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACrB,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG;QACZ,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;KAC5F,CAAC;IACF,IAAI,CAAC,cAAc,IAAI,WAAW,CAAC,KAAK,KAAK,YAAY;QACvD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAChF,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/E,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,KAAK,KAAK,SAAS,IAAI,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;IAC3E,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChE,IAAI,QAAQ,CAAC,MAAM;QACjB,KAAK,CAAC,IAAI,CAAC,2BAA2B,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzF,IAAI,WAAW,CAAC,KAAK,KAAK,YAAY;QAAE,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IACzF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACjC,CAAC;AAED,oFAAoF;AACpF,yDAAyD;AACzD,SAAS,cAAc,CAAC,WAAwB,EAAE,IAAqB;IACrE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAChC,MAAM,OAAO,GAAG,CAAC,MAAyB,EAAU,EAAE,CACpD,KAAK,OAAO,CAAC,KAAK,CAChB,QAAQ,EACR,IAAI,CAAC,kBAAkB,IAAI,MAAM,CAAC,GAAG;QACnC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC;QACtD,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAClC,EAAE,CAAC;IACN,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,OAAqC,EAAY,EAAE,CACjF,OAAO,CAAC,MAAM;QACZ,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC7C,OAAO;QACL,EAAE;QACF,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC9C,GAAG,OAAO,CACR,uBAAuB,EACvB,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACrC,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,CAClE,CACF;QACD,GAAG,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,YAAY,CAAC;QACtD,GAAG,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,GAAG,CAAC,QAAQ;YACV,CAAC,CAAC;gBACE,EAAE;gBACF,OAAO,CAAC,KAAK,CACX,OAAO,EACP,GAAG,KAAK,CAAC,QAAQ,EAAE,gBAAgB,CAAC,sCAAsC,CAC3E;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAUD,0FAA0F;AAC1F,0FAA0F;AAC1F,4BAA4B;AAC5B,SAAS,WAAW,CAAC,QAAqC;IACxD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,CAAC,KAAuB,EAAW,EAAE,CACjD,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,CAAC,KAAuB,EAAU,EAAE;QACjD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAC/B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrB,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAS,CAAE,CAAC;QAC3C,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC;IACpB,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,GAAG,EAAsD,CAAC;IAC3E,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC9D,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAChD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QACjD,KAAK;QACL,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;QAC1E,OAAO,EAAE,QAAQ;aACd,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;KAC5B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,sFAAsF;AACtF,wFAAwF;AACxF,+DAA+D;AAC/D,SAAS,YAAY,CAAC,QAAqC,EAAE,OAAgB;IAC3E,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC5D,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAc,EAAY,EAAE;QAC/D,MAAM,CAAC,KAAK,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,CAAC,IAAY,EAAY,EAAE,CACvC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,OAAO;YACL,KAAK,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,EAAE;YAC1E,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CACvC;SACF,CAAC;IACJ,CAAC,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,CAAC,CAAC,CAAC;AACL,CAAC;AAED,yFAAyF;AACzF,yCAAyC;AACzC,SAAS,QAAQ,CAAC,KAAuB;IACvC,IAAI,KAAK,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACpE,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACrD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,QAAQ,CAAC,KAAuB;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3E,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;QAChD,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,IAAI,GAAG;QACpC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;AACpB,CAAC;AAED,wFAAwF;AACxF,qFAAqF;AACrF,qDAAqD;AACrD,SAAS,UAAU,CAAC,MAAyB,EAAE,OAAgB;IAC7D,MAAM,IAAI,GACR,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACnE,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC;IACnF,MAAM,IAAI,GAAuB,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC;IAC7E,IAAI,YAAY,CAAC,MAAM;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC;IACvE,IAAI,QAAQ,EAAE,MAAM,KAAK,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC,GAAG,CACb,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE,CACnF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,OAAO,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;IACjG,MAAM,KAAK,GAAG,CAAC,MAA0B,EAAY,EAAE,CACrD,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;IACzF,MAAM,KAAK,GAAG;QACZ,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE;QAC9C,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QACzD,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;QAClE,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;QAClC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;KACjC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,OAAO,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACzE,CAAC;AAED,SAAS,KAAK,CAAC,IAAuB,EAAE,IAAY;IAClD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,WAAW,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,OAAO,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,KAAK,KAAK,GAAG,IAAI,GAAG,CAAC;AACpD,CAAC;AAED,6EAA6E;AAC7E,SAAS,YAAY,CAAC,OAAyC;IAC7D,IAAI,OAAO,KAAK,iBAAiB;QAAE,OAAO,+BAA+B,CAAC;IAC1E,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACpD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;YAC3B,OAAO,KAAK,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAEvC,6DAA6D;AAC7D,SAAS,UAAU,CAAC,IAAuB;IACzC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAe,EAAE,CAAC;IAChC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAClC,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7D,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;YACrC,KAAK,EAAE,CAAC;QACV,CAAC;;YAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC;AAED,sFAAsF;AACtF,4EAA4E;AAC5E,SAAS,eAAe,CAAC,OAAqC;IAC5D,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsE,CAAC;IAC7F,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACxF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;;YAE1E,KAAK,MAAM,IAAI,IAAI,QAAQ;gBACzB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC/D,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,GAAG,MAAM;QACT,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KACnD,CAAC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,KAAK,CAAC,KAAa,EAAE,IAAY;IACxC,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,YAAY,CAAC,MAAyB,EAAE,IAAqB;IACpE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,SAAS,GAAG,IAAI,EAAE,SAAS,CAAC;IAClC,MAAM,QAAQ,GAAG,SAAS,EAAE,WAAW,CAAC;IACxC,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,YAAY,IAAI,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CACpE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAC1C,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,YAAY;QAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzF,MAAM,KAAK,GAAG;QACZ,iBAAiB,YAAY,CAAC,MAAM,YAAY,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;KACnJ,CAAC;IACF,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,KAAK,CAAC,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,uBAAuB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxE,IAAI,SAAS,EAAE,gBAAgB;QAC7B,KAAK,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IACxE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,eAAe,IAAI,EAAE;QACrD,KAAK,CAAC,IAAI,CAAC,yBAAyB,QAAQ,CAAC,IAAI,sBAAsB,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG;QACf,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;QAClE,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;QAC9D,GAAG,CAAC,SAAS,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/D,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;SACtD,CAAC;KACH,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnB,KAAK,MAAM,OAAO,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACjF,KAAK,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,IAAI,EAAE,gBAAgB,KAAK,KAAK;QAClC,KAAK,CAAC,IAAI,CACR,2FAA2F,CAC5F,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,OAAiC;IACjD,OAAO,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;AAChD,CAAC"}

package/dist/cli/release-view.js

@@ -1,8 +1,12 @@
-// The release checklist as a person reads it: one block per repository with its checks
-// under it, so whatever holds a repository back reads in one place. Repositories with
-// nothing to report share one closing line unless --details asks for their checks. A
-// finding every repository shares, such as a tool nobody signed in to, is said once
-// above them. The report itself stays the machine interface.
+// The release checklist as a person reads it: one block per repository, opening with
+// what its release would carry (the version, both branch heads and how many commits
+// are not merged yet, whose heads let the code host's own tools list them), then its
+// checks, so whatever holds a repository back reads in one place. Repositories with
+// nothing to report close the output one line each, saying what they would release,
+// unless --details asks for their checks. A finding every repository shares, such as
+// a tool nobody signed in to, is said once above them. The report itself stays the
+// machine interface.
+import { shortSha } from '../domain/workspace/commits.js';
 import { gap, widthOf } from './render/width.js';
 const INDENT = '  ';
 const GUTTER = '  ';
@@ -12,27 +16,86 @@ const NARROWEST_MESSAGE = 24;
 export function releaseText(report, view) {
     const { display } = view;
     const { findings } = report;
-    if (findings.length === 0)
+    // Every repository is named with what it would ship, even when the findings it has
+    // are all said once for every repository.
+    const repos = [...new Set([...report.repos.map((r) => r.name), ...findings.map((f) => f.id)])];
+    if (repos.length === 0)
         return `${display.paint('quiet', '(none)')}\n`;
-    const repos = [...new Set(findings.map((f) => f.id))];
     const shared = repos.length > 1 ? sharedFindings(findings, repos.length) : [];
     const own = (repo) => findings.filter((f) => f.id === repo && !shared.some((s) => sameFinding(s, f)));
     const passed = (repo) => own(repo).every((f) => f.level === 'ok');
-    const listed = repos.filter((repo) => own(repo).length > 0);
-    const expanded = view.details ? listed : listed.filter((repo) => !passed(repo));
-    const quiet = listed.filter((repo) => !expanded.includes(repo));
-    const row = rowOf(display, Math.max(...findings.map((f) => widthOf(f.group))));
+    const expanded = view.details ? repos : repos.filter((repo) => !passed(repo));
+    const quiet = repos.filter((repo) => !expanded.includes(repo));
+    const row = rowOf(display, Math.max(0, ...findings.map((f) => widthOf(f.group))));
+    const described = new Map(report.repos.map((r) => [r.name, r]));
     const sections = [
         ...(shared.length === 0
             ? []
             : [[display.paint('strong', 'Every repository'), ...shared.flatMap(row)]]),
-        ...expanded.map((repo) => [heading(display, repo, own(repo)), ...own(repo).flatMap(row)]),
+        ...expanded.map((repo) => [
+            heading(display, repo, own(repo)),
+            ...carried(display, described.get(repo)),
+            ...own(repo).flatMap(row),
+        ]),
         ...(quiet.length === 0
             ? []
-            : [okLines(display, shared.length === 0 ? 'All checks ok:' : 'Otherwise ok:', quiet)]),
+            : [
+                okLines(display, shared.length === 0 ? 'All checks ok' : 'Otherwise ok', quiet.map((repo) => described.get(repo) ?? repo)),
+            ]),
     ];
     return `${sections.map((lines) => lines.join('\n')).join('\n\n')}\n`;
 }
+function shipping(repo) {
+    const { source, target } = repo;
+    if (source === null)
+        return undefined;
+    if (target === null)
+        return { version: source.version ?? undefined, text: headText(source) };
+    const own = source.version === null || source.version === target.version ? '' : ` (${source.version})`;
+    return {
+        version: target.version ?? undefined,
+        text: mergeText(target, source, repo.unmerged, own),
+    };
+}
+// "main a1a1a1a, dev d1d1d1d not merged: 2 commits by 1 person", or "dev merged".
+function mergeText(target, source, unmerged, own) {
+    const lands = headText(target);
+    if (unmerged?.commits === 0)
+        return `${lands}, ${source.branch} merged`;
+    const from = `${headText(source)}${own}`;
+    if (unmerged === null)
+        return `${lands}, ${from}`;
+    const people = `${unmerged.authors} ${unmerged.authors === 1 ? 'person' : 'people'}`;
+    return `${lands}, ${from} not merged: ${plural(unmerged.commits, 'commit')} by ${people}`;
+}
+function headText(head) {
+    return `${head.branch} ${shortSha(head.sha)}`;
+}
+function plural(n, noun) {
+    return `${n} ${noun}${n === 1 ? '' : 's'}`;
+}
+function sentence(shipped) {
+    return shipped.version === undefined ? shipped.text : `${shipped.version}  ${shipped.text}`;
+}
+// The release sentence and the manifest's note, under a heading.
+function carried(display, repo) {
+    if (repo === undefined)
+        return [];
+    const room = Math.max(display.room(widthOf(INDENT)), NARROWEST_MESSAGE);
+    const shipped = shipping(repo);
+    const lines = shipped === undefined ? [] : display.wrap(sentence(shipped), room).map((l) => `${INDENT}${l}`);
+    return [...lines, ...remarks(display, repo, INDENT)];
+}
+// What the host could not say about the repository, then the manifest's note.
+function remarks(display, repo, indent) {
+    const room = Math.max(display.room(widthOf(indent)), NARROWEST_MESSAGE);
+    return [
+        ...repo.unanswered.map((u) => `${u.field} unknown: ${u.reason}`),
+        ...(repo.note === null ? [] : [`note: ${repo.note}`]),
+    ]
+        .flatMap((said) => display.wrap(said, room))
+        .map((l) => `${indent}${display.paint('quiet', l)}`);
+}
 // A problem every repository has in common, the same words and the same fix.
 function sharedFindings(findings, repos) {
     const first = new Map();
@@ -82,10 +145,35 @@ function rowOf(display, width) {
         ];
     };
 }
+// The repositories with nothing to report, one line each with what they would ship.
 function okLines(display, label, repos) {
-    const room = Math.max(display.room(widthOf(INDENT)), NARROWEST_MESSAGE);
-    const [first = '', ...rest] = display.wrap(`${label} ${repos.join(', ')}`, room);
-    const painted = `${display.paint('ok', label)}${first.slice(label.length)}`;
-    return [painted, ...rest.map((line) => `${INDENT}${line}`)];
+    const rows = repos.map((repo) => typeof repo === 'string'
+        ? { name: repo, shipped: undefined, repo: undefined }
+        : { name: repo.name, shipped: shipping(repo), repo });
+    const width = Math.max(...rows.map((r) => widthOf(r.name)));
+    const versions = rows.flatMap((r) => r.shipped?.version === undefined ? [] : [r.shipped.version]);
+    const versionWidth = versions.length === 0 ? 0 : Math.max(...versions.map(widthOf));
+    const lead = widthOf(INDENT) + width + widthOf(GUTTER);
+    const room = Math.max(display.room(lead), NARROWEST_MESSAGE);
+    const under = ' '.repeat(lead);
+    return [
+        display.paint('ok', label),
+        ...rows.flatMap(({ name, shipped, repo }) => {
+            const said = shipped === undefined ? '' : aligned(shipped, versionWidth);
+            const [first = '', ...rest] = said === '' ? [] : display.wrap(said, room);
+            return [
+                `${INDENT}${name}${first === '' ? '' : `${gap(name, width)}${GUTTER}${first}`}`,
+                ...rest.map((l) => `${under}${l}`),
+                ...(repo === undefined ? [] : remarks(display, repo, under)),
+            ];
+        }),
+    ];
+}
+// The version in a column of its own, so the branches line up beneath each other.
+function aligned(shipped, versionWidth) {
+    if (versionWidth === 0)
+        return shipped.text;
+    const version = shipped.version ?? '';
+    return `${version}${gap(version, versionWidth)}${GUTTER}${shipped.text}`;
 }
 //# sourceMappingURL=release-view.js.map