@pellux/goodvibes-tui 1.1.0 → 1.7.0

package/src/panels/builtin/session.ts

@@ -1,120 +1,27 @@
-import { networkInterfaces } from 'node:os';
-import { readFileSync } from 'node:fs';
 import type { PanelManager } from '../panel-manager.ts';
-import { SessionBrowserPanel } from '../session-browser-panel.ts';
-import { QrPanel } from '../qr-panel.ts';
-import { DocsPanel } from '../docs-panel.ts';
-import { PanelListPanel } from '../panel-list-panel.ts';
 import { TokenBudgetPanel } from '../token-budget-panel.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
 import { requireUiServices } from './shared.ts';
-import {
-  getOrCreateCompanionToken,
-  regenerateCompanionToken,
-  buildCompanionConnectionInfo,
-} from '@pellux/goodvibes-sdk/platform/pairing';
-import { copyToClipboard } from '../../utils/clipboard.ts';
-
-function getLocalNetworkIp(): string {
-  const nets = networkInterfaces();
-  for (const name of Object.keys(nets)) {
-    for (const net of nets[name] ?? []) {
-      if (net.family === 'IPv4' && !net.internal) {
-        return net.address;
-      }
-    }
-  }
-  return 'localhost';
-}
-
-function readBootstrapPassword(credentialPath: string): string | undefined {
-  try {
-    const content = readFileSync(credentialPath, 'utf-8');
-    for (const line of content.split('\n')) {
-      if (line.startsWith('password=')) {
-        return line.slice('password='.length).trim();
-      }
-    }
-  } catch {
-    // credential file may not exist yet
-  }
-  return undefined;
-}
 
+// W6.1 (the purge): panel-list and system-messages were registered here
+// before the purge — both DELETE-disposition. panel-list was a picker over a
+// handful of panels (dead weight now that the registry is much smaller —
+// the picker itself is replaced by a live-registry selection modal on
+// Ctrl+P, see shell/ui-openers.ts). system-messages' buffered notices are
+// rerouted to the transcript's system channel instead of vanishing: with no
+// panel attached, SystemMessageRouter's delivery resolution
+// (resolveSystemMessageDelivery, SDK) already falls back to
+// conversation.addTypedSystemMessage for every kind/target combination — see
+// bootstrap-shell.ts and core/system-message-router.ts.
+//
+// W6.1 (the purge) — group B (WO-P): 'qr-code', 'sessions', and 'docs' also
+// migrated. 'qr-code' → the 'pairing-modal' surface; 'docs' → the
+// 'keybindings-modal' surface (merged with the shortcuts-overlay content);
+// 'sessions' folds into the existing session-picker modal ('sessions' redirects
+// to 'sessionPicker'). Their surfaces AND panel→modal redirects are registered
+// centrally in registerBuiltinModals (builtin-modals.ts). Only 'tokens' (KEEP)
+// is still registered here.
 export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
-  const ui = requireUiServices(deps);
-  manager.registerType({
-    id: 'qr-code',
-    name: 'QR Code',
-    icon: 'Q',
-    category: 'session',
-    description: 'QR code for companion app pairing — scan to connect a mobile or desktop companion',
-    factory: () => {
-      if (!deps.daemonHomeDir) throw new Error('daemonHomeDir must be provided to the session panel factory via BuiltinPanelDeps');
-      const daemonHomeDir = deps.daemonHomeDir;
-      const tokenRecord = getOrCreateCompanionToken('tui', { daemonHomeDir });
-      const daemonPort = deps.configManager.get('controlPlane.port');
-      const daemonHost = String(process.env['GOODVIBES_DAEMON_HOST'] ?? getLocalNetworkIp());
-      const daemonUrl = `http://${daemonHost}:${daemonPort}`;
-      const bootstrapPassword = readBootstrapPassword(deps.localUserAuthManager.getBootstrapCredentialPath());
-      const connectionInfo = buildCompanionConnectionInfo({
-        daemonUrl,
-        token: tokenRecord.token,
-        password: bootstrapPassword,
-        surface: 'tui',
-      });
-      const regenerate = (): typeof connectionInfo => {
-        const newRecord = regenerateCompanionToken({ daemonHomeDir });
-        return buildCompanionConnectionInfo({
-          daemonUrl,
-          token: newRecord.token,
-          password: bootstrapPassword,
-          surface: 'tui',
-        });
-      };
-      return new QrPanel(connectionInfo, regenerate, copyToClipboard, ui.readModels.controlPlane, deps.localUserAuthManager);
-    },
-  });
-
-  manager.registerType({
-    id: 'sessions',
-    name: 'Sessions',
-    icon: 'H',
-    category: 'session',
-    description: 'Browse, search, and resume past conversation sessions',
-    factory: () => new SessionBrowserPanel(deps.sessionManager, deps.resumeSession),
-  });
-
-  manager.registerType({
-    id: 'docs',
-    name: 'Docs',
-    icon: '?',
-    category: 'session',
-    description: 'Tool list, model capabilities, and keyboard shortcut reference',
-    factory: () => new DocsPanel(deps.toolRegistry, deps.providerRegistry, requireUiServices(deps).shell.keybindingsManager),
-  });
-
-  manager.registerType({
-    id: 'panel-list',
-    name: 'Panel List',
-    icon: 'L',
-    category: 'session',
-    description: 'Browse all registered panels grouped by category, with open/closed status and Enter-to-open',
-    factory: () => new PanelListPanel(manager, deps.componentHealthMonitor),
-  });
-
-  manager.registerType({
-    id: 'system-messages',
-    name: 'System Messages',
-    // 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',
@@ -127,7 +34,9 @@ export function registerSessionPanels(manager: PanelManager, deps: ResolvedBuilt
     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.
+    // opens the tab. The only builtin panel that still preloads post-purge
+    // (W6.1) — see registerBuiltinPanels callers for the others' preload
+    // removal.
     preload: true,
     retainOnClose: true,
     factory: () => {

package/src/panels/builtin/shared.ts

@@ -70,8 +70,14 @@ export interface BuiltinPanelDeps {
   dismissPlanning?: () => void;
   /** ForensicsRegistry for the Forensics panel. */
   forensicsRegistry?: import('@/runtime/index.ts').ForensicsRegistry;
-  /** EvalRegistry for the Eval panel. */
-  evalRegistry?: import('../eval-panel.ts').EvalRegistry;
+  /**
+   * EvalRegistry for the `/eval` command surface. W6.1: 'eval' the panel was
+   * deleted (DELETE-disposition), but this field is left in place — no
+   * builtin panel factory reads it anymore, and it was never wired at
+   * bootstrap in production either way (the eval CLI command reads its own
+   * copy via CommandContext.extensions.evalRegistry).
+   */
+  evalRegistry?: import('../eval-registry.ts').EvalRegistry;
   /** MemoryRegistry for the Memory panel. */
   memoryRegistry?: MemoryRegistry;
   /** Shared policy runtime state for governance/policy diagnostics. */
@@ -109,8 +115,6 @@ export interface BuiltinPanelDeps {
   projectPlanningProjectId?: string;
   /** TUI-owned persistent work plan store. */
   workPlanStore?: import('../../work-plans/work-plan-store.ts').WorkPlanStore;
-  /** Shared system-messages panel instance attached from boot so low-priority chatter stays out of conversation. */
-  systemMessagesPanel?: import('../system-messages-panel.ts').SystemMessagesPanel;
   /** Explicit UI-facing runtime services for agent/process/WRFC/remote panels and modals. */
   uiServices?: UiRuntimeServices;
   /** Shared plugin manager for plugin and security panels (widened past the read-only observer surface — WO-134 — so PluginsPanel can drive enable/disable/verify/lift-quarantine). */
@@ -137,17 +141,9 @@ export interface BuiltinPanelDeps {
   sessionChangeTracker?: Pick<SessionChangeTracker, 'getChangedFiles'>;
   /**
    * Open (or focus) a panel by id, wrapping `PanelManager.open`. Use for direct
-   * cross-panel navigation instead of printing a "/panel open …" signpost
-   * (mirrors the openAgentDetail callback below).
+   * cross-panel navigation instead of printing a "/panel open …" signpost.
    */
   openPanel?: (panelId: string) => void;
-  /**
-   * Open the agent detail modal for the given agent id.  Wired from
-   * InputHandler.agentDetailModal.open() at bootstrap — passed to the
-   * CockpitPanel factory so the agents workspace inspect key (i) works
-   * without the panel depending on the modal directly.
-   */
-  openAgentDetail?: (agentId: string) => void;
 }
 
 export type ResolvedBuiltinPanelDeps = Omit<
@@ -164,7 +160,6 @@ export type ResolvedBuiltinPanelDeps = Omit<
   | 'projectPlanningProjectId'
   | 'workPlanStore'
   | 'policyRuntimeState'
-  | 'systemMessagesPanel'
 > & {
   readonly configManager: ConfigManager;
   readonly localUserAuthManager: UserAuthManager;
@@ -178,15 +173,8 @@ export type ResolvedBuiltinPanelDeps = Omit<
   readonly projectPlanningProjectId: string;
   readonly workPlanStore: import('../../work-plans/work-plan-store.ts').WorkPlanStore;
   readonly policyRuntimeState: PolicyRuntimeState;
-  readonly systemMessagesPanel: import('../system-messages-panel.ts').SystemMessagesPanel;
 };
 
-export interface ControlPlanePanelFactoryDeps {
-  readonly approvalBroker: ApprovalBroker;
-  readonly sessionBroker: SharedSessionBroker;
-  readonly getControlPlaneRecentEvents: (limit: number) => readonly ControlPlaneRecentEvent[];
-}
-
 function requireBuiltinPanelDep<TValue>(value: TValue | undefined, message: string): TValue {
   if (value === undefined) {
     throw new Error(message);
@@ -246,31 +234,9 @@ export function resolveBuiltinPanelDeps(deps: BuiltinPanelDeps): ResolvedBuiltin
       uiServices.platform.policyRuntimeState,
       'Policy runtime state must be wired at bootstrap for builtin panels.',
     ),
-    systemMessagesPanel: requireBuiltinPanelDep(
-      deps.systemMessagesPanel,
-      'System messages panel must be wired at bootstrap for builtin panels.',
-    ),
   };
 }
 
-export function requireControlPlanePanelDeps(deps: BuiltinPanelDeps): ControlPlanePanelFactoryDeps {
-  if (!deps.approvalBroker || !deps.sessionBroker || !deps.getControlPlaneRecentEvents) {
-    throw new Error('ControlPlanePanel requires approval/session brokers and recent-event access to be wired at bootstrap.');
-  }
-  return {
-    approvalBroker: deps.approvalBroker,
-    sessionBroker: deps.sessionBroker,
-    getControlPlaneRecentEvents: deps.getControlPlaneRecentEvents,
-  };
-}
-
-export function requireAutomationManager(deps: BuiltinPanelDeps): AutomationManager {
-  if (!deps.automationManager) {
-    throw new Error('AutomationControlPanel requires an automation manager to be wired at bootstrap.');
-  }
-  return deps.automationManager;
-}
-
 export function requireUiServices(deps: BuiltinPanelDeps): UiRuntimeServices {
   if (!deps.uiServices) {
     throw new Error('UI runtime services must be wired at bootstrap for agent, process, WRFC, and remote panels.');

package/src/panels/builtin-modals.ts

@@ -0,0 +1,218 @@
+import { networkInterfaces } from 'node:os';
+import { readFileSync } from 'node:fs';
+import type { PanelManager } from './panel-manager.ts';
+import { requireUiServices, type ResolvedBuiltinPanelDeps } from './builtin/shared.ts';
+import type { ConfigModalSurface, ConfigModalView } from '../input/config-modal-types.ts';
+import { createProviderRuntimeInspectionQuery } from '../runtime/ui-service-queries.ts';
+import { createRuntimeProviderApi } from '@/runtime/index.ts';
+import { copyToClipboard } from '../utils/clipboard.ts';
+import { getOrCreateCompanionToken, buildCompanionConnectionInfo } from '@pellux/goodvibes-sdk/platform/pairing';
+// ── Group A: Providers & Connectivity + Security subset (WO-A) ───────────────
+import { createServicesModalSurface } from './modals/services-modal.ts';
+import { createSubscriptionModalSurface } from './modals/subscription-modal.ts';
+import { createRemoteModalSurface } from './modals/remote-modal.ts';
+import { createSettingsSyncModalSurface } from './modals/settings-sync-modal.ts';
+import { createProviderHealthModalSurface } from './modals/provider-health-modal.ts';
+import { createLocalAuthModalSurface } from './modals/local-auth-modal.ts';
+import { createSandboxModalSurface } from './modals/sandbox-modal.ts';
+// ── Group B: Ecosystem & Governance (WO-P, this work order) ──────────────────
+import { createMarketplaceModalSurface } from './modals/marketplace-modal.ts';
+import { createPluginsModalSurface } from './modals/plugins-modal.ts';
+import { createSkillsModalSurface } from './modals/skills-modal.ts';
+import { createHooksModalSurface } from './modals/hooks-modal.ts';
+import { createSecurityModalSurface } from './modals/security-modal.ts';
+import { createPolicyModalSurface } from './modals/policy-modal.ts';
+import { createKnowledgeModalSurface } from './modals/knowledge-modal.ts';
+import { createMemoryModalSurface, type MemoryModalDeps } from './modals/memory-modal.ts';
+import { createWorkPlanModalSurface } from './modals/work-plan-modal.ts';
+import { createKeybindingsModalSurface } from './modals/keybindings-modal.ts';
+import { createPairingModalSurface, type PairingModalConnectionInfo } from './modals/pairing-modal.ts';
+import { createPlanningModalSurface } from './modals/planning-modal.ts';
+
+/**
+ * Register the config-modal surfaces + their panel-id redirects (W6.1, the
+ * purge). Called once at startup from registerBuiltinPanels, AFTER the panels'
+ * deps are resolved (the surfaces close over the same read-models the retired
+ * panels used). For each MIGRATE-TO-MODAL surface this does two things:
+ *   1. registerModalSurface — the data + actions the config-modal host renders.
+ *   2. registerModalRedirect — so `/panel open <old-id>`, saved layouts, and any
+ *      alias still resolve to the modal.
+ *
+ * Group A (WO-A) is the Providers & Connectivity + Security subset. Group B
+ * (WO-P) is the Ecosystem & Governance set — the 12 ported config-modal
+ * surfaces plus the `sessions` fold into the existing session-picker modal.
+ */
+export function registerBuiltinModals(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
+  const ui = requireUiServices(deps);
+
+  // ── Providers & Connectivity (WO-A) ─────────────────────────────────────────
+  manager.registerModalSurface(createServicesModalSurface(deps.serviceRegistry, deps.subscriptionManager));
+  manager.registerModalRedirect('services', 'services-modal');
+
+  manager.registerModalSurface(createSubscriptionModalSurface(deps.serviceRegistry, deps.subscriptionManager));
+  manager.registerModalRedirect('subscription', 'subscription-modal');
+
+  manager.registerModalSurface(createRemoteModalSurface(ui.readModels.remote));
+  manager.registerModalRedirect('remote', 'remote-modal');
+
+  const providerRuntime = createProviderRuntimeInspectionQuery(createRuntimeProviderApi({
+    benchmarkStore: ui.providers.benchmarkStore,
+    favoritesStore: ui.providers.favoritesStore,
+    providerRegistry: ui.providers.providerRegistry,
+  }));
+  manager.registerModalSurface(createProviderHealthModalSurface(providerRuntime, ui.readModels.providers));
+  manager.registerModalRedirect('provider-health', 'providers-modal');
+  manager.registerModalRedirect('providers', 'providers-modal');
+  manager.registerModalRedirect('accounts', 'providers-modal');
+
+  // ── Security & Governance (WO-A subset) ─────────────────────────────────────
+  manager.registerModalSurface(createSettingsSyncModalSurface(deps.configManager));
+  manager.registerModalRedirect('settings-sync', 'settings-sync-modal');
+
+  // local-auth-modal is reached via the /local-auth front-door only; no
+  // redirect (the 'local-auth' panel id must keep resolving to LocalAuthPanel
+  // for the masked password-entry path). See builtin/operations.ts.
+  manager.registerModalSurface(createLocalAuthModalSurface(deps.localUserAuthManager));
+
+  manager.registerModalSurface(createSandboxModalSurface(deps.configManager, deps.sandboxSessionRegistry, deps.requestRender));
+  manager.registerModalRedirect('sandbox', 'sandbox-modal');
+
+  // ── Ecosystem & Governance (WO-P — group B) ─────────────────────────────────
+  manager.registerModalSurface(createMarketplaceModalSurface({
+    readModel: ui.readModels.marketplace,
+    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'),
+    },
+  }));
+  manager.registerModalRedirect('marketplace', 'marketplace-modal');
+
+  // plugins/hooks/knowledge deps are wired at bootstrap in production
+  // (bootstrap-shell.ts) but may be absent in a partially-wired context (e.g. a
+  // release-gate harness) — register a degraded placeholder rather than throw,
+  // so the surface + redirect always resolve (the "always register, degrade
+  // honestly" charter pattern).
+  manager.registerModalSurface(deps.pluginManager
+    ? createPluginsModalSurface({ pluginManager: deps.pluginManager })
+    : unwiredSurface('plugins-modal', 'Plugins', 'Plugin manager not wired into this session.'));
+  manager.registerModalRedirect('plugins', 'plugins-modal');
+
+  manager.registerModalSurface(createSkillsModalSurface({
+    shellPaths: {
+      workingDirectory: ui.environment.shellPaths.workingDirectory,
+      homeDirectory: ui.environment.shellPaths.homeDirectory,
+    },
+    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'),
+    },
+  }));
+  manager.registerModalRedirect('skills', 'skills-modal');
+
+  manager.registerModalSurface(deps.hookDispatcher && deps.hookWorkbench && deps.hookActivityTracker
+    ? createHooksModalSurface({ hookDispatcher: deps.hookDispatcher, hookWorkbench: deps.hookWorkbench, hookActivityTracker: deps.hookActivityTracker })
+    : unwiredSurface('hooks-modal', 'Hooks', 'Hook dispatcher/workbench not wired into this session.'));
+  manager.registerModalRedirect('hooks', 'hooks-modal');
+
+  manager.registerModalSurface(createSecurityModalSurface({ readModel: ui.readModels.security }));
+  manager.registerModalRedirect('security', 'security-modal');
+
+  manager.registerModalSurface(createPolicyModalSurface({ policyRuntimeState: deps.policyRuntimeState }));
+  manager.registerModalRedirect('policy', 'policy-modal');
+
+  manager.registerModalSurface(deps.knowledgeApi
+    ? createKnowledgeModalSurface({ knowledgeApi: deps.knowledgeApi })
+    : unwiredSurface('knowledge-modal', 'Knowledge', 'Knowledge API not wired into this session.'));
+  manager.registerModalRedirect('knowledge', 'knowledge-modal');
+
+  manager.registerModalSurface(createMemoryModalSurface({
+    memoryRegistry: deps.memoryRegistry as MemoryModalDeps['memoryRegistry'],
+  }));
+  manager.registerModalRedirect('memory', 'memory-modal');
+
+  manager.registerModalSurface(createWorkPlanModalSurface({ workPlanStore: deps.workPlanStore }));
+  manager.registerModalRedirect('work-plan', 'work-plan-modal');
+
+  manager.registerModalSurface(createKeybindingsModalSurface({
+    toolRegistry: deps.toolRegistry,
+    providerRegistry: deps.providerRegistry,
+    keybindingsManager: ui.shell.keybindingsManager,
+  }));
+  manager.registerModalRedirect('docs', 'keybindings-modal');
+
+  manager.registerModalSurface(createPairingModalSurface({
+    getConnectionInfo: () => buildPairingConnectionInfo(deps),
+    controlPlaneReadModel: ui.readModels.controlPlane,
+    copyToClipboard,
+  }));
+  manager.registerModalRedirect('qr-code', 'pairing-modal');
+
+  manager.registerModalSurface(createPlanningModalSurface({
+    service: deps.projectPlanningService,
+    projectId: deps.projectPlanningProjectId,
+    requestRender: deps.requestRender,
+  }));
+  manager.registerModalRedirect('project-planning', 'planning-modal');
+
+  // The retired 'sessions' panel folds into the EXISTING session-picker modal
+  // (no new config-modal surface); the redirect is a plain hand-off, moved here
+  // from the deleted ecosystem bridge.
+  manager.registerModalRedirect('sessions', 'sessionPicker');
+}
+
+/**
+ * Build the companion-pairing connection info lazily (called from the pairing
+ * surface's first render, not at registration time) so a missing daemon home
+ * degrades to an honest "unavailable" modal instead of throwing at startup.
+ * Mirrors the retired QrPanel factory's construction.
+ */
+function buildPairingConnectionInfo(deps: ResolvedBuiltinPanelDeps): PairingModalConnectionInfo | null {
+  if (!deps.daemonHomeDir) return null;
+  try {
+    const daemonHomeDir = deps.daemonHomeDir;
+    const tokenRecord = getOrCreateCompanionToken('tui', { daemonHomeDir });
+    const daemonPort = deps.configManager.get('controlPlane.port');
+    const daemonHost = String(process.env['GOODVIBES_DAEMON_HOST'] ?? getLocalNetworkIp());
+    const daemonUrl = `http://${daemonHost}:${daemonPort}`;
+    const bootstrapPassword = readBootstrapPassword(deps.localUserAuthManager.getBootstrapCredentialPath());
+    return buildCompanionConnectionInfo({ daemonUrl, token: tokenRecord.token, password: bootstrapPassword, surface: 'tui' }) as PairingModalConnectionInfo;
+  } catch {
+    return null;
+  }
+}
+
+/** A minimal config-modal surface that renders an honest "not wired" degraded
+ *  state — used when a group-B surface's bootstrap dependency is absent. */
+function unwiredSurface(name: string, title: string, reason: string): ConfigModalSurface {
+  return {
+    name,
+    title,
+    buildView: (): ConfigModalView => ({ title, degraded: reason, tabs: [{ id: 'main', label: title, rows: [] }] }),
+  };
+}
+
+function getLocalNetworkIp(): string {
+  const nets = networkInterfaces();
+  for (const name of Object.keys(nets)) {
+    for (const net of nets[name] ?? []) {
+      if (net.family === 'IPv4' && !net.internal) return net.address;
+    }
+  }
+  return 'localhost';
+}
+
+function readBootstrapPassword(credentialPath: string): string | undefined {
+  try {
+    const content = readFileSync(credentialPath, 'utf-8');
+    for (const line of content.split('\n')) {
+      if (line.startsWith('password=')) return line.slice('password='.length).trim();
+    }
+  } catch {
+    // credential file may not exist yet
+  }
+  return undefined;
+}

package/src/panels/builtin-panels.ts

@@ -5,6 +5,7 @@ import { registerOperationsPanels } from './builtin/operations.ts';
 import { registerAgentPanels } from './builtin/agent.ts';
 import { registerSessionPanels } from './builtin/session.ts';
 import { registerKnowledgePanels } from './builtin/knowledge.ts';
+import { registerBuiltinModals } from './builtin-modals.ts';
 
 /**
  * Register all built-in panel types with the given PanelManager.
@@ -18,6 +19,10 @@ export function registerBuiltinPanels(manager: PanelManager, deps: BuiltinPanelD
   registerAgentPanels(manager, resolved);
   registerSessionPanels(manager, resolved);
   registerKnowledgePanels(manager, resolved);
+  // W6.1 (the purge): register MIGRATE-TO-MODAL surfaces + their panel-id
+  // redirects. Must run after the panel registrations so a redirected id wins
+  // over any lingering panel registration in open().
+  registerBuiltinModals(manager, resolved);
 }
 
 export type { BuiltinPanelDeps } from './builtin/shared.ts';

package/src/panels/cost-tracker-panel.ts

@@ -22,7 +22,7 @@ import {
   DEFAULT_PANEL_PALETTE,
   type PanelWorkspaceSection,
 } from './polish.ts';
-import { calcSessionCost, isModelPriced } from '../export/cost-utils.ts';
+import { calcSessionCost, isModelPriced, computeBudgetBreach, readBudgetAlertUsd, type BudgetAlertConfigAccess } from '../export/cost-utils.ts';
 import { abbreviateCount } from '../utils/format-number.ts';
 import { isTextBackspace } from '../input/delete-key-policy.ts';
 
@@ -108,9 +108,20 @@ export class CostTrackerPanel extends BasePanel {
 
   // Budget alert threshold in USD (0 = disabled). Mutable at runtime via the
   // in-panel 'b' numeric entry or the /cost budget <usd> command — both call
-  // setBudgetThreshold() below.
+  // setBudgetThreshold() below. When configAccess is wired (production path),
+  // this field is a cache only — currentBudgetThreshold() re-reads
+  // behavior.budgetAlertUsd from config on every use so the panel and the
+  // background budget-breach notifier (core/budget-breach-notifier.ts) never
+  // disagree about the threshold. Tests that omit configAccess fall back to
+  // this field as the sole source of truth, unchanged from prior behavior.
   private budgetThreshold: number;
 
+  // Optional config-backed source of truth for the budget threshold. Absent
+  // in most existing unit tests (which construct the panel directly) and in
+  // any build that doesn't wire a config manager; present in production via
+  // builtin/development.ts.
+  private readonly configAccess: BudgetAlertConfigAccess | undefined;
+
   // Draft buffer for the in-panel budget-entry mode ('b' key). Non-null while
   // entry is active; unlike LocalAuthPanel's masked entry, the value is not
   // secret so it is echoed directly.
@@ -138,15 +149,27 @@ export class CostTrackerPanel extends BasePanel {
     turnEvents: UiEventFeed<TurnEvent>,
     agentEvents: UiEventFeed<AgentEvent>,
     getOrchestratorUsage: () => UsageSnapshot & { model?: string },
-    opts: { budgetThreshold?: number; getAgentStatus?: (agentId: string) => AgentRecord | null } = {},
+    opts: {
+      budgetThreshold?: number;
+      getAgentStatus?: (agentId: string) => AgentRecord | null;
+      configAccess?: BudgetAlertConfigAccess;
+    } = {},
   ) {
     super('cost', 'Cost', '$', 'providers');
     this.getOrchestratorUsage = getOrchestratorUsage;
     this.getAgentStatus = opts.getAgentStatus;
-    this.budgetThreshold = opts.budgetThreshold ?? 0;
+    this.configAccess = opts.configAccess;
+    this.budgetThreshold = this.configAccess ? readBudgetAlertUsd(this.configAccess.get) : (opts.budgetThreshold ?? 0);
     this.attachEvents(turnEvents, agentEvents);
   }
 
+  /** The live budget threshold: re-read from config when configAccess is wired
+   * (single source of truth shared with the background notifier), otherwise
+   * the locally-cached field (test/no-config-manager fallback). */
+  private currentBudgetThreshold(): number {
+    return this.configAccess ? readBudgetAlertUsd(this.configAccess.get) : this.budgetThreshold;
+  }
+
   // -------------------------------------------------------------------------
   // Bus wiring
   // -------------------------------------------------------------------------
@@ -309,6 +332,7 @@ export class CostTrackerPanel extends BasePanel {
   public setBudgetThreshold(usd: number): void {
     if (!Number.isFinite(usd) || usd < 0) return;
     this.budgetThreshold = usd;
+    this.configAccess?.set('behavior.budgetAlertUsd', usd);
     this.markDirty();
   }
 
@@ -330,7 +354,8 @@ export class CostTrackerPanel extends BasePanel {
     if (this.budgetEntry !== null) return this.handleBudgetEntryInput(key);
 
     if (key === 'b') {
-      this.budgetEntry = this.budgetThreshold > 0 ? String(this.budgetThreshold) : '';
+      const threshold = this.currentBudgetThreshold();
+      this.budgetEntry = threshold > 0 ? String(threshold) : '';
       this.markDirty();
       return true;
     }
@@ -405,12 +430,13 @@ export class CostTrackerPanel extends BasePanel {
 
     const totalInputTokens = this.sessionUsage.input + this.sessionUsage.cacheRead + this.sessionUsage.cacheWrite;
     const sessionCost = calcSessionCost(this.sessionUsage.input, this.sessionUsage.output, this.sessionUsage.cacheRead, this.sessionUsage.cacheWrite, this.sessionModel);
-    const overBudget = this.budgetThreshold > 0 && sessionCost > this.budgetThreshold;
+    const budgetThreshold = this.currentBudgetThreshold();
+    const overBudget = computeBudgetBreach(sessionCost, budgetThreshold);
     const sparkline = buildSparkline(this.costHistory);
     const costStr = formatCost(sessionCost, !isModelPriced(this.sessionModel));
     const costFg = overBudget ? C.bad : C.cost;
-    const budgetStr = this.budgetThreshold > 0
-      ? ` / ${formatCost(this.budgetThreshold)}`
+    const budgetStr = budgetThreshold > 0
+      ? ` / ${formatCost(budgetThreshold)}`
       : '';
     const alertStr = overBudget ? ' ! OVER BUDGET' : '';
     const sessionLines: Line[] = [
@@ -419,8 +445,8 @@ export class CostTrackerPanel extends BasePanel {
     // Budget meter — the single most important glance for this panel: how much
     // of the configured budget the session has consumed. Only shown when a
     // budget is set (otherwise the bar would be meaningless).
-    if (this.budgetThreshold > 0) {
-      const ratio = sessionCost / this.budgetThreshold;
+    if (budgetThreshold > 0) {
+      const ratio = sessionCost / budgetThreshold;
       const BAR_W = 24;
       const filled = Math.max(0, Math.min(BAR_W, Math.round(ratio * BAR_W)));
       const meterFg = overBudget ? C.bad : ratio >= 0.8 ? C.warn : C.good;