@pellux/goodvibes-tui 0.18.20 → 0.19.0

package/src/input/handler.ts

@@ -81,6 +81,7 @@ import {
 } from './handler-picker-routes.ts';
 import { handleGlobalShortcutToken } from './handler-shortcuts.ts';
 import { feedInputTokens } from './handler-feed.ts';
+import { buildInitialFeedContext, syncFeedContextMutableFields } from './feed-context-factory.ts';
 import { handlePanelIntegrationAction as runPanelIntegrationAction } from './panel-integration-actions.ts';
 import type { Panel } from '../panels/types.ts';
 import type { UiRuntimeServices } from '../runtime/ui-services.ts';
@@ -112,6 +113,8 @@ export class InputHandler {
   private pasteRegistry = new Map<string, string>();
   private nextPasteId = 1;
   private lastCtrlCTime = 0;
+  /** Long-lived feed context — reused across every feed() call to avoid per-keystroke allocation. */
+  private feedContext!: import('./handler-feed.ts').InputFeedContext;
   private commandRegistry: CommandRegistry | null = null;
   private commandContext: CommandContext | undefined = undefined;
   public autocomplete: AutocompleteEngine | null = null;
@@ -208,32 +211,108 @@ export class InputHandler {
     this.bookmarkModal = new BookmarkModal(uiServices.shell.bookmarkManager);
     this.sessionPickerModal = new SessionPickerModal(uiServices.sessions.sessionManager);
     this.profilePickerModal = new ProfilePickerModal(uiServices.shell.profileManager);
+    this.initFeedContext();
   }
 
   /**
-   * setHistory - Wire in the InputHistory instance.
-   * Optional; if not set, history navigation is disabled.
+   * initFeedContext — Build the long-lived InputFeedContext once via factory.
+   * See feed-context-factory.ts for full field documentation.
    */
-  public setHistory(history: InputHistory): void {
-    this.inputHistory = history;
+  private initFeedContext(): void {
+    this.feedContext = buildInitialFeedContext(
+      {
+        prompt: this.prompt, cursorPos: this.cursorPos, commandMode: this.commandMode,
+        panelFocused: this.panelFocused, indicatorFocused: this.indicatorFocused,
+        helpOverlayActive: this.helpOverlayActive, helpScrollOffset: this.helpScrollOffset,
+        shortcutsOverlayActive: this.shortcutsOverlayActive, shortcutsScrollOffset: this.shortcutsScrollOffset,
+        nextPasteId: this.nextPasteId, nextImageId: this.nextImageId,
+        mouseDownRow: this.mouseDownRow, mouseDownCol: this.mouseDownCol,
+        contentWidth: this.contentWidth, selectionCallback: this.selectionCallback,
+      },
+      {
+        selection: this.selection,
+        pasteRegistry: this.pasteRegistry,
+        imageRegistry: this.imageRegistry,
+        selectionModal: this.selectionModal,
+        bookmarkModal: this.bookmarkModal,
+        settingsModal: this.settingsModal,
+        sessionPickerModal: this.sessionPickerModal,
+        profilePickerModal: this.profilePickerModal,
+        historySearch: this.historySearch,
+        commandRegistry: this.commandRegistry,
+        commandContext: this.commandContext,
+        autocomplete: this.autocomplete,
+        filePicker: this.filePicker,
+        modelPicker: this.modelPicker,
+        processModal: this.processModal,
+        liveTailModal: this.liveTailModal,
+        agentDetailModal: this.agentDetailModal,
+        contextInspectorModal: this.contextInspectorModal,
+        blockActionsMenu: this.blockActionsMenu,
+        searchManager: this.searchManager,
+        modalStack: this.modalStack,
+        inputHistory: this.inputHistory,
+        conversationManager: this.conversationManager,
+        panelManager: this.uiServices.shell.panelManager,
+        keybindingsManager: this.uiServices.shell.keybindingsManager,
+        getHistory: this.getHistory,
+        getViewportHeight: this.getViewportHeight,
+        getScrollTop: this.getScrollTop,
+        scroll: this.scroll,
+        exitApp: this.exitApp,
+      },
+      {
+        modalOpened: (name: string) => this.modalOpened(name),
+        handleEscape: () => { this.handleEscape(); this.syncFeedContextMutableFields(); },
+        handleCopy: () => this.handleCopy(),
+        handleCtrlC: () => { this.handleCtrlC(); this.syncFeedContextMutableFields(); },
+        handleBlockCopy: () => this.handleBlockCopy(),
+        handleBookmark: () => this.handleBookmark(),
+        handleBlockSave: () => this.handleBlockSave(),
+        handleDiffApply: () => this.handleDiffApply(),
+        handleUndo: () => { this.handleUndo(); this.syncFeedContextMutableFields(); },
+        handleRedo: () => { this.handleRedo(); this.syncFeedContextMutableFields(); },
+        handlePaste: () => { this.handlePaste(); this.syncFeedContextMutableFields(); },
+        saveUndoState: () => this.saveUndoState(),
+        ensureInputCursorVisible: (contentWidth?: number) => this.ensureInputCursorVisible(contentWidth),
+        registerPaste: (content: string) => this.registerPaste(content),
+        executeBlockAction: (id: string) => this.executeBlockAction(id),
+        cyclePanelTab: (direction: 'next' | 'prev') => this.cyclePanelTab(direction),
+        onPanelInputConsumed: (activePanel: Panel | null, key: string) => this.handlePanelIntegrationAction(activePanel, key),
+        getWrappedPromptInfo: (contentWidth: number) => this.getWrappedPromptInfo(contentWidth),
+        moveCursorVertical: (direction: -1 | 1) => this.moveCursorVertical(direction),
+        handlePathCompletion: () => this.handlePathCompletion(),
+        handleBlockToggle: () => this.handleBlockToggle(),
+        findMarkerAtPos: (pos: number) => this.findMarkerAtPos(pos),
+        cleanupMarkerRegistry: (text: string) => this.cleanupMarkerRegistry(text),
+        expandPrompt: (text: string) => this.expandPrompt(text),
+      },
+    );
   }
 
-  /**
-   * setCommandRegistry - Wire in the slash command registry and context.
-   * Must be called before commands can be processed.
-   */
+  /** Sync mutable handler fields back into feedContext after in-feed mutations. */
+  private syncFeedContextMutableFields(): void {
+    const h = this;
+    syncFeedContextMutableFields({ prompt: h.prompt, cursorPos: h.cursorPos, commandMode: h.commandMode,
+      panelFocused: h.panelFocused, indicatorFocused: h.indicatorFocused, helpOverlayActive: h.helpOverlayActive,
+      helpScrollOffset: h.helpScrollOffset, shortcutsOverlayActive: h.shortcutsOverlayActive,
+      shortcutsScrollOffset: h.shortcutsScrollOffset, selectionCallback: h.selectionCallback,
+      nextPasteId: h.nextPasteId, nextImageId: h.nextImageId, mouseDownRow: h.mouseDownRow,
+      mouseDownCol: h.mouseDownCol, contentWidth: h.contentWidth }, this.feedContext);
+  }
+
+  /** Wire in the InputHistory instance. Optional; disables history navigation if unset. */
+  public setHistory(history: InputHistory): void { this.inputHistory = history; }
+
+  /** Wire in the slash command registry and context. Must be called before commands work. */
   public setCommandRegistry(registry: CommandRegistry, context: CommandContext): void {
     this.commandRegistry = registry;
     this.commandContext = context;
     this.autocomplete = new AutocompleteEngine(registry);
   }
 
-  /**
-   * setConversationManager - Wire in the conversation manager for block copy/apply/collapse.
-   */
-  public setConversationManager(cm: ConversationManager): void {
-    this.conversationManager = cm;
-  }
+  /** Wire in the conversation manager for block copy/apply/collapse. */
+  public setConversationManager(cm: ConversationManager): void { this.conversationManager = cm; }
 
   /**
    * openSelection - Open the generic selection modal with a callback.
@@ -464,6 +543,7 @@ export class InputHandler {
 
   /**
    * feed - Process raw stdin data through the tokenizer.
+   * Reuses the long-lived this.feedContext to avoid per-keystroke object allocation.
    */
   public feed(data: string): void {
     const immediateRequestRender = this.requestRender;
@@ -479,111 +559,31 @@ export class InputHandler {
 
     this.requestRender = bufferedRequestRender;
     try {
-      let context!: import('./handler-feed.ts').InputFeedContext;
-      const syncFeedContextFromHandler = (): void => {
-        context.prompt = this.prompt;
-        context.cursorPos = this.cursorPos;
-        context.commandMode = this.commandMode;
-        context.panelFocused = this.panelFocused;
-        context.indicatorFocused = this.indicatorFocused;
-        context.helpOverlayActive = this.helpOverlayActive;
-        context.helpScrollOffset = this.helpScrollOffset;
-        context.shortcutsOverlayActive = this.shortcutsOverlayActive;
-        context.shortcutsScrollOffset = this.shortcutsScrollOffset;
-        context.selectionCallback = this.selectionCallback;
-        context.nextPasteId = this.nextPasteId;
-        context.nextImageId = this.nextImageId;
-        context.mouseDownRow = this.mouseDownRow;
-        context.mouseDownCol = this.mouseDownCol;
-      };
-
-      context = {
-        prompt: this.prompt,
-        cursorPos: this.cursorPos,
-        commandMode: this.commandMode,
-        panelFocused: this.panelFocused,
-        indicatorFocused: this.indicatorFocused,
-        helpOverlayActive: this.helpOverlayActive,
-        helpScrollOffset: this.helpScrollOffset,
-        shortcutsOverlayActive: this.shortcutsOverlayActive,
-        shortcutsScrollOffset: this.shortcutsScrollOffset,
-        nextPasteId: this.nextPasteId,
-        nextImageId: this.nextImageId,
-        mouseDownRow: this.mouseDownRow,
-        mouseDownCol: this.mouseDownCol,
-        contentWidth: this.contentWidth,
-        pasteRegistry: this.pasteRegistry,
-        imageRegistry: this.imageRegistry,
-        selection: this.selection,
-        selectionModal: this.selectionModal,
-        selectionCallback: this.selectionCallback,
-        bookmarkModal: this.bookmarkModal,
-        settingsModal: this.settingsModal,
-        sessionPickerModal: this.sessionPickerModal,
-        profilePickerModal: this.profilePickerModal,
-        historySearch: this.historySearch,
-        commandRegistry: this.commandRegistry,
-        commandContext: this.commandContext,
-        autocomplete: this.autocomplete,
-        filePicker: this.filePicker,
-        modelPicker: this.modelPicker,
-        processModal: this.processModal,
-        liveTailModal: this.liveTailModal,
-        agentDetailModal: this.agentDetailModal,
-        contextInspectorModal: this.contextInspectorModal,
-        blockActionsMenu: this.blockActionsMenu,
-        searchManager: this.searchManager,
-        modalStack: this.modalStack,
-        inputHistory: this.inputHistory,
-        conversationManager: this.conversationManager,
-        getHistory: this.getHistory,
-        getViewportHeight: this.getViewportHeight,
-        getScrollTop: this.getScrollTop,
-        scroll: this.scroll,
-        requestRender: bufferedRequestRender,
-        modalOpened: (name: string) => this.modalOpened(name),
-        handleEscape: () => {
-          this.handleEscape();
-          syncFeedContextFromHandler();
-        },
-        handleCopy: () => this.handleCopy(),
-        handleCtrlC: () => {
-          this.handleCtrlC();
-          syncFeedContextFromHandler();
-        },
-        handleBlockCopy: () => this.handleBlockCopy(),
-        handleBookmark: () => this.handleBookmark(),
-        handleBlockSave: () => this.handleBlockSave(),
-        handleDiffApply: () => this.handleDiffApply(),
-        handleUndo: () => {
-          this.handleUndo();
-          syncFeedContextFromHandler();
-        },
-        handleRedo: () => {
-          this.handleRedo();
-          syncFeedContextFromHandler();
-        },
-        handlePaste: () => {
-          this.handlePaste();
-          syncFeedContextFromHandler();
-        },
-        saveUndoState: () => this.saveUndoState(),
-        ensureInputCursorVisible: (contentWidth?: number) => this.ensureInputCursorVisible(contentWidth),
-        registerPaste: (content: string) => this.registerPaste(content),
-        executeBlockAction: (id: string) => this.executeBlockAction(id),
-        cyclePanelTab: (direction: 'next' | 'prev') => this.cyclePanelTab(direction),
-        onPanelInputConsumed: (activePanel: Panel | null, key: string) => this.handlePanelIntegrationAction(activePanel, key),
-        panelManager: this.uiServices.shell.panelManager,
-        keybindingsManager: this.uiServices.shell.keybindingsManager,
-        getWrappedPromptInfo: (contentWidth: number) => this.getWrappedPromptInfo(contentWidth),
-        moveCursorVertical: (direction: -1 | 1) => this.moveCursorVertical(direction),
-        handlePathCompletion: () => this.handlePathCompletion(),
-        handleBlockToggle: () => this.handleBlockToggle(),
-        findMarkerAtPos: (pos: number) => this.findMarkerAtPos(pos),
-        cleanupMarkerRegistry: (text: string) => this.cleanupMarkerRegistry(text),
-        expandPrompt: (text: string) => this.expandPrompt(text),
-        exitApp: this.exitApp,
-      };
+      const context = this.feedContext;
+      // Sync mutable scalars from handler into the reused context.
+      context.prompt = this.prompt;
+      context.cursorPos = this.cursorPos;
+      context.commandMode = this.commandMode;
+      context.panelFocused = this.panelFocused;
+      context.indicatorFocused = this.indicatorFocused;
+      context.helpOverlayActive = this.helpOverlayActive;
+      context.helpScrollOffset = this.helpScrollOffset;
+      context.shortcutsOverlayActive = this.shortcutsOverlayActive;
+      context.shortcutsScrollOffset = this.shortcutsScrollOffset;
+      context.selectionCallback = this.selectionCallback;
+      context.nextPasteId = this.nextPasteId;
+      context.nextImageId = this.nextImageId;
+      context.mouseDownRow = this.mouseDownRow;
+      context.mouseDownCol = this.mouseDownCol;
+      context.contentWidth = this.contentWidth;
+      // Sync semi-stable refs that may be wired after construction.
+      context.commandRegistry = this.commandRegistry;
+      context.commandContext = this.commandContext;
+      context.autocomplete = this.autocomplete;
+      context.inputHistory = this.inputHistory;
+      context.conversationManager = this.conversationManager;
+      // Swap requestRender to buffered version for this feed.
+      context.requestRender = bufferedRequestRender;
       this.syncFeedSelectionCallback = (callback) => {
         context.selectionCallback = callback;
       };

package/src/input/keybindings.ts

@@ -138,11 +138,14 @@ function resolveKeybindingsPath(options?: KeybindingsManagerOptions): string {
 export class KeybindingsManager {
   private bindings: Record<KeyAction, KeyCombo[]>;
   private configPath: string;
+  /** Inverted lookup map: composite key → KeyAction. Built in buildLookupMap(). */
+  private lookupMap = new Map<string, KeyAction>();
 
   constructor(options: KeybindingsManagerOptions) {
     this.configPath = resolveKeybindingsPath(options);
     // Start with deep copy of defaults
     this.bindings = this.cloneDefaults();
+    this.buildLookupMap();
   }
 
   private cloneDefaults(): Record<KeyAction, KeyCombo[]> {
@@ -184,6 +187,33 @@ export class KeybindingsManager {
     } catch (err) {
       logger.debug('keybindings: failed to load config file', { path: this.configPath, err: summarizeError(err) });
     }
+    this.buildLookupMap();
+  }
+
+  /**
+   * buildLookupMap — Rebuild the inverted lookup map from the current bindings table.
+   * Called after constructor init and after loadFromDisk().
+   * Map key format: "logicalName:ctrl:shift:alt" (booleans as 0/1).
+   * Last writer wins for duplicate combos (deterministic: iterate actions in order).
+   */
+  private buildLookupMap(): void {
+    this.lookupMap.clear();
+    for (const [action, combos] of Object.entries(this.bindings) as [KeyAction, KeyCombo[]][]) {
+      for (const combo of combos) {
+        const key = `${combo.key}:${combo.ctrl ? 1 : 0}:${combo.shift ? 1 : 0}:${combo.alt ? 1 : 0}`;
+        this.lookupMap.set(key, action);
+      }
+    }
+  }
+
+  /**
+   * lookup — O(1) keybinding lookup by token.
+   * Returns the matching KeyAction, or null if no binding matches.
+   */
+  lookup(token: { logicalName?: string; ctrl?: boolean; shift?: boolean; alt?: boolean }): KeyAction | null {
+    if (!token.logicalName) return null;
+    const key = `${token.logicalName}:${token.ctrl ? 1 : 0}:${token.shift ? 1 : 0}:${token.alt ? 1 : 0}`;
+    return this.lookupMap.get(key) ?? null;
   }
 
   private validateCombos(combos: unknown[]): combos is KeyCombo[] {

package/src/input/panel-integration-actions.ts

@@ -1,4 +1,5 @@
 import type { CommandContext } from './command-registry.ts';
+import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
 import type { Panel } from '../panels/types.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import { FileExplorerPanel } from '../panels/file-explorer-panel.ts';
@@ -69,7 +70,7 @@ export function handlePanelIntegrationAction(
     const parts = command.replace(/^\//, '').split(/\s+/).filter(Boolean);
     const [name, ...args] = parts;
     if (!name) return false;
-    void commandContext.executeCommand(name, args).catch(() => {});
+    void commandContext.executeCommand(name, args).catch((err) => { logger.debug('approval panel command dispatch failed', { err }); });
     return true;
   }
 

package/src/input/settings-modal-types.ts

@@ -0,0 +1,60 @@
+import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config/schema';
+import type { ProviderAuthFreshness, ProviderAuthRoute } from '@pellux/goodvibes-sdk/platform/runtime/provider-accounts/registry';
+import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runtime/feature-flags/types';
+
+export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'danger' | 'tools' | 'flags' | 'network';
+
+export const SETTINGS_CATEGORIES: SettingsCategory[] = [
+  'display',
+  'ui',
+  'provider',
+  'subscriptions',
+  'behavior',
+  'storage',
+  'permissions',
+  'mcp',
+  'sandbox',
+  'danger',
+  'tools',
+  'flags',
+  'network',
+];
+
+export interface SettingEntry {
+  setting: ConfigSetting;
+  currentValue: unknown;
+  isDefault: boolean;
+  effectiveSource?: 'default' | 'local' | 'synced' | 'managed';
+  locked?: boolean;
+  conflict?: boolean;
+  sourceLabel?: string;
+  lockReason?: string;
+}
+
+export interface FlagEntry {
+  flag: FeatureFlag;
+  state: FlagState;
+}
+
+export interface McpEntry {
+  name: string;
+  connected: boolean;
+  role: 'general' | 'docs' | 'filesystem' | 'git' | 'database' | 'browser' | 'automation' | 'ops' | 'remote';
+  trustMode: 'constrained' | 'ask-on-risk' | 'allow-all' | 'blocked';
+  allowedPaths: string[];
+  allowedHosts: string[];
+}
+
+export interface SubscriptionEntry {
+  provider: string;
+  state: 'active' | 'pending' | 'available';
+  tokenType?: string;
+  expiresAt?: number;
+  oauthConfigured: boolean;
+  activeRoute?: ProviderAuthRoute;
+  preferredRoute?: ProviderAuthRoute;
+  authFreshness?: ProviderAuthFreshness;
+  routeReason?: string;
+  issues?: string[];
+  nextActions?: string[];
+}

package/src/input/settings-modal.ts

@@ -23,67 +23,23 @@ import type { FeatureFlag, FlagState } from '@pellux/goodvibes-sdk/platform/runt
 import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp/registry';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils/logger';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils/error-display';
-
-// ---------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------
-
-export type SettingsCategory = 'display' | 'ui' | 'provider' | 'subscriptions' | 'behavior' | 'storage' | 'permissions' | 'mcp' | 'sandbox' | 'danger' | 'tools' | 'flags';
-
-export const SETTINGS_CATEGORIES: SettingsCategory[] = [
-  'display',
-  'ui',
-  'provider',
-  'subscriptions',
-  'behavior',
-  'storage',
-  'permissions',
-  'mcp',
-  'sandbox',
-  'danger',
-  'tools',
-  'flags',
-];
-
-export interface SettingEntry {
-  setting: ConfigSetting;
-  currentValue: unknown;
-  isDefault: boolean;
-  effectiveSource?: 'default' | 'local' | 'synced' | 'managed';
-  locked?: boolean;
-  conflict?: boolean;
-  sourceLabel?: string;
-  lockReason?: string;
-}
-
-/** A single feature flag entry for the flags tab. */
-export interface FlagEntry {
-  flag: FeatureFlag;
-  state: FlagState;
-}
-
-export interface McpEntry {
-  name: string;
-  connected: boolean;
-  role: 'general' | 'docs' | 'filesystem' | 'git' | 'database' | 'browser' | 'automation' | 'ops' | 'remote';
-  trustMode: 'constrained' | 'ask-on-risk' | 'allow-all' | 'blocked';
-  allowedPaths: string[];
-  allowedHosts: string[];
-}
-
-export interface SubscriptionEntry {
-  provider: string;
-  state: 'active' | 'pending' | 'available';
-  tokenType?: string;
-  expiresAt?: number;
-  oauthConfigured: boolean;
-  activeRoute?: ProviderAuthRoute;
-  preferredRoute?: ProviderAuthRoute;
-  authFreshness?: ProviderAuthFreshness;
-  routeReason?: string;
-  issues?: string[];
-  nextActions?: string[];
-}
+import {
+  SETTINGS_CATEGORIES,
+  type FlagEntry,
+  type McpEntry,
+  type SettingEntry,
+  type SettingsCategory,
+  type SubscriptionEntry,
+} from './settings-modal-types.ts';
+
+export {
+  SETTINGS_CATEGORIES,
+  type FlagEntry,
+  type McpEntry,
+  type SettingEntry,
+  type SettingsCategory,
+  type SubscriptionEntry,
+} from './settings-modal-types.ts';
 
 /**
  * Map a config key to the model picker target it should open, or null if the
@@ -151,6 +107,13 @@ export class SettingsModal {
   /** Provider subscription entries (populated when subscriptions tab is active). */
   public subscriptionEntries: SubscriptionEntry[] = [];
 
+  /**
+   * Set after a network-category save that touches controlPlane or httpListener
+   * config keys.  Renderer reads this to display a transient restart notice.
+   * Cleared on next open() or close().
+   */
+  public lastSaveTriggeredRestart: 'control-plane' | 'http-listener' | 'web' | null = null;
+
   private configManager: ConfigManager | null = null;
   private featureFlagManager: FeatureFlagManager | null = null;
   private mcpRegistry: McpRegistry | null = null;
@@ -185,6 +148,7 @@ export class SettingsModal {
     this.editBuffer = '';
     this.mcpAllowAllConfirmationTarget = null;
     this.subscriptionLogoutConfirmationTarget = null;
+    this.lastSaveTriggeredRestart = null;
     this.active = true;
   }
 
@@ -194,6 +158,7 @@ export class SettingsModal {
     this.editBuffer = '';
     this.mcpAllowAllConfirmationTarget = null;
     this.subscriptionLogoutConfirmationTarget = null;
+    this.lastSaveTriggeredRestart = null;
     this.serviceRegistry = null;
   }
 
@@ -548,7 +513,15 @@ export class SettingsModal {
     for (const setting of CONFIG_SCHEMA) {
       const rawCat = setting.key.split('.')[0] as string;
       // Route helper.* settings into the tools group for unified display
-      const cat = (rawCat === 'helper' ? 'tools' : rawCat) as SettingsCategory;
+      // Route controlPlane.* and httpListener.* into the network group
+      let cat: SettingsCategory;
+      if (rawCat === 'helper') {
+        cat = 'tools';
+      } else if (rawCat === 'controlPlane' || rawCat === 'httpListener' || rawCat === 'web') {
+        cat = 'network';
+      } else {
+        cat = rawCat as SettingsCategory;
+      }
       if (!this.groups.has(cat)) continue;
       const currentValue = configManager.get(setting.key as ConfigKey);
       const resolved = getResolvedSettingLookup(configManager, setting.key as ConfigKey)?.entry;
@@ -720,17 +693,62 @@ export class SettingsModal {
   /** Returns [] for the flags category (flags use flagEntries instead). */
   private _currentItems(): SettingEntry[] {
     if (this.currentCategory === 'flags' || this.currentCategory === 'mcp' || this.currentCategory === 'subscriptions') return [];
-    return this.groups.get(this.currentCategory) ?? [];
+    const items = this.groups.get(this.currentCategory) ?? [];
+    if (this.currentCategory === 'network') {
+      // Hide host fields when the corresponding hostMode is not 'custom'
+      return items.filter(entry => {
+        if (entry.setting.key === 'controlPlane.host') {
+          const hostMode = this.configManager?.get('controlPlane.hostMode');
+          return hostMode === 'custom';
+        }
+        if (entry.setting.key === 'httpListener.host') {
+          const hostMode = this.configManager?.get('httpListener.hostMode');
+          return hostMode === 'custom';
+        }
+        if (entry.setting.key === 'web.host') {
+          const hostMode = this.configManager?.get('web.hostMode');
+          return hostMode === 'custom';
+        }
+        return true;
+      });
+    }
+    return items;
   }
 
   private _setValue(key: ConfigKey, value: unknown): void {
     if (!this.configManager) return;
+    // Diff previous value before writing — avoids false restart notices on no-op saves
+    const previousValue = this.configManager.get(key);
+    const isRestartKey = ['host', 'port', 'hostMode', 'enabled'].includes(key.split('.')[1] ?? '');
     try {
       this.configManager.setDynamic(key, value);
       // Update the cached entry in-place — avoids full schema re-scan on each edit
       const rawCat = key.split('.')[0] as string;
-      // helper.* entries are stored in the tools group
-      const cat = (rawCat === 'helper' ? 'tools' : rawCat) as SettingsCategory;
+      // Resolve the display category from the key prefix
+      let cat: SettingsCategory;
+      if (rawCat === 'helper') {
+        cat = 'tools';
+      } else if (rawCat === 'controlPlane') {
+        cat = 'network';
+        // SDK auto-restarts the daemon server on controlPlane binding changes
+        if (isRestartKey && previousValue !== value) {
+          this.lastSaveTriggeredRestart = 'control-plane';
+        }
+      } else if (rawCat === 'httpListener') {
+        cat = 'network';
+        // SDK auto-restarts the HTTP listener on binding changes
+        if (isRestartKey && previousValue !== value) {
+          this.lastSaveTriggeredRestart = 'http-listener';
+        }
+      } else if (rawCat === 'web') {
+        cat = 'network';
+        // SDK auto-restarts the web server on binding changes
+        if (isRestartKey && previousValue !== value) {
+          this.lastSaveTriggeredRestart = 'web';
+        }
+      } else {
+        cat = rawCat as SettingsCategory;
+      }
       const entries = this.groups.get(cat);
       if (entries) {
         const entry = entries.find(e => e.setting.key === key);

package/src/panels/agent-inspector-panel.ts

@@ -97,7 +97,7 @@ export class AgentInspectorPanel extends BasePanel {
   private cursorIndex = 0;
 
   // Refresh timer (active only while panel is active)
-  private refreshTimer: ReturnType<typeof setInterval> | null = null;
+  private refreshTimerId: ReturnType<typeof setInterval> | null = null;
 
   // Row cache — cleared on markDirty(), computed once per render cycle
   private _cachedRows: DisplayRow[] | null = null;
@@ -131,7 +131,7 @@ export class AgentInspectorPanel extends BasePanel {
     this.cursorIndex = 0;
     this.timeline = [];
     this.markDirty();
-    this._refreshTimeline().catch(() => {});
+    this._refreshTimeline().catch((err) => { logger.debug('agent inspector timeline refresh failed', { err }); });
   }
 
   // -------------------------------------------------------------------------
@@ -149,6 +149,7 @@ export class AgentInspectorPanel extends BasePanel {
 
   override onDestroy(): void {
     this._stopRefresh();
+    super.onDestroy();
   }
 
   // -------------------------------------------------------------------------
@@ -461,16 +462,16 @@ export class AgentInspectorPanel extends BasePanel {
   }
 
   private _startRefresh(): void {
-    if (this.refreshTimer) return;
-    this.refreshTimer = setInterval(() => {
-      this._refreshTimeline().catch(() => {});
-    }, REFRESH_MS);
+    if (this.refreshTimerId) return;
+    this.refreshTimerId = this.registerTimer(setInterval(() => {
+      this._refreshTimeline().catch((err) => { logger.debug('agent inspector timeline refresh tick failed', { err }); });
+    }, REFRESH_MS));
   }
 
   private _stopRefresh(): void {
-    if (this.refreshTimer) {
-      clearInterval(this.refreshTimer);
-      this.refreshTimer = null;
+    if (this.refreshTimerId) {
+      this.clearTimer(this.refreshTimerId);
+      this.refreshTimerId = null;
     }
   }