@pellux/goodvibes-tui 0.27.0 → 0.29.0

package/src/panels/builtin/operations.ts

@@ -1,16 +1,15 @@
 import type { PanelManager } from '../panel-manager.ts';
 import { CockpitPanel } from '../cockpit-panel.ts';
+import { AgentInspectorPanel } from '../agent-inspector-panel.ts';
 import { ApprovalPanel } from '../approval-panel.ts';
 import { PluginsPanel } from '../plugins-panel.ts';
 import { SkillsPanel } from '../skills-panel.ts';
 import { ServicesPanel } from '../services-panel.ts';
 import { AutomationControlPanel } from '../automation-control-panel.ts';
 import { RoutesPanel } from '../routes-panel.ts';
-import { WatchersPanel } from '../watchers-panel.ts';
 import { ControlPlanePanel } from '../control-plane-panel.ts';
 import { SubscriptionPanel } from '../subscription-panel.ts';
 import { LocalAuthPanel } from '../local-auth-panel.ts';
-import { ProviderAccountsPanel } from '../provider-accounts-panel.ts';
 import { SettingsSyncPanel } from '../settings-sync-panel.ts';
 import { WorktreePanel } from '../worktree-panel.ts';
 import { HooksPanel } from '../hooks-panel.ts';
@@ -20,25 +19,35 @@ import { SandboxPanel } from '../sandbox-panel.ts';
 import { TasksPanel } from '../tasks-panel.ts';
 import { OrchestrationPanel } from '../orchestration-panel.ts';
 import { OpsStrategyPanel } from '../ops-strategy-panel.ts';
+import { OpsControlPanel } from '../ops-control-panel.ts';
 import { CommunicationPanel } from '../communication-panel.ts';
 import { RemotePanel } from '../remote-panel.ts';
-import { ProviderStatsPanel } from '../provider-stats-panel.ts';
 import { ProviderHealthPanel } from '../provider-health-panel.ts';
 import { DebugPanel } from '../debug-panel.ts';
 import { IncidentReviewPanel } from '../incident-review-panel.ts';
-import { ForensicsPanel } from '../forensics-panel.ts';
 import { PolicyPanel } from '../policy-panel.ts';
 import { EvalPanel } from '../eval-panel.ts';
-import { createProviderAccountSnapshotQuery } from '../provider-account-snapshot.ts';
-import {
-  createEnvironmentVariableQuery,
-  createProviderRuntimeInspectionQuery,
-} from '../../runtime/ui-service-queries.ts';
+import { createProviderRuntimeInspectionQuery } from '../../runtime/ui-service-queries.ts';
 import { createRuntimeProviderApi } from '@/runtime/index.ts';
+import { selectModel } from '../../runtime/store/selectors/index.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
-import { requireAutomationManager, requireControlPlanePanelDeps, requireHookPanelDeps, requirePluginManager, requireUiServices } from './shared.ts';
+import { requireAutomationManager, requireControlPlanePanelDeps, requireHookPanelDeps, requirePluginManager, requireUiServices, withUnconfiguredFallback } from './shared.ts';
 import { createCockpitRosterReadModel } from '../cockpit-read-model.ts';
 
+// WO-152: the former single 'monitoring' category (33 panels pre-merge) is
+// split into five operator domains, applied per-registration below. Kept in
+// this file's original registration order (rather than physically regrouped
+// by category) because several registrations below close over shared local
+// state — `ui`, `providerRuntime`, `runtimeStore`, `rosterReadModel` — defined
+// once near the top of this function. Domain membership registered here:
+//   providers:              services, subscription, remote, provider-health
+//   security-policy:        approval, local-auth, settings-sync, security, sandbox, policy
+//   automation-control:     plugins, skills, automation, worktrees, hooks, marketplace
+//   incidents-diagnostics:  debug, incident, eval
+//   runtime-ops:            cockpit, routes, control-plane, tasks, orchestration,
+//                           ops, ops-control, communication (plus system-messages
+//                           and tokens/cost, registered in builtin/session.ts
+//                           and builtin/development.ts respectively)
 export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
   const ui = requireUiServices(deps);
   const providerRuntime = createProviderRuntimeInspectionQuery(createRuntimeProviderApi({
@@ -46,12 +55,7 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     favoritesStore: ui.providers.favoritesStore,
     providerRegistry: ui.providers.providerRegistry,
   }));
-  const providerAccounts = createProviderAccountSnapshotQuery({
-    providerModels: deps.providerRegistry,
-    services: deps.serviceRegistry,
-    subscriptions: deps.subscriptionManager,
-    environment: createEnvironmentVariableQuery(process.env),
-  });
+  const runtimeStore = deps.runtimeStore;
 
   const rosterReadModel = createCockpitRosterReadModel(ui.agents.agentManager);
   // Subscribe to agent lifecycle events so the roster re-renders on state changes.
@@ -70,7 +74,7 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     id: 'cockpit',
     name: 'Cockpit',
     icon: 'O',
-    category: 'monitoring',
+    category: 'runtime-ops',
     description: 'Unified operator summary for orchestration, permissions, communication, MCP, plugins, and integrations',
     factory: () => new CockpitPanel(
       ui.readModels.cockpit,
@@ -78,6 +82,13 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
       {
         openAgentDetail: (agentId: string) => deps.openAgentDetail?.(agentId),
         cancelAgent: (agentId: string) => ui.agents.agentManager.cancel(agentId),
+        // WO-130: roster Enter jumps to the Inspector console (WO-110's
+        // inspectAgent deep-link target) instead of only the quick-peek modal.
+        inspectAgent: (agentId: string) => {
+          const panel = manager.open('inspector');
+          if (panel instanceof AgentInspectorPanel) panel.inspectAgent(agentId);
+        },
+        openPanel: (panelId: string) => deps.openPanel?.(panelId),
       },
     ),
   });
@@ -86,7 +97,7 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     id: 'approval',
     name: 'Approval',
     icon: 'A',
-    category: 'monitoring',
+    category: 'security-policy',
     description: 'Action-specific approval workspace for why-prompted, why-denied, and what-if review',
     factory: () => new ApprovalPanel(deps.policyRuntimeState),
   });
@@ -94,8 +105,9 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'plugins',
     name: 'Plugins',
-    icon: 'P',
-    category: 'monitoring',
+    // WO-152: was 'P' (collided with project-planning and preview).
+    icon: '◐',
+    category: 'automation-control',
     description: 'Plugin trust, quarantine, capability, and activation status',
     factory: () => new PluginsPanel(requirePluginManager(deps)),
   });
@@ -103,12 +115,19 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'skills',
     name: 'Skills',
-    icon: 'K',
-    category: 'monitoring',
+    // WO-152: was 'K' (collided with knowledge and tokens).
+    icon: '▩',
+    category: 'automation-control',
     description: 'Project-local and global skill discovery with origin and dependency details',
     factory: () => new SkillsPanel({
       componentHealthMonitor: deps.componentHealthMonitor,
       shellPaths: ui.environment.shellPaths,
+      ecosystemPaths: {
+        cwd: ui.environment.shellPaths.workingDirectory,
+        homeDir: ui.environment.shellPaths.homeDirectory,
+        projectCatalogRoot: ui.environment.shellPaths.resolveProjectPath('tui', 'ecosystem'),
+        userCatalogRoot: ui.environment.shellPaths.resolveUserPath('tui', 'ecosystem'),
+      },
     }),
   });
 
@@ -116,7 +135,7 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     id: 'services',
     name: 'Services',
     icon: 'V',
-    category: 'monitoring',
+    category: 'providers',
     description: 'Configured external services, credential presence, and connection health tests',
     factory: () => new ServicesPanel(deps.serviceRegistry, deps.subscriptionManager),
   });
@@ -124,47 +143,39 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'automation',
     name: 'Automation',
-    icon: 'M',
-    category: 'monitoring',
-    description: 'Automation jobs, runs, deliveries, and failure posture across the control plane',
-    factory: () => new AutomationControlPanel(ui.readModels.automation),
+    // WO-152: was 'M' (collided with memory and marketplace).
+    icon: '◨',
+    category: 'automation-control',
+    description: 'Automation jobs, runs, deliveries, and watcher-fed sources across the control plane, with real enable/disable and run-now controls',
+    factory: () => new AutomationControlPanel(ui.readModels.automation, ui.readModels.watchers, {
+      automationManager: requireAutomationManager(deps),
+      watcherRegistry: deps.watcherRegistry,
+    }),
   });
 
   manager.registerType({
     id: 'routes',
     name: 'Routes',
     icon: 'R',
-    category: 'monitoring',
+    category: 'runtime-ops',
     description: 'Cross-surface route bindings and shared session attachment state',
     factory: () => new RoutesPanel(ui.readModels.routes),
   });
 
-  manager.registerType({
-    id: 'watchers',
-    name: 'Watchers',
-    icon: 'W',
-    category: 'monitoring',
-    description: 'Watcher health, lag, and degraded source state for automation inputs',
-    factory: () => new WatchersPanel(ui.readModels.watchers),
-  });
-
   manager.registerType({
     id: 'control-plane',
     name: 'Control Plane',
     icon: 'C',
-    category: 'monitoring',
+    category: 'runtime-ops',
     description: 'Daemon control-plane state, clients, approvals, and recent operator activity',
-    factory: () => {
-      requireControlPlanePanelDeps(deps);
-      return new ControlPlanePanel(ui.readModels.controlPlane);
-    },
+    factory: () => new ControlPlanePanel(ui.readModels.controlPlane, requireControlPlanePanelDeps(deps)),
   });
 
   manager.registerType({
     id: 'subscription',
     name: 'Subscriptions',
     icon: 'B',
-    category: 'monitoring',
+    category: 'providers',
     description: 'OAuth-backed provider subscriptions and supported provider override posture',
     factory: () => new SubscriptionPanel(deps.serviceRegistry, deps.subscriptionManager),
   });
@@ -173,25 +184,20 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     id: 'local-auth',
     name: 'Local Auth',
     icon: 'U',
-    category: 'monitoring',
+    category: 'security-policy',
     description: 'Local daemon/listener auth users, bootstrap posture, and active sessions',
     factory: () => new LocalAuthPanel(deps.localUserAuthManager),
   });
 
-  manager.registerType({
-    id: 'accounts',
-    name: 'Accounts',
-    icon: 'Q',
-    category: 'monitoring',
-    description: 'Provider auth routes, subscription quota-window hints, and billing-path safety notes',
-    factory: () => new ProviderAccountsPanel({ providerAccounts }),
-  });
-
   manager.registerType({
     id: 'settings-sync',
     name: 'Settings Sync',
-    icon: 'Y',
-    category: 'monitoring',
+    // WO-152: registry previously said 'Y' while the live panel's own
+    // super() call used 'S' — a pre-existing registry/instance mismatch as
+    // well as a collision ('Y' with communication/eval, 'S' with symbols).
+    // Unified to a single unique glyph in both places.
+    icon: '▱',
+    category: 'security-policy',
     description: 'Local, synced, and managed settings posture with recent sync events and active locks',
     factory: () => new SettingsSyncPanel(deps.configManager),
   });
@@ -199,17 +205,19 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'worktrees',
     name: 'Worktrees',
-    icon: 'W',
-    category: 'monitoring',
+    // WO-152: was 'W' (collided with wrfc).
+    icon: '▯',
+    category: 'automation-control',
     description: 'Orchestrator-owned git worktree lifecycle, attachments, and cleanup state',
-    factory: () => new WorktreePanel(deps.worktreeRegistry),
+    factory: () => new WorktreePanel(deps.worktreeRegistry, deps.requestRender),
   });
 
   manager.registerType({
     id: 'hooks',
     name: 'Hooks',
-    icon: 'H',
-    category: 'monitoring',
+    // WO-152: was 'H' (collided with sessions).
+    icon: '▨',
+    category: 'automation-control',
     description: 'Registered hooks, chains, contracts, and execution policy details',
     factory: () => {
       const hookDeps = requireHookPanelDeps(deps);
@@ -220,8 +228,9 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'security',
     name: 'Security',
-    icon: 'U',
-    category: 'monitoring',
+    // WO-152: was 'U' (collided with local-auth and policy).
+    icon: '▬',
+    category: 'security-policy',
     description: 'Security review workspace for token audit, policy posture, MCP quarantine, and incident pressure',
     factory: () => new SecurityPanel(ui.readModels.security),
   });
@@ -229,8 +238,9 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'marketplace',
     name: 'Marketplace',
-    icon: 'M',
-    category: 'monitoring',
+    // WO-152: was 'M' (collided with memory and automation).
+    icon: '◩',
+    category: 'automation-control',
     description: 'Curated plugin and skill marketplace with provenance, compatibility, and install posture',
     factory: () => {
       return new MarketplacePanel(ui.readModels.marketplace, {
@@ -245,26 +255,29 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'sandbox',
     name: 'Sandbox',
-    icon: 'X',
-    category: 'monitoring',
+    // WO-152: was 'X' (collided with tools).
+    icon: '▪',
+    category: 'security-policy',
     description: 'VM isolation posture for MCP servers and evaluation runtimes',
-    factory: () => new SandboxPanel(deps.configManager, deps.sandboxSessionRegistry),
+    factory: () => new SandboxPanel(deps.configManager, deps.sandboxSessionRegistry, deps.requestRender),
   });
 
   manager.registerType({
     id: 'tasks',
     name: 'Tasks',
-    icon: 'J',
-    category: 'monitoring',
+    // WO-152: was 'J' (collided with intelligence and system-messages).
+    icon: '▦',
+    category: 'runtime-ops',
     description: 'Queued, running, blocked, failed, and completed task summaries from the runtime store',
-    factory: () => new TasksPanel(ui.readModels.tasks, ui.readModels.worktrees),
+    factory: () => new TasksPanel(ui.readModels.tasks, ui.readModels.worktrees, deps.opsApi),
   });
 
   manager.registerType({
     id: 'orchestration',
     name: 'Orchestration',
-    icon: 'Q',
-    category: 'monitoring',
+    // WO-152: was 'Q' (collided with qr-code and ops-control).
+    icon: '◒',
+    category: 'runtime-ops',
     description: 'Task-graph status, node roles, and bounded recursion guard activity',
     factory: () => new OrchestrationPanel(ui.readModels.orchestration),
   });
@@ -272,47 +285,64 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
   manager.registerType({
     id: 'ops',
     name: 'Ops',
-    icon: 'O',
-    category: 'monitoring',
+    // WO-152: was 'O' (collided with cockpit). Also unifies a pre-existing
+    // registry ('monitoring') / live-instance (ops-strategy-panel.ts said
+    // 'agent') category mismatch onto a single 'runtime-ops' value.
+    icon: '◫',
+    category: 'runtime-ops',
     description: 'Adaptive planner strategy timeline, override posture, and recent execution-mode decisions',
-    factory: () => new OpsStrategyPanel(ui.events.planner, deps.adaptivePlanner),
+    factory: () => new OpsStrategyPanel(ui.events.planner, deps.adaptivePlanner, deps.planRuntime),
+  });
+
+  // WO-120: the operator intervention console behind the operator-control-plane
+  // feature flag. Registration is unconditional (matching the ControlPlanePanel
+  // pattern above) — the flag itself gates whether bootstrap.ts wires the
+  // openOpsPanel command-context callback and the Ctrl+O / `/ops view` route,
+  // not whether the panel type resolves for direct `/panel open ops-control`.
+  manager.registerType({
+    id: 'ops-control',
+    name: 'Ops Control',
+    // WO-152: was 'Q' (collided with qr-code and orchestration). Also unifies
+    // a pre-existing registry ('monitoring') / live-instance (ops-control-panel.ts
+    // said 'agent') category mismatch onto a single 'runtime-ops' value.
+    icon: '◓',
+    category: 'runtime-ops',
+    description: 'Operator intervention console: audit log plus cancel/pause/resume/retry on tasks and cancel on agents',
+    factory: () => new OpsControlPanel(ui.events.ops, deps.opsApi),
   });
 
   manager.registerType({
     id: 'communication',
     name: 'Communication',
     icon: 'Y',
-    category: 'monitoring',
+    category: 'runtime-ops',
     description: 'Structured agent communication, blocked routes, and delivery status',
     preload: true,
-    factory: () => new CommunicationPanel(ui.readModels.communication),
+    retainOnClose: true,
+    factory: () => new CommunicationPanel(
+      ui.readModels.communication,
+      (agentId: string) => deps.openAgentDetail?.(agentId),
+    ),
   });
 
   manager.registerType({
     id: 'remote',
     name: 'Remote',
-    icon: 'R',
-    category: 'monitoring',
+    // WO-152: was 'R' (collided with routes).
+    icon: '▰',
+    category: 'providers',
     description: 'Self-hosted daemon and ACP transport state with active remote connections',
     factory: () => new RemotePanel(ui.readModels.remote),
   });
 
-  manager.registerType({
-    id: 'providers',
-    name: 'Providers',
-    icon: 'R',
-    category: 'monitoring',
-    description: 'Per-provider performance metrics: latency, error rate, request count, sparkline trends',
-    factory: () => new ProviderStatsPanel(ui.events.turns, ui.events.providers, deps.requestRender, ui.readModels.providers),
-  });
-
   manager.registerType({
     id: 'provider-health',
     name: 'Health',
     icon: 'N',
-    category: 'monitoring',
-    description: 'Provider health dashboard: real-time status, latency, errors, and rate-limit cooldowns',
+    category: 'providers',
+    description: 'Provider console: status, latency timelines, error attribution, auth routes, fallback chain, and repair actions',
     preload: true,
+    retainOnClose: true,
     factory: () => new ProviderHealthPanel(
       providerRuntime,
       {
@@ -328,16 +358,32 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
         intelligence: ui.readModels.intelligence,
         continuity: ui.readModels.continuity,
         worktrees: ui.readModels.worktrees,
+        ...(runtimeStore
+          ? {
+            modelState: {
+              get: () => selectModel(runtimeStore.getState()),
+              subscribe: (listener: () => void) => runtimeStore.subscribe(listener),
+            },
+          }
+          : {}),
       },
       deps.requestRender,
     ),
   });
 
+  // WO-112 compat (wired at integration): the retired 'providers' and
+  // 'accounts' panel ids still resolve — redirected to the merged
+  // provider-health console. '/accounts panel|open' depends on the
+  // 'accounts' alias.
+  manager.registerAlias('providers', 'provider-health');
+  manager.registerAlias('accounts', 'provider-health');
+
   manager.registerType({
     id: 'debug',
     name: 'Debug',
-    icon: 'B',
-    category: 'monitoring',
+    // WO-152: was 'B' (collided with subscription).
+    icon: '▧',
+    category: 'incidents-diagnostics',
     description: 'API debug panel: per-call log with model, provider, tokens, latency, status, and error history',
     factory: () => {
       const panel = new DebugPanel(ui.events.turns, deps.requestRender);
@@ -346,44 +392,59 @@ export function registerOperationsPanels(manager: PanelManager, deps: ResolvedBu
     },
   });
 
-  if (deps.forensicsRegistry) {
-    const { forensicsRegistry } = deps;
-    manager.registerType({
-      id: 'incident',
-      name: 'Incident',
-      icon: 'N',
-      category: 'monitoring',
-      description: 'Incident workspace with root cause, permission, budget, and replay evidence',
-      factory: () => new IncidentReviewPanel(forensicsRegistry),
-    });
-    manager.registerType({
-      id: 'forensics',
-      name: 'Forensics',
-      icon: 'F',
-      category: 'monitoring',
-      description: 'Failure Forensics: auto-classified failure reports with causal chains, phase timings, and jump links',
-      factory: () => new ForensicsPanel(forensicsRegistry),
-    });
-  }
+  // WO-152: always registered (was gated behind `if (deps.forensicsRegistry)`,
+  // so `/panel open incident` reported "Unknown panel" on builds without a
+  // forensics registry wired). IncidentReviewPanel already accepts an
+  // optional registry and renders its own "not configured" empty state when
+  // it is absent, so no fallback wrapper is needed here — only the
+  // conditional registration itself is removed.
+  manager.registerType({
+    id: 'incident',
+    name: 'Incident',
+    // WO-152: was 'N' (collided with provider-health).
+    icon: '◪',
+    category: 'incidents-diagnostics',
+    description: 'Incident workspace with root cause, permission, budget, replay, causal-chain, phase-timing, and jump-link evidence',
+    factory: () => new IncidentReviewPanel(deps.forensicsRegistry),
+  });
+  // WO-114 compat (Forensics merged into Incident): the retired 'forensics'
+  // panel id still resolves — redirected to the merged Incident workspace so
+  // pre-existing openForensicsPanel()/`/forensics` callers land on the same
+  // Incident instance instead of stacking a duplicate registration.
+  manager.registerAlias('forensics', 'incident');
 
   manager.registerType({
     id: 'policy',
     name: 'Policy',
-    icon: 'U',
-    category: 'monitoring',
+    // WO-152: was 'U' (collided with local-auth and security).
+    icon: '▭',
+    category: 'security-policy',
     description: 'Policy governance: active/candidate bundles, divergence gate, rollout history, and simulation evidence',
     factory: () => new PolicyPanel(deps.policyRuntimeState),
   });
 
-  if (deps.evalRegistry) {
+  // WO-152: always registered (was gated behind `if (deps.evalRegistry)`, so
+  // `/panel open eval` reported "Unknown panel" on builds without an eval
+  // registry wired). Falls back to a "dependency not configured" empty state.
+  {
     const { evalRegistry } = deps;
     manager.registerType({
       id: 'eval',
       name: 'Eval',
-      icon: 'Y',
-      category: 'monitoring',
+      // WO-152: registry previously said 'Y' while the live panel's own
+      // super() call used 'V' — a pre-existing registry/instance mismatch as
+      // well as a collision ('Y' with communication/settings-sync, 'V' with
+      // services). Unified to a single unique glyph in both places.
+      icon: '▮',
+      category: 'incidents-diagnostics',
       description: 'Evaluation harness: benchmark suite results, scorecards, and regression gates',
-      factory: () => new EvalPanel(evalRegistry),
+      factory: withUnconfiguredFallback(
+        evalRegistry !== undefined,
+        'eval', 'Eval', '▮', 'incidents-diagnostics',
+        ' Eval registry not configured for this session.',
+        'This runtime was not wired with an evaluation harness registry at bootstrap, so no eval data is available.',
+        () => new EvalPanel(evalRegistry!, ui.environment.shellPaths.workingDirectory),
+      ),
     });
   }
 }

package/src/panels/builtin/session.ts

@@ -42,6 +42,7 @@ function readBootstrapPassword(credentialPath: string): string | undefined {
 }
 
 export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
+  const ui = requireUiServices(deps);
   manager.registerType({
     id: 'qr-code',
     name: 'QR Code',
@@ -71,7 +72,7 @@ export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuilt
           surface: 'tui',
         });
       };
-      return new QrPanel(connectionInfo, regenerate, copyToClipboard);
+      return new QrPanel(connectionInfo, regenerate, copyToClipboard, ui.readModels.controlPlane, deps.localUserAuthManager);
     },
   });
 
@@ -90,7 +91,7 @@ export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuilt
     icon: '?',
     category: 'session',
     description: 'Tool list, model capabilities, and keyboard shortcut reference',
-    factory: () => new DocsPanel(deps.toolRegistry, deps.providerRegistry),
+    factory: () => new DocsPanel(deps.toolRegistry, deps.providerRegistry, requireUiServices(deps).shell.keybindingsManager),
   });
 
   manager.registerType({
@@ -105,25 +106,50 @@ export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuilt
   manager.registerType({
     id: 'system-messages',
     name: 'System Messages',
-    icon: 'J',
-    category: 'monitoring',
+    // WO-152: was 'J' (collided with intelligence + tasks).
+    icon: '▥',
+    category: 'runtime-ops',
     description: 'Operational system messages routed away from the main conversation (scans, discovery, plugin events, tool status)',
     preload: true,
+    retainOnClose: true,
     factory: () => deps.systemMessagesPanel,
   });
 
   manager.registerType({
     id: 'tokens',
     name: 'Tokens',
-    icon: 'K',
-    category: 'monitoring',
-    description: 'Token budget tracker: per-turn and cumulative usage with context window gauge',
+    // WO-152: registry previously said 'K' while the live panel's own
+    // super() call used 'T' — a pre-existing registry/instance mismatch as
+    // well as a collision ('K' with knowledge/skills, 'T' with thinking).
+    // Unified to a single unique glyph in both places.
+    icon: '▢',
+    category: 'providers',
+    description: 'Token + context console: gauge, true composition, per-turn history, inline cost, and one-key compact',
+    // Preloaded (absorbed from the retired ContextVisualizerPanel) so turn
+    // history and pressure accumulate in the background even before the user
+    // opens the tab.
+    preload: true,
+    retainOnClose: true,
     factory: () => {
-      const panel = new TokenBudgetPanel(deps.sessionMemoryStore, deps.configManager, deps.requestRender);
+      const panel = new TokenBudgetPanel(
+        deps.sessionMemoryStore,
+        deps.configManager,
+        deps.requestRender,
+        requireUiServices(deps).events.turns,
+      );
       if (deps.orchestrator && deps.getCtxWindow) {
-        panel.wire(deps.orchestrator, deps.getCtxWindow, requireUiServices(deps).readModels.session);
+        panel.wire(
+          deps.orchestrator,
+          deps.getCtxWindow,
+          requireUiServices(deps).readModels.session,
+          () => deps.providerRegistry.getCurrentModel().id,
+        );
       }
       return panel;
     },
   });
+
+  // WO-113 compat: the retired 'context' panel id still resolves — redirected
+  // to the merged tokens console ('/panel open context', saved layouts).
+  manager.registerAlias('context', 'tokens');
 }