@north-light/crouter 0.3.163 → 0.3.165

package/dist/commands/sys/doctor.js

@@ -13,10 +13,6 @@ import { readFault } from '../../core/runtime/fault.js';
 import { detectNerdFont, nerdFontInstallCommand, NERD_FONT_SELECT_HINT } from '../../core/runtime/nerd-font.js';
 import { detectPackageManager } from './setup-core.js';
 import { validateEffectiveCommandPlugins } from '../../core/command-plugins/discovery.js';
-import { buildExternalCommandSnapshot } from '../../core/configured-clis/discovery.js';
-import { effectiveConfiguredClis } from '../../core/configured-clis/registration.js';
-import { readConfiguredCliCacheManifest } from '../../core/configured-clis/cache.js';
-import { validateConfiguredCliManifest } from '../../core/configured-clis/manifest.js';
 import { SUBTREE_NAMES } from '../../build-root.js';
 import { processGeneration, processLocatedGeneration, runtimeManifest, selectedGeneration } from './shared.js';
 function pass(scope, name, message) {
@@ -132,7 +128,7 @@ function runCommandPluginChecks(scopes) {
         v.issues.forEach((issue, i) => {
             const remediation = {
                 kind: 'human_action',
-                description: `${issue.next} If unfixable, disable (pkg plugin disable ${plugin.name}), update (pkg plugin update --name ${plugin.name}), or remove (pkg plugin remove ${plugin.name}) the plugin.`,
+                description: `${issue.next} Inspect with \`pkg plugin show ${plugin.name}\`; then update (\`pkg plugin update --name ${plugin.name}\`) or remove (\`pkg plugin remove ${plugin.name}\`) the plugin.`,
             };
             const detail = issue.path !== undefined ? ` at ${issue.path}` : '';
             results.push(failCheck(plugin.scope, `plugin:${plugin.name}:commands[${i}]`, `${issue.code}${detail}: ${issue.message} (received ${issue.received}, expected ${issue.expected})`, remediation));
@@ -140,87 +136,6 @@ function runCommandPluginChecks(scopes) {
     }
     return results;
 }
-/**
- * Validate cached manifests and configuration of every effective configured-CLI
- * registration. The snapshot (E1) is used to detect cross-contributor collisions;
- * otherwise this check reads stored manifests only — zero network. Absent store
- * is a PASS (not an issue). Only registrations in the supplied scopes are checked.
- * --fix never fetches or removes.
- */
-function runConfiguredCliChecks(scopes) {
-    const results = [];
-    const inScope = new Set(scopes);
-    const reserved = new Set(SUBTREE_NAMES);
-    // Get collision info from the unified snapshot.
-    const snapshot = buildExternalCommandSnapshot(reserved);
-    const collisionsPerContributor = new Map();
-    for (const issue of snapshot.issues) {
-        if (issue.code === 'command_collision') {
-            const key = `${issue.contributor.kind}:${issue.contributor.scope}:${issue.contributor.name}`;
-            if (!collisionsPerContributor.has(key)) {
-                collisionsPerContributor.set(key, new Set());
-            }
-            collisionsPerContributor.get(key).add(issue.path ?? 'unknown');
-        }
-    }
-    for (const registration of effectiveConfiguredClis()) {
-        if (!inScope.has(registration.scope))
-            continue;
-        // Check: store state (absent is a PASS)
-        const cachedBytes = readConfiguredCliCacheManifest(registration);
-        if (cachedBytes === null) {
-            // Absent store is a PASS (not a failure); it is hydration-eligible.
-            results.push(pass(registration.scope, `configured-cli:${registration.name}:store`, `no stored manifest (hydration-eligible on first use)`));
-            continue;
-        }
-        // Have a store: check it's readable + valid JSON
-        let raw;
-        try {
-            raw = JSON.parse(Buffer.from(cachedBytes).toString('utf8'));
-        }
-        catch {
-            const remediation = {
-                kind: 'human_action',
-                description: `Stored manifest is unparseable JSON. Run \`crtr pkg cli refresh ${registration.name}\` to re-fetch, or \`crtr pkg cli remove ${registration.name}\` to drop the registration.`,
-                command: `crtr pkg cli refresh ${registration.name}`,
-            };
-            results.push(failCheck(registration.scope, `configured-cli:${registration.name}:store`, `stored manifest.json is not valid JSON`, remediation));
-            continue;
-        }
-        // Check: manifest §4 validation
-        const validation = validateConfiguredCliManifest(raw, { reservedCoreNames: reserved });
-        if (validation.issues.length > 0) {
-            // Stored but invalid — report issues without suggesting removal (the schema itself may be fixable by a refresh).
-            validation.issues.forEach((issue, i) => {
-                const remediation = {
-                    kind: 'human_action',
-                    description: `${issue.next} Run \`crtr pkg cli refresh ${registration.name}\` to pull a corrected manifest, or \`crtr pkg cli remove ${registration.name}\` to drop the registration entirely.`,
-                    command: `crtr pkg cli refresh ${registration.name}`,
-                };
-                const detail = issue.path !== undefined ? ` at ${issue.path}` : '';
-                results.push(failCheck(registration.scope, `configured-cli:${registration.name}:manifest[${i}]`, `${issue.code}${detail}: ${issue.message} (received ${issue.received}, expected ${issue.expected})`, remediation));
-            });
-            continue;
-        }
-        // Store valid: report success + any collisions from the snapshot
-        const manifest = validation.manifest; // Safe: we checked validation.issues.length === 0 above
-        const collisions = collisionsPerContributor.get(`configured-cli:${registration.scope}:${registration.name}`) ?? new Set();
-        if (collisions.size > 0) {
-            const paths = Array.from(collisions).sort().join(', ');
-            const remediation = {
-                kind: 'human_action',
-                description: `This configured CLI's top-level command(s) or nested paths collide with core commands or other plugins. The collided paths are not mounted. Review the contributing command plugins/CLIs and resolve naming conflicts. Run \`crtr pkg cli remove ${registration.name}\` to drop this registration.`,
-                command: `crtr pkg cli show ${registration.name}`,
-            };
-            results.push(failCheck(registration.scope, `configured-cli:${registration.name}:collision`, `collision(s) at: ${paths}`, remediation));
-        }
-        else {
-            const topLevelNames = manifest.roots.map((root) => root.name).sort().join(', ');
-            results.push(pass(registration.scope, `configured-cli:${registration.name}:manifest`, topLevelNames.length > 0 ? `valid manifest, contributes top-level command(s): ${topLevelNames}` : `valid manifest`));
-        }
-    }
-    return results;
-}
 async function inventory(root) {
     const files = [];
     async function walk(dir) {
@@ -495,7 +410,7 @@ function runChecksForScope(scope, opts) {
 export const sysDoctorLeaf = defineLeaf({
     name: 'doctor',
     description: 'diagnose installation health',
-    whenToUse: 'something in your crtr install looks off and you want it diagnosed — a plugin or marketplace manifest is missing, a config entry points at a directory that no longer exists, or a command-plugin manifest/executable is malformed. Reports each problem with a structured remediation, and can apply the safe repairs for you.',
+    whenToUse: 'something in your crtr install looks off and you want it diagnosed — a plugin or marketplace manifest is missing, a config entry points at a directory that no longer exists, or a plugin command manifest/transport is malformed. Reports each problem with a structured remediation, and can apply the safe repairs for you.',
     help: {
         name: 'sys doctor',
         summary: 'diagnose runtime integrity, missing manifests, and broken config entries',
@@ -505,13 +420,13 @@ export const sysDoctorLeaf = defineLeaf({
             { kind: 'flag', name: 'remote', type: 'bool', required: false, constraint: 'Check git remotes with ls-remote (slow — makes network calls).' },
         ],
         output: [
-            { name: 'checks', type: 'object[]', required: true, constraint: 'Each: {scope, name, status, message, fixed?, remediation?}. status: pass | fail. scope may be user | project | canvas. Runtime checks validate selected and process generation manifests, sealing/containment, and full SHA-256 inventories. terminal:nerd-font (user scope) reports whether a Nerd Font is installed for the viewer\'s icon glyphs; its remediation is always a human_action carrying the platform install command, never auto-fixed. Command-plugin manifest checks appear as plugin:<name>:commands (validated statically, never executed); their remediation is always a human_action (disable/update/remove the plugin). remediation (when present) is {kind, description, ...payload} where kind is remove_config_key | rm_path | human_action; fault human_action remediations include the canonical logs command. Sorted by scope then name.' },
+            { name: 'checks', type: 'object[]', required: true, constraint: 'Each: {scope, name, status, message, fixed?, remediation?}. status: pass | fail. scope may be user | project | canvas. Runtime checks validate selected and process generation manifests, sealing/containment, and full SHA-256 inventories. terminal:nerd-font (user scope) reports whether a Nerd Font is installed for the viewer\'s icon glyphs; its remediation is always a human_action carrying the platform install command, never auto-fixed. Plugin manifest checks appear as plugin:<name>:commands (validated statically, never executed); their remediation is always a human_action (disable/update/remove the plugin). remediation (when present) is {kind, description, ...payload} where kind is remove_config_key | rm_path | human_action; fault human_action remediations include the canonical logs command. Sorted by scope then name.' },
             { name: 'ok', type: 'boolean', required: true, constraint: 'True when no unresolved fail checks remain.' },
         ],
         outputKind: 'object',
         effects: [
-            'Read-only unless --fix is passed. Runtime verification reads and hashes every selected/process generation file; command-plugin manifests are validated statically — the plugin executable is never run, at any time.',
-            'With --fix: applies each non-pass check\'s `remediation` — removes stale config entries and deletes dangling plugin/marketplace directories; canvas fault findings and command-plugin findings stay read-only (--fix never chmods or rewrites third-party plugin content).',
+            'Read-only unless --fix is passed. Runtime verification reads and hashes every selected/process generation file; plugin command manifests are validated statically — the plugin executable is never run, at any time.',
+            'With --fix: applies each non-pass check\'s `remediation` — removes stale config entries and deletes dangling plugin/marketplace directories; canvas fault findings and plugin command findings stay read-only (--fix never chmods or rewrites third-party plugin content).',
             'Each non-pass result carries a structured `remediation` describing the fix action (absolute paths, exact config keys, or a human_action with its command) so callers can apply it directly without --fix.',
         ],
     },
@@ -528,7 +443,6 @@ export const sysDoctorLeaf = defineLeaf({
         if (scopes.includes('user'))
             allResults.push(runNerdFontCheck());
         allResults.push(...runCommandPluginChecks(scopes));
-        allResults.push(...runConfiguredCliChecks(scopes));
         allResults.push(...await runFaultChecks());
         const processLocation = processGeneration();
         allResults.push(...await generationChecks('selected', selectedGeneration(), processLocation === null));

package/dist/commands/sys/setup-wizard.d.ts

@@ -63,8 +63,8 @@ export declare class SetupWizard implements Component, Focusable {
     private keyNotice;
     private brokerLimitIndex;
     private brokerLimitNotice;
-    private displayIndex;
-    private displayNotice;
+    private settingsIndex;
+    private settingsNotice;
     private cachedWidth;
     private cachedHeight;
     private cachedLines;
@@ -77,14 +77,12 @@ export declare class SetupWizard implements Component, Focusable {
     invalidate(): void;
     private setTab;
     private moveTab;
-    private moveDisplayRow;
-    /** Advance the selected display setting to its next value and persist it to user
-     *  config immediately — these are one-keystroke view preferences, so there is no
-     *  separate save gesture to forget. A viewer picks the new value up on its next
-     *  attach (`live_cycles` / `condensed_history` / `fold_finished_tools` are all read
-     *  per ChatView), and `completion_bell` on the next turn end. */
-    private cycleDisplaySetting;
-    private handleDisplayInput;
+    private moveSettingsRow;
+    /** Advance the selected preference and persist it immediately to user config.
+     *  The shared descriptor owns cycling, rendering, validation, and applicability,
+     *  so setup and `sys config set` cannot drift onto different setting catalogs. */
+    private cycleSetting;
+    private handleSettingsInput;
     private cancel;
     dispose(): void;
     private matches;
@@ -141,7 +139,7 @@ export declare class SetupWizard implements Component, Focusable {
     private renderKeybindings;
     private renderModels;
     private renderBrokerLimits;
-    private renderDisplay;
+    private renderSettings;
     render(width: number): string[];
 }
 export declare function runSetup(): Promise<void>;

package/dist/commands/sys/setup-wizard.js

@@ -10,10 +10,10 @@ import { basename, dirname, join } from 'node:path';
 import { applyTheme, defaultAgentDir } from '../../clients/attach/config.js';
 import { ANTHROPIC_PROVIDER_ID, OPENAI_CODEX_PROVIDER_ID, isManagedProvider, promoteSubscription, readSubscriptionPool, renameSubscription, } from '../../core/subscription-state.js';
 import { removeProviderRow } from '../../core/provider-management.js';
-import { readConfig, readRawConfigAtRoot, readRawScopeConfig, updateRawConfigAtomically, persistDefaultKindModel, persistModelLadders, readMergedLaunchConfig } from '../../core/config.js';
+import { readConfig, readRawConfigAtRoot, readRawScopeConfig, updateConfig, updateRawConfigAtomically, persistDefaultKindModel, persistModelLadders, readMergedLaunchConfig } from '../../core/config.js';
 import { findProjectScopeRoots, userScopeRoot } from '../../core/scope.js';
 import { loadProfileManifest, profileRoot } from '../../core/profiles/manifest.js';
-import { CONDENSED_HISTORY_MODES } from '../../types.js';
+import { USER_SETTINGS } from '../../core/user-settings.js';
 import { BINDING_CATALOG, formatBinding, formatGesture, matchesPiTuiInput, persistUserKeybindings, resolveKeybindings, KeybindingConcurrentEditError, KeybindingValidationError, } from '../../core/keybindings/index.js';
 import { configuredLadderProviders, inferPortableModelSelection } from '../../core/runtime/model-selection.js';
 import { cliClient } from '../api-client.js';
@@ -657,45 +657,8 @@ class ProviderPanel {
         return useFrame ? framed(body, width) : body.map((line) => truncateToWidth(line, width));
     }
 }
-const TAB_LABELS = ['Providers', 'Plugins', 'System', 'Exa', 'Keybindings', 'Models', 'Broker limits', 'Display'];
-const DISPLAY_TAB = 7;
-/** The viewer display settings the Display tab edits, in row order. Each row owns
- *  its own value cycling and its own formatting, so adding a setting here is the
- *  whole change — the tab's input and render loops stay generic. Every one is a
- *  user-scope `ScopeConfig` key persisted the moment it changes. */
-const DISPLAY_ROWS = [
-    {
-        key: 'fold_finished_tools',
-        label: 'Fold finished tools',
-        description: 'Fold every settled tool call to its call line (path included). Toggle live with /fold-tools.',
-        format: (cfg) => (cfg.fold_finished_tools ? 'on' : 'off'),
-        next: (cfg) => ({ fold_finished_tools: !cfg.fold_finished_tools }),
-    },
-    {
-        key: 'completion_bell',
-        label: 'Completion bell',
-        description: 'Ring a short sound in the viewer when the node you are watching finishes a turn.',
-        format: (cfg) => (cfg.completion_bell ? 'on' : 'off'),
-        next: (cfg) => ({ completion_bell: !cfg.completion_bell }),
-    },
-    {
-        key: 'live_cycles',
-        label: 'Live cycles',
-        description: 'Trailing refresh cycles rendered at full fidelity; older cycles condense to text. Default 2.',
-        format: (cfg) => String(cfg.live_cycles),
-        next: (cfg, delta) => ({ live_cycles: ((cfg.live_cycles - 1 + delta + 6) % 6) + 1 }),
-    },
-    {
-        key: 'condensed_history',
-        label: 'Condensed history',
-        description: 'Which messages of a condensed cycle still render. Tool calls are never kept.',
-        format: (cfg) => cfg.condensed_history,
-        next: (cfg, delta) => ({
-            condensed_history: CONDENSED_HISTORY_MODES[(CONDENSED_HISTORY_MODES.indexOf(cfg.condensed_history) + delta + CONDENSED_HISTORY_MODES.length)
-                % CONDENSED_HISTORY_MODES.length],
-        }),
-    },
-];
+const TAB_LABELS = ['Providers', 'Plugins', 'System', 'Exa', 'Keybindings', 'Models', 'Broker limits', 'Settings'];
+const SETTINGS_TAB = 7;
 const STRENGTHS = ['ultra', 'strong', 'medium', 'light'];
 const LADDER_PROVIDER_KEYS = ['anthropic', 'openai'];
 const THINKING_LEVELS = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
@@ -1304,20 +1267,21 @@ function buildSetupKeybindingRows() {
         }
         const members = [definition, paired];
         const menu = members.find((member) => member.pair?.field === 'menu');
-        const global = members.find((member) => member.pair?.field === 'global');
-        if (menu === undefined || global === undefined)
+        const second = members.find((member) => member.pair?.field !== 'menu');
+        if (menu === undefined || second === undefined)
             throw new Error(`incomplete keybinding pair for ${definition.id}`);
+        const secondLabel = second.pair?.field === 'global' ? 'Global' : 'Direct';
         rows.push({
             group: menu.group,
             name: menu.name,
             description: menu.description,
             fields: [
                 { label: 'Menu', definition: menu },
-                { label: 'Global', definition: global },
+                { label: secondLabel, definition: second },
             ],
         });
         consumed.add(menu.id);
-        consumed.add(global.id);
+        consumed.add(second.id);
     }
     return rows;
 }
@@ -1354,8 +1318,8 @@ export class SetupWizard {
     keyNotice;
     brokerLimitIndex = 0;
     brokerLimitNotice;
-    displayIndex = 0;
-    displayNotice;
+    settingsIndex = 0;
+    settingsNotice;
     cachedWidth;
     cachedHeight;
     cachedLines;
@@ -1430,33 +1394,29 @@ export class SetupWizard {
         const next = ((this.activeTab + delta + TAB_LABELS.length) % TAB_LABELS.length);
         this.setTab(next);
     }
-    moveDisplayRow(delta) {
-        this.displayIndex = (this.displayIndex + delta + DISPLAY_ROWS.length) % DISPLAY_ROWS.length;
-        this.displayNotice = undefined;
+    moveSettingsRow(delta) {
+        this.settingsIndex = (this.settingsIndex + delta + USER_SETTINGS.length) % USER_SETTINGS.length;
+        this.settingsNotice = undefined;
         this.invalidate();
     }
-    /** Advance the selected display setting to its next value and persist it to user
-     *  config immediately — these are one-keystroke view preferences, so there is no
-     *  separate save gesture to forget. A viewer picks the new value up on its next
-     *  attach (`live_cycles` / `condensed_history` / `fold_finished_tools` are all read
-     *  per ChatView), and `completion_bell` on the next turn end. */
-    cycleDisplaySetting(delta) {
-        const row = DISPLAY_ROWS[this.displayIndex];
-        const current = readConfig('user');
-        const next = row.next(current, delta);
-        updateRawConfigAtomically('user', (latest) => ({ ...latest, ...next }));
-        this.displayNotice = `Saved ${row.key} = ${row.format({ ...current, ...next })}. Applies on the next attach.`;
+    /** Advance the selected preference and persist it immediately to user config.
+     *  The shared descriptor owns cycling, rendering, validation, and applicability,
+     *  so setup and `sys config set` cannot drift onto different setting catalogs. */
+    cycleSetting(delta) {
+        const setting = USER_SETTINGS[this.settingsIndex];
+        const config = updateConfig('user', (current) => setting.cycle(current, delta));
+        this.settingsNotice = `Saved ${setting.key} = ${setting.format(config)}. ${setting.applies}`;
         this.invalidate();
     }
-    handleDisplayInput(data) {
+    handleSettingsInput(data) {
         if (this.matches('crtr.setup.list-down', data))
-            this.moveDisplayRow(1);
+            this.moveSettingsRow(1);
         else if (this.matches('crtr.setup.list-up', data))
-            this.moveDisplayRow(-1);
+            this.moveSettingsRow(-1);
         else if (this.matches('crtr.setup.toggle', data) || this.matches('crtr.setup.cell-next', data))
-            this.cycleDisplaySetting(1);
+            this.cycleSetting(1);
         else if (this.matches('crtr.setup.cell-previous', data))
-            this.cycleDisplaySetting(-1);
+            this.cycleSetting(-1);
         else if (this.matches('crtr.setup.advance', data))
             this.moveTab(1);
     }
@@ -2049,8 +2009,8 @@ export class SetupWizard {
                 this.invalidate();
             return;
         }
-        if (this.activeTab === DISPLAY_TAB) {
-            this.handleDisplayInput(data);
+        if (this.activeTab === SETTINGS_TAB) {
+            this.handleSettingsInput(data);
             return;
         }
         this.handleBrokerLimitsInput(data);
@@ -2077,7 +2037,7 @@ export class SetupWizard {
                 : `${this.label('crtr.setup.list-down')}/${this.label('crtr.setup.list-up')} row · ${this.label('crtr.setup.cell-previous')}/${this.label('crtr.setup.cell-next')} column · ${this.label('crtr.setup.models.scope-next')} scope · ${this.label('crtr.setup.models.open')} edit · ${this.label('crtr.setup.tab-next')} next · ${this.label('crtr.setup.cancel')} cancel`;
             return [truncateToWidth(theme.fg('dim', hint), width)];
         }
-        if (this.activeTab === DISPLAY_TAB) {
+        if (this.activeTab === SETTINGS_TAB) {
             return [truncateToWidth(theme.fg('dim', `${this.label('crtr.setup.list-down')}/${this.label('crtr.setup.list-up')} row · ${this.label('crtr.setup.toggle')} or ${this.label('crtr.setup.cell-next')}/${this.label('crtr.setup.cell-previous')} change value · ${tabs} · ${this.label('crtr.setup.cancel')} cancel`), width)];
         }
         if (this.activeTab === 6) {
@@ -2406,22 +2366,28 @@ export class SetupWizard {
         }
         return out;
     }
-    renderDisplay(width) {
+    renderSettings(width) {
         const out = [];
-        const cfg = readConfig('user');
-        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Display'))}${theme.fg('dim', '  user scope · attach viewer')}`, width));
-        out.push(truncateToWidth(theme.fg('dim', 'Each change saves immediately and applies to viewers attached from now on.'), width));
+        const config = readConfig('user');
+        const capacity = Math.max(1, Math.floor((this.terminalRows() - 13) / 2));
+        const range = visibleRange(USER_SETTINGS.length, this.settingsIndex, capacity);
+        out.push(truncateToWidth(`${theme.fg('accent', theme.bold('Settings'))}${theme.fg('dim', '  user scope')}`, width));
+        out.push(truncateToWidth(theme.fg('dim', 'General preferences live here; specialized settings keep their own tabs. Changes save immediately.'), width));
         out.push('');
-        for (const [index, row] of DISPLAY_ROWS.entries()) {
-            const selected = index === this.displayIndex;
+        for (let index = range.start; index < range.end; index += 1) {
+            const setting = USER_SETTINGS[index];
+            const selected = index === this.settingsIndex;
             const marker = selected ? theme.fg('accent', '▶') : ' ';
-            const name = selected ? theme.fg('accent', row.label) : row.label;
-            out.push(truncateToWidth(`${marker} ${padAnsi(name, 24)} ${theme.fg('success', row.format(cfg))}`, width));
-            out.push(truncateToWidth(theme.fg('dim', `    ${row.description}`), width));
+            const name = selected ? theme.fg('accent', setting.label) : setting.label;
+            out.push(truncateToWidth(`${marker} ${padAnsi(name, 24)} ${theme.fg('success', setting.format(config))}`, width));
+            out.push(truncateToWidth(theme.fg('dim', `    ${setting.description}`), width));
+        }
+        if (range.start > 0 || range.end < USER_SETTINGS.length) {
+            out.push(theme.fg('dim', `(${this.settingsIndex + 1}/${USER_SETTINGS.length})`));
         }
-        if (this.displayNotice) {
+        if (this.settingsNotice) {
             out.push('');
-            for (const line of wrapText(this.displayNotice, width))
+            for (const line of wrapText(this.settingsNotice, width))
                 out.push(theme.fg('success', line));
         }
         return out;
@@ -2450,7 +2416,7 @@ export class SetupWizard {
                                         ? this.renderModels(width)
                                         : this.activeTab === 6
                                             ? this.renderBrokerLimits(width)
-                                            : this.renderDisplay(width)),
+                                            : this.renderSettings(width)),
             '',
             ...this.renderFooter(width),
         ];

package/dist/core/__tests__/base-worker-prompt.test.js

@@ -22,39 +22,36 @@ test('base sub-personas receive hands-on guidance instead of universal delegatio
     assert.doesNotMatch(orchestrator, /You are a hands-on worker/);
     assert.match(orchestrator, /You are an orchestrator/);
 });
-test('developer orchestrators gate only fact-dependent decisions on explore synthesis', () => {
+test('developer orchestrators receive the development front door and acceptance bar', () => {
     const prompt = renderPreferencesForSubject(subject('orchestrator', 'developer')).block;
-    assert.match(prompt, /When a downstream decision depends on unknown source facts.*?Wait for every scout in that evidence wave's final completion result \(`crtr push final`\), not merely an update.*?synthesize the findings into one factual artifact.*?specialist who owns the decision/s);
-    assert.match(prompt, /The scout artifact ends at evidence/);
-    assert.match(prompt, /Independent work that does not depend on the pending facts may proceed in parallel/);
-    assert.match(prompt, /absolute artifact path plus every relevant report or context path/);
-    assert.doesNotMatch(prompt, /first wave explore-only|before launching downstream advisor, spec, design, plan, developer, and review children|Wait for every explore report/);
+    assert.match(prompt, /Before you shape a software roadmap, read `crtr memory read development` for development styles, roadmap shapes, and exit criteria that fit the goal's risk/);
+    assert.match(prompt, /Treat implementation as complete only when it is \*\*provably correct against the spec's acceptance criteria\*\*, not merely when it compiles/);
+    assert.doesNotMatch(prompt, /When a downstream decision depends on unknown source facts|Run the remaining delegation pipeline|Give each substantive implementation batch one independent review assignment/);
 });
-test('review guidance bounds one critique pass and closes through evidence', () => {
-    const developer = renderPreferencesForSubject(subject('orchestrator', 'developer')).block;
-    assert.match(developer, /one independent review assignment/);
-    assert.match(developer, /Validation means executing acceptance criteria.*?evidence, not review/s);
-    assert.doesNotMatch(developer, /Hand each lens to its own reviewer|idle capacity is a wasted wake|When in doubt, more rigor/);
+test('review and plan orchestrators use shared review disposition rules', () => {
+    const sharedReviewRule = /substantive logic gets one independent review pass;.*?Its verdict is settled: fix or dismiss its findings, then validate the changed behavior rather than asking any reviewer for another opinion or PASS/s;
     const reviewOrchestrator = renderPreferencesForSubject(subject('orchestrator', 'review')).block;
     assert.match(reviewOrchestrator, /Choose the one decomposition axis/);
     assert.match(reviewOrchestrator, /at most five base review children.*?in one wave/s);
-    assert.match(reviewOrchestrator, /Never delegate synthesis, adjudication, or validation of the synthesis/);
-    assert.doesNotMatch(reviewOrchestrator, /Decompose the surface two ways/);
+    assert.match(reviewOrchestrator, sharedReviewRule);
+    assert.match(reviewOrchestrator, /You own synthesis and evidence reconciliation.*?The owner disposes findings and validates changed behavior/s);
+    assert.doesNotMatch(reviewOrchestrator, /Decompose the surface two ways|Never delegate synthesis, adjudication, or validation of the synthesis/);
     const reviewWorker = renderPreferencesForSubject(subject('base', 'review')).block;
     assert.match(reviewWorker, /A slice delegated by another reviewer remains base/);
     const planner = renderPreferencesForSubject(subject('orchestrator', 'plan')).block;
-    assert.match(planner, /one independent review pass/);
-    assert.doesNotMatch(planner, /Fan out your plan-reviewer sub-kinds|loops review.*?re-review/s);
+    assert.match(planner, sharedReviewRule);
+    assert.doesNotMatch(planner, /Give a consequential synthesized plan one independent review pass|requirements-coverage, pattern-consistency, code-smells, security, and architecture-fit lenses/);
 });
-test('explore personas keep current-state evidence separate from target-state decisions', () => {
+test('explore personas preserve complete evidence without identity or tool manuals', () => {
     const base = renderPreferencesForSubject(subject('base', 'explore')).block;
-    assert.match(base, /fast current-state codebase scout/);
+    assert.match(base, /Your work is \*\*read-only evidence gathering\*\* — map what exists, where it lives, how it behaves, and which constraints, gaps, or feasibility limits the source proves/);
     assert.match(base, /Root cause and recommendations belong to `advisor`, target architecture to `design`, required behavior and acceptance criteria to `spec`, and implementation decomposition to `plan`/);
     assert.match(base, /A task cannot expand your role: even when it explicitly asks, \*\*never\*\* produce those decisions/);
-    assert.match(base, /leave any requested diagnosis, recommendation, target design, acceptance criteria, or implementation breakdown unperformed/);
-    assert.doesNotMatch(base, /answer architecture questions|suggest changes beyond what was asked/);
+    assert.match(base, /Done is the \*\*requested factual surface fully mapped\*\* with evidence, not a plausible partial sketch/);
+    assert.match(base, /complete findings.*?exact files and line numbers.*?self-contained/s);
+    assert.doesNotMatch(base, /You are a fast current-state codebase scout|Use grep, find, and file reads/);
     const orchestrator = renderPreferencesForSubject(subject('orchestrator', 'explore')).block;
-    assert.match(orchestrator, /current-state research question/);
-    assert.match(orchestrator, /even when it explicitly asks for diagnosis or a target-state decision, gather only the facts.*?return the unperformed handoff to the matching specialist/);
+    assert.match(orchestrator, /even when it explicitly asks for diagnosis or a target-state decision, gather only the facts that decision needs and return the unperformed handoff to the matching specialist/);
+    assert.match(orchestrator, /The map is complete only when every factual sub-question is answered/);
     assert.match(orchestrator, /factual synthesis.*not a pile of transcripts or a proposed solution/);
 });

package/dist/core/__tests__/command-plugins-surfaces.test.js

@@ -33,7 +33,6 @@ process.stdout.write(JSON.stringify({ protocolVersion: 1, ok: true, result: { ap
 function validManifest() {
     return {
         schemaVersion: 1,
-        executable: 'bin/cmd.js',
         mounts: [
             {
                 parent: [],
@@ -67,12 +66,27 @@ function validManifest() {
     };
 }
 const CASES = [
-    (() => { const m = validManifest(); m['executable'] = '../../../../bin/sh'; return { name: 'escaping executable path', code: 'command_path_unsafe', manifest: m }; })(),
+    { name: 'escaping executable path', code: 'command_path_unsafe', executable: '../../../../bin/sh' },
     { name: 'non-executable file', code: 'command_not_executable', execBit: false },
     (() => { const m = validManifest(); m['schemaVersion'] = 2; return { name: 'unknown schemaVersion', code: 'command_schema_version', manifest: m }; })(),
     (() => { const m = validManifest(); m['requires'] = { crtr: '>=1' }; return { name: 'unknown top-level key', code: 'command_manifest_invalid', manifest: m }; })(),
-    (() => { const m = validManifest(); m['mounts'][0].parent = ['sys']; return { name: 'non-empty parent', code: 'command_parent_invalid', manifest: m }; })(),
 ];
+function nestedManifest() {
+    const manifest = validManifest();
+    const mounts = manifest['mounts'];
+    const topLevel = mounts[0];
+    const child = topLevel.node['children'][0];
+    topLevel.node['children'] = [{
+            kind: 'branch',
+            name: 'tools',
+            description: 'application tools',
+            whenToUse: 'inspect application tools',
+            summary: 'application tools',
+            children: [],
+        }];
+    mounts.push({ parent: ['app', 'tools'], node: { ...child, name: 'status' } });
+    return manifest;
+}
 // ---------------------------------------------------------------------------
 // Isolated home + cwd
 // ---------------------------------------------------------------------------
@@ -155,7 +169,13 @@ function writePlugin(dir, name, c) {
     const root = join(dir, name);
     mkdirSync(join(root, '.crouter-plugin'), { recursive: true });
     mkdirSync(join(root, 'bin'), { recursive: true });
-    writeFileSync(join(root, '.crouter-plugin', 'plugin.json'), JSON.stringify({ name, version: '0.1.0', description: 'fixture', commands: 'commands.json' }));
+    writeFileSync(join(root, '.crouter-plugin', 'plugin.json'), JSON.stringify({
+        name,
+        version: '0.1.0',
+        description: 'fixture',
+        commands: 'commands.json',
+        transport: { kind: 'exec', executable: c.executable ?? 'bin/cmd.js' },
+    }));
     writeFileSync(join(root, 'commands.json'), JSON.stringify(c.manifest ?? validManifest()));
     const execPath = join(root, 'bin', 'cmd.js');
     writeFileSync(execPath, SENTINEL_EXEC);
@@ -189,9 +209,23 @@ describe('pkg plugin show surfaces command validation', () => {
         resetScopeCache();
         const out = await pluginShow.run({ name: 'p' });
         const commands = out['commands'];
+        const manifest = out['manifest'];
+        assert.deepEqual(commands.mounts, ['app']);
+        assert.equal(commands.issues.length, 0);
+        assert.deepEqual(manifest.transport, { kind: 'exec', executable: 'bin/cmd.js' }, 'the executable belongs to plugin.json transport, not commands.json');
+        assertNotExecuted();
+    });
+    test('a nested mount composes into an empty exec branch instead of being rejected', async () => {
+        writePlugin(join(userRoot, 'plugins'), 'p', { name: 'nested mount', code: '', manifest: nestedManifest() });
+        resetScopeCache();
+        const out = await pluginShow.run({ name: 'p' });
+        const commands = out['commands'];
         assert.deepEqual(commands.mounts, ['app']);
         assert.equal(commands.issues.length, 0);
-        assert.ok(typeof commands.executable === 'string', 'executable path is resolved for a valid manifest');
+        const snapshot = discoverCommandContributions(new Set(), emptyStart);
+        const tools = snapshot.contributions[0].node.children.find((node) => node.name === 'tools');
+        assert.equal(tools.kind, 'branch');
+        assert.deepEqual(tools.children.map((node) => node.name), ['status']);
         assertNotExecuted();
     });
 });