@pellux/goodvibes-tui 2.0.21 → 2.1.0

package/src/{panels → views}/modals/hooks-modal.ts

@@ -1,5 +1,5 @@
 import { MODAL_TONES } from './modal-theme.ts';
-import { infoRow } from './modal-surface-helpers.ts';
+import { infoRow, headerRow } from './modal-surface-helpers.ts';
 import { listHookPointContracts } from '@pellux/goodvibes-sdk/platform/hooks';
 import type {
   HookActivityTracker,
@@ -18,11 +18,11 @@ import type {
 // ---------------------------------------------------------------------------
 // Hooks → config-modal surface (group-B port). Two tabs: 'Hooks' (active
 // registrations + contract posture) and 'Activity' (recent runtime activity +
-// managed authoring + last simulation, the panel's expand-activity view, now a
+// managed authoring + last simulation, the earlier view's expand-activity view, now a
 // dedicated tab). All sources are in-memory (dispatcher/workbench/tracker hold
 // live state), so buildView reads live and refresh() is a no-op. Toggle/remove/
 // simulate route to their `/hooks` command path. Selection-blind port: the
-// panel's selected-hook contract detail is folded into each hook row label.
+// view's selected-hook contract detail is folded into each hook row label.
 // ---------------------------------------------------------------------------
 
 export type HooksModalDispatcher = Pick<HookDispatcher, 'listHooks' | 'getChains'>;
@@ -68,11 +68,11 @@ class HooksModalSurface implements ConfigModalSurface {
     if (hooks.length === 0) {
       const rows: ConfigModalRow[] = [
         infoRow('empty:0', 'No hooks are currently registered.'),
-        infoRow('empty:1', `contracts ${contracts.length}  chains ${chains.length}  managed ${managedHooks.length}`, { dim: true }),
-        infoRow('empty:2', `hooks file: ${hooksFilePath}`, { dim: true }),
-        infoRow('empty:title', 'Next steps'),
-        infoRow('empty:hooks', '/hooks     — review hook contracts and managed authoring actions', { dim: true }),
-        infoRow('empty:settings', '/settings  — review hook/runtime behavior in the settings surface', { dim: true }),
+        infoRow('empty:1', `contracts ${contracts.length}  chains ${chains.length}  managed ${managedHooks.length}`, { fg: MODAL_TONES.dim }),
+        infoRow('empty:2', `hooks file: ${hooksFilePath}`, { fg: MODAL_TONES.dim }),
+        headerRow('empty:title', 'Next steps'),
+        infoRow('empty:hooks', '/hooks     — review hook contracts and managed authoring actions', { fg: MODAL_TONES.dim }),
+        infoRow('empty:settings', '/settings  — review hook/runtime behavior in the settings surface', { fg: MODAL_TONES.dim }),
       ];
       return { id: 'hooks', label: 'Hooks', rows, emptyText: '' };
     }
@@ -101,7 +101,7 @@ class HooksModalSurface implements ConfigModalSurface {
     const rows: ConfigModalRow[] = [];
     const recentActivity = this.deps.hookActivityTracker.listRecent(20);
     if (recentActivity.length === 0) {
-      rows.push(infoRow('act:none', 'No hook activity recorded yet.', { dim: true }));
+      rows.push(infoRow('act:none', 'No hook activity recorded yet.', { fg: MODAL_TONES.dim }));
     } else {
       recentActivity.forEach((record, i) => {
         const decisionText = record.ok ? (record.decision ?? 'ok') : 'error';
@@ -110,18 +110,18 @@ class HooksModalSurface implements ConfigModalSurface {
       });
     }
 
-    rows.push(infoRow('auth:title', 'Authoring'));
+    rows.push(headerRow('auth:title', 'Authoring'));
     const recentAuthoring = this.deps.hookWorkbench.listRecentActions(3);
     if (recentAuthoring.length === 0) {
-      rows.push(infoRow('auth:none', 'No managed hook authoring actions recorded yet.', { dim: true }));
+      rows.push(infoRow('auth:none', 'No managed hook authoring actions recorded yet.', { fg: MODAL_TONES.dim }));
     } else {
-      recentAuthoring.forEach((action, i) => rows.push(infoRow(`auth:${i}`, `${action.kind.padEnd(14)} ${action.target}`, { dim: true })));
+      recentAuthoring.forEach((action, i) => rows.push(infoRow(`auth:${i}`, `${action.kind.padEnd(14)} ${action.target}`, { fg: MODAL_TONES.dim })));
     }
 
     const lastSimulation = this.deps.hookWorkbench.getLastSimulation();
     if (lastSimulation) {
       rows.push(infoRow('sim:path', `last simulation: ${lastSimulation.eventPath}`));
-      rows.push(infoRow('sim:matches', `matches: hooks=${lastSimulation.matchedHooks.length} chains=${lastSimulation.matchedChains.length}`, { dim: true }));
+      rows.push(infoRow('sim:matches', `matches: hooks=${lastSimulation.matchedHooks.length} chains=${lastSimulation.matchedChains.length}`, { fg: MODAL_TONES.dim }));
     }
     return { id: 'activity', label: 'Activity', rows, emptyText: 'No hook activity recorded yet.' };
   }

package/src/{panels → views}/modals/keybindings-modal.ts

@@ -1,4 +1,5 @@
-import { infoRow } from './modal-surface-helpers.ts';
+import { MODAL_TONES } from './modal-theme.ts';
+import { infoRow, headerRow } from './modal-surface-helpers.ts';
 import type {
   ConfigModalActionContext,
   ConfigModalRow,
@@ -10,14 +11,13 @@ import { KeybindingsManager } from '../../input/keybindings.ts';
 
 // ---------------------------------------------------------------------------
 // Docs + Shortcuts → 'keybindings' config-modal surface (group-B port).
-// A MERGE of the retired DocsPanel (tools/models/shortcuts) and the
+// A MERGE of the retired Docs view (tools/models/shortcuts) and the
 // shortcuts-overlay reference. Three tabs: 'Tools', 'Models', and 'Shortcuts'
 // (the categorized keyboard reference, driven live off keybindingsManager so
 // user overrides show up, followed by an exhaustive 'All Bindings (live)'
-// table). Enter opens the tool-inspector successor ('fleet') or switches the
-// active model, both via the command path (fleet is a panel; /model is a
-// settings mutation). Selection-blind port: the panel's selected tool/model
-// detail is folded into each row label. The panel's live '/' filter is dropped
+// table). Enter opens Agents on processes running the selected tool
+// (/agents --target <tool>:tool) or switches the active model (/model). Selection-blind port: the earlier view's selected tool/model
+// detail is folded into each row label. The earlier view's live '/' filter is dropped
 // (the host has no query state).
 // ---------------------------------------------------------------------------
 
@@ -58,7 +58,7 @@ class KeybindingsModalSurface implements ConfigModalSurface {
   }
 
   private toolsTab(): ConfigModalTab {
-    if (!this.deps.toolRegistry) return { id: 'tools', label: 'Tools', rows: [infoRow('tools:none', 'Tool registry not wired into this session.', { dim: true })], emptyText: 'Tool registry not wired into this session.' };
+    if (!this.deps.toolRegistry) return { id: 'tools', label: 'Tools', rows: [infoRow('tools:none', 'Tool registry not wired into this session.', { fg: MODAL_TONES.dim })], emptyText: 'Tool registry not wired into this session.' };
     const tools = this.deps.toolRegistry.list();
     const rows: ConfigModalRow[] = tools.map((tool) => {
       const d = tool.definition;
@@ -70,11 +70,11 @@ class KeybindingsModalSurface implements ConfigModalSurface {
       const detail = [d.description, meta.join('  |  ') || null].filter((s): s is string => Boolean(s)).join(' · ');
       return { id: `tool:${d.name}`, label: detail ? `${d.name.padEnd(22)} ${detail}` : d.name };
     });
-    return { id: 'tools', label: 'Tools', rows, emptyText: 'No tools registered.', hints: ['enter open in fleet'] };
+    return { id: 'tools', label: 'Tools', rows, emptyText: 'No tools registered.', hints: ['enter open in agents'] };
   }
 
   private modelsTab(): ConfigModalTab {
-    if (!this.deps.providerRegistry) return { id: 'models', label: 'Models', rows: [infoRow('models:none', 'Provider registry not wired into this session.', { dim: true })], emptyText: 'Provider registry not wired into this session.' };
+    if (!this.deps.providerRegistry) return { id: 'models', label: 'Models', rows: [infoRow('models:none', 'Provider registry not wired into this session.', { fg: MODAL_TONES.dim })], emptyText: 'Provider registry not wired into this session.' };
     const activeKey = this.deps.providerRegistry.getCurrentModel?.()?.registryKey;
     const rows: ConfigModalRow[] = this.sortedModels().map((model) => {
       const ctxK = model.contextWindow > 0 ? `${(model.contextWindow / 1000).toFixed(0)}k` : '?';
@@ -86,19 +86,18 @@ class KeybindingsModalSurface implements ConfigModalSurface {
 
   private shortcutsTab(): ConfigModalTab {
     const km = this.deps.keybindingsManager;
-    if (!km) return { id: 'shortcuts', label: 'Shortcuts', rows: [infoRow('sc:none', 'Keybindings manager not wired into this session.', { dim: true })], emptyText: 'Keybindings manager not wired into this session.' };
+    if (!km) return { id: 'shortcuts', label: 'Shortcuts', rows: [infoRow('sc:none', 'Keybindings manager not wired into this session.', { fg: MODAL_TONES.dim })], emptyText: 'Keybindings manager not wired into this session.' };
     const kb = (action: Parameters<KeybindingsManager['getComboLabel']>[0]) => km.getComboLabel(action);
     const rows: ConfigModalRow[] = [];
     let n = 0;
     const category = (title: string, entries: ReadonlyArray<readonly [string, string]>): void => {
-      rows.push(infoRow(`sc:t:${n++}`, title));
+      rows.push(headerRow(`sc:t:${n++}`, title));
       for (const [key, desc] of entries) rows.push(infoRow(`sc:${n++}`, `${key.padEnd(20)} ${desc}`));
     };
-    category('Navigation', [['Up / Down', 'Scroll / history recall'], ['PageUp / PageDn', 'Scroll by full page'], ['Home / End', 'Jump to start / end of line'], [kb('search'), 'Search conversation'], ['n / N (search)', 'Next / previous match'], ['Mouse wheel', 'Scroll conversation or hovered panel']]);
+    category('Navigation', [['Up / Down', 'Scroll / history recall'], ['PageUp / PageDn', 'Scroll by full page'], ['Home / End', 'Jump to start / end of line'], [kb('search'), 'Search conversation'], ['n / N (search)', 'Next / previous match'], ['Mouse wheel', 'Scroll the conversation']]);
     category('Editing', [['Enter', 'Submit message'], ['Shift+Enter', 'Insert newline'], ['@', 'Open file picker'], ['/', 'Slash command mode'], [kb('paste'), 'Paste (image priority)'], [`${kb('undo')} / ${kb('redo')}`, 'Undo / redo'], [kb('clear-prompt'), 'Clear prompt'], [kb('delete-word'), 'Delete word backward'], [kb('kill-line'), 'Kill to end of line']]);
-    category('Actions', [['Tab', 'Collapse/expand block'], [kb('bookmark'), 'Bookmark block'], [kb('block-copy'), 'Copy block to clipboard'], [kb('block-save'), 'Save block to file'], [kb('copy-selection'), 'Copy selection'], ['F2', 'Process monitor'], ['?', 'Help overlay'], [`${kb('clear-cancel')} x2`, 'Exit']]);
-    category('Panels', [['Tab', 'Swap focus between input and panel workspace'], [kb('panel-picker'), 'Open / focus / hide panel workspace'], [kb('panel-tab-next'), 'Next workspace panel tab'], [kb('panel-tab-prev'), 'Previous workspace panel tab'], [`${kb('panel-tab-1')}...${kb('panel-tab-9')}`, 'Jump to workspace tab 1-9'], [kb('panel-focus-toggle'), 'Swap focus between top / bottom pane'], [kb('panel-close'), 'Close active panel'], [kb('panel-close-all'), 'Close all panels'], [kb('panel-ops'), 'Open the Ops Control panel']]);
-    category('In-Panel Controls', [['j / k', 'Move selection down / up'], ['g / G', 'Jump to top / bottom'], ['/', 'Filter the list']]);
+    category('Actions', [['Tab', 'Collapse/expand block'], [kb('bookmark'), 'Bookmark block'], [kb('block-copy'), 'Copy block to clipboard'], [kb('block-save'), 'Save block to file'], [kb('copy-selection'), 'Copy selection'], ['F2', 'Agents'], ['?', 'Help overlay'], [`${kb('clear-cancel')} x2`, 'Exit']]);
+    category('Views', [[kb('command-palette'), 'Command palette: every command and view'], [`F2 / ${kb('open-agents')}`, 'Agents'], ['/usage', 'Usage: context, tokens and cost'], ['/changes', 'Changes: files, diff, review'], ['/notifications', 'Notification history'], ['Esc', 'Close the top modal (one level)']]);
     const allBindings = km.getAll().map((entry) => [entry.combos.length > 0 ? entry.combos.map((combo) => km.formatCombo(combo)).join(', ') : '(unbound)', entry.description] as const);
     category('All Bindings (live)', allBindings);
     return { id: 'shortcuts', label: 'Shortcuts', rows, emptyText: 'No shortcuts recorded.' };
@@ -112,19 +111,12 @@ class KeybindingsModalSurface implements ConfigModalSurface {
     if (id === 'refresh') { ctx.setStatus('Docs & shortcuts are read live.'); ctx.requestRender(); return; }
     if (id !== 'activate') return;
     if (ctx.tabId === 'tools') {
-      // item 4: pass the tool name through as a deep-link target.
-      // Honest caveat (documented, not a bug to silently paper over): fleet's
-      // ProcessKind set has no 'tool' node, a docs Tools row names a static
-      // tool DEFINITION, not a live process, so FleetPanel.receiveDeepLink
-      // will not currently find a match and shows its honest "node no longer
-      // present" line. The plumbing is still worth wiring now (matches the
-      // work-plan agent/wrfc jumps' shape), it starts resolving for free the
-      // day fleet grows a per-tool-call node (the retired DocsPanel's own
-      // comment already anticipated this: "no filter-by-tool equivalent
-      // there yet").
+      // The tool name rides as a `<tool>:tool` target: the Agents modal
+      // selects the first process whose current step is that tool, or says
+      // nothing is running it right now.
       const toolName = ctx.row?.id.startsWith('tool:') ? ctx.row.id.slice('tool:'.length) : null;
-      void ctx.executeCommand?.('panel', toolName ? ['open', 'fleet', '--target', `${toolName}:tool`] : ['open', 'fleet']);
-      ctx.setStatus('Opened the tool inspector (fleet).');
+      void ctx.executeCommand?.('agents', toolName ? ['--target', `${toolName}:tool`] : []);
+      ctx.setStatus(toolName ? `Opened Agents on ${toolName}.` : 'Opened Agents.');
       return;
     }
     if (ctx.tabId === 'models') {

package/src/{panels → views}/modals/knowledge-modal.ts

@@ -1,4 +1,5 @@
-import { infoRow } from './modal-surface-helpers.ts';
+import { MODAL_TONES } from './modal-theme.ts';
+import { infoRow, headerRow } from './modal-surface-helpers.ts';
 import type {
   ConfigModalActionContext,
   ConfigModalRow,
@@ -11,10 +12,10 @@ import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 // ---------------------------------------------------------------------------
 // Knowledge (graph) → config-modal surface (group-B port). Two tabs:
 // 'Browse' (sources/nodes/issues + schedules) and 'Review' (the open-issue
-// queue), the panel's browse/review toggle, now host tabs. Issue review
+// queue), the earlier view's browse/review toggle, now host tabs. Issue review
 // mutations (accept/reject/resolve/reopen) route to the `/knowledge
 // review-issue` command. 'm' cross-opens the memory surface. Selection-blind
-// port: the panel's selected-row id/detail is folded into each row label.
+// port: the earlier view's selected-row id/detail is folded into each row label.
 // refresh() is the only place this module touches the SDK.
 // ---------------------------------------------------------------------------
 
@@ -108,8 +109,8 @@ class KnowledgeModalSurface implements ConfigModalSurface {
     ];
     const rows: ConfigModalRow[] = this.browseRows.map((row) => this.rowFor(row));
     if (this.schedules.length > 0) {
-      rows.push(infoRow('sched:title', 'Schedules'));
-      this.schedules.slice(0, 4).forEach((s, i) => rows.push(infoRow(`sched:${i}`, `${s.enabled ? 'on ' : 'off'}  ${s.label}`, s.enabled ? undefined : { dim: true })));
+      rows.push(headerRow('sched:title', 'Schedules'));
+      this.schedules.slice(0, 4).forEach((s, i) => rows.push(infoRow(`sched:${i}`, `${s.enabled ? 'on ' : 'off'}  ${s.label}`, s.enabled ? undefined : { fg: MODAL_TONES.dim })));
     }
     return { id: 'browse', label: 'Browse', header, rows, emptyText: 'No ingested knowledge yet.', hints: ['m memory'] };
   }

package/src/{panels → views}/modals/local-auth-modal.ts

@@ -5,7 +5,7 @@ import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { postureLine, kv } from './modal-surface-helpers.ts';
 
 /** Mutation surface the surface needs to gate p/d/b on, a subset of UserAuthManager,
- *  mirroring LocalAuthPanel's own `hasLocalAuthMutations` guard. */
+ *  mirroring the retired local-auth view's own `hasLocalAuthMutations` guard. */
 type LocalAuthMutations = Pick<UserAuthManager, 'addUser' | 'deleteUser' | 'rotatePassword' | 'clearBootstrapCredentialFile'>;
 
 function hasLocalAuthMutations(value: LocalAuthInspectionQuery): value is LocalAuthInspectionQuery & LocalAuthMutations {
@@ -25,14 +25,13 @@ function usernameOf(row: ConfigModalRow | null): string | null {
 }
 
 /**
- * Local-auth config-modal surface (migrated from the `local-auth` panel).
- * `inspect()` is synchronous, so buildView reads it live every tick. All
- * mutations (add-user, rotate-password, delete-user, clear-bootstrap-file)
- * dispatch through the existing `/local-auth` command rather than touching
- * the auth manager directly, the command opens masked password entry for
- * add-user/rotate-password when no password argument is supplied, which is
- * exactly how the retired panel kept plaintext out of history and the
- * transcript. This surface never renders, accepts, or holds a password.
+ * Local-auth config-modal surface. `inspect()` is synchronous, so buildView
+ * reads it live every tick. add-user and rotate-password open the masked
+ * password prompt (input/masked-entry-modal.ts) on top of this modal, the one
+ * path that keeps a plaintext password out of argv, history and the
+ * transcript; delete-user and clear-bootstrap-file dispatch through the
+ * `/local-auth` command. This surface never renders, accepts, or holds a
+ * password.
  */
 class LocalAuthModalSurface implements ConfigModalSurface {
   readonly name = 'local-auth-modal';
@@ -42,7 +41,10 @@ class LocalAuthModalSurface implements ConfigModalSurface {
    *  consulted; see settings-sync-modal's `hasStaged` for the same idiom). */
   private bootstrapPresent = false;
 
-  constructor(private readonly authManager: LocalAuthInspectionQuery) {}
+  constructor(
+    private readonly authManager: LocalAuthInspectionQuery,
+    private readonly openMaskedEntry: (kind: 'add-user' | 'rotate-password', username?: string) => void,
+  ) {}
 
   readonly actions: ConfigModalAction[] = [
     { key: 'a', id: 'add-user', label: 'add user' },
@@ -93,20 +95,16 @@ class LocalAuthModalSurface implements ConfigModalSurface {
 
   onAction(id: string, ctx: ConfigModalActionContext): void {
     switch (id) {
-      // add-user / rotate-password require the masked password-entry sub-mode,
-      // which renders on the LocalAuthPanel and cannot draw or capture input
-      // underneath this fullscreen modal. Point the operator at the command
-      // (which opens masked entry) rather than dispatching it into a hidden
-      // surface, the secure flow stays a keystroke away, just not from here.
+      // The password prompt opens on top of this modal and never echoes.
       case 'add-user':
-        ctx.print('To add a user securely, run  /local-auth add-user <username>  (opens masked password entry).');
-        ctx.setStatus('Run /local-auth add-user <username> for masked entry.');
+        if (!hasLocalAuthMutations(this.authManager)) { ctx.setStatus('Local auth mutations are not available in this session.'); break; }
+        this.openMaskedEntry('add-user');
         break;
       case 'rotate-pw': {
         const username = usernameOf(ctx.row);
         if (!username) return;
-        ctx.print(`To rotate securely, run  /local-auth rotate-password ${username}  (opens masked password entry).`);
-        ctx.setStatus(`Run /local-auth rotate-password ${username} for masked entry.`);
+        if (!hasLocalAuthMutations(this.authManager)) { ctx.setStatus('Local auth mutations are not available in this session.'); break; }
+        this.openMaskedEntry('rotate-password', username);
         break;
       }
       case 'delete': {
@@ -127,6 +125,9 @@ class LocalAuthModalSurface implements ConfigModalSurface {
   }
 }
 
-export function createLocalAuthModalSurface(authManager: LocalAuthInspectionQuery): ConfigModalSurface {
-  return new LocalAuthModalSurface(authManager);
+export function createLocalAuthModalSurface(
+  authManager: LocalAuthInspectionQuery,
+  openMaskedEntry: (kind: 'add-user' | 'rotate-password', username?: string) => void = () => {},
+): ConfigModalSurface {
+  return new LocalAuthModalSurface(authManager, openMaskedEntry);
 }

package/src/{panels → views}/modals/marketplace-modal.ts

@@ -5,7 +5,7 @@ import type {
   ConfigModalView,
 } from '../../input/config-modal-types.ts';
 import { MODAL_TONES } from './modal-theme.ts';
-import { infoRow } from './modal-surface-helpers.ts';
+import { infoRow, headerRow } from './modal-surface-helpers.ts';
 import {
   loadEcosystemCatalog,
   listInstalledEcosystemEntries,
@@ -20,7 +20,7 @@ import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
-/** Live deps the marketplace modal captures (mirrors the panel factory). */
+/** Live deps the marketplace modal captures (mirrors the earlier view factory). */
 export interface MarketplaceModalDeps {
   readonly readModel?: UiReadModel<UiMarketplaceSnapshot>;
   readonly ecosystemPaths?: EcosystemCatalogPathOptions;
@@ -41,16 +41,16 @@ const KINDS: readonly EcosystemEntryKind[] = ['plugin', 'skill', 'hook-pack', 'p
  * Marketplace → config-modal surface (group-B port). Local-first
  * publish/import catalog (NOT a remote store) with provenance, compatibility,
  * and install posture. Disk catalog loads happen in refresh() (never in
- * buildView), mirroring the panel's explicit render()/refresh() split.
+ * buildView), mirroring the earlier view's explicit render()/refresh() split.
  * Install/uninstall route to the `/marketplace` command path (charter: no
  * destructive confirm folded into a modal).
  *
- * Honest empty-state: the panel's original "No curated marketplace
+ * Honest empty-state: the earlier view's original "No curated marketplace
  * entries found yet." copy implied a curated remote catalog. It isn't one,
  * loadEcosystemCatalog only ever reads .goodvibes/ecosystem/<kind>s.json under
  * the project/home, populated solely by `/marketplace publish` and
  * `/marketplace bundle import`. The empty-state copy below (locked byte-for-byte
- * in the golden) names that reality. Selection-blind port: the panel's
+ * in the golden) names that reality. Selection-blind port: the earlier view's
  * selected-entry compatibility/risk/state detail is folded into each row label.
  */
 class MarketplaceModalSurface implements ConfigModalSurface {
@@ -129,10 +129,10 @@ class MarketplaceModalSurface implements ConfigModalSurface {
         rows.push(infoRow('empty:0', 'This is your local plugin, skill, hook-pack, and policy-pack catalog; not a remote store.'));
         rows.push(infoRow('empty:1', "It's empty because nothing has been published or imported into this workspace yet. Entries appear here once you publish a local component or import a bundle."));
       }
-      rows.push(infoRow('empty:title', 'Populate it', { bold: true }));
-      rows.push(infoRow('empty:publish', '/marketplace publish <kind> <path>  — publish local plugins/skills into the catalog', { dim: true }));
-      rows.push(infoRow('empty:import', '/marketplace bundle import <path>   — import a catalog bundle from disk', { dim: true }));
-      rows.push(infoRow('empty:review', '/marketplace catalog review         — inspect the current local catalog posture', { dim: true }));
+      rows.push(headerRow('empty:title', 'Populate it'));
+      rows.push(infoRow('empty:publish', '/marketplace publish <kind> <path>  — publish local plugins/skills into the catalog', { fg: MODAL_TONES.dim }));
+      rows.push(infoRow('empty:import', '/marketplace bundle import <path>   — import a catalog bundle from disk', { fg: MODAL_TONES.dim }));
+      rows.push(infoRow('empty:review', '/marketplace catalog review         — inspect the current local catalog posture', { fg: MODAL_TONES.dim }));
       return {
         title: 'Marketplace',
         tabs: [{ id: 'catalog', label: 'Catalog', rows, emptyText: '' }],
@@ -165,9 +165,9 @@ class MarketplaceModalSurface implements ConfigModalSurface {
     // Recommendations (displayed with their command; digit-jump dropped).
     const recommendations = snapshot?.recommendations ?? [];
     if (recommendations.length > 0) {
-      rows.push(infoRow('rec:title', 'Recommended', { bold: true }));
+      rows.push(headerRow('rec:title', 'Recommended'));
       for (const [i, rec] of recommendations.slice(0, 3).entries()) {
-        rows.push(infoRow(`rec:${i}`, `${rec.title}: ${rec.command}`, { dim: true }));
+        rows.push(infoRow(`rec:${i}`, `${rec.title}: ${rec.command}`, { fg: MODAL_TONES.dim }));
       }
     }
 

package/src/{panels → views}/modals/memory-modal.ts

@@ -13,12 +13,12 @@ import { classifyConsolidationFetchError } from '../memory-consolidation-gateway
 // ---------------------------------------------------------------------------
 // Memory → config-modal surface (group-B port). Two tabs: 'All Records'
 // (the full record list) and 'Review Queue' (the operator review queue), the
-// same split the panel toggled with Tab, now real host tabs. Review-state
+// same split the earlier view toggled with Tab, now real host tabs. Review-state
 // mutations (reviewed/stale/contradicted/fresh) and record delete route to the
 // existing `/recall review` / `/recall remove` command path (charter: no
 // destructive mutation direct-called from a modal). Selection-blind port: the
-// panel's selected-record scope/class/tags/provenance detail is folded into
-// each row label. `memoryRegistry` absent → the retired MemoryPanel's
+// view's selected-record scope/class/tags/provenance detail is folded into
+// each row label. `memoryRegistry` absent → the retired Memory view's
 // "not configured" copy renders as an honest degraded state.
 //
 // Read path (memory-spine adoption): reads go through the spine client's
@@ -68,7 +68,7 @@ export interface MemoryModalDeps {
   /**
    * Resolve the memory-consolidation-receipts gateway (memory-consolidation-gateway.ts),
    * lazily, called fresh each time the Proposals tab (re)fetches, exactly like
-   * the Fleet panel's `resolveGateway` (fleet-gateway.ts / fleet-acts.ts). Absent
+   * the Agents modal's `resolveGateway` (fleet-gateway.ts / fleet-acts.ts). Absent
    * in a session with no daemon-backed control plane wired: the Proposals tab
    * then renders its "unavailable" honest state without ever attempting a fetch.
    */
@@ -105,8 +105,8 @@ function rankForReview(records: readonly MemoryRecordLike[], limit: number): Mem
     .slice(0, limit);
 }
 
-// Mirrors registerKnowledgePanels's withUnconfiguredFallback copy for the
-// retired MemoryPanel (src/panels/builtin/knowledge.ts) verbatim.
+// Mirrors the retired knowledge-view registration's withUnconfiguredFallback copy for the
+// retired memory view verbatim.
 const NOT_CONFIGURED_TITLE = 'Memory registry not configured for this session.';
 const NOT_CONFIGURED_BODY = 'This runtime was not wired with a project memory registry at bootstrap, so no memory data is available.';
 
@@ -324,8 +324,8 @@ class MemoryModalSurface implements ConfigModalSurface {
     };
     switch (id) {
       case 'markReviewed': review('reviewed', Math.max(record.confidence, 85)); break;
-      case 'markStale': review('stale', Math.min(record.confidence, 40), 'marked stale from the memory panel'); break;
-      case 'markContradicted': review('contradicted', 0, 'marked contradicted from the memory panel'); break;
+      case 'markStale': review('stale', Math.min(record.confidence, 40), 'marked stale from the memory modal'); break;
+      case 'markContradicted': review('contradicted', 0, 'marked contradicted from the memory modal'); break;
       case 'markFresh': review('fresh', Math.max(record.confidence, 60)); break;
       case 'remove': void ctx.executeCommand?.('recall', ['remove', record.id]); ctx.setStatus(`Dispatched /recall remove ${record.id}.`); break;
     }

package/src/{panels → views}/modals/modal-surface-helpers.ts

@@ -1,13 +1,14 @@
-import { DEFAULT_PANEL_PALETTE } from '../polish.ts';
-import type { ModalSectionStyle } from '../../renderer/modal-factory.ts';
+import { DEFAULT_VIEW_PALETTE } from '../polish.ts';
+import type { ModalSectionStyle } from '../../input/config-modal-types.ts';
 import type { ConfigModalRow } from '../../input/config-modal-types.ts';
 
 /**
  * Shared formatting helpers for config-modal surfaces. Row styling reuses
- * DEFAULT_PANEL_PALETTE (the retired panels' palette) so a migrated modal reads
- * as the same surface it replaced, the goldens stay panel-consistent.
+ * DEFAULT_VIEW_PALETTE (theme tokens). The frame, tabs, search row, group
+ * headers and keycap hints are drawn by the modal surface kit in
+ * renderConfigModal; surfaces only describe rows.
  */
-export const PALETTE = DEFAULT_PANEL_PALETTE;
+export const PALETTE = DEFAULT_VIEW_PALETTE;
 
 export type Tone = 'good' | 'bad' | 'warn' | 'info' | 'dim' | 'value';
 
@@ -52,3 +53,12 @@ export function postureLine(cells: string[]): string {
 export function infoRow(id: string, label: string, style?: ModalSectionStyle): ConfigModalRow {
   return { id, label, selectable: false, ...(style ? { style } : {}) };
 }
+
+/**
+ * A group header row (a section title such as "Next steps"). The kit draws it
+ * as a ✦ lowercase accent header with a blank row above it; it is never
+ * selectable and never filtered out by the search row.
+ */
+export function headerRow(id: string, label: string): ConfigModalRow {
+  return { id, label, selectable: false, header: true };
+}

package/src/{panels → views}/modals/pairing-modal.ts

@@ -86,7 +86,7 @@ export interface PairingModalDeps {
 }
 
 // Fixed-width placeholder, deliberately NOT derived from the real secret's
-// length (mirrors QrPanel.SECRET_MASK), so masking doesn't leak length.
+// length (mirrors the retired pairing view's SECRET_MASK), so masking doesn't leak length.
 const SECRET_MASK = '••••••••••••';
 
 class PairingModalSurface implements ConfigModalSurface {
@@ -149,20 +149,20 @@ class PairingModalSurface implements ConfigModalSurface {
     const displayLink = this.revealed ? deepLink : SECRET_MASK;
 
     const rows: ConfigModalRow[] = [];
-    rows.push(infoRow('intro', 'Scan with the GoodVibes web app to pair this device; it opens already signed in.', { dim: true }));
+    rows.push(infoRow('intro', 'Scan with the GoodVibes web app to pair this device; it opens already signed in.', { fg: MODAL_TONES.dim }));
     rows.push(infoRow('url', `Web app   ${url}`));
     rows.push(infoRow('name', `Device    ${tokenName}`));
     rows.push(infoRow('token', `Token     ${displayToken}`, { fg: MODAL_TONES.reasoning }));
-    rows.push(infoRow('link', `Link      ${displayLink}`, { dim: true }));
+    rows.push(infoRow('link', `Link      ${displayLink}`, { fg: MODAL_TONES.dim }));
     if (this.deps.controlPlaneReadModel) {
       const connected = this.deps.controlPlaneReadModel.getSnapshot().activeClientIds.length;
-      rows.push(infoRow('companions', `Devices connected: ${connected}`, connected > 0 ? { fg: MODAL_TONES.good } : { dim: true }));
+      rows.push(infoRow('companions', `Devices connected: ${connected}`, connected > 0 ? { fg: MODAL_TONES.good } : { fg: MODAL_TONES.dim }));
     }
 
     // The offer set carried by this pairing, each named with its plain-language
     // consequence, each declinable in the web app.
     if (offers.length > 0) {
-      rows.push(infoRow('offers-h', 'Offers (each declinable when you pair):', { dim: true }));
+      rows.push(infoRow('offers-h', 'Offers (each declinable when you pair):', { fg: MODAL_TONES.dim }));
       formatPairingOffers(offers).forEach((line, i) => rows.push(infoRow(`offer:${i}`, line)));
     }
     // The labeled browser-capability list, what the paired device actually gets
@@ -170,7 +170,7 @@ class PairingModalSurface implements ConfigModalSurface {
     // never hidden behind a dead button.
     const capabilities = formatPostureCapabilities(posture);
     if (capabilities.length > 0) {
-      rows.push(infoRow('caps-h', 'This device will get:', { dim: true }));
+      rows.push(infoRow('caps-h', 'This device will get:', { fg: MODAL_TONES.dim }));
       capabilities.forEach((line, i) => rows.push(infoRow(`cap:${i}`, line)));
     }
     // The ONE honest LAN line, the SDK posture's own notice (LAN_PLAIN_HTTP_NOTICE),
@@ -205,16 +205,16 @@ class PairingModalSurface implements ConfigModalSurface {
     if (!ts || !ts.available) return; // absence stays quiet
     const httpsUrl = this.serveReceipt?.url ?? ts.httpsUrl;
     if (httpsUrl) {
-      rows.push(infoRow('ts-h', 'Encrypted access (Tailscale):', { dim: true }));
+      rows.push(infoRow('ts-h', 'Encrypted access (Tailscale):', { fg: MODAL_TONES.dim }));
       rows.push(infoRow('ts-url', `  ${httpsUrl}`, { fg: MODAL_TONES.good }));
     } else {
       rows.push(infoRow('ts-h', 'Tailscale detected: press t to serve this app over https (MagicDNS).', { fg: MODAL_TONES.reasoning }));
     }
     const receipt = this.serveReceipt ?? ts.lastServe;
     if (receipt) {
-      rows.push(infoRow('ts-receipt', `  ${receipt.ok ? '✓' : '✗'} ${receipt.detail}`, receipt.ok ? { dim: true } : { fg: MODAL_TONES.warn }));
+      rows.push(infoRow('ts-receipt', `  ${receipt.ok ? '✓' : '✗'} ${receipt.detail}`, receipt.ok ? { fg: MODAL_TONES.dim } : { fg: MODAL_TONES.warn }));
     } else if (this.serving) {
-      rows.push(infoRow('ts-serving', '  Serving over tailscale…', { dim: true }));
+      rows.push(infoRow('ts-serving', '  Serving over tailscale…', { fg: MODAL_TONES.dim }));
     }
   }
 

package/src/{panels → views}/modals/planning-modal.ts

@@ -53,11 +53,6 @@ interface PlanningModalSnapshot {
 
 interface TextLine { readonly content: string; readonly fg?: string; }
 
-const GOOD = MODAL_TONES.good;
-const WARN = MODAL_TONES.warn;
-const BAD = MODAL_TONES.bad;
-const INFO = MODAL_TONES.info;
-
 function getCurrentQuestion(state: ProjectPlanningState, evaluation: ProjectPlanningEvaluation | null): ProjectPlanningQuestion | null {
   const open = state.openQuestions.find((question) => (question.status ?? 'open') === 'open');
   return open ?? evaluation?.nextQuestion ?? null;
@@ -65,7 +60,7 @@ function getCurrentQuestion(state: ProjectPlanningState, evaluation: ProjectPlan
 
 function buildStateLines(state: ProjectPlanningState, evaluation: ProjectPlanningEvaluation | null): TextLine[] {
   const readiness = evaluation?.readiness ?? state.readiness;
-  const readinessColor = readiness === 'executable' ? GOOD : readiness === 'needs-user-input' ? WARN : undefined;
+  const readinessColor = readiness === 'executable' ? MODAL_TONES.good : readiness === 'needs-user-input' ? MODAL_TONES.warn : undefined;
   const blockingGaps = (evaluation?.gaps ?? []).filter((gap) => gap.severity === 'blocking').length;
   const lines: TextLine[] = [
     { content: `readiness ${readiness}  approved ${state.executionApproved ? 'yes' : 'no'}  questions ${state.openQuestions.length} open / ${state.answeredQuestions.length} answered`, ...(readinessColor ? { fg: readinessColor } : {}) },
@@ -74,14 +69,14 @@ function buildStateLines(state: ProjectPlanningState, evaluation: ProjectPlannin
   ];
   if (state.scope) lines.push({ content: `scope: ${state.scope}` });
   if (state.knownContext.length) lines.push({ content: `known context: ${state.knownContext.join(' | ')}` });
-  if (evaluation?.nextQuestion) lines.push({ content: `next question: ${evaluation.nextQuestion.prompt}`, fg: INFO });
+  if (evaluation?.nextQuestion) lines.push({ content: `next question: ${evaluation.nextQuestion.prompt}`, fg: MODAL_TONES.info });
   return lines;
 }
 
 function buildGapsLines(evaluation: ProjectPlanningEvaluation | null): TextLine[] {
   const gaps = evaluation?.gaps ?? [];
-  if (gaps.length === 0) return [{ content: 'Readiness gaps: none.', fg: GOOD }];
-  return [{ content: 'Readiness gaps:' }, ...gaps.slice(0, 12).map((gap) => ({ content: `  ${gap.severity.toUpperCase()} ${gap.kind}: ${gap.message}`, fg: gap.severity === 'blocking' ? BAD : WARN }))];
+  if (gaps.length === 0) return [{ content: 'Readiness gaps: none.', fg: MODAL_TONES.good }];
+  return [{ content: 'Readiness gaps:' }, ...gaps.slice(0, 12).map((gap) => ({ content: `  ${gap.severity.toUpperCase()} ${gap.kind}: ${gap.message}`, fg: gap.severity === 'blocking' ? MODAL_TONES.bad : MODAL_TONES.warn }))];
 }
 
 function buildTasksLines(state: ProjectPlanningState): TextLine[] {
@@ -90,18 +85,18 @@ function buildTasksLines(state: ProjectPlanningState): TextLine[] {
     lines.push({ content: '  No decomposed tasks recorded yet.' });
   } else {
     for (const task of state.tasks) {
-      lines.push({ content: `  ${task.id}: ${task.title} [${task.status ?? 'pending'}]${task.canRunConcurrently ? ' - concurrent' : ''}`, ...(task.blockedOnUserInput ? { fg: WARN } : {}) });
+      lines.push({ content: `  ${task.id}: ${task.title} [${task.status ?? 'pending'}]${task.canRunConcurrently ? ' - concurrent' : ''}`, ...(task.blockedOnUserInput ? { fg: MODAL_TONES.warn } : {}) });
       if (task.dependencies?.length) lines.push({ content: `    dependencies: ${task.dependencies.join(', ')}` });
-      if (task.verification?.length) lines.push({ content: `    verification: ${task.verification.join(' | ')}`, fg: GOOD });
+      if (task.verification?.length) lines.push({ content: `    verification: ${task.verification.join(' | ')}`, fg: MODAL_TONES.good });
     }
   }
   if (state.verificationGates.length) {
     lines.push({ content: 'Verification gates:' });
-    for (const gate of state.verificationGates) lines.push({ content: `  ${gate.id}: ${gate.description} [${gate.status ?? 'pending'}]`, fg: gate.required === false ? undefined : GOOD });
+    for (const gate of state.verificationGates) lines.push({ content: `  ${gate.id}: ${gate.description} [${gate.status ?? 'pending'}]`, fg: gate.required === false ? undefined : MODAL_TONES.good });
   }
   if (state.agentAssignments.length) {
     lines.push({ content: 'Agent handoff candidates:' });
-    for (const assignment of state.agentAssignments) lines.push({ content: `  ${assignment.taskId}: ${assignment.agentType ?? 'none'}${assignment.canRunConcurrently ? ' - can run concurrently' : ''}`, fg: INFO });
+    for (const assignment of state.agentAssignments) lines.push({ content: `  ${assignment.taskId}: ${assignment.agentType ?? 'none'}${assignment.canRunConcurrently ? ' - can run concurrently' : ''}`, fg: MODAL_TONES.info });
   }
   return lines;
 }
@@ -111,7 +106,7 @@ function buildDecisionsLines(state: ProjectPlanningState, storedDecisions: reado
   for (const decision of [...storedDecisions, ...state.decisions]) byId.set(decision.id, decision);
   const decisions = [...byId.values()];
   if (decisions.length === 0) return [{ content: 'Decisions: none recorded yet.' }];
-  return [{ content: 'Decisions:' }, ...decisions.slice(0, 12).map((decision) => ({ content: `  ${decision.title}: ${decision.decision} [${decision.status ?? 'accepted'}]`, fg: decision.status === 'rejected' ? BAD : undefined }))];
+  return [{ content: 'Decisions:' }, ...decisions.slice(0, 12).map((decision) => ({ content: `  ${decision.title}: ${decision.decision} [${decision.status ?? 'accepted'}]`, fg: decision.status === 'rejected' ? MODAL_TONES.bad : undefined }))];
 }
 
 function buildLanguageLines(language: ProjectPlanningLanguageArtifact | null): TextLine[] {
@@ -119,9 +114,9 @@ function buildLanguageLines(language: ProjectPlanningLanguageArtifact | null): T
   const lines: TextLine[] = [{ content: 'Project language:' }];
   for (const term of language.terms.slice(0, 8)) {
     lines.push({ content: `  ${term.term}: ${term.definition}` });
-    if (term.avoid?.length) lines.push({ content: `    avoid: ${term.avoid.join(', ')}`, fg: BAD });
+    if (term.avoid?.length) lines.push({ content: `    avoid: ${term.avoid.join(', ')}`, fg: MODAL_TONES.bad });
   }
-  for (const ambiguity of language.ambiguities.slice(0, 8)) lines.push({ content: `  resolved ambiguity - ${ambiguity.phrase}: ${ambiguity.resolution}`, fg: INFO });
+  for (const ambiguity of language.ambiguities.slice(0, 8)) lines.push({ content: `  resolved ambiguity - ${ambiguity.phrase}: ${ambiguity.resolution}`, fg: MODAL_TONES.info });
   return lines;
 }
 
@@ -177,7 +172,7 @@ class PlanningModalSurface implements ConfigModalSurface {
 
   buildView(): ConfigModalView {
     if (!this.snapshot) {
-      return { title: 'Planning', tabs: [{ id: 'planning', label: 'Planning', rows: [infoRow('load', this.loading ? 'Loading project planning state...' : 'Project planning state unavailable.', { dim: true })] }], hints: ['r refresh'] };
+      return { title: 'Planning', tabs: [{ id: 'planning', label: 'Planning', rows: [infoRow('load', this.loading ? 'Loading project planning state...' : 'Project planning state unavailable.', { fg: MODAL_TONES.dim })] }], hints: ['r refresh'] };
     }
 
     const { status, state, evaluation, decisions, language } = this.snapshot;
@@ -197,9 +192,9 @@ class PlanningModalSurface implements ConfigModalSurface {
     const { question, actions } = this.currentAnswerActions();
     if (question) {
       line({ content: 'Answer Current Question' });
-      line({ content: question.prompt, fg: INFO });
+      line({ content: question.prompt, fg: MODAL_TONES.info });
       if (question.whyItMatters) line({ content: `Why this matters: ${question.whyItMatters}` });
-      if (question.recommendedAnswer && !isGenericRecommendation(question.recommendedAnswer)) line({ content: `Recommendation: ${question.recommendedAnswer}`, fg: GOOD });
+      if (question.recommendedAnswer && !isGenericRecommendation(question.recommendedAnswer)) line({ content: `Recommendation: ${question.recommendedAnswer}`, fg: MODAL_TONES.good });
       for (const action of actions) {
         rows.push({ id: action.id, label: `${action.label} - ${action.detail}`, ...(action.disabled ? { selectable: false } : {}) });
       }
@@ -270,7 +265,7 @@ function buildGoldenService(): PlanningModalService {
     openQuestions: [{ id: 'golden-question-1', prompt: 'What is in scope for this golden fixture?', whyItMatters: 'Keeps the render deterministic.', recommendedAnswer: 'Use a focused first-pass scope for this goal.', status: 'open' }],
     answeredQuestions: [{ id: 'golden-question-0', prompt: 'Is this a golden fixture?', status: 'answered', answer: 'Yes.', answeredAt: 0 }],
     decisions: [], assumptions: [], constraints: [], risks: [],
-    tasks: [{ id: 'golden-task-1', title: 'Implement the golden fixture', status: 'pending', dependencies: [], verification: ['bun test src/test/panels/modals/planning-modal.test.ts'] }],
+    tasks: [{ id: 'golden-task-1', title: 'Implement the golden fixture', status: 'pending', dependencies: [], verification: ['bun test src/test/views/modals/planning-modal.test.ts'] }],
     dependencies: [], verificationGates: [{ id: 'golden-gate-1', description: 'Golden render is byte-stable.', status: 'pending', required: true }],
     agentAssignments: [{ taskId: 'golden-task-1', agentType: 'worker', canRunConcurrently: false }],
     readiness: 'needs-user-input', executionApproved: false, createdAt: 0, updatedAt: 0,