@pellux/goodvibes-tui 2.0.21 → 2.1.0

package/src/input/handler.ts

@@ -22,13 +22,13 @@ import { InputHistory, HistorySearch } from './input-history.ts';
 import type { BlockMeta, ConversationManager } from '../core/conversation';
 import { BlockActionsMenu } from '../renderer/block-actions.ts';
 import { ContextInspectorModal } from '../renderer/context-inspector.ts';
+import { OverlayFilters } from './overlay-filter.ts';
 import { BookmarkModal } from './bookmark-modal.ts';
 import { SettingsModal } from './settings-modal.ts';
 import { McpWorkspace } from './mcp-workspace.ts';
 import { SessionPickerModal, getSharedHostedSessionRoster } from './session-picker-modal.ts';
 import { ConfigModal } from './config-modal.ts';
 import { ProfilePickerModal } from './profile-picker-modal.ts';
-import type { PanelBurstGuardState } from './panel-paste-flood-guard.ts';
 import { OnboardingWizardController, type OnboardingWizardAction, type OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
 import {
   applyOnboardingRequest,
@@ -64,10 +64,8 @@ import { pasteFromClipboard, pasteImageFromClipboard } from '../utils/clipboard.
 import {
   handleIndicatorFocusToken,
   handleMouseToken,
-  handlePanelFocusToken,
   handlePromptKeyToken,
   handlePromptTextToken,
-  type PanelMouseLayout,
 } from './handler-feed-routes.ts';
 import {
   ensureInputCursorVisible,
@@ -115,11 +113,9 @@ import { handleGlobalShortcutToken } from './handler-shortcuts.ts';
 import { feedInputTokens } from './handler-feed.ts';
 import type { InputHandlerLike } from './handler-types.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';
-export { handlePanelIntegrationAction } from './panel-integration-actions.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
+import { SurfaceModalHost } from './surface-modal-host.ts';
 
 type SelectionModalCallback = (result: SelectionResult | null) => void;
 
@@ -148,34 +144,6 @@ export class InputHandler implements InputHandlerLike {
   public commandMode = false;
   /** True when the process indicator bar has keyboard focus. */
   public indicatorFocused = false;
-  /**
-   * Fallback focus store used only when the panel manager does not implement
-   * focus ownership (lightweight test stubs). Production always delegates to
-   * PanelManager, which is the single source of truth.
-   */
-  private _panelFocusedFallback = false;
-  /**
-   * True when keyboard focus is on the active panel (arrow/enter go to panel,
-   * not prompt). Ownership lives in PanelManager (focusTarget); this reads and
-   * writes through to it so handler focus can never disagree with what the
-   * panel workspace actually shows.
-   */
-  public get panelFocused(): boolean {
-    const pm = this.uiServices.shell.panelManager;
-    return typeof pm.getFocusTarget === 'function'
-      ? pm.getFocusTarget() === 'panel'
-      : this._panelFocusedFallback;
-  }
-  public set panelFocused(value: boolean) {
-    const pm = this.uiServices.shell.panelManager;
-    if (typeof pm.focusPanels === 'function' && typeof pm.focusPrompt === 'function') {
-      if (value) pm.focusPanels();
-      else pm.focusPrompt();
-    } else {
-      this._panelFocusedFallback = value;
-    }
-  }
-
   public tokenizer = new InputTokenizer();
   public pasteRegistry = new Map<string, string>();
   public nextPasteId = 1;
@@ -193,12 +161,18 @@ export class InputHandler implements InputHandlerLike {
   public selectionModal = new SelectionModal();
   public searchManager = new SearchManager();
   public contextInspectorModal = new ContextInspectorModal();
+  public readonly overlayFilters = new OverlayFilters();
   public bookmarkModal: BookmarkModal;
   public blockActionsMenu = new BlockActionsMenu();
+  public surfaceModals = new SurfaceModalHost();
+  /** Agent and process views (shell/session-views.ts); null until the shell wires them. */
+  public sessionView: import('./handler-session-view-route.ts').SessionViewControls | null = null;
+  /** The main transcript's scroll, for Esc while scrolled back (handler-modal-stack.ts); null until the shell wires it. */
+  public transcriptScroll: import('./handler-modal-stack.ts').TranscriptScrollControls | null = null;
+  /** Screen rows above the transcript, set each frame by the shell: the header, the chips, the gap under them. */
+  public bodyTopRow = 2;
   public settingsModal = new SettingsModal();
   public configModal = new ConfigModal();
-  /** item 5, paste-flood guard state, mutated in place across tokens (never reallocated). */
-  private panelBurstGuard: PanelBurstGuardState = { timestamps: [], suspended: false, hintShown: false };
   public mcpWorkspace = new McpWorkspace();
   public onboardingWizard = new OnboardingWizardController();
   public onboardingModelPickerCancelSnapshot: OnboardingWizardSnapshot | null = null;
@@ -211,7 +185,7 @@ export class InputHandler implements InputHandlerLike {
    * Used to support back-navigation via Escape.
    */
   public modalStack: string[] = [];
-  public modalReturnFocus: 'prompt' | 'panel' | 'indicator' = 'prompt';
+  public modalReturnFocus: 'prompt' | 'indicator' = 'prompt';
   public sessionPickerModal: SessionPickerModal;
   public profilePickerModal: ProfilePickerModal;
   /** True when the help overlay is visible. */
@@ -231,6 +205,9 @@ export class InputHandler implements InputHandlerLike {
   public lastBlockCopyTime = 0;
   public mouseDownRow = -1;
   public mouseDownCol = -1;
+  /** Clickable footer screen rows (set by the shell each frame) and what opens them. */
+  public footerTargets: ReadonlyMap<number, import('../renderer/footer-targets.ts').FooterTarget> = new Map();
+  public onFooterTarget: ((target: import('../renderer/footer-targets.ts').FooterTarget) => void) | null = null;
 
   /** Pasted images: maps marker IDs to base64 image data. */
   public imageRegistry = new Map<string, { data: string; mediaType: string }>();
@@ -282,8 +259,6 @@ export class InputHandler implements InputHandlerLike {
       uiServices.providers.benchmarkStore,
       uiServices.providers.providerRegistry,
     );
-    // retirement: ProcessModal/LiveTailModal/AgentDetailModal were removed
-    //, F2 now opens the Fleet panel, which subsumes the live process tree.
     this.bookmarkModal = new BookmarkModal(uiServices.shell.bookmarkManager);
     this.sessionPickerModal = new SessionPickerModal(uiServices.sessions.sessionManager, uiServices.sessions.sessionBroker, getSharedHostedSessionRoster(), () => this.requestRender()); // third source: the daemon-hosted roster
     this.profilePickerModal = new ProfilePickerModal(uiServices.shell.profileManager);
@@ -299,12 +274,12 @@ export class InputHandler implements InputHandlerLike {
     this.feedContext = buildInitialFeedContext(
       {
         prompt: this.prompt, cursorPos: this.cursorPos, inputScrollTop: this.inputScrollTop, commandMode: this.commandMode,
-        panelFocused: this.panelFocused, indicatorFocused: this.indicatorFocused,
+        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, panelMouseLayout: this.panelMouseLayout,
+        contentWidth: this.contentWidth,
         selectionCallback: this.selectionCallback,
       },
       {
@@ -327,16 +302,16 @@ export class InputHandler implements InputHandlerLike {
         modelPicker: this.modelPicker,
         onboardingWizard: this.onboardingWizard,
         contextInspectorModal: this.contextInspectorModal,
+        overlayFilters: this.overlayFilters,
         blockActionsMenu: this.blockActionsMenu,
+        surfaceModals: this.surfaceModals,
         searchManager: this.searchManager,
         modalStack: this.modalStack,
         inputHistory: this.inputHistory,
         conversationManager: this.conversationManager,
-        panelManager: this.uiServices.shell.panelManager,
         keybindingsManager: this.uiServices.shell.keybindingsManager,
         killRing: this.killRing,
         focusTracker: this.uiServices.platform.focusTracker,
-        panelBurstGuard: this.panelBurstGuard,
         getHistory: this.getHistory,
         getViewportHeight: this.getViewportHeight,
         getScrollTop: this.getScrollTop,
@@ -345,6 +320,7 @@ export class InputHandler implements InputHandlerLike {
       },
       {
         modalOpened: (name: string) => this.modalOpened(name),
+        getSessionView: () => this.sessionView,
         handleEscape: () => { if (!this.cancelConcealedInput()) this.handleEscape(); this.syncFeedContextMutableFields(); },
         submitConcealedInput: (value: string) => this.submitConcealedInput(value),
         handleCopy: () => this.handleCopy(),
@@ -362,11 +338,12 @@ export class InputHandler implements InputHandlerLike {
         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(),
+        footerTargetAt: (row: number) => this.footerTargets.get(row),
+        openFooterTarget: (target) => { this.onFooterTarget?.(target); },
+        bodyTopRow: () => this.bodyTopRow,
         handleBlockToggle: () => this.handleBlockToggle(),
         findMarkerAtPos: (pos: number) => this.findMarkerAtPos(pos),
         cleanupMarkerRegistry: (text: string) => this.cleanupMarkerRegistry(text),
@@ -386,12 +363,11 @@ export class InputHandler implements InputHandlerLike {
   public syncFeedContextMutableFields(): void {
     const h = this;
     syncFeedContextMutableFields({ prompt: h.prompt, cursorPos: h.cursorPos, inputScrollTop: h.inputScrollTop, commandMode: h.commandMode,
-      panelFocused: h.panelFocused, indicatorFocused: h.indicatorFocused, helpOverlayActive: h.helpOverlayActive,
+      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,
-      panelMouseLayout: h.panelMouseLayout }, this.feedContext);
+      mouseDownCol: h.mouseDownCol, contentWidth: h.contentWidth }, this.feedContext);
   }
 
   /** Wire in the InputHistory instance. Optional; disables history navigation if unset. */
@@ -421,6 +397,7 @@ export class InputHandler implements InputHandlerLike {
       allowSearch?: boolean;
       customActions?: Map<string, SelectionAction>;
       primaryVerbLabel?: string;
+      onHighlight?: (item: import('./selection-modal.ts').SelectionItem | null) => void;
     } | undefined,
     callback: SelectionModalCallback,
   ): void {
@@ -465,7 +442,6 @@ export class InputHandler implements InputHandlerLike {
   public openModelPickerWithTarget(target: ModelPickerTarget, source: 'settings' | 'onboarding' = 'settings'): boolean { return openModelPickerWithTargetForHandler(this, target, source); }
   public openProviderModelPickerWithTarget(target: ModelPickerTarget, source: 'settings' | 'onboarding' = 'settings'): boolean { return openProviderModelPickerWithTargetForHandler(this, target, source); }
   public openMcpWorkspace(context: CommandContext): void {
-    this.panelFocused = false;
     this.indicatorFocused = false;
     this.modalOpened('mcpWorkspace');
     this.mcpWorkspace.open(context);
@@ -517,7 +493,6 @@ export class InputHandler implements InputHandlerLike {
       context.cursorPos = this.cursorPos;
       context.inputScrollTop = this.inputScrollTop;
       context.commandMode = this.commandMode;
-      context.panelFocused = this.panelFocused;
       context.indicatorFocused = this.indicatorFocused;
       context.helpOverlayActive = this.helpOverlayActive;
       context.helpScrollOffset = this.helpScrollOffset;
@@ -529,7 +504,6 @@ export class InputHandler implements InputHandlerLike {
       context.mouseDownRow = this.mouseDownRow;
       context.mouseDownCol = this.mouseDownCol;
       context.contentWidth = this.contentWidth;
-      context.panelMouseLayout = this.panelMouseLayout;
       // Sync semi-stable refs that may be wired after construction.
       context.commandRegistry = this.commandRegistry;
       context.commandContext = this.commandContext;
@@ -546,7 +520,6 @@ export class InputHandler implements InputHandlerLike {
       this.cursorPos = context.cursorPos;
       this.inputScrollTop = context.inputScrollTop;
       this.commandMode = context.commandMode;
-      this.panelFocused = context.panelFocused;
       this.indicatorFocused = context.indicatorFocused;
       // Overlay flags: only apply the pipeline's value when the pipeline
       // itself changed it (e.g. Escape closing the overlay). Otherwise keep
@@ -587,17 +560,12 @@ export class InputHandler implements InputHandlerLike {
 
   /** Content width for wrapping, set by main.ts via setContentWidth(). */
   public contentWidth = 76;
-  public panelMouseLayout: PanelMouseLayout | null = null;
 
   /** Set the content width used for wrapping calculations. Call from main.ts. */
   public setContentWidth(w: number): void {
     this.contentWidth = w;
   }
 
-  public setPanelMouseLayout(layout: PanelMouseLayout | null): void {
-    this.panelMouseLayout = layout;
-  }
-
   /**
    * Move cursor up or down by one WRAPPED line.
    * Uses the segment table to navigate visual lines, not raw \n lines.
@@ -770,19 +738,6 @@ export class InputHandler implements InputHandlerLike {
    * Word-wrap a single line to fit within maxW columns.
    * Breaks at spaces; words wider than maxW are force-broken.
    */
-  public cyclePanelTab(direction: 'next' | 'prev'): void {
-    const pm = this.uiServices.shell.panelManager;
-    if (pm.isVisible()) {
-      if (direction === 'next') pm.nextWorkspaceTab();
-      else pm.prevWorkspaceTab();
-      this.requestRender();
-    }
-  }
-
-  public handlePanelIntegrationAction(activePanel: Panel | null, key: string): void {
-    runPanelIntegrationAction(this.uiServices.shell.panelManager, activePanel, key, this.commandContext);
-  }
-
   public wordWrapLine(line: string, maxW: number): string[] {
     return wordWrapLine(line, maxW);
   }

package/src/input/keybindings.ts

@@ -34,22 +34,7 @@ export type KeyAction =
   | 'clear-cancel'
   | 'screen-clear'
   | 'command-palette'
-  | 'panel-picker'
-  | 'panel-close'
-  | 'panel-close-all'
-  | 'panel-tab-next'
-  | 'panel-tab-prev'
-  | 'panel-tab-1'
-  | 'panel-tab-2'
-  | 'panel-tab-3'
-  | 'panel-tab-4'
-  | 'panel-tab-5'
-  | 'panel-tab-6'
-  | 'panel-tab-7'
-  | 'panel-tab-8'
-  | 'panel-tab-9'
-  | 'panel-ops'
-  | 'panel-focus-toggle'
+  | 'open-agents'
   | 'history-search'
   | 'search'
   | 'block-copy'
@@ -72,7 +57,8 @@ export type KeyAction =
   | 'cancel-tool-call'
   | 'toggle-keep-awake'
   | 'toggle-memory-provenance'
-  | 'voice-input';
+  | 'voice-input'
+  | 'focus-work-tree';
 
 /** Human-readable description for each action (used in /keybindings display). */
 export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
@@ -80,22 +66,7 @@ export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
   'clear-cancel':          'Clear input / cancel generation / exit (double)',
   'screen-clear':          'Repaint the screen',
   'command-palette':       'Open the command palette (search & run any command)',
-  'panel-picker':          'Open, focus, or hide the panel workspace',
-  'panel-close':            'Close the currently active panel',
-  'panel-close-all':         'Close all open panels',
-  'panel-tab-next':        'Next workspace panel tab',
-  'panel-tab-prev':        'Previous workspace panel tab',
-  'panel-tab-1':           'Jump to workspace panel tab 1',
-  'panel-tab-2':           'Jump to workspace panel tab 2',
-  'panel-tab-3':           'Jump to workspace panel tab 3',
-  'panel-tab-4':           'Jump to workspace panel tab 4',
-  'panel-tab-5':           'Jump to workspace panel tab 5',
-  'panel-tab-6':           'Jump to workspace panel tab 6',
-  'panel-tab-7':           'Jump to workspace panel tab 7',
-  'panel-tab-8':           'Jump to workspace panel tab 8',
-  'panel-tab-9':           'Jump to workspace panel tab 9',
-  'panel-ops':             'Open, focus, or close the Fleet panel (toggle)',
-  'panel-focus-toggle':    'Switch keyboard focus between top and bottom pane',
+  'open-agents':           'Open the Agents view (same as F2)',
   'history-search':        'Reverse input history search',
   'search':                'Toggle conversation search',
   'block-copy':            'Copy nearest block to clipboard',
@@ -122,6 +93,7 @@ export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
   // state, there is no release event to watch, so this is two discrete presses,
   // and the description says so instead of implying a hold that cannot exist.
   'voice-input':           'Voice input: press to start recording, press again to stop and transcribe into the composer',
+  'focus-work-tree':       'Move the keyboard onto the conversation work tree (arrows move and fold, Enter opens, y copies, Esc returns)',
 };
 
 /** Default key bindings for all actions. */
@@ -129,43 +101,14 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   'copy-selection':        [{ key: 'c', ctrl: true, shift: true }],
   'clear-cancel':          [{ key: 'c', ctrl: true }],
   'screen-clear':          [{ key: 'l', ctrl: true }],
-  // Ctrl+K opens the command palette (the standard palette chord across editors).
-  // The readline kill-to-end-of-line that historically owned Ctrl+K is repointed
-  // to Alt+K below so the capability is kept, not lost.
-  'command-palette':       [{ key: 'k', ctrl: true }],
-  'panel-picker':          [{ key: 'p', ctrl: true }],
-  'panel-close':            [{ key: 'x', ctrl: true }],
-  'panel-close-all':         [{ key: 'x', ctrl: true, shift: true }],
-  // Ctrl+] stays the primary next-tab chord; Ctrl+PageDown is added as a second
-  // binding. Ctrl+[ was REMOVED as prev-tab: it is byte 0x1B (ESC), so the
-  // legacy tokenizer path emits it as 'escape', the binding never matched on
-  // most terminals AND the key fired Escape (a split-brain chord). Ctrl+PageUp
-  // replaces it: Ctrl+PageUp/PageDown tokenize consistently (\x1b[5;5~ /
-  // \x1b[6;5~ -> pageup/pagedown ctrl:true) in both the legacy and CSI-u paths.
-  'panel-tab-next':        [{ key: ']', ctrl: true }, { key: 'pagedown', ctrl: true }],
-  'panel-tab-prev':        [{ key: 'pageup', ctrl: true }],
-  // Alt+1..9: jump directly to the Nth workspace panel tab (across both panes).
-  // The tokenizer delivers Alt as the token's `meta` modifier; comboMatches /
-  // lookup treat `meta` as an alias for `alt`, so these alt-combos route through
-  // the same rebindable path as every other action.
-  'panel-tab-1':           [{ key: '1', alt: true }],
-  'panel-tab-2':           [{ key: '2', alt: true }],
-  'panel-tab-3':           [{ key: '3', alt: true }],
-  'panel-tab-4':           [{ key: '4', alt: true }],
-  'panel-tab-5':           [{ key: '5', alt: true }],
-  'panel-tab-6':           [{ key: '6', alt: true }],
-  'panel-tab-7':           [{ key: '7', alt: true }],
-  'panel-tab-8':           [{ key: '8', alt: true }],
-  'panel-tab-9':           [{ key: '9', alt: true }],
-  // Ctrl+O: TOGGLE the Fleet panel (open+focus / bring-to-front+focus / close
-  //, see toggleFleetPanel in handler-shortcuts.ts). The former Ops
-  // Control panel was retired to an 'ops-control' -> 'fleet' alias; the
-  // binding is KEPT (repointed, not removed) so the Ctrl+O muscle memory still
-  // lands somewhere useful. Routed globally in handleGlobalShortcutToken.
-  'panel-ops':             [{ key: 'o', ctrl: true }],
-  // Ctrl+G: toggle keyboard focus between the top and bottom panes. Ctrl+G is
-  // otherwise unbound in the default table.
-  'panel-focus-toggle':    [{ key: 'g', ctrl: true }],
+  // Ctrl+P opens the command palette, the one entry point for every command,
+  // view and setting; Ctrl+K (the other common palette chord) opens it too. The
+  // readline kill-to-end-of-line that historically owned Ctrl+K is repointed to
+  // Alt+K below so the capability is kept, not lost.
+  'command-palette':       [{ key: 'p', ctrl: true }, { key: 'k', ctrl: true }],
+  // Ctrl+O: the Agents modal (same as F2), where the old Fleet and Ops
+  // consoles' content lives now. Routed globally in handleGlobalShortcutToken.
+  'open-agents':           [{ key: 'o', ctrl: true }],
   'history-search':        [{ key: 'r', ctrl: true }],
   'search':                [{ key: 'f', ctrl: true }],
   'block-copy':            [{ key: 'y', ctrl: true }],
@@ -216,6 +159,8 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   // is paste and stays paste). Two presses rather than a hold: see the action's
   // description, a terminal has no key-release event to hold against.
   'voice-input':           [{ key: 'v', alt: true }],
+  // Alt+Up and Ctrl+Up: into the work tree from the composer (plain Up keeps input history).
+  'focus-work-tree':       [{ key: 'up', alt: true }, { key: 'up', ctrl: true }],
 };
 
 /** Resolved overrides type: each key can be a single combo or array. */
@@ -327,7 +272,7 @@ export class KeybindingsManager {
     if (!token.logicalName) return null;
     // The tokenizer delivers the Alt modifier as `meta`; the binding table stores
     // it as `alt`. Treat the two as one modifier at the matching boundary so
-    // Alt-based combos (word-nav, kill-ring, panel-tab-1..9) resolve at runtime.
+    // Alt-based combos (word-nav, kill-ring) resolve at runtime.
     const alt = token.alt ?? token.meta;
     const key = `${token.logicalName}:${token.ctrl ? 1 : 0}:${token.shift ? 1 : 0}:${alt ? 1 : 0}`;
     return this.lookupMap.get(key) ?? null;

package/src/input/masked-entry-modal.ts

@@ -0,0 +1,117 @@
+/**
+ * masked-entry-modal.ts, the local-auth password prompt as a kit modal.
+ *
+ * `/local-auth add-user <name>` and `/local-auth rotate-password <name>` with
+ * no password argument, and the Local Auth modal's a / p actions, open this.
+ * It is the only way to set a local password that keeps the plaintext out of
+ * argv, input history, the transcript and scrollback: keystrokes land in a
+ * private buffer that is never rendered (the row shows dots), and the buffer
+ * is dropped before the auth call runs, so it never outlives the attempt.
+ */
+
+import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
+import type { UserAuthManager } from '@pellux/goodvibes-sdk/platform/security';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import type { SurfaceModal, SurfaceModalHost } from './surface-modal-host.ts';
+import type { SurfaceLayer } from '../renderer/surface-kit.ts';
+import { renderMaskedEntryModal, type MaskedEntryView } from '../renderer/masked-entry-modal.ts';
+import { isTextBackspace } from './delete-key-policy.ts';
+
+export type MaskedEntryKind = 'add-user' | 'rotate-password';
+
+export interface MaskedEntryOptions {
+  readonly kind: MaskedEntryKind;
+  /** The user; for add-user it may be empty, and the modal asks for it first. */
+  readonly username?: string;
+  readonly auth: Pick<UserAuthManager, 'addUser' | 'rotatePassword'>;
+  /** Report the outcome (never includes the password). */
+  readonly onDone?: (message: string) => void;
+}
+
+/** Printable characters of a text token (control characters are dropped). */
+function printable(text: string): string {
+  return [...text].filter((ch) => ch >= ' ' && ch !== '\x7f').join('');
+}
+
+export class MaskedEntryModal implements SurfaceModal, MaskedEntryView {
+  readonly name = 'masked-entry';
+  readonly kind: MaskedEntryKind;
+  username: string;
+  step: 'username' | 'password';
+  error: string | null = null;
+  /** The password being typed. Private, never rendered, cleared on submit, cancel and close. */
+  private buffer = '';
+
+  constructor(private readonly options: MaskedEntryOptions) {
+    this.kind = options.kind;
+    this.username = (options.username ?? '').trim();
+    this.step = this.kind === 'add-user' && this.username.length === 0 ? 'username' : 'password';
+  }
+
+  get passwordLength(): number {
+    return [...this.buffer].length;
+  }
+
+  onClose(): void {
+    this.buffer = '';
+  }
+
+  escape(): boolean {
+    // Esc from the password step of a new user goes back to the username.
+    if (this.step === 'password' && this.kind === 'add-user' && !this.options.username) {
+      this.buffer = '';
+      this.error = null;
+      this.step = 'username';
+      return true;
+    }
+    return false;
+  }
+
+  private submit(host: SurfaceModalHost): void {
+    if (this.step === 'username') {
+      if (this.username.length === 0) return;
+      this.step = 'password';
+      this.error = null;
+      return;
+    }
+    if (this.buffer.length === 0) return;
+    const password = this.buffer;
+    // Drop the secret before the call so it never lingers after an exception.
+    this.buffer = '';
+    try {
+      if (this.kind === 'add-user') {
+        const added = this.options.auth.addUser(this.username, password, ['admin']);
+        host.close(this, 'done');
+        this.options.onDone?.(`Added local auth user ${added.username}.`);
+      } else {
+        this.options.auth.rotatePassword(this.username, password);
+        host.close(this, 'done');
+        this.options.onDone?.(`Rotated the password for ${this.username}. Existing sessions were revoked.`);
+      }
+    } catch (error) {
+      this.error = summarizeError(error);
+    }
+  }
+
+  handleToken(token: InputToken, host: SurfaceModalHost): void {
+    if (token.type === 'text') {
+      const text = printable(token.value);
+      if (!text) return;
+      if (this.step === 'username') this.username += text.replace(/\s+/g, '');
+      else this.buffer += text;
+      this.error = null;
+      return;
+    }
+    if (token.type !== 'key') return;
+    const key = token.logicalName ?? '';
+    if (key === 'enter') this.submit(host);
+    else if (isTextBackspace(key)) {
+      if (this.step === 'username') this.username = this.username.slice(0, -1);
+      else this.buffer = [...this.buffer].slice(0, -1).join('');
+    }
+  }
+
+  render(screenWidth: number, screenHeight: number): SurfaceLayer {
+    return renderMaskedEntryModal(this, screenWidth, screenHeight);
+  }
+}

package/src/input/mcp-workspace.ts

@@ -218,6 +218,11 @@ export class McpWorkspace {
   public tools: readonly RegisteredTool[] = [];
   public loadingTools = false;
   public lastError: string | null = null;
+  /**
+   * The browser's always-live search row. Narrows the server and action rows;
+   * selectedIndex indexes the narrowed list (visibleRows).
+   */
+  public query = '';
   private context: CommandContext | null = null;
   private snapshot: McpWorkspaceSnapshot = {
     projectPath: '',
@@ -233,6 +238,7 @@ export class McpWorkspace {
     this.selectedIndex = 0;
     this.formIndex = 0;
     this.lastError = null;
+    this.query = '';
     this.refreshSnapshot();
     void this.refreshTools();
   }
@@ -264,8 +270,23 @@ export class McpWorkspace {
     ];
   }
 
+  /** The rows the search row lets through (servers by name, role or source; actions by label). */
+  get visibleRows(): readonly McpWorkspaceRow[] {
+    const q = this.query.trim().toLowerCase();
+    if (!q) return this.rows;
+    return this.rows.filter((row) => row.type === 'server'
+      ? [row.server.name, row.server.role, row.server.source].some((v) => v.toLowerCase().includes(q))
+      : row.label.toLowerCase().includes(q));
+  }
+
+  /** Replace the browser query; the selection moves to the first match. */
+  setQuery(query: string): void {
+    this.query = query;
+    this.selectedIndex = 0;
+  }
+
   get selectedRow(): McpWorkspaceRow | null {
-    return this.rows[this.selectedIndex] ?? null;
+    return this.visibleRows[this.selectedIndex] ?? null;
   }
 
   get selectedServer(): McpWorkspaceServerRow | null {
@@ -303,7 +324,7 @@ export class McpWorkspace {
       effectiveConfig,
       servers: mergeServers(effectiveConfig, runtimeServers),
     };
-    this.selectedIndex = Math.max(0, Math.min(this.selectedIndex, this.rows.length - 1));
+    this.selectedIndex = Math.max(0, Math.min(this.selectedIndex, this.visibleRows.length - 1));
   }
 
   async refreshTools(): Promise<void> {
@@ -417,7 +438,7 @@ export class McpWorkspace {
   }
 
   moveSelection(delta: number): void {
-    const total = this.mode === 'form' ? this.formFields.length : this.rows.length;
+    const total = this.mode === 'form' ? this.formFields.length : this.visibleRows.length;
     if (total <= 0) return;
     if (this.mode === 'form') {
       this.formIndex = Math.max(0, Math.min(total - 1, this.formIndex + delta));
@@ -496,6 +517,16 @@ export function handleMcpWorkspaceToken(
     return true;
   }
 
+  const browseAction = (key: string): boolean => {
+    if (key === 'a') workspace.openAddForm();
+    else if (key === 'e' && workspace.selectedServer) workspace.openEditForm(workspace.selectedServer.name);
+    else if (key === 'd' && workspace.selectedServer) workspace.requestDelete(workspace.selectedServer.name);
+    else if (key === 'r') void workspace.reloadRuntime();
+    else if (key === 't') void workspace.refreshTools();
+    else return false;
+    return true;
+  };
+
   if (token.type === 'text') {
     if (workspace.mode === 'form') {
       workspace.appendFormText(token.value);
@@ -503,12 +534,11 @@ export function handleMcpWorkspaceToken(
       if (token.value.toLowerCase() === 'y') void workspace.confirmDelete();
       else if (token.value.toLowerCase() === 'n') workspace.cancelForm();
     } else {
+      // Browse: the search row is always live. An action letter fires while
+      // the query is empty; everything else is typed into the query.
       const value = token.value.toLowerCase();
-      if (value === 'a') workspace.openAddForm();
-      else if (value === 'e' && workspace.selectedServer) workspace.openEditForm(workspace.selectedServer.name);
-      else if (value === 'd' && workspace.selectedServer) workspace.requestDelete(workspace.selectedServer.name);
-      else if (value === 'r') void workspace.reloadRuntime();
-      else if (value === 't') void workspace.refreshTools();
+      const claimed = workspace.query.length === 0 && [...token.value].length === 1 && 'aedrt'.includes(value);
+      if (!claimed || !browseAction(value)) workspace.setQuery(workspace.query + token.value);
     }
     requestRender();
     return true;
@@ -516,6 +546,8 @@ export function handleMcpWorkspaceToken(
 
   if (token.type !== 'key') return true;
   if (token.logicalName === 'escape') {
+    // One level per Esc: the form or the remove confirmation returns to the
+    // browser; the browser closes the workspace.
     if (workspace.mode === 'form' || workspace.mode === 'delete-confirm') {
       workspace.cancelForm();
       requestRender();
@@ -530,7 +562,10 @@ export function handleMcpWorkspaceToken(
   else if (token.logicalName === 'pageup') workspace.moveSelection(-10);
   else if (token.logicalName === 'pagedown') workspace.moveSelection(10);
   else if (token.logicalName === 'enter') void workspace.activateSelected();
-  else if (token.logicalName === 'backspace' || token.logicalName === 'delete') {
+  else if (token.logicalName === 'backspace') {
+    if (workspace.mode === 'form') workspace.backspaceFormText();
+    else if (workspace.mode === 'browse' && workspace.query.length > 0) workspace.setQuery(workspace.query.slice(0, -1));
+  } else if (token.logicalName === 'delete') {
     if (workspace.mode === 'form') workspace.backspaceFormText();
     else if (workspace.mode === 'browse' && workspace.selectedServer) workspace.requestDelete(workspace.selectedServer.name);
   } else if (token.logicalName === 'left') {
@@ -539,14 +574,10 @@ export function handleMcpWorkspaceToken(
     if (workspace.mode === 'form') workspace.adjustFormEnum(1);
   } else if (token.logicalName === 'space') {
     if (workspace.mode === 'form') workspace.appendFormText(' ');
-  } else if (token.logicalName === 'a' && workspace.mode === 'browse') {
-    workspace.openAddForm();
-  } else if (token.logicalName === 'd' && workspace.mode === 'browse' && workspace.selectedServer) {
-    workspace.requestDelete(workspace.selectedServer.name);
-  } else if (token.logicalName === 'r' && workspace.mode === 'browse') {
-    void workspace.reloadRuntime();
-  } else if (token.logicalName === 't' && workspace.mode === 'browse') {
-    void workspace.refreshTools();
+    else if (workspace.mode === 'browse') workspace.setQuery(workspace.query + ' ');
+  } else if (workspace.mode === 'browse' && token.logicalName) {
+    // Modified letters (CSI-u chords) fire their action whatever the query holds.
+    browseAction(token.logicalName);
   }
 
   requestRender();