@pellux/goodvibes-tui 1.1.0 → 1.9.0

package/src/input/handler.ts

@@ -19,16 +19,15 @@ import type { SelectionResult, SelectionAction } from './selection-modal.ts';
 import { SearchManager } from './search.ts';
 import { InputHistory, HistorySearch } from './input-history.ts';
 import type { BlockMeta, ConversationManager } from '../core/conversation';
-import { ProcessModal } from '../renderer/process-modal.ts';
-import { LiveTailModal } from '../renderer/live-tail-modal.ts';
 import { BlockActionsMenu } from '../renderer/block-actions.ts';
-import { AgentDetailModal } from '../renderer/agent-detail-modal.ts';
 import { ContextInspectorModal } from '../renderer/context-inspector.ts';
 import { BookmarkModal } from './bookmark-modal.ts';
 import { SettingsModal } from './settings-modal.ts';
 import { McpWorkspace } from './mcp-workspace.ts';
 import { SessionPickerModal } 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,
@@ -106,9 +105,7 @@ import {
   handleBlockActionsToken,
   handleEscapeOnlyModalToken,
   handleFilePickerToken,
-  handleLiveTailToken,
   handleModelPickerToken,
-  handleProcessModalToken,
 } from './handler-picker-routes.ts';
 import { handleGlobalShortcutToken } from './handler-shortcuts.ts';
 import { feedInputTokens } from './handler-feed.ts';
@@ -184,13 +181,13 @@ export class InputHandler implements InputHandlerLike {
   public modelPicker: ModelPickerModal;
   public selectionModal = new SelectionModal();
   public searchManager = new SearchManager();
-  public processModal: ProcessModal;
-  public liveTailModal: LiveTailModal;
-  public agentDetailModal: AgentDetailModal;
   public contextInspectorModal = new ContextInspectorModal();
   public bookmarkModal: BookmarkModal;
   public blockActionsMenu = new BlockActionsMenu();
   public settingsModal = new SettingsModal();
+  public configModal = new ConfigModal();
+  /** DEBT-5 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;
@@ -272,25 +269,10 @@ export class InputHandler implements InputHandlerLike {
       uiServices.providers.benchmarkStore,
       uiServices.providers.providerRegistry,
     );
-    this.processModal = new ProcessModal({
-      agentManager: uiServices.agents.agentManager,
-      processManager: uiServices.shell.processManager,
-      wrfcController: uiServices.agents.wrfcController,
-    });
-    this.liveTailModal = new LiveTailModal({
-      agentManager: uiServices.agents.agentManager,
-      processManager: uiServices.shell.processManager,
-    });
-    this.agentDetailModal = new AgentDetailModal({
-      agentManager: uiServices.agents.agentManager,
-      agentMessageBus: uiServices.agents.agentMessageBus,
-      sessionLogPathResolver: (agentId) => uiServices.environment.shellPaths.resolveProjectPath('tui', 'sessions', `${agentId}.jsonl`),
-      // SDK 0.23.0: supply wrfcController so the modal can show constraint data
-      wrfcController: uiServices.agents.wrfcController,
-      cancelAgent: (agentId: string) => uiServices.agents.agentManager.cancel(agentId),
-    });
+    // W6.1 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);
+    this.sessionPickerModal = new SessionPickerModal(uiServices.sessions.sessionManager, uiServices.sessions.sessionBroker);
     this.profilePickerModal = new ProfilePickerModal(uiServices.shell.profileManager);
     this.initFeedContext();
   }
@@ -322,6 +304,7 @@ export class InputHandler implements InputHandlerLike {
         mcpWorkspace: this.mcpWorkspace,
         sessionPickerModal: this.sessionPickerModal,
         profilePickerModal: this.profilePickerModal,
+        configModal: this.configModal,
         historySearch: this.historySearch,
         commandRegistry: this.commandRegistry,
         commandContext: this.commandContext,
@@ -329,9 +312,6 @@ export class InputHandler implements InputHandlerLike {
         filePicker: this.filePicker,
         modelPicker: this.modelPicker,
         onboardingWizard: this.onboardingWizard,
-        processModal: this.processModal,
-        liveTailModal: this.liveTailModal,
-        agentDetailModal: this.agentDetailModal,
         contextInspectorModal: this.contextInspectorModal,
         blockActionsMenu: this.blockActionsMenu,
         searchManager: this.searchManager,
@@ -341,6 +321,8 @@ export class InputHandler implements InputHandlerLike {
         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,
@@ -421,6 +403,7 @@ export class InputHandler implements InputHandlerLike {
       preSelectId?: string;
       allowSearch?: boolean;
       customActions?: Map<string, SelectionAction>;
+      primaryVerbLabel?: string;
     } | undefined,
     callback: SelectionModalCallback,
   ): void {

package/src/input/keybindings.ts

@@ -88,7 +88,7 @@ export const ACTION_DESCRIPTIONS: Record<KeyAction, string> = {
   '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 the Ops Control panel',
+  'panel-ops':             'Open, focus, or close the Fleet panel (toggle)',
   'panel-focus-toggle':    'Switch keyboard focus between top and bottom pane',
   'history-search':        'Reverse input history search',
   'search':                'Toggle conversation search',
@@ -119,8 +119,14 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   'panel-picker':          [{ key: 'p', ctrl: true }],
   'panel-close':            [{ key: 'x', ctrl: true }],
   'panel-close-all':         [{ key: 'x', ctrl: true, shift: true }],
-  'panel-tab-next':        [{ key: ']', ctrl: true }],
-  'panel-tab-prev':        [{ key: '[', ctrl: 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
@@ -134,10 +140,11 @@ export const DEFAULT_KEYBINDINGS: Record<KeyAction, KeyCombo[]> = {
   'panel-tab-7':           [{ key: '7', alt: true }],
   'panel-tab-8':           [{ key: '8', alt: true }],
   'panel-tab-9':           [{ key: '9', alt: true }],
-  // Ctrl+O: open the Ops Control panel (operator intervention console).
-  // Routed globally in handleGlobalShortcutToken: prefers commandContext.openOpsPanel()
-  // when the operator-control-plane feature flag wired it, else falls back to opening
-  // the always-registered 'ops-control' panel type directly via the panel manager.
+  // Ctrl+O: TOGGLE the Fleet panel (open+focus / bring-to-front+focus / close
+  // — see toggleFleetPanel in handler-shortcuts.ts, UX-C). The former Ops
+  // Control panel was retired to an 'ops-control' -> 'fleet' alias (W6.1); 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.
@@ -355,7 +362,15 @@ export class KeybindingsManager {
     if (combo.ctrl) parts.push('Ctrl');
     if (combo.alt) parts.push('Alt');
     if (combo.shift) parts.push('Shift');
-    parts.push(combo.key.length === 1 ? combo.key.toUpperCase() : combo.key);
+    // Friendly display for named keys with a conventional abbreviation, so a
+    // chord like Ctrl+PageUp reads consistently with the "PageUp / PageDn"
+    // scroll help text. Single chars upper-case; other named keys pass through.
+    const KEY_DISPLAY: Record<string, string> = { pageup: 'PageUp', pagedown: 'PageDn' };
+    parts.push(
+      combo.key.length === 1
+        ? combo.key.toUpperCase()
+        : KEY_DISPLAY[combo.key] ?? combo.key,
+    );
     return parts.join('+');
   }
 

package/src/input/model-picker-types.ts

@@ -1,15 +1,17 @@
 import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers';
 
-export type PickerMode = 'model' | 'provider' | 'effort' | 'contextCap';
+export type PickerMode = 'model' | 'provider' | 'effort' | 'contextCap' | 'embeddingProvider';
 
 /**
  * Which config keys the model picker writes to on commit.
- * 'main'   -> provider.provider + provider.model (default)
- * 'helper' -> helper.globalProvider + helper.globalModel (+ helper.enabled: true)
- * 'tool'   -> tools.llmProvider + tools.llmModel (+ tools.llmEnabled: true)
- * 'tts'    -> tts.llmProvider + tts.llmModel
+ * 'main'       -> provider.provider + provider.model (default)
+ * 'helper'     -> helper.globalProvider + helper.globalModel (+ helper.enabled: true)
+ * 'tool'       -> tools.llmProvider + tools.llmModel (+ tools.llmEnabled: true)
+ * 'tts'        -> tts.llmProvider + tts.llmModel
+ * 'embeddings' -> provider.embeddingProvider, via MemoryEmbeddingProviderRegistry.setDefaultProvider()
+ *                 (not an LLM route — no model concept, see ModelPickerTargetInfo.configuredNote)
  */
-export type ModelPickerTarget = 'main' | 'helper' | 'tool' | 'tts';
+export type ModelPickerTarget = 'main' | 'helper' | 'tool' | 'tts' | 'embeddings';
 
 export type ModelPickerFocusPane = 'targets' | 'items';
 
@@ -21,6 +23,22 @@ export interface ModelPickerTargetInfo {
   readonly model: string;
   readonly enabled: boolean;
   readonly inherited: boolean;
+  /**
+   * Honest override for the "Current:" summary line. Used by the 'embeddings'
+   * target (which has no model concept — only a provider id + dimensions +
+   * configured state) so the renderer never prints a phantom "model:" value.
+   * When set, this replaces the computed provider:model route text.
+   */
+  readonly configuredNote?: string;
+}
+
+/** One entry in the embedding-provider picker list (PickerMode 'embeddingProvider'). */
+export interface EmbeddingProviderPickerEntry {
+  readonly id: string;
+  readonly label: string;
+  readonly dimensions: number;
+  readonly configured: boolean;
+  readonly detail?: string;
 }
 
 /**

package/src/input/model-picker.ts

@@ -7,6 +7,7 @@ import type {
   BenchmarkSort,
   CapabilityFilter,
   CategoryFilter,
+  EmbeddingProviderPickerEntry,
   FilteredModelsCache,
   FilteredProvidersCache,
   GroupByMode,
@@ -40,6 +41,7 @@ export type {
   BenchmarkSort,
   CapabilityFilter,
   CategoryFilter,
+  EmbeddingProviderPickerEntry,
   GroupByMode,
   ModelFamily,
   ModelPickerFocusPane,
@@ -86,6 +88,10 @@ export class ModelPickerModal {
   public models: ModelDefinition[] = [];
   public providers: string[] = [];
   public effortLevels: string[] = [];
+  /** Entries for PickerMode 'embeddingProvider' — the 'embeddings' target's own tiny item list. */
+  public embeddingProviders: EmbeddingProviderPickerEntry[] = [];
+  /** Mode to restore when navigating the targets rail away from 'embeddings'. */
+  private nonEmbeddingMode: PickerMode = 'model';
   /** The model chosen in model-mode, awaiting effort selection. */
   public pendingModel: ModelDefinition | null = null;
   /** The model awaiting context cap input (contextCap mode). */
@@ -148,9 +154,20 @@ export class ModelPickerModal {
   }
 
   setTarget(target: ModelPickerTarget): void {
+    const previousTarget = this.target;
     this.target = target;
     const idx = this.targetInfos.findIndex((entry) => entry.target === target);
     this.targetIndex = idx >= 0 ? idx : this.targetIndex;
+    // The 'embeddings' target routes through its own tiny item-list mode
+    // (embedding providers are not ModelDefinition-shaped) rather than
+    // whatever LLM mode the picker session was already in. Remember the
+    // mode we came from so tabbing back to another target restores it.
+    if (target === 'embeddings' && this.mode !== 'embeddingProvider') {
+      this.nonEmbeddingMode = this.mode;
+      this.mode = 'embeddingProvider';
+    } else if (previousTarget === 'embeddings' && target !== 'embeddings' && this.mode === 'embeddingProvider') {
+      this.mode = this.nonEmbeddingMode;
+    }
     this.alignSelectionToTarget();
   }
 
@@ -171,6 +188,13 @@ export class ModelPickerModal {
       this.selectedIndex = modelIdx >= 0 ? modelIdx : 0;
       this.scrollOffset = 0;
       this._scrollToSelection(20);
+      return;
+    }
+    if (this.mode === 'embeddingProvider') {
+      const providerIdx = this.embeddingProviders.findIndex((provider) => provider.id === info.provider);
+      this.selectedIndex = providerIdx >= 0 ? providerIdx : 0;
+      this.scrollOffset = 0;
+      this._scrollToSelection(20);
     }
   }
 
@@ -237,7 +261,22 @@ export class ModelPickerModal {
     }
   }
 
-  /** Open showing all models — entry point for /model */
+  /**
+   * Open showing all models — entry point for /model.
+   *
+   * W3-T2: search starts FOCUSED. Live tmux repro (cc-w3-t2) showed the actual
+   * friction wasn't the filter itself (it already works — fuzzy multi-word
+   * substring over id/displayName/provider) but that with search unfocused by
+   * default, typing a search term went character-by-character into single-key
+   * shortcuts instead (g=group, c=capability, a=available-only, b=benchmark) —
+   * e.g. typing "claude" silently cycled the capability filter (on 'c') and
+   * toggled available-only off (on 'a') while the visible list never
+   * filtered, with no error and no indication anything happened. Reaching
+   * search required already knowing to press '/' or Up at the top row.
+   * Starting focused makes "just start typing" work the way every other
+   * picker in this codebase (and everywhere else) already behaves; Down
+   * still blurs search into list navigation (see handleModelPickerToken).
+   */
   openAllModels(models: ModelDefinition[], currentModelId: string): void {
     this.models = models;
     this.mode = 'model';
@@ -245,6 +284,7 @@ export class ModelPickerModal {
     this.pendingModel = null;
     this.focusPane = 'items';
     this.searchFocused = false;
+    this.focusSearch();
     this.query = '';
     this.categoryFilter = 'all';
     this.capabilityFilter = 'none';
@@ -255,7 +295,7 @@ export class ModelPickerModal {
     this.scrollOffset = 0;
   }
 
-  /** Open showing providers first — entry point for /provider */
+  /** Open showing providers first — entry point for /provider. W3-T2: search starts focused — see openAllModels(). */
   openProviders(providers: string[], currentProvider: string): void {
     this.previousMode = null;
     this.providers = providers;
@@ -264,6 +304,7 @@ export class ModelPickerModal {
     this.pendingModel = null;
     this.focusPane = 'items';
     this.searchFocused = false;
+    this.focusSearch();
     this.query = '';
     this.categoryFilter = 'all';
     this.capabilityFilter = 'none';
@@ -273,6 +314,27 @@ export class ModelPickerModal {
     this.scrollOffset = 0;
   }
 
+  /**
+   * Open the embedding-provider list — entry point for the 'embeddings' target.
+   * Deliberately NOT routed through openAllModels (ModelDefinition-shaped) or
+   * openProviders (LLM-provider label resolution) — embedding providers are a
+   * flat {id, label, dimensions, configured} list with no model concept, and
+   * reusing either existing opener would mislabel or drop unrecognized ids.
+   */
+  openEmbeddingProviders(providers: EmbeddingProviderPickerEntry[], currentId: string): void {
+    this.previousMode = null;
+    this.embeddingProviders = providers;
+    this.mode = 'embeddingProvider';
+    this.active = true;
+    this.pendingModel = null;
+    this.focusPane = 'items';
+    this.searchFocused = false;
+    this.query = '';
+    const idx = providers.findIndex((provider) => provider.id === currentId);
+    this.selectedIndex = idx >= 0 ? idx : 0;
+    this.scrollOffset = 0;
+  }
+
   /** Transition to model list filtered by provider (called from provider mode Enter). */
   showModelsForProvider(models: ModelDefinition[], _provider: string): void {
     this.previousMode = 'provider';
@@ -311,6 +373,8 @@ export class ModelPickerModal {
     this.targetIndex = 0;
     this.models = [];
     this.providers = [];
+    this.embeddingProviders = [];
+    this.nonEmbeddingMode = 'model';
     this.pendingModel = null;
     this.contextCapPendingModel = null;
     this.contextCapQuery = '';
@@ -473,6 +537,16 @@ export class ModelPickerModal {
       this.providerItemsCache = cache;
       return result;
     }
+    if (this.mode === 'embeddingProvider') {
+      // Tiny list (typically 2-4 entries) — no caching infrastructure needed.
+      // Unconfigured providers are shown honestly (isConfigured: false), never hidden.
+      return this.embeddingProviders.map((provider) => ({
+        id: provider.id,
+        label: provider.label,
+        detail: `${provider.dimensions}d${provider.configured ? '' : ' · unconfigured'}`,
+        isConfigured: provider.configured,
+      }));
+    }
     // effort mode
     return buildEffortItems(this.effortLevels);
   }
@@ -481,6 +555,7 @@ export class ModelPickerModal {
   getItemCount(): number {
     if (this.mode === 'model') return this.getFilteredModels().length;
     if (this.mode === 'provider') return this.getFilteredProviders().length;
+    if (this.mode === 'embeddingProvider') return this.embeddingProviders.length;
     return this.effortLevels.length;
   }
 

package/src/input/onboarding/onboarding-runtime-status.ts

@@ -27,6 +27,13 @@ export function runtimePortDiagnostic(
     if (status.mode === 'unavailable') {
       return `The configured endpoint ${status.baseUrl} is unavailable after startup or restart.${reason}`;
     }
+    if (status.mode === 'incompatible') {
+      // A GoodVibes daemon IS on the port, but it speaks an incompatible wire
+      // version, so this TUI neither adopted it nor started a competing daemon.
+      // status.reason already names the port and both versions (SDK side).
+      const version = status.version ? ` version ${status.version}` : '';
+      return `A GoodVibes service${version} is running at ${status.baseUrl} but is not wire-compatible with this TUI, so it was not adopted.${reason}`;
+    }
     if (status.mode === 'external') {
       const version = status.version ? ` version ${status.version}` : '';
       return `An existing GoodVibes service was verified at ${status.baseUrl}${version}.`;
@@ -62,7 +69,9 @@ export function isRuntimeEndpointOccupyingConfiguredPort(
   endpoint: OnboardingRuntimeEndpoint,
 ): boolean {
   const status = getRuntimeEndpointStatus(state, endpoint);
-  if (status) return status.mode === 'embedded' || status.mode === 'external' || status.mode === 'blocked';
+  // 'incompatible' means a GoodVibes daemon holds the configured port (we just
+  // did not adopt it) — the port IS occupied, so report it as such.
+  if (status) return status.mode === 'embedded' || status.mode === 'external' || status.mode === 'blocked' || status.mode === 'incompatible';
   return endpoint === 'daemon'
     ? state?.daemonRunning === true || state?.daemonPortInUse === true
     : state?.httpListenerRunning === true || state?.httpListenerPortInUse === true;

package/src/input/onboarding/onboarding-wizard-apply.ts

@@ -85,7 +85,14 @@ export function buildOnboardingApplyRequest(controller: OnboardingWizardControll
     setConfig('service.enabled', hasServers);
     setConfig('service.autostart', hasServers);
     setConfig('service.restartOnFailure', true);
-    setConfig('danger.daemon', hasServers);
+    // One-Platform daemon-by-default (SDK docs/decisions/2026-07-05-daemon-by-default.md):
+    // the loopback-only cross-surface session daemon is safe-by-design (Wave 1:
+    // loopback bind, auth-gated, rate-limited) and runs regardless of whether
+    // browser/LAN/webhook/external-app capabilities are selected here — it is no
+    // longer bundled with those network-exposing surfaces, so onboarding leaves
+    // daemon.enabled untouched and lets the SDK's own default-true (or an existing
+    // explicit user override) govern. (The deprecated danger.daemon alias this
+    // comment used to also name was removed in Wave 6.)
     setConfig('controlPlane.enabled', hasServers);
     setConfig('danger.httpListener', httpListener);
     setConfig('web.enabled', browserAccess);

package/src/input/onboarding/onboarding-wizard-constants.ts

@@ -18,7 +18,10 @@ export const DEFAULT_CAPABILITIES: readonly OnboardingStep1CapabilityItem[] = [
     id: 'local-tui-only',
     label: 'Local TUI Only (No Servers)',
     selected: true,
-    detail: 'Use GoodVibes only in this terminal. No browser access, background service, HTTP listener, external app surface, or network setup.',
+    // Honest wording (One-Platform daemon-by-default): this avoids browser/LAN/
+    // webhook/external-app exposure, but the loopback-only GoodVibes daemon
+    // still runs by default for cross-surface visibility on this machine.
+    detail: 'Use GoodVibes only in this terminal. No browser access, HTTP listener, external app surface, or network setup. A loopback-only background daemon still runs by default so sessions here stay visible to other GoodVibes surfaces on this machine — turn it off in Settings > daemon if you want none at all.',
   },
   {
     id: 'browser-access',

package/src/input/onboarding/onboarding-wizard-network-adopt.ts

@@ -0,0 +1,136 @@
+/**
+ * F1 (One-Platform Wave 2 friction fix): the Network step's daemon-source choice
+ * — start a new daemon owned by this TUI (default) vs connect to one that is
+ * already running elsewhere with a known token. Extracted from
+ * onboarding-wizard-steps.ts to keep that file under the architecture line cap.
+ */
+import { legacyUnitNote, MANAGED_SERVICE_NAME } from '../../runtime/legacy-daemon-migration.ts';
+import { normalizeText } from './onboarding-wizard-helpers.ts';
+import type { OnboardingWizardControllerLike } from './onboarding-wizard-types.ts';
+import type { OnboardingWizardFieldDefinition } from './onboarding-wizard-types.ts';
+
+export const DAEMON_SOURCE_FIELD_ID = 'network.daemon-source';
+
+/** Current daemon-source selection ('start' default, or 'adopt'). */
+export function getDaemonSource(controller: OnboardingWizardControllerLike): string {
+  return controller.getStringFieldValue(DAEMON_SOURCE_FIELD_ID, 'start');
+}
+
+/**
+ * Push the daemon-source radio, plus the host/port/token/connect fields when
+ * 'adopt' is selected, onto the Network step's field list. Independent of the
+ * local/custom network mode — adopting someone else's daemon is a client-side
+ * choice about which daemon THIS TUI talks to, not about how THIS TUI's own
+ * daemon binds to the network.
+ */
+export function pushDaemonAdoptionFields(
+  fields: OnboardingWizardFieldDefinition[],
+  controller: OnboardingWizardControllerLike,
+  daemonSource: string,
+  bindSettings: { readonly controlPlane: { readonly host?: string | undefined; readonly port?: number | undefined } } | undefined,
+): void {
+  fields.push({
+    kind: 'radio',
+    id: DAEMON_SOURCE_FIELD_ID,
+    label: 'GoodVibes daemon source',
+    hint: 'Start a new daemon owned by this TUI (default), or connect to one that is already running elsewhere with a known token.',
+    options: [
+      { id: 'start', label: 'Start a new daemon', hint: 'This TUI starts and owns its own daemon (default).' },
+      { id: 'adopt', label: 'Connect to an existing running daemon', hint: 'Point this TUI at a daemon someone already started, using its host, port, and token.' },
+    ],
+    defaultValue: 'start',
+  });
+  if (daemonSource !== 'adopt') return;
+  fields.push(
+    {
+      kind: 'text',
+      id: 'network.adopt-daemon-host',
+      label: 'Existing daemon host',
+      hint: 'Host or IP address of the already-running GoodVibes daemon.',
+      placeholder: '127.0.0.1',
+      defaultValue: controller.getStringFieldValue('network.adopt-daemon-host', normalizeText(bindSettings?.controlPlane.host) || '127.0.0.1'),
+    },
+    {
+      kind: 'text',
+      id: 'network.adopt-daemon-port',
+      label: 'Existing daemon port',
+      hint: 'Port the already-running GoodVibes daemon is bound to.',
+      placeholder: '3421',
+      defaultValue: controller.getStringFieldValue('network.adopt-daemon-port', String(bindSettings?.controlPlane.port ?? 3421)),
+    },
+    {
+      kind: 'masked',
+      id: 'network.adopt-daemon-token',
+      label: 'Existing daemon token',
+      hint: "Bearer token that daemon was started with. Connecting writes it into this home directory's operator-tokens.json so this TUI authenticates as that daemon instead of minting its own.",
+      placeholder: 'gv_...',
+      defaultValue: controller.getStringFieldValue('network.adopt-daemon-token', ''),
+    },
+    {
+      kind: 'action',
+      id: 'network.adopt-daemon-connect',
+      label: 'Connect to this daemon now',
+      hint: 'Apply the host/port above, install the token, and verify the connection immediately (before Apply at the end of the wizard). Result prints to the feed below.',
+      action: 'connect-existing-daemon',
+      defaultValue: 'Connect',
+    },
+  );
+}
+
+/**
+ * W4-D1: the guided, visible entry point for migrating a detected legacy
+ * `goodvibes-daemon.service` unit — closes the fast-follow-up flagged when
+ * `handleMigrateLegacyDaemonServiceForHandler` (handler-onboarding-daemon-adopt.ts)
+ * shipped fully built but not wired to any onboarding control. Independent of
+ * the daemon-source radio above: this offers to retire an old unmanaged unit
+ * regardless of whether the wizard is set to start a new daemon or adopt an
+ * existing one.
+ *
+ * Visible ONLY when the runtime snapshot's read-only `legacyDaemon` detection
+ * (collected via `detectLegacyUnit`, see `../../runtime/legacy-daemon-migration.ts`)
+ * found a unit file present — never rendered speculatively. Confirm-gated on
+ * top of the engine's own consent requirement: a checklist toggle must be
+ * checked before the action executes the real migration (`confirmMigration:
+ * true`); left unchecked, pressing the action still works but only prints the
+ * engine's dry-run plan (`confirmMigration: false`) — see
+ * `runLegacyDaemonMigration`'s honest dry-run branch. The action label and
+ * hint change to make which mode is armed unambiguous before it is pressed.
+ */
+export function pushLegacyDaemonMigrationFields(
+  fields: OnboardingWizardFieldDefinition[],
+  controller: OnboardingWizardControllerLike,
+): void {
+  const legacy = controller.runtimeSnapshot?.legacyDaemon;
+  if (!legacy || !legacy.present) return;
+
+  fields.push({
+    kind: 'status',
+    id: 'network.migrate-legacy-daemon-detected',
+    label: 'Legacy daemon service detected',
+    // F2 follow-up: name the unit this host actually resolves (carried on the
+    // snapshot from `resolveConfiguredServiceName` at collection time) — the
+    // MANAGED_SERVICE_NAME fallback only covers snapshots built without it.
+    hint: legacyUnitNote(legacy, legacy.trackedServiceName ?? MANAGED_SERVICE_NAME),
+    defaultValue: legacy.active ? 'Installed and running' : 'Installed (not active)',
+  });
+
+  const confirmFieldId = 'network.migrate-legacy-daemon-confirm';
+  const confirmed = controller.getBooleanFieldValue(confirmFieldId, false);
+  fields.push({
+    kind: 'checklist',
+    id: confirmFieldId,
+    label: 'Confirm migration execution',
+    hint: 'When checked, the action below performs the real migration: install and start the new managed service, verify it comes up healthy, and only then stop, disable, and remove the legacy unit. Leave unchecked to preview the plan without changing anything.',
+    defaultValue: false,
+  });
+  fields.push({
+    kind: 'action',
+    id: 'network.migrate-legacy-daemon',
+    label: confirmed ? 'Migrate legacy daemon service now' : 'Preview migration plan',
+    hint: confirmed
+      ? 'Executes the migration now: new-up-then-old-down, never touching the legacy unit until the new one is verified healthy. Result prints to the feed below.'
+      : 'Prints the migration plan without changing anything. Check "Confirm migration execution" above to arm the real migration.',
+    action: 'migrate-legacy-daemon-service',
+    defaultValue: confirmed ? 'Migrate' : 'Preview',
+  });
+}

package/src/input/onboarding/onboarding-wizard-steps.ts

@@ -9,6 +9,7 @@ import {
   type ExternalSurfaceSpec,
 } from './onboarding-wizard-external-surfaces.ts';
 import { countSelected, modelSelectionLabel, normalizeText } from './onboarding-wizard-helpers.ts';
+import { getDaemonSource, pushDaemonAdoptionFields, pushLegacyDaemonMigrationFields } from './onboarding-wizard-network-adopt.ts';
 import type { OnboardingWizardControllerLike } from './onboarding-wizard-types.ts';
 import type { OnboardingWizardAcknowledgementFieldDefinition, OnboardingWizardActionFieldDefinition, OnboardingWizardChecklistFieldDefinition, OnboardingWizardExternalSurfaceStepId, OnboardingWizardFieldDefinition, OnboardingWizardModelPickerFieldDefinition, OnboardingWizardRadioFieldDefinition, OnboardingWizardRadioOption, OnboardingWizardStepDefinition } from './onboarding-wizard-types.ts';
 
@@ -123,7 +124,7 @@ export function buildCapabilitiesStep(controller: OnboardingWizardControllerLike
         id: 'capabilities.clear',
         action: 'clear-capabilities',
         label: 'Use Local TUI Only (No Servers)',
-        hint: 'Clear all server-backed capabilities and keep GoodVibes in this terminal only.',
+        hint: 'Clear all server-backed capabilities: no browser access, LAN reachability, webhooks/events, or external app surfaces. The loopback-only background daemon still runs by default.',
         defaultValue: 'Action',
       },
     ];
@@ -518,11 +519,7 @@ export function buildNetworkStep(controller: OnboardingWizardControllerLike): On
     const listenerEnabled = controller.shouldExposeHttpListenerNetworkFields();
     const listenerWillApply = controller.shouldEnableHttpListener();
     const controlPlaneRemote = controller.shouldExposeControlPlaneNetwork();
-    const networkEnabled = {
-      controlPlane: controlPlaneRemote,
-      httpListener: listenerEnabled,
-      web: browserEnabled,
-    };
+    const networkEnabled = { controlPlane: controlPlaneRemote, httpListener: listenerEnabled, web: browserEnabled };
     const mode = controller.getStringFieldValue('network.mode', controller.runtimeDerived.step1_5NetworkMode);
     const custom = mode === 'custom';
     const fields: OnboardingWizardFieldDefinition[] = [
@@ -536,6 +533,11 @@ export function buildNetworkStep(controller: OnboardingWizardControllerLike): On
       },
     ];
 
+    // F1: recognize an adoptable already-running daemon (see onboarding-wizard-network-adopt.ts).
+    const daemonSource = getDaemonSource(controller);
+    pushDaemonAdoptionFields(fields, controller, daemonSource, bindSettings);
+    pushLegacyDaemonMigrationFields(fields, controller);
+
     if (custom) {
       const sharedIpField: OnboardingWizardChecklistFieldDefinition = {
         kind: 'checklist',
@@ -635,6 +637,7 @@ export function buildNetworkStep(controller: OnboardingWizardControllerLike): On
       summaryTitle: 'Bind posture',
       summaryLines: [
         `Mode: ${custom ? 'custom' : 'local network default'}`,
+        `Daemon source: ${daemonSource === 'adopt' ? 'connect to an existing running daemon' : 'start a new daemon'}`,
         `Browser surface: ${browserEnabled ? 'enabled' : 'not selected'}`,
         `HTTP listener: ${listenerWillApply ? 'enabled' : listenerEnabled ? 'available for selected external apps' : 'not selected'}`,
       ],

package/src/input/onboarding/onboarding-wizard-types.ts

@@ -53,7 +53,9 @@ export type OnboardingWizardAction =
   | 'cloudflare-verify'
   | 'cloudflare-disable'
   | 'start-openai-subscription'
-  | 'finish-openai-subscription';
+  | 'finish-openai-subscription'
+  | 'connect-existing-daemon'
+  | 'migrate-legacy-daemon-service';
 
 export type OnboardingWizardApplyFeedbackSeverity = 'info' | 'warning' | 'error';