@north-light/crouter 0.3.184 → 0.3.186

package/dist/commands/pkg/market-manage.js

@@ -155,6 +155,7 @@ export const marketUpdate = defineLeaf({
         summary: 'git pull one or all registered marketplaces',
         params: [
             { kind: 'flag', name: 'name', type: 'string', required: false, constraint: 'Marketplace name to update. Omit to update all registered marketplaces.' },
+            { kind: 'flag', name: 'scope', type: 'enum', choices: ['user', 'project'], required: false, constraint: 'Narrows resolution.' },
         ],
         output: [
             { name: 'updated', type: 'object[]', required: true, constraint: 'One entry per marketplace processed: {name, updated, sha}.' },
@@ -164,6 +165,8 @@ export const marketUpdate = defineLeaf({
     },
     run: async (input) => {
         const name = input['name'];
+        const scopeInput = input['scope'];
+        const scope = scopeInput === undefined ? undefined : resolveScopeArg(scopeInput);
         function pullIfGit(root) {
             const shaBefore = currentSha(root);
             if (!isGitRepo(root))
@@ -189,7 +192,7 @@ export const marketUpdate = defineLeaf({
                     }
                     s.marketplaces[target.name].last_updated = nowIso();
                 });
-                const sourcedPlugins = listAllPlugins().filter((plugin) => plugin.scope !== 'builtin' && plugin.sourceMarketplace === target.name);
+                const sourcedPlugins = listAllPlugins().filter((plugin) => plugin.scope === target.scope && plugin.sourceMarketplace === target.name);
                 for (const plugin of sourcedPlugins) {
                     if (isSymlink(plugin.root)) {
                         // Marketplace pull above updates symlinked relative-source plugins.
@@ -217,13 +220,19 @@ export const marketUpdate = defineLeaf({
             return results;
         }
         if (name !== undefined) {
-            const found = findMarketplaceByName(name);
+            const found = scope === undefined || scope === 'all' || scope === 'builtin'
+                ? findMarketplaceByName(name)
+                : findMarketplaceByName(name, scope);
             if (!found)
-                throw notFound(`marketplace not found: ${name}`);
+                throw notFound(`marketplace not found: ${name}${scope === undefined || scope === 'all' || scope === 'builtin' ? '' : ` (scope: ${scope})`}`);
             const results = await doUpdate([{ name: found.name, scope: found.scope, root: found.root }]);
             return { updated: results };
         }
-        const targets = listAllMarketplaces().map((m) => ({ name: m.name, scope: m.scope, root: m.root }));
+        const targets = (scope === undefined || scope === 'all'
+            ? listAllMarketplaces()
+            : scope === 'builtin'
+                ? []
+                : listAllMarketplaces().filter((marketplace) => marketplace.scope === scope)).map((m) => ({ name: m.name, scope: m.scope, root: m.root }));
         const results = await doUpdate(targets);
         return { updated: results };
     },

package/dist/commands/pkg/plugin-manage.js

@@ -549,6 +549,7 @@ export const pluginUpdate = defineLeaf({
         summary: 'refresh one or all installed plugins',
         params: [
             { kind: 'flag', name: 'name', type: 'string', required: false, constraint: 'Plugin name to update. Omit to update all installed plugins.' },
+            { kind: 'flag', name: 'scope', type: 'enum', choices: ['user', 'project'], required: false, constraint: 'Narrows resolution.' },
         ],
         output: [
             { name: 'updated', type: 'object[]', required: true, constraint: 'One entry per plugin processed: {name, transport?, updated, sha?, version?, docs?, commands?, error?}. Archive plugins report transport=http and replace their complete directory after an authenticated refetch; version is the archive content identifier and docs is the written memory-document count. sha is present for git updates. A bulk update reports and skips a failed archive plugin. commands is present for validated command plugins: {mounts: string[], issues: object[]}.' },
@@ -558,15 +559,19 @@ export const pluginUpdate = defineLeaf({
     },
     run: async (input) => {
         const name = input['name'];
+        const scopeInput = input['scope'];
+        const scope = scopeInput === undefined ? undefined : resolveScopeArg(scopeInput);
         const marketplaceCache = new Map();
         if (name !== undefined) {
-            const found = findPluginByName(name);
+            const found = scope === undefined || scope === 'all' || scope === 'builtin'
+                ? findPluginByName(name)
+                : findPluginByName(name, scope);
             if (found === null) {
-                throw notFound(`plugin not found: ${name}`);
+                throw notFound(`plugin not found: ${name}${scope === undefined || scope === 'all' || scope === 'builtin' ? '' : ` (scope: ${scope})`}`);
             }
             return { updated: [await updateOnePlugin(found, marketplaceCache, { strict: true })] };
         }
-        const targets = listAllPlugins().filter((p) => p.scope !== 'builtin');
+        const targets = listAllPlugins().filter((plugin) => plugin.scope !== 'builtin' && (scope === undefined || scope === 'all' || plugin.scope === scope));
         const results = [];
         for (const plugin of targets) {
             try {

package/dist/commands/pkg.js

@@ -1,5 +1,6 @@
 // `crtr pkg` subtree: plugin lifecycle and marketplace source management.
 import { defineBranch } from '../core/command.js';
+import { pkgBrowseLeaf } from './pkg/browse.js';
 import { pluginBranch } from './pkg/plugin.js';
 import { marketBranch } from './pkg/market.js';
 export function registerPkg() {
@@ -14,6 +15,6 @@ export function registerPkg() {
             name: 'pkg',
             summary: 'manage plugins and marketplace sources',
         },
-        children: [pluginBranch, marketBranch],
+        children: [pkgBrowseLeaf, pluginBranch, marketBranch],
     });
 }

package/dist/commands/sys/doctor.js

@@ -114,18 +114,20 @@ async function runCommandPluginChecks(scopes) {
     const inScope = new Set(scopes);
     const reserved = new Set(SUBTREE_NAMES);
     // Validate the whole effective set together so cross-plugin top-level name
-    // collisions surface here — a collided command is NOT mounted, and every
-    // claimant must fail, not pass.
+    // collisions surface here. A collision no longer costs anyone their command:
+    // each claimant mounts under an origin-qualified name, so it is reported as a
+    // healthy mount rather than a failure demanding the user remove a plugin.
     for (const v of validateEffectiveCommandPlugins(reserved, undefined, undefined, await coreCommandPaths())) {
         const plugin = v.plugin;
         if (!inScope.has(plugin.scope))
             continue;
-        if (v.issues.length === 0) {
+        const blocking = v.issues.filter((issue) => issue.code !== 'command_collision');
+        if (blocking.length === 0) {
             const mounts = v.contributions.map((c) => c.node.name).join(', ');
             results.push(pass(plugin.scope, `plugin:${plugin.name}:commands`, mounts.length > 0 ? `contributes top-level command(s): ${mounts}` : `command manifest valid`));
             continue;
         }
-        v.issues.forEach((issue, i) => {
+        blocking.forEach((issue, i) => {
             const remediation = {
                 kind: 'human_action',
                 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.`,

package/dist/commands/sys/panels/broker-limits-panel.d.ts

@@ -1,5 +1,5 @@
 import { Input } from "@earendil-works/pi-tui";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 export declare class BrokerLimitsPanel implements SetupPanel {
     private readonly onChange;
     readonly warningInput: Input;

package/dist/commands/sys/panels/broker-limits-panel.js

@@ -1,7 +1,7 @@
 import { Input, truncateToWidth } from "@earendil-works/pi-tui";
 import { readConfig, updateRawConfigAtomically } from "../../../core/config.js";
 import { BROKER_LIMIT_OVERRIDE_PRECEDENCE } from "../setup.js";
-import { padAnsi, theme, wrapText } from "./panel.js";
+import { padAnsi, theme, wrapText } from "../../../core/tui/panel.js";
 function positive(value) {
     return /^\d+$/.test(value) &&
         Number.isSafeInteger(Number(value)) &&

package/dist/commands/sys/panels/dependencies-panel.d.ts

@@ -1,5 +1,5 @@
 import type { SetupSystemInstallPlan } from "../setup-core.js";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 export declare class DependenciesPanel implements SetupPanel {
     private readonly plans;
     private readonly onChange;

package/dist/commands/sys/panels/dependencies-panel.js

@@ -1,5 +1,5 @@
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { theme } from "./panel.js";
+import { theme } from "../../../core/tui/panel.js";
 function toolLabel(tool) {
     return tool === "nvim" ? "nvim" : tool === "nerd-font" ? "Nerd Font" : "tmux";
 }

package/dist/commands/sys/panels/keybindings-panel.js

@@ -2,7 +2,7 @@ import { Input, matchesKey, truncateToWidth, visibleWidth, } from "@earendil-wor
 import { BINDING_CATALOG, formatBinding, formatGesture, isAttachPaneBinding, matchesPiTuiInput, persistUserKeybindings, KeybindingConcurrentEditError, KeybindingValidationError, } from "../../../core/keybindings/index.js";
 import { installTmuxBindings, occupiedTmuxRootGestures, } from "../../../core/runtime/tmux-chrome.js";
 import { SetupKeybindingsDraft } from "../setup-core.js";
-import { padAnsi, theme } from "./panel.js";
+import { padAnsi, theme } from "../../../core/tui/panel.js";
 /** Collapse explicitly-paired catalog definitions into one setup action row.
  *  Pair membership and field roles come only from catalog metadata; neither
  *  rendering nor installation guesses from binding ID names. */

package/dist/commands/sys/panels/models-panel.d.ts

@@ -1,7 +1,7 @@
 import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
 import { type TUI } from "@earendil-works/pi-tui";
 import type { BindingId } from "../../../core/keybindings/index.js";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 export declare class ModelsPanel implements SetupPanel {
     private readonly tui;
     private readonly runtime;

package/dist/commands/sys/panels/models-panel.js

@@ -6,7 +6,7 @@ import { readRawConfigAtRoot, persistDefaultKindModel, persistModelLadders, read
 import { findProjectScopeRoots, userScopeRoot } from "../../../core/scope.js";
 import { loadProfileManifest, profileRoot, } from "../../../core/profiles/manifest.js";
 import { configuredLadderProviders, inferPortableModelSelection, MODEL_PROVIDER_KEYS, MODEL_STRENGTHS, THINKING_SUFFIXES, } from "../../../core/runtime/model-selection.js";
-import { fitTail, padAnsi, renderRows, theme, } from "./panel.js";
+import { fitTail, padAnsi, renderRows, theme, } from "../../../core/tui/panel.js";
 const MODELS_CHROME_LINES = 3;
 const RUNTIME_PROVIDER_ID = {
     anthropic: ANTHROPIC_PROVIDER_ID,

package/dist/commands/sys/panels/plugins-panel.d.ts

@@ -1,5 +1,5 @@
 import type { SetupPackageId, SetupPackageManifestEntry } from "../setup-core.js";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 export declare class PluginsPanel implements SetupPanel {
     private readonly manifest;
     private readonly installedPackageIds;

package/dist/commands/sys/panels/plugins-panel.js

@@ -1,5 +1,5 @@
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { theme, wrapText } from "./panel.js";
+import { theme, wrapText } from "../../../core/tui/panel.js";
 export class PluginsPanel {
     manifest;
     installedPackageIds;

package/dist/commands/sys/panels/prefs-panel.d.ts

@@ -1,5 +1,5 @@
 import { type UserSettingGroup } from "../../../core/user-settings.js";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 /**
  * One destination's worth of user-scope preference rows. The old single
  * "Settings" tab listed every row flat with a permanent description under each,

package/dist/commands/sys/panels/prefs-panel.js

@@ -1,7 +1,7 @@
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import { readConfig, updateConfig } from "../../../core/config.js";
 import { userSettingsInGroup, } from "../../../core/user-settings.js";
-import { padAnsi, theme, visibleRange, wrapText, } from "./panel.js";
+import { padAnsi, theme, visibleRange, wrapText, } from "../../../core/tui/panel.js";
 const LABEL_WIDTH = 26;
 /**
  * One destination's worth of user-scope preference rows. The old single

package/dist/commands/sys/panels/provider-panel.d.ts

@@ -1,6 +1,6 @@
 import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
 import { type TUI } from "@earendil-works/pi-tui";
-import { type SetupPanel } from "./panel.js";
+import { type SetupPanel } from "../../../core/tui/panel.js";
 type AuthStatus = ReturnType<ModelRegistry["getProviderAuthStatus"]>;
 type ProviderAuthType = "oauth" | "api_key";
 type ProviderRow = {

package/dist/commands/sys/panels/provider-panel.js

@@ -5,7 +5,7 @@ import { dialogAuthInteraction } from "../../../core/auth-interaction.js";
 import { isManagedProvider, promoteSubscription, readSubscriptionPool, renameSubscription, } from "../../../core/subscription-state.js";
 import { removeProviderRow } from "../../../core/provider-management.js";
 import { cliClient } from "../../api-client.js";
-import { fitTail, theme, visibleRange, } from "./panel.js";
+import { fitTail, theme, visibleRange, } from "../../../core/tui/panel.js";
 /** Curated setup-catalog view over pi's OAuth providers + the model registry. */
 export function buildProviderCatalog(runtime, registry) {
     const oauth = runtime

package/dist/commands/sys/settings-shell.js

@@ -10,7 +10,7 @@ import { runSetupSettingsProcess } from "./setup-settings-runner.js";
 import { BrokerLimitsPanel } from "./panels/broker-limits-panel.js";
 import { KeybindingsPanel } from "./panels/keybindings-panel.js";
 import { ModelsPanel } from "./panels/models-panel.js";
-import { PAGE_CHROME_ROWS, columns, padAnsi, pageFrame, theme, } from "./panels/panel.js";
+import { PAGE_CHROME_ROWS, columns, padAnsi, pageFrame, theme, } from "../../core/tui/panel.js";
 import { PrefsPanel } from "./panels/prefs-panel.js";
 import { ProviderPanel } from "./panels/provider-panel.js";
 /** Rail column width, including its badge gutter. */

package/dist/commands/sys/setup-settings-runner.d.ts

@@ -1,24 +1,13 @@
 import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
-import { ProcessTerminal, TUI, type Component, type Focusable } from "@earendil-works/pi-tui";
-import { readRawScopeConfig } from "../../core/config.js";
-import { type BindingId, type BindingResolution } from "../../core/keybindings/index.js";
-type SetupSettingsSurface = Component & Focusable & {
-    dispose(): void;
-};
-type SetupSettingsProcessContext = {
-    tui: TUI;
-    terminal: ProcessTerminal;
+import type { BindingId, BindingResolution } from "../../core/keybindings/index.js";
+import { type TuiPageContext, type TuiPageControl, type TuiPageSurface } from "../../core/tui/page-host.js";
+/** Setup and settings both edit pi's model configuration, so their host adds
+ * the model runtime to the shared page context. Every other page concern —
+ * theme, keybindings, terminal lifecycle — belongs to `runTuiPage`. */
+type SetupSettingsProcessContext = TuiPageContext & {
     agentDir: string;
     runtime: ModelRuntime;
     registry: ModelRegistry;
-    bindings: BindingResolution<BindingId>;
-    rawUserConfig: ReturnType<typeof readRawScopeConfig>;
-};
-type SetupSettingsProcessControl<Result> = {
-    submit(result: Result): void;
-    cancel(): void;
 };
-/** The process-level terminal host shared by setup and settings. Navigation,
- * submission, and panel policy stay in their concrete surface factories. */
-export declare function runSetupSettingsProcess<Result>(createSurface: (context: SetupSettingsProcessContext, control: SetupSettingsProcessControl<Result>) => SetupSettingsSurface, interceptCancel?: (data: string, bindings: BindingResolution<BindingId>) => boolean): Promise<Result | undefined>;
+export declare function runSetupSettingsProcess<Result>(createSurface: (context: SetupSettingsProcessContext, control: TuiPageControl<Result>) => TuiPageSurface, interceptCancel?: (data: string, bindings: BindingResolution<BindingId>) => boolean): Promise<Result | undefined>;
 export {};

package/dist/commands/sys/setup-settings-runner.js

@@ -1,63 +1,14 @@
 import { ModelRegistry, ModelRuntime } from "@earendil-works/pi-coding-agent";
-import { ProcessTerminal, TUI, } from "@earendil-works/pi-tui";
 import { join } from "node:path";
-import { applyTheme, defaultAgentDir } from "../../clients/attach/config.js";
-import { readRawScopeConfig } from "../../core/config.js";
-import { resolveKeybindings, } from "../../core/keybindings/index.js";
+import { defaultAgentDir } from "../../clients/attach/config.js";
 import { PoolCredentialStore } from "../../core/pool-credential-store.js";
-/** The process-level terminal host shared by setup and settings. Navigation,
- * submission, and panel policy stay in their concrete surface factories. */
+import { runTuiPage, } from "../../core/tui/page-host.js";
 export async function runSetupSettingsProcess(createSurface, interceptCancel) {
-    applyTheme({ cwd: process.cwd() });
     const agentDir = defaultAgentDir();
     const runtime = await ModelRuntime.create({
         credentials: new PoolCredentialStore(join(agentDir, "auth.json")),
         modelsPath: join(agentDir, "models.json"),
     });
     const registry = new ModelRegistry(runtime);
-    const rawUserConfig = readRawScopeConfig("user");
-    const bindings = resolveKeybindings(rawUserConfig?.keybindings);
-    const terminal = new ProcessTerminal();
-    const tui = new TUI(terminal, true);
-    return new Promise((resolve, reject) => {
-        let surface;
-        let restored = false;
-        const restore = () => {
-            if (restored)
-                return;
-            restored = true;
-            surface?.dispose();
-            try {
-                tui.stop();
-            }
-            catch {
-                /* terminal restore */
-            }
-        };
-        const finish = (result) => {
-            restore();
-            resolve(result);
-        };
-        try {
-            surface = createSurface({ tui, terminal, agentDir, runtime, registry, bindings, rawUserConfig }, { submit: finish, cancel: () => finish(undefined) });
-            tui.addChild(surface);
-            tui.setFocus(surface);
-            process.once("exit", restore);
-            for (const signal of ["SIGTERM", "SIGHUP", "SIGINT"])
-                process.once(signal, () => finish(undefined));
-            if (interceptCancel !== undefined) {
-                tui.addInputListener((data) => {
-                    if (!interceptCancel(data, bindings))
-                        return undefined;
-                    finish(undefined);
-                    return { consume: true };
-                });
-            }
-            tui.start();
-        }
-        catch (error) {
-            restore();
-            reject(error);
-        }
-    });
+    return runTuiPage((context, control) => createSurface({ ...context, agentDir, runtime, registry }, control), interceptCancel);
 }

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

@@ -10,7 +10,7 @@ import { formatGesture, matchesPiTuiInput, } from "../../core/keybindings/index.
 import { buildSetupInitialState, executeSetupSubmission, formatSetupExecutionSummary, packagePlanAction, reconcileInboxFrontDoor, renderSetupStaticInstructions, } from "./setup-core.js";
 import { runSetupSettingsProcess } from "./setup-settings-runner.js";
 import { DependenciesPanel } from "./panels/dependencies-panel.js";
-import { PAGE_CHROME_ROWS, pageFrame, theme, } from "./panels/panel.js";
+import { PAGE_CHROME_ROWS, pageFrame, theme, } from "../../core/tui/panel.js";
 import { PluginsPanel } from "./panels/plugins-panel.js";
 import { ProviderPanel } from "./panels/provider-panel.js";
 const STEPS = ["Providers", "Plugins", "Dependencies"];

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

@@ -10,7 +10,8 @@
 //     real BranchDef/LeafDef whose root/branch/leaf help carries the plugin's
 //     representations, schema, effects, and stable order.
 //  2. Core collision — a fixture claiming a SUBTREE_NAMES name is skipped +
-//     recorded as a command_collision issue.
+//     recorded as a command_collision issue; plugin collisions keep both
+//     commands under origin-qualified names.
 //  3. Scope/shadowing — a project copy shadows a user copy of the same plugin
 //     name; a disabled project copy suppresses the user copy.
 //  4. Protocol integration (table-driven, one fixture executable) — request
@@ -39,10 +40,6 @@ import { CrtrError } from '../../errors.js';
 import { resetScopeCache } from '../../scope.js';
 import { listInstalledPluginsInRoot } from '../../resolver.js';
 import { pluginShow } from '../../../commands/pkg/plugin-inspect.js';
-import { sysDoctorLeaf } from '../../../commands/sys/doctor.js';
-import { createApiServer } from '../../../daemon/api/server.js';
-import { apiSocketPath, crtrHome } from '../../canvas/paths.js';
-import { closeDb } from '../../canvas/db.js';
 // The set of reserved core names discovery must fail closed against. We don't
 // import the real SUBTREE_NAMES (build-root.ts pulls the whole tree); a small
 // explicit set is enough for the collision contract and keeps the test cheap.
@@ -156,8 +153,12 @@ function installPlugin(scopeRoot, name, opts = {}) {
     const execPath = join(root, 'bin', 'cmd.js');
     writeFileSync(execPath, opts.exec ?? FIXTURE_EXEC);
     chmodSync(execPath, opts.execBit === false ? 0o644 : 0o755);
-    if (opts.enabled === false) {
-        writeFileSync(join(scopeRoot, 'config.json'), JSON.stringify({ plugins: { [name]: { enabled: false } } }));
+    const config = {
+        ...(opts.enabled === false ? { enabled: false } : {}),
+        ...(opts.sourceMarketplace !== undefined ? { source_marketplace: opts.sourceMarketplace } : {}),
+    };
+    if (Object.keys(config).length > 0) {
+        writeFileSync(join(scopeRoot, 'config.json'), JSON.stringify({ plugins: { [name]: config } }));
     }
     return root;
 }
@@ -599,8 +600,8 @@ describe('plugin help addenda', () => {
 });
 // ---------------------------------------------------------------------------
 // Lifecycle surfaces — the validator's verdict must reach the caller WITHOUT
-// executing the plugin binary, and a cross-plugin top-level collision must not
-// read as a pass on any claimant.
+// executing the plugin binary, and a cross-plugin top-level collision must
+// preserve every claimant under its origin-qualified command name.
 // ---------------------------------------------------------------------------
 describe('lifecycle surfaces report validation without executing the plugin', () => {
     // Records the fact it ran. No validation surface may ever spawn it.
@@ -639,45 +640,25 @@ process.stdout.write(JSON.stringify({ protocolVersion: 1, ok: true, result: { ap
         assert.equal(commands.mounts.length, 0, 'a rejected manifest contributes no mounts');
         assertNotExecuted();
     });
-    test('a cross-plugin top-level collision drops the command and fails BOTH claimants on every surface', async () => {
-        // Two plugins, each valid in isolation, both claiming `app`.
+    test('a cross-plugin top-level collision keeps both commands under their origin-qualified names', async () => {
+        // Two plugins, each valid in isolation, both claiming `app`. One is direct;
+        // the other records its marketplace as the command origin.
         installPlugin(userRoot, 'p-one', { exec: SENTINEL_EXEC });
-        installPlugin(userRoot, 'p-two', { exec: SENTINEL_EXEC });
+        installPlugin(userRoot, 'p-two', { exec: SENTINEL_EXEC, sourceMarketplace: 'fixture-market' });
         resetScopeCache();
         const snapshot = discoverCommandContributions(new Set(['sys']), emptyStart);
-        assert.equal(snapshot.contributions.length, 0, 'a collided top-level command must not be mounted by ANY claimant');
-        assert.deepEqual(snapshot.issues.filter((i) => i.code === 'command_collision').map((i) => i.plugin).sort(), ['p-one', 'p-two'], 'both claimants are flagged');
-        for (const name of ['p-one', 'p-two']) {
+        assert.deepEqual(snapshot.contributions.map((contribution) => contribution.node.name).sort(), ['fixture-market:app', 'p-one:app']);
+        assert.deepEqual(snapshot.issues.filter((i) => i.code === 'command_collision').map((i) => i.plugin).sort(), ['p-one', 'p-two'], 'both claimants report their resolved mount');
+        for (const [name, mount] of [['p-one', 'p-one:app'], ['p-two', 'fixture-market:app']]) {
             const out = await pluginShow.run({ name });
             const commands = out['commands'];
-            assert.deepEqual(commands.mounts, [], `${name} must not list the collided command as an accepted mount`);
+            assert.deepEqual(commands.mounts, [mount], `${name} lists its qualified command as an accepted mount`);
             const issue = commands.issues.find((i) => i.code === 'command_collision');
             assert.ok(issue, `${name} show must carry the command_collision issue`);
             assert.deepEqual(issue.received.split(', ').sort(), ['p-one', 'p-two'], 'the issue names both claimants');
-        }
-        // `sys doctor` scans live nodes through the daemon API, so it needs a
-        // reachable daemon answering with an empty roster (no node is ever created
-        // here) rather than trying to autostart a subprocess.
-        mkdirSync(crtrHome(), { recursive: true });
-        const server = createApiServer();
-        try {
-            for (let i = 0; i < 200 && !existsSync(apiSocketPath()); i++)
-                await new Promise((r) => setTimeout(r, 25));
-            assert.equal(existsSync(apiSocketPath()), true, 'api socket never bound');
-            const out = await sysDoctorLeaf.run({ scope: 'user', fix: false, remote: false });
-            const checks = out['checks'];
-            for (const name of ['p-one', 'p-two']) {
-                assert.equal(checks.find((k) => k.name === `plugin:${name}:commands` && k.status === 'pass'), undefined, `${name} must not PASS while its command is dropped by a collision`);
-                const failCheck = checks.find((k) => k.name.startsWith(`plugin:${name}:commands`) && k.status === 'fail' && /command_collision/.test(k.message));
-                assert.ok(failCheck, `${name} must fail with command_collision, got ${JSON.stringify(checks.map((k) => k.name + ':' + k.status))}`);
-                assert.match(failCheck.message, /claimed by multiple plugins/);
-                assert.equal(failCheck.remediation?.kind, 'human_action', 'command remediation is never auto-applied');
-            }
-            assert.equal(out['ok'], false);
-        }
-        finally {
-            await server.close();
-            closeDb();
+            assert.match(issue.message, new RegExp(`mounted as "${mount}"`));
+            assert.equal(issue.expected, 'an origin-qualified top-level command for each claimant');
+            assert.equal(issue.next, `Invoke "${mount}" to use this plugin command.`);
         }
         assertNotExecuted();
     });

package/dist/core/__tests__/session-model.test.js

@@ -98,12 +98,10 @@ test('a welcome is a COMPLETE catch-up: a re-welcome drops a dead broker s level
     const s0 = fold(initialSessionState(), [
         welcome(),
         { type: 'extension_ui_request', id: 'u1', method: 'setStatus', statusKey: 'gone', statusText: 'stale' },
-        { type: 'queue_update', steering: ['one', 'two'], followUp: [], steeringIds: ['id-1'] },
+        { type: 'queue_update', steering: ['one', 'two'], followUp: [] },
     ]);
     assert.equal(s0.display.statuses['gone'], 'stale');
-    // Broker-enriched ids zip positionally; a position without one (older broker,
-    // short array) still renders as a bare-text entry.
-    assert.deepEqual(s0.queued, [{ id: 'id-1', text: 'one' }, { text: 'two' }]);
+    assert.deepEqual(s0.queued, [{ text: 'one' }, { text: 'two' }]);
     assert.equal(s0.engine?.pendingMessageCount, 2);
     // A fresh broker (post-revive) welcomes with its OWN levels and an empty queue,
     // and emits no queue_update to overwrite the panel — so the welcome must.

package/dist/core/command-manifests/registry.d.ts

@@ -4,7 +4,13 @@ import type { DeclLeafBase, DeclBranch, CommandManifestIssue } from './schema.js
 export type CommandContributorRef = {
     name: string;
     scope: 'user' | 'project';
+    sourceMarketplace?: string;
 };
+/** The stable source name used to qualify a colliding plugin command. */
+export declare function commandContributorOrigin(contributor: Pick<CommandContributorRef, 'name' | 'sourceMarketplace'>): string;
+/** The top-level name assigned to a plugin command that collides with another
+ * plugin command. */
+export declare function qualifiedTopLevelCommandName(contributor: Pick<CommandContributorRef, 'name' | 'sourceMarketplace'>, commandName: string): string;
 /** Adapter callback to turn a declared leaf into a crtr LeafDef. Takes the
  *  leaf definition and its resolved command path, returns the outputKind and
  *  run function to be used by the tree composer. */
@@ -34,7 +40,8 @@ export interface CommandRegistrySnapshot {
     issues: ContributorIssue[];
 }
 /** Resolve a flat list of candidate contributions into a collision-resolved
- *  snapshot. Every contribution at a collided path is dropped (all claimants),
- *  an issue is recorded on each claimant, core names take precedence, and
- *  results are deterministically ordered by contributor name. */
+ *  snapshot. Plugin claimants at a collided path are qualified by origin and
+ *  kept; core names take precedence and are dropped. An issue is recorded on
+ *  every claimant, and results are deterministically ordered by contributor
+ *  name. */
 export declare function resolveCommandRegistry(candidates: readonly CommandContribution[], reservedCoreNames: ReadonlySet<string>): CommandRegistrySnapshot;