fix(known-hosts): make virtualized grid cards keyboard-focusable

Grid HostItem roots now set data-vault-focus-target + tabIndex like list
mode so VirtualizedHostCollection arrow-key focus works at 30+ hosts.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

application/app/AppActiveTabChrome.tsx

@@ -7,7 +7,6 @@ import {
 } from '../state/activeTabStore';
 import { updateActiveChromeThemeDeps } from '../state/activeChromeThemeSync';
 import { useActiveChromeTheme } from '../state/useActiveChromeTheme';
-import { useAppearanceChromeStore } from '../state/appearanceChromeStore';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 import { resolveActiveChromeTheme } from './activeChromeTheme';
 import type { TerminalAppearanceHostScope, ResolvedAppearance } from '../../domain/terminalAppearanceRuntime';
@@ -20,7 +19,7 @@ import type {
 import type { LogView } from '../state/logViewState';
 import type { EditorTabChrome } from '../state/editorTabStore';
 
-export interface AppActiveTabChromeProps {
+interface AppActiveTabChromeProps {
   showSftpTab: boolean;
   setActiveTabId: (id: string) => void;
   applyAppTheme: () => void;
@@ -30,6 +29,8 @@ export interface AppActiveTabChromeProps {
   workspaceById: Map<string, Workspace>;
   currentTerminalTheme: TerminalTheme;
   followAppTerminalTheme: boolean;
+  accentMode: 'theme' | 'custom';
+  customAccent: string;
   editorTabs: readonly EditorTabChrome[];
   logViews: readonly LogView[];
   resolveSessionAppearance?: (hostScope: TerminalAppearanceHostScope) => ResolvedAppearance;
@@ -43,9 +44,6 @@ export interface AppActiveTabChromeProps {
  * re-renders this null-rendering component (and the self-subscribing leaves)
  * instead of forcing the entire App tree (which holds all vault/session/
  * settings state and rebuilds the giant AppView ctx) to re-render.
- *
- * Accent comes from appearanceChromeStore so color-picker drag does not
- * rebuild AppShell chrome props.
  */
 export function AppActiveTabChrome({
   showSftpTab,
@@ -57,13 +55,14 @@ export function AppActiveTabChrome({
   workspaceById,
   currentTerminalTheme,
   followAppTerminalTheme,
+  accentMode,
+  customAccent,
   editorTabs,
   logViews,
   resolveSessionAppearance,
   t,
 }: AppActiveTabChromeProps) {
   const activeTabId = useActiveTabId();
-  const { accentMode, customAccent } = useAppearanceChromeStore();
 
   useEffect(() => {
     if (!showSftpTab && activeTabId === 'sftp') {

application/app/AppFollowTerminalTheme.test.ts

@@ -2,8 +2,7 @@ import assert from "node:assert/strict";
 import { readFileSync } from "node:fs";
 import test from "node:test";
 
-const appSideEffectsSource = readFileSync(new URL("./AppSideEffects.tsx", import.meta.url), "utf8");
-const terminalHostSource = readFileSync(new URL("./hosts/TerminalHost.tsx", import.meta.url), "utf8");
+const appSource = readFileSync(new URL("../../App.tsx", import.meta.url), "utf8");
 const appViewSource = readFileSync(new URL("./AppView.tsx", import.meta.url), "utf8");
 const runtimeSource = readFileSync(new URL("../state/useThemeRuntime.ts", import.meta.url), "utf8");
 const settingsSource = readFileSync(new URL("../state/useSettingsState.ts", import.meta.url), "utf8");
@@ -14,32 +13,28 @@ test("follow-app terminal theme selection updates the matching UI theme via Them
   assert.match(runtimeSource, /setLightUiThemeId\(update\.uiThemeId\)/);
   assert.match(runtimeSource, /setTheme\(update\.appTheme\)/);
   assert.doesNotMatch(runtimeSource, /isFollowAppIntentSettled\(userIntent\.themeId/);
-  assert.match(terminalHostSource, /useThemeRuntime\(/);
-  assert.match(terminalHostSource, /pickTerminalTheme\(themeId\)/);
-  assert.match(terminalHostSource, /pickTheme: pickTerminalTheme/);
-  // Theme members are listed field-by-field on the TerminalHost bag (not themeRuntime bag).
-  assert.match(terminalHostSource, /clearThemeIntent,/);
-  assert.match(terminalHostSource, /settleManualThemeIntent,/);
-  assert.match(terminalHostSource, /pickTerminalTheme,/);
-  assert.match(terminalHostSource, /resolveSessionAppearance: resolveFocusedAppearance/);
+  assert.match(appSource, /useThemeRuntime\(/);
+  assert.match(appSource, /pickTerminalTheme\(themeId\)/);
+  assert.match(appSource, /pickTheme: pickTerminalTheme/);
+  // Domain deps must use stable members, not the whole themeRuntime bag.
+  assert.match(appSource, /clearThemeIntent, settleManualThemeIntent, pickTerminalTheme, resolveFocusedAppearance/);
   assert.doesNotMatch(
-    terminalHostSource,
+    appSource,
     /followAppTerminalTheme, themeRuntime, handleConnectSerial/,
   );
   // Terminal domain must not thrash on whole settings bag identity.
-  assert.match(terminalHostSource, /sshDebugLogsEnabled:/);
+  assert.match(appSource, /sshDebugLogsEnabled,/);
   assert.doesNotMatch(
-    terminalHostSource,
+    appSource,
     /splitSessionWithCurrentShell, settings, terminalFontFamilyId/,
   );
   // Hotkey path must not depend on whole settings/sessions for callback identity.
-  assert.match(appSideEffectsSource, /showSftpTab: showSftpTabRef\.current/);
-  assert.match(appSideEffectsSource, /sessions: sessionsRef\.current/);
-  assert.match(appSideEffectsSource, /connectionLogs: connectionLogsRef\.current/);
-  assert.match(terminalHostSource, /useTerminalAppearanceInjection/);
-  assert.match(terminalHostSource, /includeChromeSurfaces: followAppTerminalTheme/);
-  assert.match(terminalHostSource, /useTerminalAppearanceInjection\(accentedGlobalAppearance/);
-  assert.match(terminalHostSource, /clearThemeIntent\(\)/);
+  assert.match(appSource, /showSftpTab: showSftpTabRef\.current/);
+  assert.match(appSource, /sessions: sessionsRef\.current/);
+  assert.match(appSource, /connectionLogs: connectionLogsRef\.current/);
+  assert.match(appSource, /useTerminalAppearanceInjection/);
+  assert.match(appSource, /includeChromeSurfaces: followAppTerminalTheme/);
+  assert.match(appSource, /clearThemeIntent\(\)/);
   assert.match(runtimeSource, /injectTerminalAppearanceVars\(appearance\.theme, \{ includeChromeSurfaces \}\)/);
   assert.doesNotMatch(settingsSource, /pendingFollowAppTerminalThemeId/);
   assert.doesNotMatch(settingsSource, /applyFollowAppTerminalThemePick/);
@@ -48,10 +43,10 @@ test("follow-app terminal theme selection updates the matching UI theme via Them
   assert.match(appViewSource, /pickTerminalTheme=\{ctx\.pickTerminalTheme\}/);
 });
 
-test("default terminal theme selection persists via TerminalHost", () => {
-  // Product path lives on TerminalHost; AppSideEffects no longer owns this handler.
-  assert.match(terminalHostSource, /const handleDefaultTerminalThemeChange = useCallback\(\(themeId: string\) => \{/);
-  assert.match(terminalHostSource, /setTerminalThemeId\(themeId\)/);
-  assert.match(terminalHostSource, /TERMINAL_THEME_AUTO/);
+test("default terminal theme selection clears the current mode override", () => {
+  assert.match(appSource, /const handleDefaultTerminalThemeChange = useCallback\(\(themeId: string\) => \{/);
+  assert.match(appSource, /setTerminalThemeId\(themeId\)/);
+  assert.match(appSource, /resolvedTheme === 'dark'[\s\S]*setTerminalThemeDarkId\(TERMINAL_THEME_AUTO\)/);
+  assert.match(appSource, /setTerminalThemeLightId\(TERMINAL_THEME_AUTO\)/);
   assert.match(appViewSource, /onUpdateTerminalThemeId=\{handleDefaultTerminalThemeChange\}/);
 });

application/app/AppHostTreeLayer.tsx

@@ -1,7 +1,6 @@
 import React, { memo, useMemo } from 'react';
 
 import { useActiveTabId } from '../state/activeTabStore';
-import { useAppearanceChromeStore } from '../state/appearanceChromeStore';
 import type { EditorTabChrome } from '../state/editorTabStore';
 import type { LogView } from '../state/logViewState';
 import { useManualTerminalChromeSurfaceInjection } from '../state/useManualTerminalChromeSurfaceInjection';
@@ -27,7 +26,9 @@ interface AppHostTreeLayerProps {
   editorTabs: readonly EditorTabChrome[];
   logViews: readonly LogView[];
   orderedTabs: readonly string[];
+  accentMode: 'theme' | 'custom';
   currentTerminalTheme: TerminalTheme;
+  customAccent: string;
   followAppTerminalTheme: boolean;
   hostById: ReadonlyMap<string, Host>;
   themeById: ReadonlyMap<string, TerminalTheme>;
@@ -59,9 +60,9 @@ function appHostTreeLayerAreEqual(
     && prev.editorTabs === next.editorTabs
     && prev.logViews === next.logViews
     && prev.orderedTabs === next.orderedTabs
-    // accentMode / customAccent intentionally omitted — read from
-    // appearanceChromeStore so accent drag does not rebuild the App shell.
+    && prev.accentMode === next.accentMode
     && prev.currentTerminalTheme === next.currentTerminalTheme
+    && prev.customAccent === next.customAccent
     && prev.followAppTerminalTheme === next.followAppTerminalTheme
     && prev.hostById === next.hostById
     && prev.themeById === next.themeById
@@ -82,7 +83,9 @@ const AppHostTreeLayerInner: React.FC<AppHostTreeLayerProps> = ({
   editorTabs,
   logViews,
   orderedTabs,
+  accentMode,
   currentTerminalTheme,
+  customAccent,
   followAppTerminalTheme,
   hostById,
   themeById,
@@ -93,7 +96,6 @@ const AppHostTreeLayerInner: React.FC<AppHostTreeLayerProps> = ({
   onCreateLocalTerminal,
 }) => {
   const activeTabId = useActiveTabId();
-  const { accentMode, customAccent } = useAppearanceChromeStore();
   const sessionIds = useMemo(() => new Set(sessions.map((session) => session.id)), [sessions]);
   const workspaceIds = useMemo(() => new Set(workspaces.map((workspace) => workspace.id)), [workspaces]);
   const logViewIds = useMemo(() => new Set(logViews.map((logView) => logView.id)), [logViews]);

application/app/AppLocalState.tsx

@@ -1,13 +0,0 @@
-import type { ReactNode } from 'react';
-
-/**
- * Owns dialog / queue / ephemeral React state for the main window.
- *
- * The concrete state currently lives in `AppSideEffects` (same React tree)
- * and is published into `appLocalUiStore` for Host islands. This provider is
- * the composition slot the architecture requires so App itself never owns
- * domain bags or mega-hook subscriptions.
- */
-export function AppLocalStateProvider({ children }: { children: ReactNode }) {
-  return <>{children}</>;
-}

application/app/AppMounts.test.ts

@@ -53,12 +53,10 @@ test('vault activation suppresses inherited text color transitions', () => {
 });
 
 test('vault surface carries app theme vars while terminal chrome is active', () => {
-  const appThemeStyleSource = readFileSync(new URL('./useAppThemeStyle.ts', import.meta.url), 'utf8');
   assert.match(appMountsSource, /appThemeStyle\?: React\.CSSProperties/);
   assert.match(appMountsSource, /style=\{\{ \.\.\.appThemeStyle, \.\.\.containerStyle \}\}/);
-  assert.match(appThemeStyleSource, /buildAppThemeCssVars\(tokens, accentMode, customAccent\)/);
-  assert.match(appThemeStyleSource, /useAppearanceChromeStore/);
-  assert.match(appViewSource, /VaultThemedSurface|useAppThemeStyle|appThemeStyle/);
+  assert.match(appViewSource, /buildAppThemeCssVars\(tokens, accentMode, customAccent\)/);
+  assert.match(appViewSource, /<VaultViewContainer appThemeStyle=\{appThemeStyle\}>/);
 });
 
 test('active tab chrome keeps removed theme side effects unmounted', () => {

application/app/AppShell.architecture.test.ts

@@ -1,224 +0,0 @@
-import assert from 'node:assert/strict';
-import { existsSync, readFileSync, readdirSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import test from 'node:test';
-
-const here = dirname(fileURLToPath(import.meta.url));
-const appShellSource = readFileSync(join(here, 'AppShell.tsx'), 'utf8');
-const appSource = readFileSync(join(here, '../../App.tsx'), 'utf8');
-const vaultPublisherSource = readFileSync(join(here, 'publishers/VaultPublisher.tsx'), 'utf8');
-const sessionPublisherSource = readFileSync(join(here, 'publishers/SessionPublisher.tsx'), 'utf8');
-const settingsPublisherSource = readFileSync(join(here, 'publishers/SettingsPublisher.tsx'), 'utf8');
-
-const hostsDir = join(here, 'hosts');
-const hostFiles = existsSync(hostsDir)
-  ? readdirSync(hostsDir).filter((name) => name.endsWith('.tsx') || name.endsWith('.ts'))
-  : [];
-const hostSources = Object.fromEntries(
-  hostFiles.map((name) => [name, readFileSync(join(hostsDir, name), 'utf8')]),
-);
-
-const MEGA_HOOKS = ['useVaultState', 'useSessionState', 'useSettingsState'] as const;
-const APP_RUNTIME_HOOKS = [
-  'useAppVaultRuntime',
-  'useAppSessionRuntime',
-  'useAppSettingsRuntime',
-] as const;
-
-test('AppShell does not co-host the vault/session/settings mega hooks', () => {
-  for (const hook of MEGA_HOOKS) {
-    assert.doesNotMatch(
-      appShellSource,
-      new RegExp(`${hook}\\s*\\(`),
-      `AppShell must not call ${hook}(); Hosts subscribe to stores instead`,
-    );
-  }
-});
-
-test('AppShell composes the four Host islands', () => {
-  assert.match(appShellSource, /<VaultHost\b/);
-  assert.match(appShellSource, /<TerminalHost\b/);
-  assert.match(appShellSource, /<ChromeHost\b/);
-  assert.match(appShellSource, /<DialogsHost\b/);
-});
-
-test('AppShell renders the shell from store-backed bags only', () => {
-  assert.match(appShellSource, /useSyncExternalStore|useAppShellProps/);
-  assert.match(appShellSource, /appViewDomainsEqual/);
-  assert.match(appShellSource, /<AppView domains=\{domains\} \/>/);
-  assert.match(appShellSource, /<AppActiveTabChrome \{\.\.\.chrome\} \/>/);
-});
-
-test('App renders through AppShell and owns no domain bags', () => {
-  assert.match(appSource, /<AppShell\b/);
-  assert.doesNotMatch(appSource, /<AppView\b/);
-  assert.doesNotMatch(appSource, /<AppActiveTabChrome\b/);
-  assert.doesNotMatch(appSource, /<ConfirmDialog\b/);
-  assert.doesNotMatch(appSource, /<PortForwardHostKeyDialog\b/);
-  assert.doesNotMatch(appSource, /appVaultDomain\s*=/);
-  assert.doesNotMatch(appSource, /appTerminalDomain\s*=/);
-  assert.doesNotMatch(appSource, /appChromeDomain\s*=/);
-  assert.doesNotMatch(appSource, /appDialogsDomain\s*=/);
-});
-
-test('App.tsx does not subscribe to vault/session/settings runtimes or mega hooks', () => {
-  for (const hook of MEGA_HOOKS) {
-    assert.doesNotMatch(appSource, new RegExp(`\\b${hook}\\s*\\(`));
-  }
-  for (const hook of APP_RUNTIME_HOOKS) {
-    assert.doesNotMatch(
-      appSource,
-      new RegExp(`\\b${hook}\\s*\\(`),
-      `App.tsx must not call ${hook}(); move subscriptions into Hosts / AppSideEffects`,
-    );
-  }
-  assert.match(appSource, /<VaultPublisher>/);
-  assert.match(appSource, /<SessionPublisher\b/);
-  assert.match(appSource, /<SettingsPublisher\b/);
-  assert.match(appSource, /<AppSideEffects\b/);
-});
-
-test('publishers own the mega hooks and store fan-out', () => {
-  assert.match(vaultPublisherSource, /\buseVaultState\s*\(/);
-  assert.match(sessionPublisherSource, /\buseSessionState\s*\(/);
-  assert.match(settingsPublisherSource, /\buseSettingsState\s*\(/);
-  assert.match(vaultPublisherSource, /publishVaultSnapshot\(/);
-  assert.match(vaultPublisherSource, /registerVaultSnapshotActions\(/);
-  assert.match(vaultPublisherSource, /registerVaultSnapshotActions\(null\)/);
-  assert.match(sessionPublisherSource, /publishSessionSnapshot\(/);
-  assert.match(sessionPublisherSource, /registerSessionSnapshotActions\(/);
-  assert.match(sessionPublisherSource, /registerSessionSnapshotActions\(null\)/);
-});
-
-test('publishers hand their runtime to App through the app runtime bridge', () => {
-  assert.match(vaultPublisherSource, /registerAppVaultRuntime\(vault\)/);
-  assert.match(vaultPublisherSource, /registerAppVaultRuntime\(null\)/);
-  assert.match(vaultPublisherSource, /<AppVaultRuntimeContext\.Provider value=\{vaultForApp\}>/);
-  assert.match(vaultPublisherSource, /notes: _notes/);
-  assert.match(vaultPublisherSource, /connectionLogs: _connectionLogs/);
-
-  assert.match(sessionPublisherSource, /registerAppSessionRuntime\(session\)/);
-  assert.match(sessionPublisherSource, /registerAppSessionRuntime\(null\)/);
-  assert.match(sessionPublisherSource, /<AppSessionRuntimeContext\.Provider value=\{session\}>/);
-
-  assert.match(settingsPublisherSource, /registerAppSettingsRuntime\(settings\)/);
-  assert.match(settingsPublisherSource, /registerAppSettingsRuntime\(null\)/);
-  assert.match(settingsPublisherSource, /<AppSettingsRuntimeContext\.Provider value=\{settings\}>/);
-});
-
-test('VaultHost builds from vault snapshot stores', () => {
-  const source = hostSources['VaultHost.tsx'];
-  assert.ok(source, 'application/app/hosts/VaultHost.tsx must exist');
-  assert.match(source, /useVaultSnapshot/);
-  assert.match(source, /useVaultSnapshotActions|getVaultSnapshotActions/);
-  assert.doesNotMatch(source, /\buseVaultState\s*\(/);
-  assert.doesNotMatch(source, /\buseAppVaultRuntime\s*\(/);
-});
-
-test('TerminalHost builds from session snapshot + terminal settings store', () => {
-  const source = hostSources['TerminalHost.tsx'];
-  assert.ok(source, 'application/app/hosts/TerminalHost.tsx must exist');
-  assert.match(source, /useSessionSnapshot/);
-  assert.match(source, /useSessionSnapshotActions|getSessionSnapshotActions/);
-  assert.match(source, /useTerminalSettingsStore|getTerminalSettingsSnapshot/);
-  assert.doesNotMatch(source, /\buseSessionState\s*\(/);
-  assert.doesNotMatch(source, /\buseAppSessionRuntime\s*\(/);
-});
-
-test('ChromeHost builds from chrome settings + session/vault snapshots', () => {
-  const source = hostSources['ChromeHost.tsx'];
-  assert.ok(source, 'application/app/hosts/ChromeHost.tsx must exist');
-  assert.match(source, /useSettingsChromeStore|getSettingsChromeSnapshot/);
-  assert.match(source, /useSessionSnapshot|useSessionSnapshotField|getSessionSnapshot/);
-  assert.match(source, /useVaultSnapshot|useVaultSnapshotField|getVaultSnapshot/);
-  assert.doesNotMatch(source, /\buseSettingsState\s*\(/);
-  assert.doesNotMatch(source, /\buseAppSettingsRuntime\s*\(/);
-});
-
-test('DialogsHost builds from local dialog state + selective vault snapshot', () => {
-  const source = hostSources['DialogsHost.tsx'];
-  assert.ok(source, 'application/app/hosts/DialogsHost.tsx must exist');
-  assert.match(source, /useVaultSnapshot|useVaultSnapshotField|getVaultSnapshot/);
-  assert.doesNotMatch(source, /\buseVaultState\s*\(/);
-  assert.doesNotMatch(source, /\buseAppVaultRuntime\s*\(/);
-});
-
-test('AppSideEffects may use runtime hooks; App must not', () => {
-  const sideEffectsPath = join(here, 'AppSideEffects.tsx');
-  assert.ok(existsSync(sideEffectsPath), 'application/app/AppSideEffects.tsx must exist');
-  const sideEffectsSource = readFileSync(sideEffectsPath, 'utf8');
-  assert.doesNotMatch(sideEffectsSource, /\bfunction App\b|\bconst App\b/);
-  assert.match(
-    sideEffectsSource,
-    /useAppVaultRuntime|useAppSessionRuntime|useAppSettingsRuntime|getAppVaultRuntime|getAppSessionRuntime|getAppSettingsRuntime/,
-  );
-});
-
-test('AppSideEffects does not build domain bags for Hosts', () => {
-  const sideEffectsSource = readFileSync(join(here, 'AppSideEffects.tsx'), 'utf8');
-  assert.doesNotMatch(sideEffectsSource, /appVaultDomain\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appTerminalDomain\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appChromeDomain\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appDialogsDomain\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appMountsDomain\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appViewDomains\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appShellChrome\s*=/);
-  assert.doesNotMatch(sideEffectsSource, /appShellOverlays\s*=/);
-  // Flat glue only — no prepared domain bags on the handlers bridge.
-  assert.doesNotMatch(sideEffectsSource, /vaultDomain\s*:/);
-  assert.doesNotMatch(sideEffectsSource, /terminalDomain\s*:/);
-  assert.doesNotMatch(sideEffectsSource, /chromeDomain\s*:/);
-  assert.doesNotMatch(sideEffectsSource, /dialogsDomain\s*:/);
-  assert.doesNotMatch(sideEffectsSource, /mountsDomain\s*:/);
-  assert.match(sideEffectsSource, /registerAppHandlers\s*\(/);
-  assert.match(sideEffectsSource, /publishAppLocalUi\s*\(/);
-});
-
-test('Hosts assemble bags field-by-field without spreading prepared domains', () => {
-  for (const name of ['VaultHost.tsx', 'TerminalHost.tsx', 'ChromeHost.tsx', 'DialogsHost.tsx']) {
-    const source = hostSources[name];
-    assert.ok(source, `application/app/hosts/${name} must exist`);
-    assert.doesNotMatch(
-      source,
-      /handlers\?\.(vault|terminal|chrome|dialogs)Domain|handlers\?\.appShellChrome|handlers\?\.appShellOverlays/,
-      `${name} must not read prepared *Domain / appShell* bags from handlers`,
-    );
-    assert.doesNotMatch(
-      source,
-      /\.\.\.\s*prepared/,
-      `${name} must not spread a prepared domain bag`,
-    );
-    assert.match(source, /getAppHandlers|subscribeAppHandlers/);
-  }
-});
-
-test('published Host bags omit notes, accent, and connectionLogs churn fields', () => {
-  const vaultHost = hostSources['VaultHost.tsx'];
-  const terminalHost = hostSources['TerminalHost.tsx'];
-  assert.ok(vaultHost && terminalHost);
-
-  // Notes / connection logs live in dedicated stores — VaultHost must not
-  // publish them into the vault domain bag that AppView consumes.
-  assert.doesNotMatch(vaultHost, /\bnotes\s*,/);
-  assert.doesNotMatch(vaultHost, /\bconnectionLogs\s*,/);
-  assert.doesNotMatch(vaultHost, /notesStore|connectionLogsStore|useNotesStore|useConnectionLogs/);
-
-  // Accent feeds useThemeRuntime for local injection only; the published
-  // terminal domain bag must not list accentMode/customAccent fields.
-  const domainStart = terminalHost.indexOf('const terminalDomain = useMemo');
-  assert.notEqual(domainStart, -1);
-  const domain = terminalHost.slice(domainStart, terminalHost.indexOf('useLayoutEffect(() => {\n    if (terminalDomain)', domainStart));
-  assert.doesNotMatch(domain, /accentMode/);
-  assert.doesNotMatch(domain, /customAccent/);
-  assert.match(domain, /currentTerminalTheme,/);
-  assert.match(
-    terminalHost,
-    /useTerminalAppearanceInjection\(accentedGlobalAppearance/,
-  );
-});
-
-test('AppShell uses default memo (store-driven), not always-rerender comparator', () => {
-  assert.match(appShellSource, /memo\s*\(\s*AppShellView\s*\)/);
-  assert.doesNotMatch(appShellSource, /memo\s*\(\s*AppShellView\s*,\s*\(\s*\)\s*=>\s*false\s*\)/);
-});

application/app/AppShell.tsx

@@ -1,68 +0,0 @@
-import { memo } from 'react';
-
-import { useI18n } from '../i18n/I18nProvider';
-import { ConfirmDialog } from '../../components/ui/confirm-dialog';
-import { PortForwardHostKeyDialog } from '../../components/port-forwarding';
-import { AppActiveTabChrome } from './AppActiveTabChrome';
-import { AppView } from './AppView';
-import {
-  useAppShellProps,
-  type AppShellOverlays,
-} from './appShellPropsStore';
-import { ChromeHost } from './hosts/ChromeHost';
-import { DialogsHost } from './hosts/DialogsHost';
-import { TerminalHost } from './hosts/TerminalHost';
-import { VaultHost } from './hosts/VaultHost';
-
-export type { AppShellOverlays };
-
-/**
- * The rendered main window. Host islands subscribe to stores and publish
- * domain / chrome / overlay bags into `appShellPropsStore`; this shell only
- * re-renders when those bag identities change (see `appViewDomainsEqual` /
- * chrome / overlays identity checks in the store).
- *
- * Default `memo` is enough: AppShell takes no props, so parent App updates
- * do not force a re-render; store subscriptions via `useAppShellProps` still
- * drive updates when Hosts publish new bag identities.
- *
- * `AppShell.architecture.test.ts` enforces Host composition and that the
- * three mega hooks never reappear here.
- */
-function AppShellView() {
-  const { t } = useI18n();
-  const { domains, chrome, overlays } = useAppShellProps();
-
-  return (
-    <>
-      <VaultHost />
-      <TerminalHost />
-      <ChromeHost />
-      <DialogsHost />
-      {domains && chrome && overlays ? (
-        <>
-          <PortForwardHostKeyDialog onAddKnownHost={overlays.onAddKnownHost} />
-          <ConfirmDialog
-            open={overlays.deleteHostConfirm !== null}
-            title={
-              overlays.deleteHostConfirm
-                ? t('confirm.deleteHost', { name: overlays.deleteHostConfirm.name })
-                : ''
-            }
-            confirmLabel={t('action.delete')}
-            destructive
-            onOpenChange={(open) => {
-              if (!open) overlays.onCancelDeleteHost();
-            }}
-            onConfirm={overlays.onConfirmDeleteHost}
-          />
-          <AppActiveTabChrome {...chrome} />
-          <AppView domains={domains} />
-        </>
-      ) : null}
-    </>
-  );
-}
-
-export const AppShell = memo(AppShellView);
-AppShell.displayName = 'AppShell';

application/app/AppSideEffects.snippetsDelete.test.ts

@@ -1,30 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { readFileSync } from "node:fs";
-
-const source = readFileSync(new URL("./AppSideEffects.tsx", import.meta.url), "utf8");
-
-test("snippets delete handler cleans host bindings via deleteSelectedSnippets", () => {
-  assert.match(source, /collectSnippetDeleteIds/);
-  assert.match(source, /deleteSelectedSnippets/);
-  assert.match(
-    source,
-    /netcatty:snippets:delete[\s\S]*void deleteSelectedSnippets\(ids\)/,
-  );
-  assert.doesNotMatch(
-    source,
-    /updateSnippets\(snippets\.filter\(\(s\) => !ids\.has\(s\.id\)\)\)/,
-  );
-});
-
-test("snippets delete handler uses vault live snapshot instead of component refs", () => {
-  // Component-level snippetsRef/hostsRef lag concurrent vault mutations that
-  // already advanced useVaultState refs before React re-renders AppSideEffects.
-  // Deletion must go through the vault hook's atomic live-snapshot path.
-  assert.match(source, /deleteSelectedSnippets,/);
-  assert.doesNotMatch(source, /snippetsRef\.current\s*=\s*snippets/);
-  assert.doesNotMatch(
-    source,
-    /deleteSelectedSnippetsFromVault\(\s*snippetsRef\.current/,
-  );
-});

application/app/AppView.tsx

@@ -24,12 +24,8 @@ import { AppHostTreeLayer } from './AppHostTreeLayer';
 import { AppHostEditorLayer } from './AppHostEditorLayer';
 import { AppPluginKeybindingHost } from './AppPluginKeybindingHost';
 import { shouldOpenHostEditOnWorkSurface } from './workTabSurface';
-import { useConnectionLogsStore } from '../state/connectionLogsStore';
-import {
-  useSettingsChromeActions,
-  useSettingsChromeStore,
-} from '../state/settingsChromeStore';
-import { useAppThemeStyle } from './useAppThemeStyle';
+import { getUiThemeById } from '../../infrastructure/config/uiThemes';
+import { buildAppThemeCssVars } from '../state/settingsStateDefaults';
 import { useMainWindowInputFocusRecovery } from '../state/useMainWindowInputFocusRecovery';
 import { useExternalMcpToggleState } from '../state/useExternalMcpToggleState';
 import { selectPluginThemeTokens } from '../state/pluginContributionEnvironment';
@@ -132,82 +128,6 @@ function RenameDraftDialog({
 }
 
 
-/**
- * Applies app theme CSS vars to the vault surface. Subscribing here (instead of
- * in AppView) keeps accent-picker drags from rebuilding the whole shell; the
- * `children` element identity is unchanged so VaultView bails out.
- */
-function AppVaultThemeSurface({
-  VaultViewContainer,
-  children,
-}: {
-  VaultViewContainer: React.ComponentType<any>;
-  children: React.ReactNode;
-}) {
-  const appThemeStyle = useAppThemeStyle();
-  return (
-    <VaultViewContainer appThemeStyle={appThemeStyle}>
-      {children}
-    </VaultViewContainer>
-  );
-}
-
-/** Plugin keybinding host with locally derived theme tokens and locale. */
-function AppPluginKeybindingThemeHost({
-  sessions,
-  workspaces,
-}: {
-  sessions: any[];
-  workspaces: any[];
-}) {
-  const appThemeStyle = useAppThemeStyle();
-  const { resolvedTheme, uiLanguage } = useSettingsChromeStore();
-  const pluginThemeTokens = useMemo(
-    () => selectPluginThemeTokens(appThemeStyle as Record<string, unknown>),
-    [appThemeStyle],
-  );
-  return (
-    <AppPluginKeybindingHost
-      locale={uiLanguage}
-      theme={resolvedTheme}
-      themeTokens={pluginThemeTokens}
-      sessions={sessions}
-      workspaces={workspaces}
-    />
-  );
-}
-
-/**
- * Log replay surface reads the latest log body from connectionLogsStore, so
- * terminal-data appends never touch the App domain bags.
- */
-function AppLogViewSurface({
-  LogViewWrapper,
-  logView,
-  defaultTerminalTheme,
-  defaultFontSize,
-  onClose,
-}: {
-  LogViewWrapper: React.ComponentType<any>;
-  logView: any;
-  defaultTerminalTheme: any;
-  defaultFontSize: number;
-  onClose: () => void;
-}) {
-  const { connectionLogs, updateConnectionLog } = useConnectionLogsStore();
-  const latestLog =
-    connectionLogs.find((log) => log.id === logView.connectionLogId) ?? logView.log;
-  return (
-    <LogViewWrapper
-      logView={{ ...logView, log: latestLog }}
-      defaultTerminalTheme={defaultTerminalTheme}
-      defaultFontSize={defaultFontSize}
-      onClose={onClose}
-      onUpdateLog={updateConnectionLog}
-    />
-  );
-}
-
 export type AppViewProps = {
   domains: AppViewDomains;
 };
@@ -256,50 +176,30 @@ function AppViewInner({ domains }: AppViewProps) {
   useMainWindowInputFocusRecovery({ onPageHidden: dismissTransientOverlays });
 
   const {
-    addShellHistoryEntry, removeShellHistoryEntry, addSessionToWorkspace, addToWorkspaceDialog, appendHostToWorkspace, appendLocalTerminalToWorkspace,
-    clearAndRemoveSource, clearAndRemoveSources, closeLogView, closeSession, closeTabsBatch, closeWorkspace, commitPluginImporterData, commitVaultImportTransaction, copySessionToNewWindowWithCurrentShell, copySessionWithCurrentShell, copyWorkspaceWithCurrentShell,
-    convertKnownHostToHost, createWorkspaceFromSessions, createWorkspaceFromTargets, createWorkspaceWithHosts,
-    customGroups, currentTerminalTheme, deepLinkHostDraft, draggingSessionId, effectiveKnownHosts, editorTabs, editorWordWrap, emptyVaultConflict,
+    accentMode, addShellHistoryEntry, removeShellHistoryEntry, addSessionToWorkspace, addToWorkspaceDialog, appendHostToWorkspace, appendLocalTerminalToWorkspace,
+    clearAndRemoveSource, clearAndRemoveSources, clearUnsavedConnectionLogs, closeLogView, closeSession, closeTabsBatch, closeWorkspace, commitPluginImporterData, commitVaultImportTransaction, copySessionToNewWindowWithCurrentShell, copySessionWithCurrentShell, copyWorkspaceWithCurrentShell,
+    connectionLogs, convertKnownHostToHost, createWorkspaceFromSessions, createWorkspaceFromTargets, createWorkspaceWithHosts, customAccent,
+    customGroups, currentTerminalTheme, deepLinkHostDraft, deleteConnectionLog, draggingSessionId, effectiveKnownHosts, editorTabs, editorWordWrap, emptyVaultConflict,
     followAppTerminalTheme,
     groupConfigs, handleAddKnownHost, handleConnectSerial, handleConnectToHost, handleCreateLocalTerminal, handleDefaultTerminalThemeChange, handleDeleteHost,
     handleEndSessionDrag, handleFollowAppTerminalThemeChange, handleHostConnectWithProtocolCheck, handleHotkeyAction, handleKeyboardInteractiveCancel, handleKeyboardInteractiveSubmit,
     handleOpenHostFromVaultNote, handleOpenQuickSwitcher, handleOpenSettings, handleOpenVaultHostFromChat, handleOpenVaultNoteFromChat, handleOpenVaultSectionFromChat, handleOpenVaultSnippetFromChat, handleRootContextMenu, handlePassphraseCancel, handlePassphraseSkip, handlePassphraseSubmit, handleProtocolSelect,
     handleRequestCloseEditorTabRef, handleSessionStatusChange, handleSyncNowManual, handleTerminalDataCapture, handleUpdateHostFromTerminal,
     hostById, hosts, terminalHosts, updateTerminalHosts, hotkeyScheme, identities, importOrReuseKey, isBroadcastEnabled, isCreateWorkspaceOpen, isMacClient, isQuickSwitcherOpen,
-    keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, openLogView, openNoteRequest, orderedTabsWithEditors, orphanSessions,
+    keyBindings, keyboardInteractiveQueue, keys, logViews, managedSources, navigateToSection, noteGroups, notes, openLogView, openNoteRequest, orderedTabsWithEditors, orphanSessions,
     passphraseQueue, protocolSelectHost, proxyProfiles, portForwardingRules, quickResults, quickSearch, removeSessionFromWorkspace, reorderWorkTabs, reorderWorkspaceSessions,
-    resolveEmptyVaultConflict, resolveSessionAppearance, runSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sshDebugLogsEnabled,
+    resolveEmptyVaultConflict, resolvedTheme, resolveSessionAppearance, runSnippet, sessionLogsDir, sessionLogsEnabled, sessionLogsFormat, sessionLogsTimestampsEnabled, sessionRenameTarget, sshDebugLogsEnabled,
     sessions, setActiveTabId, setDeepLinkHostDraft, setDraggingSessionId, setEditorWordWrap,
     setNavigateToSection, setTerminalFontFamilyId, setTerminalFontSize, setVaultFocusRequest, updateSessionFontSize, updateSessionRestoreCwd, updateSessionDynamicTitle, updateSessionCodingCliProvider, clearSessionFontSizeOverride,
-    setWorkspaceFocusedSession, sftpAutoOpenSidebar, sftpFollowTerminalCwd, setSftpFollowTerminalCwd, sftpAutoSync, sftpDefaultViewMode, sftpDoubleClickBehavior,
+    setWorkspaceFocusedSession, settings, sftpAutoOpenSidebar, sftpFollowTerminalCwd, setSftpFollowTerminalCwd, sftpAutoSync, sftpDefaultViewMode, sftpDoubleClickBehavior,
     sftpShowHiddenFiles, sftpUseCompressedUpload, snippetPackages, snippets, splitSessionWithCurrentShell, startSessionRename,
     startWorkspaceRename, submitSessionRename, submitWorkspaceRename, t, terminalFontFamilyId, terminalFontSize, terminalSettings, terminalThemeId, themeById,
-    toggleBroadcast, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, unmanageSource,
+    toggleBroadcast, toggleConnectionLogSaved, toggleScriptsSidePanelRef, toggleSidePanelRef, toggleWorkspaceViewMode, unmanageSource, updateConnectionLog,
     readPersistedHosts, readPersistedManagedSources, updateCustomGroups, updateGroupConfigs, updateHostDistro, updateHosts, updateIdentities, updateKeys, updateKnownHosts, updateManagedSources,
-    updateProxyProfiles, updateSnippetPackages, updateSnippets, updateSplitSizes, updateTerminalSetting, vaultFocusRequest, workspaceRenameTarget, workspaces,
+    updateNoteGroups, updateNotes, updateProxyProfiles, updateSnippetPackages, updateSnippets, updateSplitSizes, updateTerminalSetting, vaultFocusRequest, workspaceRenameTarget, workspaces,
     VaultViewContainer, SftpViewMount, TerminalLayerMount, LogViewWrapper,
   } = ctx;
 
-  // Chrome-visible settings slice comes from settingsChromeStore, not from the
-  // App chrome domain bag — the whole `settings` object changes identity on
-  // every settings render and would rebuild the shell.
-  const {
-    theme: themePreference,
-    resolvedTheme,
-    windowOpacity,
-    showSftpTab,
-    showHostTreeSidebar,
-    showRecentHosts,
-    hostClickBehavior,
-    showOnlyUngroupedHostsInRoot,
-    dynamicTabTitleMode,
-    disableTerminalFontZoom,
-    restoreTerminalCwd,
-    terminalSidePanelAutoOpen,
-    terminalSidePanelAutoOpenTab,
-  } = useSettingsChromeStore();
-  const { setTheme, setWindowOpacity } = useSettingsChromeActions();
-
   const handleTerminalCommandExecuted = useCallback((
     command: string,
     hostId: string,
@@ -317,6 +217,21 @@ function AppViewInner({ domains }: AppViewProps) {
     setAddToWorkspaceDialog({ mode: 'append', workspaceId });
   }, [setAddToWorkspaceDialog]);
 
+  const appThemeStyle = useMemo(() => {
+    const tokens = getUiThemeById(
+      resolvedTheme,
+      resolvedTheme === 'dark' ? settings.darkUiThemeId : settings.lightUiThemeId,
+    ).tokens;
+    return {
+      ...buildAppThemeCssVars(tokens, accentMode, customAccent),
+      colorScheme: resolvedTheme,
+    } as React.CSSProperties;
+  }, [accentMode, customAccent, resolvedTheme, settings.darkUiThemeId, settings.lightUiThemeId]);
+
+  const pluginThemeTokens = useMemo(
+    () => selectPluginThemeTokens(appThemeStyle as Record<string, unknown>),
+    [appThemeStyle],
+  );
   const isPeerSessionWindow = typeof window !== 'undefined'
     && window.location.hash.startsWith('#/session-window');
   const externalMcpToggle = useExternalMcpToggleState();
@@ -439,7 +354,7 @@ function AppViewInner({ domains }: AppViewProps) {
     <div className="flex flex-col h-screen text-foreground font-sans netcatty-shell" data-terminal-appearance-root onContextMenu={handleRootContextMenu}>
       <TopTabs
         theme={resolvedTheme}
-        themePreference={themePreference}
+        themePreference={settings.theme}
         hosts={hosts}
         sessions={sessions}
         orphanSessions={orphanSessions}
@@ -459,21 +374,21 @@ function AppViewInner({ domains }: AppViewProps) {
         onCloseLogView={closeLogView}
         onCloseTabsBatch={closeTabsBatch}
         onOpenQuickSwitcher={handleOpenQuickSwitcher}
-        onThemeChange={setTheme}
+        onThemeChange={settings.setTheme}
         onOpenSettings={handleOpenSettings}
         externalMcpEnabled={externalMcpToggle.enabled}
         onToggleExternalMcp={externalMcpToggle.setEnabled}
         showExternalMcpToggle={!isPeerSessionWindow}
-        windowOpacity={windowOpacity}
-        setWindowOpacity={setWindowOpacity}
+        windowOpacity={settings.windowOpacity}
+        setWindowOpacity={settings.setWindowOpacity}
         onSyncNow={handleSyncNowManual}
         onStartSessionDrag={setDraggingSessionId}
         onEndSessionDrag={handleEndSessionDrag}
         onReorderTabs={reorderWorkTabs}
         onRemoveSessionFromWorkspace={removeSessionFromWorkspace}
-        showSftpTab={showSftpTab}
-        showHostTreeSidebar={showHostTreeSidebar}
-        dynamicTabTitleMode={dynamicTabTitleMode}
+        showSftpTab={settings.showSftpTab}
+        showHostTreeSidebar={settings.showHostTreeSidebar}
+        dynamicTabTitleMode={settings.terminalSettings.dynamicTabTitleMode}
         editorTabs={editorTabs}
         pluginViewTabs={pluginViewTabs}
         onClosePluginViewTab={closePluginViewTab}
@@ -483,7 +398,7 @@ function AppViewInner({ domains }: AppViewProps) {
 
       <div className="flex-1 relative min-h-0">
         <AppHostTreeLayer
-          enabled={showHostTreeSidebar}
+          enabled={settings.showHostTreeSidebar}
           hosts={hosts}
           customGroups={customGroups}
           groupConfigs={groupConfigs}
@@ -492,7 +407,9 @@ function AppViewInner({ domains }: AppViewProps) {
           editorTabs={editorTabs}
           logViews={logViews}
           orderedTabs={orderedTabsWithEditors}
+          accentMode={accentMode}
           currentTerminalTheme={currentTerminalTheme}
+          customAccent={customAccent}
           followAppTerminalTheme={followAppTerminalTheme}
           hostById={hostById}
           themeById={themeById}
@@ -527,7 +444,7 @@ function AppViewInner({ domains }: AppViewProps) {
           onUpdateHosts={updateHosts}
         />
 
-        <AppVaultThemeSurface VaultViewContainer={VaultViewContainer}>
+        <VaultViewContainer appThemeStyle={appThemeStyle}>
           <VaultView
             hosts={hosts}
             keys={keys}
@@ -535,8 +452,11 @@ function AppViewInner({ domains }: AppViewProps) {
             proxyProfiles={proxyProfiles}
             snippets={snippets}
             snippetPackages={snippetPackages}
+            notes={notes}
+            noteGroups={noteGroups}
             customGroups={customGroups}
             knownHosts={effectiveKnownHosts}
+            connectionLogs={connectionLogs}
             managedSources={managedSources}
             sessionCount={sessions.filter((s) => !s.hiddenFromTabs).length}
             hotkeyScheme={hotkeyScheme}
@@ -560,6 +480,8 @@ function AppViewInner({ domains }: AppViewProps) {
             onUpdateProxyProfiles={updateProxyProfiles}
             onUpdateSnippets={updateSnippets}
             onUpdateSnippetPackages={updateSnippetPackages}
+            onUpdateNotes={updateNotes}
+            onUpdateNoteGroups={updateNoteGroups}
             onUpdateCustomGroups={updateCustomGroups}
             onCommitPluginImporterData={commitPluginImporterData}
             onUpdateKnownHosts={updateKnownHosts}
@@ -570,11 +492,14 @@ function AppViewInner({ domains }: AppViewProps) {
             onClearAndRemoveManagedSources={clearAndRemoveSources}
             onUnmanageSource={unmanageSource}
             onConvertKnownHost={convertKnownHostToHost}
+            onToggleConnectionLogSaved={toggleConnectionLogSaved}
+            onDeleteConnectionLog={deleteConnectionLog}
+            onClearUnsavedConnectionLogs={clearUnsavedConnectionLogs}
             onRunSnippet={runSnippet}
             onOpenLogView={openLogView}
-            showRecentHosts={showRecentHosts}
-            hostClickBehavior={hostClickBehavior}
-            showOnlyUngroupedHostsInRoot={showOnlyUngroupedHostsInRoot}
+            showRecentHosts={settings.showRecentHosts}
+            hostClickBehavior={settings.hostClickBehavior}
+            showOnlyUngroupedHostsInRoot={settings.showOnlyUngroupedHostsInRoot}
             navigateToSection={navigateToSection}
             onNavigateToSectionHandled={() => setNavigateToSection(null)}
             deepLinkHostDraft={deepLinkHostDraft}
@@ -583,7 +508,7 @@ function AppViewInner({ domains }: AppViewProps) {
             onVaultFocusRequestHandled={() => setVaultFocusRequest(null)}
             terminalSettings={terminalSettings}
           />
-        </AppVaultThemeSurface>
+        </VaultViewContainer>
 
         <SftpViewMount
           hosts={terminalHosts}
@@ -629,12 +554,14 @@ function AppViewInner({ domains }: AppViewProps) {
           clearThemeIntent={ctx.clearThemeIntent}
           settleManualThemeIntent={ctx.settleManualThemeIntent}
           resolveSessionAppearance={ctx.resolveSessionAppearance}
+          accentMode={accentMode}
+          customAccent={customAccent}
           terminalSettings={terminalSettings}
           terminalFontFamilyId={terminalFontFamilyId}
           fontSize={terminalFontSize}
           hotkeyScheme={hotkeyScheme}
-          disableTerminalFontZoom={disableTerminalFontZoom}
-          restoreTerminalCwd={restoreTerminalCwd}
+          disableTerminalFontZoom={settings.disableTerminalFontZoom}
+          restoreTerminalCwd={settings.restoreTerminalCwd}
           keyBindings={keyBindings}
           onHotkeyAction={handleHotkeyAction}
           onUpdateTerminalThemeId={handleDefaultTerminalThemeChange}
@@ -685,8 +612,8 @@ function AppViewInner({ domains }: AppViewProps) {
           sftpShowHiddenFiles={sftpShowHiddenFiles}
           sftpUseCompressedUpload={sftpUseCompressedUpload}
           sftpAutoOpenSidebar={sftpAutoOpenSidebar}
-          terminalSidePanelAutoOpen={terminalSidePanelAutoOpen}
-          terminalSidePanelAutoOpenTab={terminalSidePanelAutoOpenTab}
+          terminalSidePanelAutoOpen={settings.terminalSidePanelAutoOpen}
+          terminalSidePanelAutoOpenTab={settings.terminalSidePanelAutoOpenTab}
           sftpFollowTerminalCwd={sftpFollowTerminalCwd}
           setSftpFollowTerminalCwd={setSftpFollowTerminalCwd}
           editorWordWrap={editorWordWrap}
@@ -696,7 +623,7 @@ function AppViewInner({ domains }: AppViewProps) {
           sessionLogsFormat={sessionLogsFormat}
           sessionLogsTimestampsEnabled={sessionLogsTimestampsEnabled}
           sshDebugLogsEnabled={sshDebugLogsEnabled}
-          showHostTreeSidebar={showHostTreeSidebar}
+          showHostTreeSidebar={settings.showHostTreeSidebar}
           toggleScriptsSidePanelRef={toggleScriptsSidePanelRef}
           toggleSidePanelRef={toggleSidePanelRef}
           onStartSessionRename={startSessionRename}
@@ -704,18 +631,21 @@ function AppViewInner({ domains }: AppViewProps) {
           onRemoveSessionFromWorkspace={removeSessionFromWorkspace}
         />
 
-        {/* Log Views - readonly terminal replays. The latest log body comes
-            from connectionLogsStore inside AppLogViewSurface. */}
-        {logViews.map((logView: any) => (
-          <AppLogViewSurface
-            key={logView.id}
-            LogViewWrapper={LogViewWrapper}
-            logView={logView}
-            defaultTerminalTheme={currentTerminalTheme}
-            defaultFontSize={terminalFontSize}
-            onClose={() => closeLogView(logView.id)}
-          />
-        ))}
+        {/* Log Views - readonly terminal replays */}
+        {logViews.map(logView => {
+          // Get the latest log data from connectionLogs to reflect updates
+          const latestLog = connectionLogs.find(l => l.id === logView.connectionLogId) || logView.log;
+          return (
+            <LogViewWrapper
+              key={logView.id}
+              logView={{ ...logView, log: latestLog }}
+              defaultTerminalTheme={currentTerminalTheme}
+              defaultFontSize={terminalFontSize}
+              onClose={() => closeLogView(logView.id)}
+              onUpdateLog={updateConnectionLog}
+            />
+          );
+        })}
 
         {/* Editor Tabs — kept mounted for Monaco instance persistence; visibility toggled via CSS */}
         {editorTabs.map((tab) => (
@@ -732,7 +662,10 @@ function AppViewInner({ domains }: AppViewProps) {
           </LazyLoadBoundary>
         ))}
 
-        <AppPluginKeybindingThemeHost
+        <AppPluginKeybindingHost
+          locale={settings.uiLanguage}
+          theme={resolvedTheme}
+          themeTokens={pluginThemeTokens}
           sessions={sessions}
           workspaces={workspaces}
         />
@@ -823,7 +756,7 @@ function AppViewInner({ domains }: AppViewProps) {
               results={quickResults}
               sessions={sessions}
               workspaces={workspaces}
-              showSftpTab={showSftpTab}
+              showSftpTab={settings.showSftpTab}
               onQueryChange={setQuickSearch}
               onSelect={handleHostConnectWithProtocolCheck}
               onEditHost={(host) => {

application/app/activeChromeTheme.test.ts

@@ -78,30 +78,6 @@ test("editor tabs use the followed terminal theme when follow-app terminal theme
   assert.equal(resolved?.id, currentTheme.id);
 });
 
-test("follow-app chrome applies custom accent onto the published base theme", () => {
-  const editorTab = {
-    id: "editor-1",
-    hostId: "host-1",
-    sessionId: "sftp-1",
-  };
-
-  const resolved = resolveActiveChromeTheme({
-    ...baseInput,
-    accentMode: "custom",
-    customAccent: "0 100% 50%",
-    activeTabId: toEditorTabId(editorTab.id),
-    editorTabs: [editorTab as unknown as EditorTab],
-    followAppTerminalTheme: true,
-    hostById: new Map([
-      ["host-1", { id: "host-1", theme: hostTheme.id } as unknown as Host],
-    ]),
-  });
-
-  assert.equal(resolved?.id, currentTheme.id);
-  assert.notEqual(resolved?.colors.cursor, currentTheme.colors.cursor);
-  assert.notEqual(resolved, currentTheme);
-});
-
 test("log tabs use the saved log theme when available", () => {
   const resolved = resolveActiveChromeTheme({
     ...baseInput,

application/app/activeChromeTheme.ts

@@ -18,12 +18,12 @@ export type ResolveActiveChromeThemeInput = {
   customAccent: string;
   editorTabs: readonly EditorTabChrome[];
   followAppTerminalTheme: boolean;
-  hostById: ReadonlyMap<string, Host>;
+  hostById: Map<string, Host>;
   logViews: readonly LogView[];
   resolveSessionAppearance?: (hostScope: TerminalAppearanceHostScope) => ResolvedAppearance;
-  sessionById: ReadonlyMap<string, TerminalSession>;
-  themeById: ReadonlyMap<string, TerminalTheme>;
-  workspaceById: ReadonlyMap<string, Workspace>;
+  sessionById: Map<string, TerminalSession>;
+  themeById: Map<string, TerminalTheme>;
+  workspaceById: Map<string, Workspace>;
 };
 
 export function isActiveChromeThemeResolvable({
@@ -68,9 +68,7 @@ export function resolveActiveChromeTheme({
   };
 
   const resolveHostTheme = (hostId: string): TerminalTheme => {
-    if (followAppTerminalTheme) {
-      return applyCustomAccentToTerminalTheme(currentTerminalTheme, accentMode, customAccent);
-    }
+    if (followAppTerminalTheme) return currentTerminalTheme;
     if (resolveSessionAppearance) {
       return resolveSessionAppearance(resolveHostScope(hostId)).theme;
     }
@@ -92,15 +90,12 @@ export function resolveActiveChromeTheme({
   const logView = logViews.find((item) => item.id === activeTabId);
   if (logView) {
     const explicitThemeId = logView.log.themeId;
-    const base = explicitThemeId ? themeById.get(explicitThemeId) ?? currentTerminalTheme : currentTerminalTheme;
-    return applyCustomAccentToTerminalTheme(base, accentMode, customAccent);
+    return explicitThemeId ? themeById.get(explicitThemeId) ?? currentTerminalTheme : currentTerminalTheme;
   }
 
   const workspace = workspaceById.get(activeTabId);
   if (workspace) {
-    if (followAppTerminalTheme) {
-      return applyCustomAccentToTerminalTheme(currentTerminalTheme, accentMode, customAccent);
-    }
+    if (followAppTerminalTheme) return currentTerminalTheme;
 
     if (workspace.viewMode === "focus") {
       const focusedSession = resolveWorkspaceTargetSessionFromMap(workspace, sessionById);

application/app/appHandlersBridge.ts

@@ -1,64 +0,0 @@
-/**
- * Stable accessor bridge for App-local handlers that Host islands need when
- * assembling domain bags. `AppSideEffects` registers the live glue via
- * `useLayoutEffect`; Hosts call `getAppHandlers()` instead of receiving mega
- * props from App.
- *
- * Keep this intentionally loose (`Record<string, unknown>`): the handler set
- * tracks App glue, not a frozen public API.
- */
-
-type Listener = () => void;
-
-export type AppHandlers = Record<string, unknown>;
-
-function handlersShallowEqual(prev: AppHandlers, next: AppHandlers): boolean {
-  const prevKeys = Object.keys(prev);
-  const nextKeys = Object.keys(next);
-  if (prevKeys.length !== nextKeys.length) return false;
-  for (const key of nextKeys) {
-    if (prev[key] !== next[key]) return false;
-  }
-  return true;
-}
-
-class AppHandlersBridge {
-  private handlers: AppHandlers | null = null;
-  private listeners = new Set<Listener>();
-
-  get = (): AppHandlers | null => this.handlers;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  set(next: AppHandlers | null): void {
-    if (this.handlers === next) return;
-    if (
-      this.handlers
-      && next
-      && handlersShallowEqual(this.handlers, next)
-    ) {
-      return;
-    }
-    this.handlers = next;
-    for (const listener of this.listeners) listener();
-  }
-}
-
-const bridge = new AppHandlersBridge();
-
-export function registerAppHandlers(handlers: AppHandlers | null): void {
-  bridge.set(handlers);
-}
-
-export function getAppHandlers(): AppHandlers | null {
-  return bridge.get();
-}
-
-export function subscribeAppHandlers(listener: Listener): () => void {
-  return bridge.subscribe(listener);
-}

application/app/appLocalUiStore.ts

@@ -1,116 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { Host, PortForwardingRule } from '../../domain/models';
-import type { VaultSection } from '../../components/VaultView';
-import type { KeyboardInteractiveRequest } from '../../components/KeyboardInteractiveModal';
-import type { PassphraseRequest } from '../../components/PassphraseModal';
-
-type Listener = () => void;
-
-/**
- * Dialog / queue / ephemeral UI owned outside the vault/session/settings
- * mega hooks. DialogsHost / VaultHost / TerminalHost subscribe here so
- * AppSideEffects never has to rebuild domain bags when a modal opens.
- *
- * `portForwardingRules` is published here as a thin derived slice: the PF
- * hook still lives in AppSideEffects (tray / sync / auto-start), but Hosts
- * must not receive a prepared terminal domain bag.
- */
-export type AppLocalUiSnapshot = {
-  isQuickSwitcherOpen: boolean;
-  isCreateWorkspaceOpen: boolean;
-  addToWorkspaceDialog:
-    | { mode: 'append'; workspaceId: string }
-    | { mode: 'create' }
-    | null;
-  quickSearch: string;
-  protocolSelectHost: Host | null;
-  navigateToSection: VaultSection | null;
-  deepLinkHostDraft: Host | null;
-  ephemeralHosts: readonly Host[];
-  portForwardingRules: readonly PortForwardingRule[];
-  keyboardInteractiveQueue: readonly KeyboardInteractiveRequest[];
-  passphraseQueue: readonly PassphraseRequest[];
-  deleteHostConfirm: { hostId: string; name: string } | null;
-  vaultFocusRequest: unknown;
-  openNoteRequest: unknown;
-  emptyVaultConflict: unknown;
-};
-
-export const EMPTY_APP_LOCAL_UI: AppLocalUiSnapshot = Object.freeze({
-  isQuickSwitcherOpen: false,
-  isCreateWorkspaceOpen: false,
-  addToWorkspaceDialog: null,
-  quickSearch: '',
-  protocolSelectHost: null,
-  navigateToSection: null,
-  deepLinkHostDraft: null,
-  ephemeralHosts: Object.freeze([]) as readonly Host[],
-  portForwardingRules: Object.freeze([]) as readonly PortForwardingRule[],
-  keyboardInteractiveQueue: Object.freeze([]) as readonly KeyboardInteractiveRequest[],
-  passphraseQueue: Object.freeze([]) as readonly PassphraseRequest[],
-  deleteHostConfirm: null,
-  vaultFocusRequest: null,
-  openNoteRequest: null,
-  emptyVaultConflict: null,
-});
-class AppLocalUiStore {
-  private snapshot: AppLocalUiSnapshot = EMPTY_APP_LOCAL_UI;
-  private listeners = new Set<Listener>();
-
-  getSnapshot = (): AppLocalUiSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: AppLocalUiSnapshot): void {
-    const prev = this.snapshot;
-    if (
-      prev.isQuickSwitcherOpen === next.isQuickSwitcherOpen
-      && prev.isCreateWorkspaceOpen === next.isCreateWorkspaceOpen
-      && prev.addToWorkspaceDialog === next.addToWorkspaceDialog
-      && prev.quickSearch === next.quickSearch
-      && prev.protocolSelectHost === next.protocolSelectHost
-      && prev.navigateToSection === next.navigateToSection
-      && prev.deepLinkHostDraft === next.deepLinkHostDraft
-      && prev.ephemeralHosts === next.ephemeralHosts
-      && prev.portForwardingRules === next.portForwardingRules
-      && prev.keyboardInteractiveQueue === next.keyboardInteractiveQueue
-      && prev.passphraseQueue === next.passphraseQueue
-      && prev.deleteHostConfirm === next.deleteHostConfirm
-      && prev.vaultFocusRequest === next.vaultFocusRequest
-      && prev.openNoteRequest === next.openNoteRequest
-      && prev.emptyVaultConflict === next.emptyVaultConflict
-    ) {
-      return;
-    }
-    this.snapshot = next;
-    for (const listener of this.listeners) listener();
-  }
-}
-
-export const appLocalUiStore = new AppLocalUiStore();
-
-export function publishAppLocalUi(snapshot: AppLocalUiSnapshot): void {
-  appLocalUiStore.setSnapshot(snapshot);
-}
-
-export function getAppLocalUiSnapshot(): AppLocalUiSnapshot {
-  return appLocalUiStore.getSnapshot();
-}
-
-export function subscribeAppLocalUi(listener: Listener): () => void {
-  return appLocalUiStore.subscribe(listener);
-}
-
-export function useAppLocalUiStore(): AppLocalUiSnapshot {
-  return useSyncExternalStore(
-    subscribeAppLocalUi,
-    getAppLocalUiSnapshot,
-    getAppLocalUiSnapshot,
-  );
-}

application/app/appShellPropsStore.ts

@@ -1,120 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { KnownHost } from '../../types';
-import type { AppActiveTabChromeProps } from './AppActiveTabChrome';
-import { appViewDomainsEqual, type AppViewDomains } from './appViewDomains';
-
-type Listener = () => void;
-
-export type AppShellOverlays = {
-  onAddKnownHost: (knownHost: KnownHost) => void;
-  deleteHostConfirm: { hostId: string; name: string } | null;
-  onCancelDeleteHost: () => void;
-  onConfirmDeleteHost: () => void;
-};
-
-export type AppShellPropsSnapshot = {
-  domains: AppViewDomains | null;
-  chrome: AppActiveTabChromeProps | null;
-  overlays: AppShellOverlays | null;
-};
-
-const EMPTY: AppShellPropsSnapshot = Object.freeze({
-  domains: null,
-  chrome: null,
-  overlays: null,
-});
-
-/**
- * Host islands publish domain / chrome / overlay bags here. `AppShell`
- * subscribes via `useSyncExternalStore` and only re-renders when bag
- * identities change (`appViewDomainsEqual` + chrome/overlays identity).
- */
-class AppShellPropsStore {
-  private snapshot: AppShellPropsSnapshot = EMPTY;
-  private listeners = new Set<Listener>();
-
-  getSnapshot = (): AppShellPropsSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setDomains(domains: AppViewDomains): void {
-    const prev = this.snapshot;
-    if (prev.domains && appViewDomainsEqual(prev.domains, domains)) {
-      return;
-    }
-    this.snapshot = { ...prev, domains };
-    for (const listener of this.listeners) listener();
-  }
-
-  setChrome(chrome: AppActiveTabChromeProps): void {
-    if (this.snapshot.chrome === chrome) return;
-    this.snapshot = { ...this.snapshot, chrome };
-    for (const listener of this.listeners) listener();
-  }
-
-  setOverlays(overlays: AppShellOverlays): void {
-    if (this.snapshot.overlays === overlays) return;
-    this.snapshot = { ...this.snapshot, overlays };
-    for (const listener of this.listeners) listener();
-  }
-
-  setDomainSlice<K extends keyof AppViewDomains>(
-    key: K,
-    slice: AppViewDomains[K],
-  ): void {
-    const prev = this.snapshot.domains;
-    if (prev && prev[key] === slice) return;
-    const domains = {
-      vault: prev?.vault ?? {},
-      terminal: prev?.terminal ?? {},
-      chrome: prev?.chrome ?? {},
-      dialogs: prev?.dialogs ?? {},
-      mounts: prev?.mounts ?? {},
-      [key]: slice,
-    } as AppViewDomains;
-    this.setDomains(domains);
-  }
-}
-
-export const appShellPropsStore = new AppShellPropsStore();
-
-export function publishAppShellDomains(domains: AppViewDomains): void {
-  appShellPropsStore.setDomains(domains);
-}
-
-export function publishAppShellDomainSlice<K extends keyof AppViewDomains>(
-  key: K,
-  slice: AppViewDomains[K],
-): void {
-  appShellPropsStore.setDomainSlice(key, slice);
-}
-
-export function publishAppShellChrome(chrome: AppActiveTabChromeProps): void {
-  appShellPropsStore.setChrome(chrome);
-}
-
-export function publishAppShellOverlays(overlays: AppShellOverlays): void {
-  appShellPropsStore.setOverlays(overlays);
-}
-
-export function getAppShellPropsSnapshot(): AppShellPropsSnapshot {
-  return appShellPropsStore.getSnapshot();
-}
-
-export function subscribeAppShellProps(listener: Listener): () => void {
-  return appShellPropsStore.subscribe(listener);
-}
-
-export function useAppShellProps(): AppShellPropsSnapshot {
-  return useSyncExternalStore(
-    subscribeAppShellProps,
-    getAppShellPropsSnapshot,
-    getAppShellPropsSnapshot,
-  );
-}

application/app/hosts/ChromeHost.tsx

@@ -1,210 +0,0 @@
-import { useCallback, useLayoutEffect, useMemo, useRef, useSyncExternalStore } from 'react';
-
-import { TERMINAL_THEMES } from '../../../infrastructure/config/terminalThemes';
-import { retainStableSessionsIgnoringPresentation } from '../../../domain/terminalPaneSessionsEqual';
-import { useI18n } from '../../i18n/I18nProvider';
-import { useCustomThemes } from '../../state/customThemeStore';
-import { useEditorTabChromeList } from '../../state/editorTabStore';
-import { toEditorTabId } from '../../state/activeTabStore';
-import {
-  getSessionSnapshotActions,
-  useSessionSnapshot,
-  useSessionSnapshotActions,
-} from '../../state/sessionSnapshotStore';
-import { useSettingsChromeStore } from '../../state/settingsChromeStore';
-import { useVaultSnapshot } from '../../state/vaultSnapshotStore';
-import {
-  getTerminalSettingsActions,
-  useTerminalSettingsStore,
-} from '../../state/terminalSettingsStore';
-import { usePluginViewTabs } from '../../state/pluginViewTabStore';
-import { getAppHandlers, subscribeAppHandlers } from '../appHandlersBridge';
-import {
-  publishAppShellChrome,
-  publishAppShellDomainSlice,
-} from '../appShellPropsStore';
-import {
-  getThemeRuntimeActions,
-  subscribeThemeRuntimeActions,
-} from '../themeRuntimeBridge';
-
-const IS_MAC_CLIENT =
-  typeof navigator !== 'undefined' && /Mac|Macintosh/.test(navigator.userAgent);
-
-/**
- * Chrome island: TopTabs / active-tab chrome from settings chrome store,
- * appearance chrome, and selective session/vault snapshot fields. Assembles
- * chrome + shell chrome bags field-by-field — never spreads a prepared bag.
- */
-export function ChromeHost() {
-  const { t } = useI18n();
-  const settingsChrome = useSettingsChromeStore();
-  const session = useSessionSnapshot();
-  const sessionActions = useSessionSnapshotActions();
-  const vault = useVaultSnapshot();
-  const terminalSettings = useTerminalSettingsStore();
-  const editorTabs = useEditorTabChromeList();
-  const pluginViewTabs = usePluginViewTabs();
-  void pluginViewTabs;
-  const customThemes = useCustomThemes();
-  const handlers = useSyncExternalStore(
-    subscribeAppHandlers,
-    getAppHandlers,
-    getAppHandlers,
-  );
-  const themeRuntime = useSyncExternalStore(
-    subscribeThemeRuntimeActions,
-    getThemeRuntimeActions,
-    getThemeRuntimeActions,
-  );
-
-  const orphanSessionsForShellRef = useRef(session.orphanSessions);
-  const orphanSessionsForShell = retainStableSessionsIgnoringPresentation(
-    orphanSessionsForShellRef.current,
-    session.orphanSessions as never,
-  );
-  orphanSessionsForShellRef.current = orphanSessionsForShell as typeof session.orphanSessions;
-
-  const themeById = useMemo(
-    () => new Map([...customThemes, ...TERMINAL_THEMES].map((theme) => [theme.id, theme])),
-    [customThemes],
-  );
-
-  const hostById = useMemo(
-    () => new Map(vault.hosts.map((host) => [host.id, host])),
-    [vault.hosts],
-  );
-
-  const sessionById = useMemo(
-    () => new Map(session.sessions.map((s) => [s.id, s])),
-    [session.sessions],
-  );
-
-  const workspaceById = useMemo(
-    () => new Map(session.workspaces.map((workspace) => [workspace.id, workspace])),
-    [session.workspaces],
-  );
-
-  const editorTabTopIds = useMemo(
-    () => editorTabs.map((tab) => toEditorTabId(tab.id)),
-    [editorTabs],
-  );
-  const pluginViewTabIds = useMemo(
-    () => pluginViewTabs.map((tab) => tab.id),
-    [pluginViewTabs],
-  );
-  const additionalWorkTabIds = useMemo(
-    () => [...editorTabTopIds, ...pluginViewTabIds],
-    [editorTabTopIds, pluginViewTabIds],
-  );
-
-  const orderedTabsWithEditors = useMemo(
-    () => sessionActions?.getOrderedWorkTabs(additionalWorkTabIds) ?? ['vault'],
-    [additionalWorkTabIds, sessionActions],
-  );
-
-  const reorderWorkTabs = useCallback((
-    draggedId: string,
-    targetId: string,
-    position: 'before' | 'after' = 'before',
-  ) => {
-    sessionActions?.reorderTabs(draggedId, targetId, position, additionalWorkTabIds);
-  }, [additionalWorkTabIds, sessionActions]);
-
-  const chromeDomain = useMemo(() => {
-    if (!handlers) return null;
-    return {
-      closeLogView: sessionActions?.closeLogView,
-      handleEndSessionDrag: handlers.handleEndSessionDrag,
-      handleOpenQuickSwitcher: handlers.handleOpenQuickSwitcher,
-      handleOpenSettings: handlers.handleOpenSettings,
-      handleRootContextMenu: handlers.handleRootContextMenu,
-      handleSyncNowManual: handlers.handleSyncNowManual,
-      isMacClient: IS_MAC_CLIENT,
-      logViews: session.logViews,
-      openLogView: sessionActions?.openLogView,
-      orderedTabsWithEditors,
-      orphanSessions: orphanSessionsForShell,
-      reorderWorkTabs,
-      resetSessionRename: sessionActions?.resetSessionRename,
-      resetWorkspaceRename: sessionActions?.resetWorkspaceRename,
-      sessionRenameTarget: session.sessionRenameTarget,
-      setActiveTabId: sessionActions?.setActiveTabId,
-      startSessionRename: sessionActions?.startSessionRename,
-      renameSessionInline: sessionActions?.renameSessionInline,
-      startWorkspaceRename: sessionActions?.startWorkspaceRename,
-      submitSessionRename: sessionActions?.submitSessionRename,
-      submitWorkspaceRename: sessionActions?.submitWorkspaceRename,
-      t,
-      themeById,
-      workspaceRenameTarget: session.workspaceRenameTarget,
-    };
-  }, [
-    handlers,
-    orderedTabsWithEditors,
-    orphanSessionsForShell,
-    reorderWorkTabs,
-    session.logViews,
-    session.sessionRenameTarget,
-    session.workspaceRenameTarget,
-    sessionActions,
-    t,
-    themeById,
-  ]);
-
-  // Call-time getters so chrome can publish before Publisher layout effects
-  // register action slots — avoids undefined applyAppTheme/setActiveTabId on
-  // the first Host publish (startup TypeError under StrictMode).
-  const setActiveTabId = useCallback((id: string) => {
-    getSessionSnapshotActions()?.setActiveTabId?.(id);
-  }, []);
-  const applyAppTheme = useCallback(() => {
-    getTerminalSettingsActions()?.applyAppTheme?.();
-  }, []);
-
-  const appShellChrome = useMemo(() => {
-    if (!handlers) return null;
-    // Theme runtime actions may still be null on the first paint before
-    // TerminalHost registers them; wait so AppActiveTabChrome never mounts
-    // with a missing resolveSessionAppearance / currentTerminalTheme.
-    if (!themeRuntime?.currentTerminalTheme || !themeRuntime?.resolveFocusedAppearance) {
-      return null;
-    }
-    return {
-      showSftpTab: settingsChrome.showSftpTab,
-      setActiveTabId,
-      applyAppTheme,
-      hostById,
-      sessionById,
-      themeById,
-      workspaceById,
-      currentTerminalTheme: themeRuntime.currentTerminalTheme,
-      followAppTerminalTheme: terminalSettings.followAppTerminalTheme,
-      editorTabs,
-      logViews: session.logViews,
-      resolveSessionAppearance: themeRuntime.resolveFocusedAppearance,
-      t,
-    };
-  }, [
-    applyAppTheme,
-    editorTabs,
-    handlers,
-    hostById,
-    session.logViews,
-    sessionById,
-    setActiveTabId,
-    settingsChrome.showSftpTab,
-    t,
-    terminalSettings.followAppTerminalTheme,
-    themeById,
-    themeRuntime,
-    workspaceById,
-  ]);
-
-  useLayoutEffect(() => {
-    if (chromeDomain) publishAppShellDomainSlice('chrome', chromeDomain);
-    if (appShellChrome) publishAppShellChrome(appShellChrome as never);
-  }, [appShellChrome, chromeDomain]);
-
-  return null;
-}

application/app/hosts/DialogsHost.tsx

@@ -1,107 +0,0 @@
-import { useLayoutEffect, useMemo, useSyncExternalStore } from 'react';
-
-import { getHostSearchMatch } from '../../../lib/searchMatcher';
-import type { Host } from '../../../types';
-import { useEditorTabChromeList } from '../../state/editorTabStore';
-import { useVaultSnapshot } from '../../state/vaultSnapshotStore';
-import { getAppHandlers, subscribeAppHandlers } from '../appHandlersBridge';
-import {
-  publishAppShellDomainSlice,
-  publishAppShellOverlays,
-} from '../appShellPropsStore';
-import { useAppLocalUiStore } from '../appLocalUiStore';
-
-const EMPTY_HOST_RESULTS: Host[] = [];
-
-/**
- * Dialogs island: local dialog/queue state from `appLocalUiStore`, plus a
- * selective vault hosts subscription for quick-search results when open.
- * Assembles dialogs + overlays field-by-field — never spreads a prepared bag.
- */
-export function DialogsHost() {
-  const local = useAppLocalUiStore();
-  const vault = useVaultSnapshot();
-  const editorTabs = useEditorTabChromeList();
-  const handlers = useSyncExternalStore(
-    subscribeAppHandlers,
-    getAppHandlers,
-    getAppHandlers,
-  );
-
-  const quickResults = useMemo(() => {
-    if (!local.isQuickSwitcherOpen) return EMPTY_HOST_RESULTS;
-    const term = local.quickSearch.trim();
-    if (!term) return vault.hosts as Host[];
-    return (vault.hosts as Host[])
-      .map((host) => ({ host, match: getHostSearchMatch(term, host) }))
-      .filter((entry) => entry.match.matched)
-      .sort((left, right) => {
-        if (left.match.score !== right.match.score) {
-          return right.match.score - left.match.score;
-        }
-        return left.host.label.localeCompare(right.host.label);
-      })
-      .map((entry) => entry.host);
-  }, [local.isQuickSwitcherOpen, local.quickSearch, vault.hosts]);
-
-  const dialogsDomain = useMemo(() => {
-    if (!handlers) return null;
-    return {
-      addToWorkspaceDialog: local.addToWorkspaceDialog,
-      clearAndRemoveSource: handlers.clearAndRemoveSource,
-      clearAndRemoveSources: handlers.clearAndRemoveSources,
-      editorTabs,
-      emptyVaultConflict: local.emptyVaultConflict,
-      handleHostConnectWithProtocolCheck: handlers.handleHostConnectWithProtocolCheck,
-      handleKeyboardInteractiveCancel: handlers.handleKeyboardInteractiveCancel,
-      handleKeyboardInteractiveSubmit: handlers.handleKeyboardInteractiveSubmit,
-      handlePassphraseCancel: handlers.handlePassphraseCancel,
-      handlePassphraseSkip: handlers.handlePassphraseSkip,
-      handlePassphraseSubmit: handlers.handlePassphraseSubmit,
-      handleProtocolSelect: handlers.handleProtocolSelect,
-      handleRequestCloseEditorTabRef: handlers.handleRequestCloseEditorTabRef,
-      isCreateWorkspaceOpen: local.isCreateWorkspaceOpen,
-      isQuickSwitcherOpen: local.isQuickSwitcherOpen,
-      keyboardInteractiveQueue: local.keyboardInteractiveQueue,
-      passphraseQueue: local.passphraseQueue,
-      protocolSelectHost: local.protocolSelectHost,
-      quickResults,
-      quickSearch: local.quickSearch,
-      resolveEmptyVaultConflict: handlers.resolveEmptyVaultConflict,
-      setAddToWorkspaceDialog: handlers.setAddToWorkspaceDialog,
-      setIsCreateWorkspaceOpen: handlers.setIsCreateWorkspaceOpen,
-      setIsQuickSwitcherOpen: handlers.setIsQuickSwitcherOpen,
-      setProtocolSelectHost: handlers.setProtocolSelectHost,
-      setQuickSearch: handlers.setQuickSearch,
-    };
-  }, [
-    editorTabs,
-    handlers,
-    local.addToWorkspaceDialog,
-    local.emptyVaultConflict,
-    local.isCreateWorkspaceOpen,
-    local.isQuickSwitcherOpen,
-    local.keyboardInteractiveQueue,
-    local.passphraseQueue,
-    local.protocolSelectHost,
-    local.quickSearch,
-    quickResults,
-  ]);
-
-  const overlays = useMemo(() => {
-    if (!handlers) return null;
-    return {
-      onAddKnownHost: handlers.handleAddKnownHost as (knownHost: never) => void,
-      deleteHostConfirm: local.deleteHostConfirm,
-      onCancelDeleteHost: handlers.handleCancelDeleteHost as () => void,
-      onConfirmDeleteHost: handlers.handleConfirmDeleteHost as () => void,
-    };
-  }, [handlers, local.deleteHostConfirm]);
-
-  useLayoutEffect(() => {
-    if (dialogsDomain) publishAppShellDomainSlice('dialogs', dialogsDomain);
-    if (overlays) publishAppShellOverlays(overlays as never);
-  }, [dialogsDomain, overlays]);
-
-  return null;
-}

application/app/hosts/TerminalHost.tsx

@@ -1,279 +0,0 @@
-import { useCallback, useLayoutEffect, useMemo, useRef, useSyncExternalStore } from 'react';
-
-import { TERMINAL_THEME_AUTO } from '../../../domain/terminalAppearance';
-import { retainStableSessionsIgnoringPresentation } from '../../../domain/terminalPaneSessionsEqual';
-import { getAppSettingsRuntime } from '../../state/appRuntimeBridge';
-import { useAppearanceChromeStore } from '../../state/appearanceChromeStore';
-import { useCustomThemes } from '../../state/customThemeStore';
-import {
-  useSessionSnapshot,
-  useSessionSnapshotActions,
-} from '../../state/sessionSnapshotStore';
-import {
-  useSettingsChromeActions,
-  useSettingsChromeStore,
-} from '../../state/settingsChromeStore';
-import {
-  useTerminalSettingsActions,
-  useTerminalSettingsStore,
-} from '../../state/terminalSettingsStore';
-import { useThemeRuntime, useTerminalAppearanceInjection } from '../../state/useThemeRuntime';
-import {
-  useVaultSnapshot,
-  useVaultSnapshotActions,
-} from '../../state/vaultSnapshotStore';
-import { getAppHandlers, subscribeAppHandlers } from '../appHandlersBridge';
-import { publishAppShellDomainSlice } from '../appShellPropsStore';
-import { useAppLocalUiStore } from '../appLocalUiStore';
-import { registerThemeRuntimeActions } from '../themeRuntimeBridge';
-
-/**
- * Terminal island: sessions from `sessionSnapshotStore`, terminal settings
- * from `terminalSettingsStore`, mutators via snapshot actions, theme runtime
- * owned here, glue handlers from the app handlers bridge. Assembles the full
- * terminal domain bag field-by-field — never spreads a prepared bag.
- */
-export function TerminalHost() {
-  const session = useSessionSnapshot();
-  const sessionActions = useSessionSnapshotActions();
-  const vault = useVaultSnapshot();
-  const vaultActions = useVaultSnapshotActions();
-  const terminalSettings = useTerminalSettingsStore();
-  const terminalSettingsActions = useTerminalSettingsActions();
-  const {
-    followAppTerminalTheme,
-    terminalThemeId,
-    terminalThemeDarkId,
-    terminalThemeLightId,
-  } = terminalSettings;
-  const settingsChrome = useSettingsChromeStore();
-  const settingsChromeActions = useSettingsChromeActions();
-  const appearance = useAppearanceChromeStore();
-  const customThemes = useCustomThemes();
-  const local = useAppLocalUiStore();
-  const handlers = useSyncExternalStore(
-    subscribeAppHandlers,
-    getAppHandlers,
-    getAppHandlers,
-  );
-
-  // Call-time getters: SettingsPublisher registers the runtime in a layout
-  // effect after this Host's first render. Capturing noop setters into
-  // useThemeRuntime would permanently drop follow-app UI theme persistence.
-  const setLightUiThemeId = useCallback((id: string) => {
-    getAppSettingsRuntime()?.setLightUiThemeId?.(id);
-  }, []);
-  const setDarkUiThemeId = useCallback((id: string) => {
-    getAppSettingsRuntime()?.setDarkUiThemeId?.(id);
-  }, []);
-
-  const themeRuntime = useThemeRuntime({
-    terminalThemeId,
-    terminalThemeDarkId,
-    terminalThemeLightId,
-    followAppTerminalTheme,
-    resolvedTheme: settingsChrome.resolvedTheme,
-    lightUiThemeId: settingsChrome.lightUiThemeId,
-    darkUiThemeId: settingsChrome.darkUiThemeId,
-    accentMode: appearance.accentMode,
-    customAccent: appearance.customAccent,
-    customThemes,
-    setTheme: settingsChromeActions.setTheme,
-    setLightUiThemeId,
-    setDarkUiThemeId,
-  });
-
-  const {
-    globalAppearance,
-    accentedGlobalAppearance,
-    clearIntent: clearThemeIntent,
-    settleManualIntent: settleManualThemeIntent,
-    pickTheme: pickTerminalTheme,
-    resolveFocusedAppearance,
-    currentTerminalTheme,
-  } = themeRuntime;
-
-  // Inject live accent into CSS vars without publishing accented theme identity
-  // into the terminal domain bag (accent drag must not rebuild AppShell).
-  useTerminalAppearanceInjection(accentedGlobalAppearance, {
-    includeChromeSurfaces: followAppTerminalTheme,
-  });
-
-  const prevFollowAppTerminalThemeRef = useRef(followAppTerminalTheme);
-  useLayoutEffect(() => {
-    if (prevFollowAppTerminalThemeRef.current === followAppTerminalTheme) return;
-    prevFollowAppTerminalThemeRef.current = followAppTerminalTheme;
-    clearThemeIntent();
-  }, [followAppTerminalTheme, clearThemeIntent]);
-
-  // Bridge exposes the stable base theme only — ChromeHost must not republish
-  // when accentedGlobalAppearance identity churns during color-picker drag.
-  const themeBridgeActions = useMemo(() => ({
-    clearThemeIntent,
-    settleManualThemeIntent,
-    pickTerminalTheme,
-    resolveFocusedAppearance: resolveFocusedAppearance as (...args: never[]) => unknown,
-    currentTerminalTheme,
-    globalAppearance,
-  }), [
-    clearThemeIntent,
-    currentTerminalTheme,
-    globalAppearance,
-    pickTerminalTheme,
-    resolveFocusedAppearance,
-    settleManualThemeIntent,
-  ]);
-
-  useLayoutEffect(() => {
-    registerThemeRuntimeActions(themeBridgeActions);
-    return () => {
-      registerThemeRuntimeActions(null);
-    };
-  }, [themeBridgeActions]);
-
-  const sessionsForShellRef = useRef(session.sessions);
-  const sessionsForShell = retainStableSessionsIgnoringPresentation(
-    sessionsForShellRef.current,
-    session.sessions as never,
-  );
-  sessionsForShellRef.current = sessionsForShell as typeof session.sessions;
-
-  const hostById = useMemo(
-    () => new Map(vault.hosts.map((host) => [host.id, host])),
-    [vault.hosts],
-  );
-
-  const terminalHosts = useMemo(
-    () => (
-      local.ephemeralHosts.length > 0
-        ? [...vault.hosts, ...local.ephemeralHosts]
-        : vault.hosts
-    ),
-    [local.ephemeralHosts, vault.hosts],
-  );
-
-  const handleDefaultTerminalThemeChange = useCallback((themeId: string) => {
-    // Persist the default theme for ephemeral/manual hosts. Mode overrides
-    // reset to auto so the chosen theme becomes the new baseline for the
-    // current resolved UI mode (same behavior as pre-Host App).
-    terminalSettingsActions?.setTerminalThemeId(themeId);
-    if (settingsChrome.resolvedTheme === 'dark') {
-      terminalSettingsActions?.setTerminalThemeDarkId(TERMINAL_THEME_AUTO);
-    } else {
-      terminalSettingsActions?.setTerminalThemeLightId(TERMINAL_THEME_AUTO);
-    }
-  }, [settingsChrome.resolvedTheme, terminalSettingsActions]);
-
-  const handleFollowAppTerminalThemeChange = useCallback((themeId: string) => {
-    pickTerminalTheme(themeId);
-  }, [pickTerminalTheme]);
-
-  const terminalDomain = useMemo(() => {
-    if (!handlers) return null;
-    return {
-      addSessionToWorkspace: sessionActions?.addSessionToWorkspace,
-      appendHostToWorkspace: sessionActions?.appendHostToWorkspace,
-      appendLocalTerminalToWorkspace: sessionActions?.appendLocalTerminalToWorkspace,
-      clearSessionFontSizeOverride: sessionActions?.clearSessionFontSizeOverride,
-      closeSession: sessionActions?.closeSession,
-      closeTabsBatch: handlers.closeTabsBatch,
-      copySessionWithCurrentShell: handlers.copySessionWithCurrentShell,
-      copyWorkspaceWithCurrentShell: handlers.copyWorkspaceWithCurrentShell,
-      copySessionToNewWindowWithCurrentShell: handlers.copySessionToNewWindowWithCurrentShell,
-      closeWorkspace: sessionActions?.closeWorkspace,
-      createWorkspaceFromSessions: sessionActions?.createWorkspaceFromSessions,
-      createWorkspaceFromTargets: handlers.createWorkspaceFromTargets,
-      createWorkspaceWithHosts: handlers.createWorkspaceWithHosts,
-      currentTerminalTheme,
-      draggingSessionId: session.draggingSessionId,
-      editorWordWrap: terminalSettings.editorWordWrap,
-      followAppTerminalTheme: terminalSettings.followAppTerminalTheme,
-      clearThemeIntent,
-      settleManualThemeIntent,
-      pickTerminalTheme,
-      resolveSessionAppearance: resolveFocusedAppearance,
-      handleConnectSerial: handlers.handleConnectSerial,
-      handleConnectToHost: handlers.handleConnectToHost,
-      handleCreateLocalTerminal: handlers.handleCreateLocalTerminal,
-      handleDefaultTerminalThemeChange,
-      handleFollowAppTerminalThemeChange,
-      handleHotkeyAction: handlers.handleHotkeyAction,
-      handleSessionStatusChange: handlers.handleSessionStatusChange,
-      handleTerminalDataCapture: handlers.handleTerminalDataCapture,
-      handleUpdateHostFromTerminal: handlers.handleUpdateHostFromTerminal,
-      hostById,
-      terminalHosts,
-      updateTerminalHosts: handlers.updateTerminalHosts,
-      hotkeyScheme: terminalSettings.hotkeyScheme,
-      isBroadcastEnabled: sessionActions?.isBroadcastEnabled,
-      keyBindings: terminalSettings.keyBindings,
-      openNoteRequest: local.openNoteRequest,
-      portForwardingRules: local.portForwardingRules,
-      removeSessionFromWorkspace: sessionActions?.removeSessionFromWorkspace,
-      reorderWorkspaceSessions: sessionActions?.reorderWorkspaceSessions,
-      runSnippet: handlers.runSnippet,
-      sessionLogsDir: terminalSettings.sessionLogsDir,
-      sessionLogsEnabled: terminalSettings.sessionLogsEnabled,
-      sessionLogsFormat: terminalSettings.sessionLogsFormat,
-      sessionLogsTimestampsEnabled: terminalSettings.sessionLogsTimestampsEnabled,
-      sessions: sessionsForShell,
-      setDraggingSessionId: sessionActions?.setDraggingSessionId,
-      setEditorWordWrap: terminalSettingsActions?.setEditorWordWrap,
-      setTerminalFontFamilyId: terminalSettingsActions?.setTerminalFontFamilyId,
-      setTerminalFontSize: terminalSettingsActions?.setTerminalFontSize,
-      setWorkspaceFocusedSession: sessionActions?.setWorkspaceFocusedSession,
-      sftpAutoOpenSidebar: terminalSettings.sftpAutoOpenSidebar,
-      sftpFollowTerminalCwd: terminalSettings.sftpFollowTerminalCwd,
-      setSftpFollowTerminalCwd: terminalSettingsActions?.setSftpFollowTerminalCwd,
-      sftpAutoSync: terminalSettings.sftpAutoSync,
-      sftpDefaultViewMode: terminalSettings.sftpDefaultViewMode,
-      sftpDoubleClickBehavior: terminalSettings.sftpDoubleClickBehavior,
-      sftpShowHiddenFiles: terminalSettings.sftpShowHiddenFiles,
-      sftpUseCompressedUpload: terminalSettings.sftpUseCompressedUpload,
-      splitSessionWithCurrentShell: handlers.splitSessionWithCurrentShell,
-      sshDebugLogsEnabled: terminalSettings.sshDebugLogsEnabled,
-      terminalFontFamilyId: terminalSettings.terminalFontFamilyId,
-      terminalFontSize: terminalSettings.terminalFontSize,
-      terminalSettings: terminalSettings.terminalSettings,
-      terminalThemeId: terminalSettings.terminalThemeId,
-      toggleBroadcast: sessionActions?.toggleBroadcast,
-      toggleScriptsSidePanelRef: handlers.toggleScriptsSidePanelRef,
-      toggleSidePanelRef: handlers.toggleSidePanelRef,
-      toggleWorkspaceViewMode: sessionActions?.toggleWorkspaceViewMode,
-      updateHostDistro: vaultActions?.updateHostDistro,
-      updateSplitSizes: sessionActions?.updateSplitSizes,
-      updateSessionFontSize: sessionActions?.updateSessionFontSize,
-      updateSessionRestoreCwd: sessionActions?.updateSessionRestoreCwd,
-      updateSessionDynamicTitle: sessionActions?.updateSessionDynamicTitle,
-      updateSessionCodingCliProvider: sessionActions?.updateSessionCodingCliProvider,
-      updateTerminalSetting: terminalSettingsActions?.updateTerminalSetting,
-      workspaces: session.workspaces,
-    };
-  }, [
-    clearThemeIntent,
-    currentTerminalTheme,
-    handleDefaultTerminalThemeChange,
-    handleFollowAppTerminalThemeChange,
-    handlers,
-    hostById,
-    local.openNoteRequest,
-    local.portForwardingRules,
-    pickTerminalTheme,
-    resolveFocusedAppearance,
-    session.draggingSessionId,
-    session.workspaces,
-    sessionActions,
-    sessionsForShell,
-    settleManualThemeIntent,
-    terminalHosts,
-    terminalSettings,
-    terminalSettingsActions,
-    vaultActions,
-  ]);
-
-  useLayoutEffect(() => {
-    if (terminalDomain) publishAppShellDomainSlice('terminal', terminalDomain);
-  }, [terminalDomain]);
-
-  return null;
-}

application/app/hosts/VaultHost.tsx

@@ -1,104 +0,0 @@
-import { useLayoutEffect, useMemo, useSyncExternalStore } from 'react';
-
-import { getEffectiveKnownHosts } from '../../../infrastructure/syncHelpers';
-import {
-  useVaultSnapshot,
-  useVaultSnapshotActions,
-} from '../../state/vaultSnapshotStore';
-import { getAppHandlers, subscribeAppHandlers } from '../appHandlersBridge';
-import { publishAppShellDomainSlice } from '../appShellPropsStore';
-import { useAppLocalUiStore } from '../appLocalUiStore';
-import { APP_MOUNTS_DOMAIN } from './mountsDomain';
-
-/**
- * Vault island: catalog from `vaultSnapshotStore`, glue handlers from the
- * app handlers bridge, local vault UI from `appLocalUiStore`. Assembles the
- * full vault domain bag field-by-field — never spreads a prepared bag from
- * AppSideEffects.
- */
-export function VaultHost() {
-  const vault = useVaultSnapshot();
-  const actions = useVaultSnapshotActions();
-  const local = useAppLocalUiStore();
-  const handlers = useSyncExternalStore(
-    subscribeAppHandlers,
-    getAppHandlers,
-    getAppHandlers,
-  );
-
-  const effectiveKnownHosts = useMemo(
-    () => getEffectiveKnownHosts(vault.knownHosts as never) ?? [],
-    [vault.knownHosts],
-  );
-
-  const vaultDomain = useMemo(() => {
-    if (!handlers) return null;
-    return {
-      addShellHistoryEntry: actions?.addShellHistoryEntry,
-      removeShellHistoryEntry: actions?.removeShellHistoryEntry,
-      commitPluginImporterData: actions?.commitPluginImporterData,
-      commitVaultImportTransaction: actions?.commitVaultImportTransaction,
-      convertKnownHostToHost: actions?.convertKnownHostToHost,
-      customGroups: vault.customGroups,
-      deepLinkHostDraft: local.deepLinkHostDraft,
-      effectiveKnownHosts,
-      groupConfigs: vault.groupConfigs,
-      handleAddKnownHost: handlers.handleAddKnownHost,
-      handleDeleteHost: handlers.handleDeleteHost,
-      handleOpenHostFromVaultNote: handlers.handleOpenHostFromVaultNote,
-      handleOpenVaultHostFromChat: handlers.handleOpenVaultHostFromChat,
-      handleOpenVaultNoteFromChat: handlers.handleOpenVaultNoteFromChat,
-      handleOpenVaultSectionFromChat: handlers.handleOpenVaultSectionFromChat,
-      handleOpenVaultSnippetFromChat: handlers.handleOpenVaultSnippetFromChat,
-      hosts: vault.hosts,
-      identities: vault.identities,
-      importOrReuseKey: actions?.importOrReuseKey,
-      keys: vault.keys,
-      managedSources: vault.managedSources,
-      navigateToSection: local.navigateToSection,
-      proxyProfiles: vault.proxyProfiles,
-      readPersistedHosts: actions?.readPersistedHosts,
-      readPersistedManagedSources: actions?.readPersistedManagedSources,
-      setDeepLinkHostDraft: handlers.setDeepLinkHostDraft,
-      setNavigateToSection: handlers.setNavigateToSection,
-      setVaultFocusRequest: handlers.setVaultFocusRequest,
-      snippetPackages: vault.snippetPackages,
-      snippets: vault.snippets,
-      unmanageSource: handlers.unmanageSource,
-      updateCustomGroups: actions?.updateCustomGroups,
-      updateGroupConfigs: actions?.updateGroupConfigs,
-      updateHosts: actions?.updateHosts,
-      updateIdentities: actions?.updateIdentities,
-      updateKeys: actions?.updateKeys,
-      updateKnownHosts: actions?.updateKnownHosts,
-      updateManagedSources: actions?.updateManagedSources,
-      updateProxyProfiles: actions?.updateProxyProfiles,
-      updateSnippetPackages: actions?.updateSnippetPackages,
-      updateSnippets: actions?.updateSnippets,
-      vaultFocusRequest: local.vaultFocusRequest,
-    };
-  }, [
-    actions,
-    effectiveKnownHosts,
-    handlers,
-    local.deepLinkHostDraft,
-    local.navigateToSection,
-    local.vaultFocusRequest,
-    vault.customGroups,
-    vault.groupConfigs,
-    vault.hosts,
-    vault.identities,
-    vault.keys,
-    vault.managedSources,
-    vault.proxyProfiles,
-    vault.snippetPackages,
-    vault.snippets,
-  ]);
-
-  useLayoutEffect(() => {
-    if (vaultDomain) publishAppShellDomainSlice('vault', vaultDomain);
-    publishAppShellDomainSlice('mounts', APP_MOUNTS_DOMAIN);
-  }, [vaultDomain]);
-
-  return null;
-}

application/app/hosts/mountsDomain.ts

@@ -1,9 +0,0 @@
-import { LogViewWrapper, SftpViewMount, TerminalLayerMount, VaultViewContainer } from '../AppMounts';
-
-/** Lazy mount wrappers — stable module identity for the app lifetime. */
-export const APP_MOUNTS_DOMAIN = Object.freeze({
-  VaultViewContainer,
-  SftpViewMount,
-  TerminalLayerMount,
-  LogViewWrapper,
-});

application/app/publishers/SessionPublisher.tsx

@@ -1,217 +0,0 @@
-import { useLayoutEffect, useMemo } from 'react';
-
-import {
-  AppSessionRuntimeContext,
-  registerAppSessionRuntime,
-} from '../../state/appRuntimeBridge';
-import {
-  publishSessionSnapshot,
-  registerSessionSnapshotActions,
-} from '../../state/sessionSnapshotStore';
-import { useSessionState } from '../../state/useSessionState';
-import type { ReactNode } from 'react';
-
-export type SessionPublisherProps = {
-  /** Peer session windows must not write the main window's restore record. */
-  persistSessionRestore: boolean;
-  children?: ReactNode;
-};
-
-/**
- * Owns `useSessionState` and publishes it the same three ways `VaultPublisher`
- * publishes the vault: catalog into `sessionSnapshotStore`, mutators into its
- * action slot, and the whole runtime onto `appRuntimeBridge` for App.
- */
-export function SessionPublisher({ persistSessionRestore, children }: SessionPublisherProps) {
-  const session = useSessionState({ persistSessionRestore });
-  const {
-    sessions,
-    orphanSessions,
-    workspaces,
-    logViews,
-    draggingSessionId,
-    sessionRenameTarget,
-    workspaceRenameTarget,
-    setActiveTabId,
-    closeSession,
-    closeSessions,
-    closeWorkspace,
-    openLogView,
-    closeLogView,
-    setDraggingSessionId,
-    startSessionRename,
-    renameSessionInline,
-    submitSessionRename,
-    resetSessionRename,
-    startWorkspaceRename,
-    submitWorkspaceRename,
-    resetWorkspaceRename,
-    removeSessionFromWorkspace,
-    setWorkspaceFocusedSession,
-    toggleWorkspaceViewMode,
-    createLocalTerminal,
-    createSerialSession,
-    connectToHost,
-    updateSessionStatus,
-    updateSessionFontSize,
-    clearSessionFontSizeOverride,
-    createWorkspaceWithHosts,
-    createWorkspaceFromSessions,
-    addSessionToWorkspace,
-    appendHostToWorkspace,
-    appendLocalTerminalToWorkspace,
-    createWorkspaceFromTargets,
-    updateSplitSizes,
-    splitSession,
-    reorderWorkspaceSessions,
-    moveFocusInWorkspace,
-    runSnippet,
-    getOrderedWorkTabs,
-    reorderTabs,
-    toggleBroadcast,
-    isBroadcastEnabled,
-    copySession,
-    copyWorkspace,
-    createSessionFromCloneSource,
-    updateSessionRestoreCwd,
-    getSessionRestoreCwd,
-    updateSessionDynamicTitle,
-    updateSessionCodingCliProvider,
-  } = session;
-
-  useLayoutEffect(() => {
-    registerAppSessionRuntime(session);
-  }, [session]);
-
-  // Only a real unmount clears the slot; see VaultPublisher for why.
-  useLayoutEffect(() => () => {
-    registerAppSessionRuntime(null);
-  }, []);
-
-  useLayoutEffect(() => {
-    publishSessionSnapshot({
-      sessions,
-      orphanSessions,
-      workspaces,
-      logViews,
-      draggingSessionId,
-      sessionRenameTarget,
-      workspaceRenameTarget,
-    });
-  }, [
-    draggingSessionId,
-    logViews,
-    orphanSessions,
-    sessionRenameTarget,
-    sessions,
-    workspaceRenameTarget,
-    workspaces,
-  ]);
-
-  const sessionActions = useMemo(() => ({
-    setActiveTabId,
-    closeSession,
-    closeSessions,
-    closeWorkspace,
-    openLogView,
-    closeLogView,
-    setDraggingSessionId,
-    startSessionRename,
-    renameSessionInline,
-    submitSessionRename,
-    resetSessionRename,
-    startWorkspaceRename,
-    submitWorkspaceRename,
-    resetWorkspaceRename,
-    removeSessionFromWorkspace,
-    setWorkspaceFocusedSession,
-    toggleWorkspaceViewMode,
-    createLocalTerminal,
-    createSerialSession,
-    connectToHost,
-    updateSessionStatus,
-    updateSessionFontSize,
-    clearSessionFontSizeOverride,
-    createWorkspaceWithHosts,
-    createWorkspaceFromSessions,
-    addSessionToWorkspace,
-    appendHostToWorkspace,
-    appendLocalTerminalToWorkspace,
-    createWorkspaceFromTargets,
-    updateSplitSizes,
-    splitSession,
-    reorderWorkspaceSessions,
-    moveFocusInWorkspace,
-    runSnippet,
-    getOrderedWorkTabs,
-    reorderTabs,
-    toggleBroadcast,
-    isBroadcastEnabled,
-    copySession,
-    copyWorkspace,
-    createSessionFromCloneSource,
-    updateSessionRestoreCwd,
-    getSessionRestoreCwd,
-    updateSessionDynamicTitle,
-    updateSessionCodingCliProvider,
-  }), [
-    addSessionToWorkspace,
-    appendHostToWorkspace,
-    appendLocalTerminalToWorkspace,
-    clearSessionFontSizeOverride,
-    closeLogView,
-    closeSession,
-    closeSessions,
-    closeWorkspace,
-    connectToHost,
-    copySession,
-    copyWorkspace,
-    createLocalTerminal,
-    createSerialSession,
-    createSessionFromCloneSource,
-    createWorkspaceFromSessions,
-    createWorkspaceFromTargets,
-    createWorkspaceWithHosts,
-    getOrderedWorkTabs,
-    getSessionRestoreCwd,
-    isBroadcastEnabled,
-    moveFocusInWorkspace,
-    openLogView,
-    removeSessionFromWorkspace,
-    renameSessionInline,
-    reorderTabs,
-    reorderWorkspaceSessions,
-    resetSessionRename,
-    resetWorkspaceRename,
-    runSnippet,
-    setActiveTabId,
-    setDraggingSessionId,
-    setWorkspaceFocusedSession,
-    splitSession,
-    startSessionRename,
-    startWorkspaceRename,
-    submitSessionRename,
-    submitWorkspaceRename,
-    toggleBroadcast,
-    toggleWorkspaceViewMode,
-    updateSessionCodingCliProvider,
-    updateSessionDynamicTitle,
-    updateSessionFontSize,
-    updateSessionRestoreCwd,
-    updateSessionStatus,
-    updateSplitSizes,
-  ]);
-
-  useLayoutEffect(() => {
-    registerSessionSnapshotActions(sessionActions);
-    return () => {
-      registerSessionSnapshotActions(null);
-    };
-  }, [sessionActions]);
-
-  return (
-    <AppSessionRuntimeContext.Provider value={session}>
-      {children}
-    </AppSessionRuntimeContext.Provider>
-  );
-}

application/app/publishers/SettingsPublisher.tsx

@@ -1,47 +0,0 @@
-import { useLayoutEffect, type ReactNode } from 'react';
-
-import {
-  AppSettingsRuntimeContext,
-  registerAppSettingsRuntime,
-} from '../../state/appRuntimeBridge';
-import { useSettingsState } from '../../state/useSettingsState';
-
-export type SettingsPublisherProps = {
-  /** Peer session windows must not drive the main window's settings IPC sync. */
-  enableSettingsSync: boolean;
-  /** Peer session windows must not re-apply OS-level system settings effects. */
-  enableSystemEffects: boolean;
-  children?: ReactNode;
-};
-
-/**
- * Owns `useSettingsState` and hands it to consumers the same way
- * `VaultPublisher` / `SessionPublisher` hand over their runtimes: a context for
- * render-time reads and the `appRuntimeBridge` slot for imperative callers.
- *
- * The store fan-out (`settingsChromeStore` / `appearanceChromeStore`) already
- * happens inside `useSettingsState`, so this publisher only relocates the hook
- * out of the component that also builds the shell's domain bags.
- */
-export function SettingsPublisher({
-  enableSettingsSync,
-  enableSystemEffects,
-  children,
-}: SettingsPublisherProps) {
-  const settings = useSettingsState({ enableSettingsSync, enableSystemEffects });
-
-  useLayoutEffect(() => {
-    registerAppSettingsRuntime(settings);
-  }, [settings]);
-
-  // Only a real unmount clears the slot; see VaultPublisher for why.
-  useLayoutEffect(() => () => {
-    registerAppSettingsRuntime(null);
-  }, []);
-
-  return (
-    <AppSettingsRuntimeContext.Provider value={settings}>
-      {children}
-    </AppSettingsRuntimeContext.Provider>
-  );
-}

application/app/publishers/VaultPublisher.tsx

@@ -1,197 +0,0 @@
-import { useLayoutEffect, useMemo, useRef, type ReactNode } from 'react';
-
-import {
-  AppVaultRuntimeContext,
-  registerAppVaultRuntime,
-  type AppVaultContextValue,
-} from '../../state/appRuntimeBridge';
-import {
-  publishVaultSnapshot,
-  registerVaultSnapshotActions,
-} from '../../state/vaultSnapshotStore';
-import { useVaultState } from '../../state/useVaultState';
-import { getEffectiveKnownHosts } from '../../../infrastructure/syncHelpers';
-
-export type VaultPublisherProps = {
-  children?: ReactNode;
-};
-
-function vaultContextValuesEqual(
-  prev: AppVaultContextValue,
-  next: AppVaultContextValue,
-): boolean {
-  const keys = Object.keys(next) as Array<keyof AppVaultContextValue>;
-  return keys.every((key) => prev[key] === next[key]);
-}
-
-/**
- * Owns `useVaultState` and publishes it three ways: the catalog into
- * `vaultSnapshotStore` for shell surfaces that subscribe to a slice, the
- * mutators into the same store's action slot, and a **catalog-only** runtime
- * onto `AppVaultRuntimeContext` for App.
- *
- * `notes` / `noteGroups` / `connectionLogs` / `shellHistory` are intentionally
- * absent from the context value: they churn on a different cadence and already
- * fan out through dedicated stores. Including them would force App (the
- * domain-bag builder) to re-render on every note edit or session log append.
- * Imperative callers that still need the full hook return use
- * `getAppVaultRuntime()`.
- */
-export function VaultPublisher({ children }: VaultPublisherProps) {
-  const vault = useVaultState();
-  const {
-    isInitialized,
-    hosts,
-    keys,
-    identities,
-    proxyProfiles,
-    snippets,
-    snippetPackages,
-    customGroups,
-    knownHosts,
-    managedSources,
-    groupConfigs,
-    updateHosts,
-    updateKeys,
-    importOrReuseKey,
-    updateIdentities,
-    updateProxyProfiles,
-    updateSnippets,
-    updateSnippetPackages,
-    updateCustomGroups,
-    updateKnownHosts,
-    updateManagedSources,
-    updateGroupConfigs,
-    convertKnownHostToHost,
-    readPersistedHosts,
-    readPersistedManagedSources,
-    commitPluginImporterData,
-    commitVaultImportTransaction,
-    updateHostDistro,
-    updateHostLastConnected,
-    addShellHistoryEntry,
-    removeShellHistoryEntry,
-  } = vault;
-
-  useLayoutEffect(() => {
-    registerAppVaultRuntime(vault);
-  }, [vault]);
-
-  // Only a real unmount clears the slot. A re-render re-registers through the
-  // effect above, and StrictMode's simulated remount re-runs both.
-  useLayoutEffect(() => () => {
-    registerAppVaultRuntime(null);
-  }, []);
-
-  // useVaultState decrypts hosts/keys before it reads known hosts, so the state
-  // is briefly empty at boot even when storage has entries. Publish the same
-  // storage fallback App uses so a subscriber connecting during that window
-  // does not re-prompt for a fingerprint it already trusts.
-  const effectiveKnownHosts = useMemo(
-    () => getEffectiveKnownHosts(knownHosts) ?? [],
-    [knownHosts],
-  );
-
-  useLayoutEffect(() => {
-    publishVaultSnapshot({
-      isVaultInitialized: isInitialized,
-      hosts,
-      keys,
-      identities,
-      proxyProfiles,
-      snippets,
-      snippetPackages,
-      customGroups,
-      knownHosts: effectiveKnownHosts,
-      managedSources,
-      groupConfigs,
-    });
-  }, [
-    customGroups,
-    effectiveKnownHosts,
-    groupConfigs,
-    hosts,
-    identities,
-    isInitialized,
-    keys,
-    managedSources,
-    proxyProfiles,
-    snippetPackages,
-    snippets,
-  ]);
-
-  useLayoutEffect(() => {
-    registerVaultSnapshotActions({
-      updateHosts,
-      updateKeys,
-      importOrReuseKey,
-      updateIdentities,
-      updateProxyProfiles,
-      updateSnippets,
-      updateSnippetPackages,
-      updateCustomGroups,
-      updateKnownHosts,
-      updateManagedSources,
-      updateGroupConfigs,
-      convertKnownHostToHost,
-      readPersistedHosts,
-      readPersistedManagedSources,
-      commitPluginImporterData,
-      commitVaultImportTransaction,
-      updateHostDistro,
-      updateHostLastConnected,
-      addShellHistoryEntry,
-      removeShellHistoryEntry,
-    });
-    return () => {
-      registerVaultSnapshotActions(null);
-    };
-  }, [
-    addShellHistoryEntry,
-    commitPluginImporterData,
-    commitVaultImportTransaction,
-    convertKnownHostToHost,
-    importOrReuseKey,
-    readPersistedHosts,
-    readPersistedManagedSources,
-    removeShellHistoryEntry,
-    updateCustomGroups,
-    updateGroupConfigs,
-    updateHostDistro,
-    updateHostLastConnected,
-    updateHosts,
-    updateIdentities,
-    updateKeys,
-    updateKnownHosts,
-    updateManagedSources,
-    updateProxyProfiles,
-    updateSnippetPackages,
-    updateSnippets,
-  ]);
-
-  // Strip high-churn fields, then retain the previous object identity when only
-  // those fields (or exportData) changed so React context consumers stay quiet.
-  const vaultForAppRef = useRef<AppVaultContextValue | null>(null);
-  const vaultForApp = useMemo((): AppVaultContextValue => {
-    const {
-      notes: _notes,
-      noteGroups: _noteGroups,
-      connectionLogs: _connectionLogs,
-      shellHistory: _shellHistory,
-      exportData: _exportData,
-      ...catalog
-    } = vault;
-    const prev = vaultForAppRef.current;
-    if (prev && vaultContextValuesEqual(prev, catalog)) {
-      return prev;
-    }
-    vaultForAppRef.current = catalog;
-    return catalog;
-  }, [vault]);
-
-  return (
-    <AppVaultRuntimeContext.Provider value={vaultForApp}>
-      {children}
-    </AppVaultRuntimeContext.Provider>
-  );
-}

application/app/strictModeIdempotency.test.ts

@@ -1,271 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const appSource = readFileSync(new URL('../../App.tsx', import.meta.url), 'utf8');
-const appSideEffectsSource = readFileSync(
-  new URL('./AppSideEffects.tsx', import.meta.url),
-  'utf8',
-);
-const indexSource = readFileSync(new URL('../../index.tsx', import.meta.url), 'utf8');
-const startupEffectsSource = readFileSync(
-  new URL('./useAppStartupEffects.ts', import.meta.url),
-  'utf8',
-);
-const updateCheckSource = readFileSync(
-  new URL('../state/useUpdateCheck.ts', import.meta.url),
-  'utf8',
-);
-const portForwardingAutoStartSource = readFileSync(
-  new URL('../state/usePortForwardingAutoStart.ts', import.meta.url),
-  'utf8',
-);
-
-test('every renderer root mounts under StrictMode', () => {
-  assert.match(indexSource, /import \{ StrictMode, Suspense, lazy \} from 'react'/);
-
-  const renderCalls = indexSource.match(/root\.render\(/g) ?? [];
-  assert.equal(renderCalls.length, 4, 'main, settings, tray and terminal-popup roots');
-
-  let cursor = 0;
-  for (let index = 0; index < renderCalls.length; index += 1) {
-    const renderAt = indexSource.indexOf('root.render(', cursor);
-    assert.notEqual(renderAt, -1);
-    const opener = indexSource.slice(renderAt, renderAt + 60);
-    assert.match(opener, /root\.render\(\s*<StrictMode>/, `root.render #${index + 1} lacks StrictMode`);
-    cursor = renderAt + 'root.render('.length;
-  }
-});
-
-test('clone-session payload is consumed once even if the effect re-runs', () => {
-  const effectStart = appSideEffectsSource.indexOf('consumedNewWindowSessionRef');
-  assert.notEqual(effectStart, -1, 'clone-session effect must latch on payload identity');
-  const effectEnd = appSideEffectsSource.indexOf(
-    '}, [createSessionFromCloneSource, isVaultInitialized, pendingNewWindowSession]);',
-    effectStart,
-  );
-  assert.notEqual(effectEnd, -1);
-  const body = appSideEffectsSource.slice(effectStart, effectEnd);
-
-  // A ref comparison is required: clearing the state only lands on the next
-  // render, so a re-invoked effect still closes over the same payload.
-  assert.match(body, /if \(consumedNewWindowSessionRef\.current === pendingNewWindowSession\) return;/);
-  assert.ok(
-    body.indexOf('consumedNewWindowSessionRef.current = pending')
-      < body.indexOf('createSessionFromCloneSource(pending.sourceSession'),
-    'payload must be marked consumed before the clone is created',
-  );
-});
-
-test('rendererReady is notified once per renderer process', () => {
-  assert.match(appSource, /^let rendererReadySent = false;$/m);
-  const guardAt = appSource.indexOf('if (!rendererReadySent) {');
-  assert.notEqual(guardAt, -1);
-  const guarded = appSource.slice(guardAt, guardAt + 200);
-  assert.match(guarded, /rendererReadySent = true;/);
-  assert.match(guarded, /netcattyBridge\.get\(\)\?\.rendererReady\?\.\(\)/);
-  assert.ok(
-    guarded.indexOf('rendererReadySent = true;')
-      < guarded.indexOf('netcattyBridge.get()?.rendererReady?.()'),
-    'the latch must be set before the IPC call so a re-entrant effect is blocked',
-  );
-});
-
-test('update-available toast latches on the release version', () => {
-  const latchAt = startupEffectsSource.indexOf('toastedUpdateVersionRef');
-  assert.notEqual(latchAt, -1);
-  assert.match(startupEffectsSource, /const toastedUpdateVersionRef = useRef<string \| null>\(null\)/);
-  assert.match(startupEffectsSource, /if \(toastedUpdateVersionRef\.current === version\) return;/);
-
-  const guardAt = startupEffectsSource.indexOf('if (toastedUpdateVersionRef.current === version) return;');
-  const toastAt = startupEffectsSource.indexOf('toast.info(', guardAt);
-  assert.notEqual(toastAt, -1);
-  assert.ok(guardAt < toastAt, 'the version latch must gate the toast call');
-});
-
-test('port-forward auto-start runs once across a StrictMode double effect', () => {
-  assert.match(
-    portForwardingAutoStartSource,
-    /const autoStartExecutedRef = useRef\(false\);/,
-    'the launch auto-start needs a module-render latch, not just an effect dep list',
-  );
-
-  const effectStart = portForwardingAutoStartSource.indexOf('if (autoStartExecutedRef.current) return;');
-  assert.notEqual(effectStart, -1, 'the effect must bail out when the latch is already set');
-  const effectEnd = portForwardingAutoStartSource.indexOf(
-    '}, [\n    enabled,\n    isVaultInitialized,\n    runAutoStart,\n  ]);',
-    effectStart,
-  );
-  assert.notEqual(effectEnd, -1, 'auto-start effect dep list moved; update this contract');
-  const body = portForwardingAutoStartSource.slice(effectStart, effectEnd);
-
-  // StrictMode invokes the effect twice with the same render's closure, so the
-  // latch has to be written before the async run is kicked off — awaiting or
-  // deferring the write would let the second invoke start a duplicate tunnel.
-  const latchAt = body.indexOf('autoStartExecutedRef.current = true;');
-  const runAt = body.indexOf('void runAutoStart();');
-  assert.notEqual(latchAt, -1);
-  assert.notEqual(runAt, -1);
-  assert.ok(latchAt < runAt, 'the latch must be set before runAutoStart() is called');
-
-  // The vault gate must also sit before the latch: latching on a pre-hydration
-  // invoke would permanently suppress the real auto-start.
-  assert.ok(
-    body.indexOf('if (!isVaultInitialized) return;') < latchAt,
-    'the vault gate must precede the latch write',
-  );
-});
-
-test('cancelled startup update check resets its latch instead of skipping forever', () => {
-  const scheduleAt = updateCheckSource.indexOf('let checkArmed = true;');
-  assert.notEqual(scheduleAt, -1);
-  const tail = updateCheckSource.slice(scheduleAt);
-
-  // The latch is only meaningful once the timer actually fires; a cleanup that
-  // cancels it beforehand must let the next effect schedule again.
-  assert.match(tail, /startupCheckTimeoutRef\.current = setTimeout\(async \(\) => \{\s*\n\s*checkArmed = false;/);
-  assert.match(tail, /if \(checkArmed\) \{\s*\n\s*hasCheckedOnStartupRef\.current = false;\s*\n\s*\}/);
-});
-
-test('terminal popup config survives StrictMode unsubscribe/resubscribe', () => {
-  const preloadSource = readFileSync(new URL('../../electron/preload.cjs', import.meta.url), 'utf8');
-  const apiSource = readFileSync(new URL('../../electron/preload/api.cjs', import.meta.url), 'utf8');
-
-  assert.match(preloadSource, /lastPayload:\s*null/);
-  assert.match(
-    preloadSource,
-    /terminalPopupConfigState\.lastPayload = payload/,
-    'incoming popup config must be retained beyond the one-shot pending slot',
-  );
-
-  const subscribeAt = apiSource.indexOf('onTerminalPopupConfig:');
-  assert.notEqual(subscribeAt, -1);
-  const subscribe = apiSource.slice(subscribeAt, subscribeAt + 700);
-  assert.match(
-    subscribe,
-    /terminalPopupConfigState\.pending \?\? terminalPopupConfigState\.lastPayload/,
-    'resubscribe must replay lastPayload after pending was drained',
-  );
-  assert.match(subscribe, /terminalPopupConfigState\.pending = null/);
-  assert.doesNotMatch(
-    subscribe,
-    /terminalPopupConfigState\.lastPayload = null/,
-    'StrictMode remount must not clear lastPayload on subscribe',
-  );
-});
-
-test('vault init cancels the superseded StrictMode effect before publishing ready', () => {
-  const vaultSource = readFileSync(
-    new URL('../state/useVaultState.ts', import.meta.url),
-    'utf8',
-  );
-  const initAt = vaultSource.indexOf('let cancelled = false;');
-  assert.notEqual(initAt, -1, 'vault init must track cancellation');
-  const initSlice = vaultSource.slice(initAt, initAt + 12000);
-  assert.match(initSlice, /return \(\) => \{\s*\n\s*cancelled = true;\s*\n\s*\};/);
-  assert.match(
-    initSlice,
-    /if \(!cancelled\) \{\s*\n\s*setIsInitialized\(true\);\s*\n\s*setVaultInitialized\(true\);\s*\n\s*\}/,
-    'only the surviving init may mark the vault ready',
-  );
-  assert.match(initSlice, /if \(cancelled\) return;/);
-});
-
-test('global hotkey registration cleans up across StrictMode remount', () => {
-  const systemEffectsSource = readFileSync(
-    new URL('../state/systemSettingsEffects.ts', import.meta.url),
-    'utf8',
-  );
-  const hotkeyAt = systemEffectsSource.indexOf('Persist and sync toggle window hotkey setting');
-  assert.notEqual(hotkeyAt, -1);
-  const hotkeyEffect = systemEffectsSource.slice(hotkeyAt, hotkeyAt + 2200);
-  assert.match(hotkeyEffect, /let cancelled = false;/);
-  assert.match(hotkeyEffect, /if \(cancelled\) return;/);
-  assert.match(
-    hotkeyEffect,
-    /if \(didRegister\) \{\s*\n\s*bridge\?\.unregisterGlobalHotkey/,
-    'cleanup must unregister a registration started by this effect',
-  );
-  // Early return before notify must not skip returning the cleanup function.
-  assert.doesNotMatch(
-    hotkeyEffect,
-    /if \(!persistMountedRef\.current\) return;\s*\n\s*notifySettingsChanged/,
-  );
-});
-
-test('settings persistMountedRef resets on StrictMode cleanup', () => {
-  const settingsSource = readFileSync(
-    new URL('../state/useSettingsState.ts', import.meta.url),
-    'utf8',
-  );
-  const markAt = settingsSource.indexOf('Mark persist effects mounted AFTER all persist useEffects');
-  assert.notEqual(markAt, -1);
-  const markEffect = settingsSource.slice(markAt, markAt + 500);
-  assert.match(markEffect, /persistMountedRef\.current = true;/);
-  assert.match(
-    markEffect,
-    /return \(\) => \{\s*\n\s*persistMountedRef\.current = false;\s*\n\s*\};/,
-    'remount must treat boot as a fresh mount, not a settings change',
-  );
-});
-
-test('tray panel connect flush latches against StrictMode double invoke', () => {
-  const sideEffectsSource = readFileSync(
-    new URL('./AppSideEffects.tsx', import.meta.url),
-    'utf8',
-  );
-  assert.match(sideEffectsSource, /pendingTrayConnectFlushKeyRef/);
-  assert.match(
-    sideEffectsSource,
-    /if \(pendingTrayConnectFlushKeyRef\.current === flushKey\) return;/,
-  );
-});
-
-test('ssh transport idle TTL notify latches against StrictMode double invoke', () => {
-  const settingsSource = readFileSync(
-    new URL('../state/useSettingsState.ts', import.meta.url),
-    'utf8',
-  );
-  assert.match(settingsSource, /lastPushedSshTransportIdleTtlRef/);
-  assert.match(
-    settingsSource,
-    /if \(lastPushedSshTransportIdleTtlRef\.current === sshTransportIdleTtlMs\) return;/,
-  );
-  assert.match(
-    settingsSource,
-    /lastPushedSshTransportIdleTtlRef\.current = sshTransportIdleTtlMs;/,
-  );
-});
-
-test('terminal selection Ask-AI payload is consumed once under StrictMode', () => {
-  const hostSource = readFileSync(
-    new URL('../../components/terminalLayer/TerminalLayerSupport.tsx', import.meta.url),
-    'utf8',
-  );
-  assert.match(hostSource, /consumedTerminalSelectionRequestIds/);
-  assert.doesNotMatch(
-    hostSource,
-    /consumedTerminalSelectionRequestIdRef/,
-    'component refs reset on StrictMode remount; use a module Set',
-  );
-  assert.match(
-    hostSource,
-    /if \(consumedTerminalSelectionRequestIds\.has\(pendingTerminalSelection\.requestId\)\)/,
-  );
-  const latchAt = hostSource.indexOf('markTerminalSelectionRequestConsumed(pendingTerminalSelection.requestId)');
-  const draftAt = hostSource.indexOf('updateDraft(scopeKey, defaultAgentId');
-  assert.ok(latchAt > 0 && draftAt > latchAt, 'must latch before mutating the draft');
-});
-
-test('Codex App Server interaction bridge is app-singleton like MCP approvals', () => {
-  assert.match(appSource, /setupCodexAppServerInteractionBridge/);
-  const panelSource = readFileSync(
-    new URL('../../components/AIChatSidePanel.tsx', import.meta.url),
-    'utf8',
-  );
-  assert.doesNotMatch(
-    panelSource,
-    /setupCodexAppServerInteractionBridge/,
-    'per-panel Codex IPC listeners fan out approvals under retained multi-tab mounts',
-  );
-});

application/app/themeRuntimeBridge.ts

@@ -1,52 +0,0 @@
-/**
- * Theme runtime actions produced by TerminalHost (`useThemeRuntime`).
- * AppSideEffects handlers (default/follow theme changes) call through this
- * bridge instead of co-hosting the hook.
- */
-
-type Listener = () => void;
-
-export type ThemeRuntimeBridgeActions = {
-  clearThemeIntent: () => void;
-  settleManualThemeIntent: () => void;
-  pickTerminalTheme: (themeId: string) => void;
-  resolveFocusedAppearance: (...args: never[]) => unknown;
-  currentTerminalTheme: unknown;
-  globalAppearance: unknown;
-};
-
-class ThemeRuntimeBridge {
-  private actions: ThemeRuntimeBridgeActions | null = null;
-  private listeners = new Set<Listener>();
-
-  get = (): ThemeRuntimeBridgeActions | null => this.actions;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  set(next: ThemeRuntimeBridgeActions | null): void {
-    if (this.actions === next) return;
-    this.actions = next;
-    for (const listener of this.listeners) listener();
-  }
-}
-
-const bridge = new ThemeRuntimeBridge();
-
-export function registerThemeRuntimeActions(
-  actions: ThemeRuntimeBridgeActions | null,
-): void {
-  bridge.set(actions);
-}
-
-export function getThemeRuntimeActions(): ThemeRuntimeBridgeActions | null {
-  return bridge.get();
-}
-
-export function subscribeThemeRuntimeActions(listener: Listener): () => void {
-  return bridge.subscribe(listener);
-}

application/app/useAppStartupEffects.ts

@@ -9,7 +9,10 @@ import { sftpTransferCenterStore } from '../state/sftpTransferCenterStore';
 import { resumeTransferWithDedicatedSession } from '../state/sftp/dedicatedTransferResume';
 import { getSftpTransferResourceKeys, globalSftpTransferScheduler } from '../state/sftp/globalTransferScheduler';
 import { hasNewSourceFingerprint } from '../state/sftp/transferProgressMetadata';
-import { STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY } from '../../infrastructure/config/storageKeys';
+import {
+  STORAGE_KEY_AUTO_UPDATE_ENABLED,
+  STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY,
+} from '../../infrastructure/config/storageKeys';
 import type { TransferTask } from '../../domain/models';
 import { isTerminalBootEpochCurrent } from '../../domain/terminalBootEpoch';
 import {
@@ -213,17 +216,14 @@ export function useAppStartupEffects(ctx: StartupEffectsContext) {
   }, [dedicatedResumeHosts, enabled, identities, isVaultInitialized, keys, knownHosts, terminalSettings]);
 
   // Show toast notification when update is available (only when auto-download is idle)
-  const toastedUpdateVersionRef = useRef<string | null>(null);
   useEffect(() => {
     if (!enabled) return;
     // Skip "update available" toast if auto-download has already started or completed
     if (updateState.autoDownloadStatus !== 'idle') return;
     // Don't show automatic notification when auto-update is disabled
-    if (localStorageAdapter.readString('netcatty_auto_update_enabled_v1') === 'false') return;
+    if (localStorageAdapter.readString(STORAGE_KEY_AUTO_UPDATE_ENABLED) === 'false') return;
     if (updateState.hasUpdate && updateState.latestRelease) {
       const version = updateState.latestRelease.version;
-      if (toastedUpdateVersionRef.current === version) return;
-      toastedUpdateVersionRef.current = version;
       toast.info(
         t('update.available.message', { version }),
         {

application/app/useAppThemeStyle.ts

@@ -1,28 +0,0 @@
-import type React from 'react';
-import { useMemo } from 'react';
-
-import { useAppearanceChromeStore } from '../state/appearanceChromeStore';
-import { useSettingsChromeStore } from '../state/settingsChromeStore';
-import { buildAppThemeCssVars } from '../state/settingsStateDefaults';
-import { getUiThemeById } from '../../infrastructure/config/uiThemes';
-
-/**
- * App theme CSS variables for surfaces that need them (vault surface, plugin
- * theme tokens). Reads accent from appearanceChromeStore and UI theme ids from
- * settingsChromeStore so accent drags only re-render the leaf that applies the
- * vars, never the App shell.
- */
-export function useAppThemeStyle(): React.CSSProperties {
-  const { accentMode, customAccent } = useAppearanceChromeStore();
-  const { resolvedTheme, darkUiThemeId, lightUiThemeId } = useSettingsChromeStore();
-  return useMemo(() => {
-    const tokens = getUiThemeById(
-      resolvedTheme,
-      resolvedTheme === 'dark' ? darkUiThemeId : lightUiThemeId,
-    ).tokens;
-    return {
-      ...buildAppThemeCssVars(tokens, accentMode, customAccent),
-      colorScheme: resolvedTheme,
-    } as React.CSSProperties;
-  }, [accentMode, customAccent, darkUiThemeId, lightUiThemeId, resolvedTheme]);
-}

application/app/workTabSurface.test.ts

@@ -267,32 +267,6 @@ test('shared host tree uses the followed terminal theme when follow-app terminal
   assert.equal(resolved.id, currentTheme.id);
 });
 
-test('follow-app host tree applies custom accent onto the published base theme', () => {
-  const currentTheme = makeTheme('app-light', 'light', '#ffffff');
-  const host = {
-    id: 'host-1',
-    label: 'Host',
-    hostname: 'host.local',
-    username: 'root',
-    tags: [],
-    os: 'linux',
-  } as Host;
-
-  const resolved = resolveWorkTabHostTreeTheme({
-    activeHostId: host.id,
-    accentMode: 'custom',
-    currentTerminalTheme: currentTheme,
-    customAccent: '0 100% 50%',
-    followAppTerminalTheme: true,
-    hostById: new Map([[host.id, host]]),
-    themeById: new Map([[currentTheme.id, currentTheme]]),
-  });
-
-  assert.equal(resolved.id, currentTheme.id);
-  assert.notEqual(resolved.colors.cursor, currentTheme.colors.cursor);
-  assert.notEqual(resolved, currentTheme);
-});
-
 test('shared host tree falls back to the current terminal theme without an active host', () => {
   const currentTheme = makeTheme('app-dark', 'dark', '#111111');
 

application/app/workTabSurface.ts

@@ -179,9 +179,7 @@ export function resolveWorkTabHostTreeTheme({
   hostById: ReadonlyMap<string, Host>;
   themeById: ReadonlyMap<string, TerminalTheme>;
 }): TerminalTheme {
-  if (!activeHostId || followAppTerminalTheme) {
-    return applyCustomAccentToTerminalTheme(currentTerminalTheme, accentMode, customAccent);
-  }
+  if (!activeHostId || followAppTerminalTheme) return currentTerminalTheme;
 
   const host = hostById.get(activeHostId) ?? null;
   const themeId = resolveHostTerminalThemeId(host, currentTerminalTheme.id);

application/i18n/locales/en/ai.ts

@@ -61,15 +61,6 @@ export const enAiMessages: Messages = {
   'ai.providers.contextWindow.help': 'Leave blank to use the model list value when available, otherwise Netcatty uses a safe default.',
   'ai.providers.contextWindow.error': 'Enter a positive whole number, or leave it blank.',
   'ai.providers.refreshModels': 'Refresh models',
-  'ai.providers.test': 'Test',
-  'ai.providers.test.testing': 'Testing…',
-  'ai.providers.test.ok': 'Connected ({latency} ms)',
-  'ai.providers.test.warn': 'Reached endpoint, but response looks incomplete ({latency} ms)',
-  'ai.providers.test.warnSlow': 'Connected, but slow ({latency} ms)',
-  'ai.providers.test.error': 'Failed ({detail})',
-  'ai.providers.test.missingBaseUrl': 'Enter a Base URL first',
-  'ai.providers.test.missingApiKey': 'Enter an API key first',
-  'ai.providers.test.unavailable': 'Connection test is unavailable in this environment',
   'ai.providers.searchModel': 'Search or type model ID...',
   'ai.providers.filterModels': 'Filter models...',
   'ai.providers.loadingModels': 'Loading models...',

application/i18n/locales/en/core.ts

@@ -89,12 +89,8 @@ export const enCoreMessages: Messages = {
   'settings.tab.appearance': 'Appearance',
   'settings.tab.terminal': 'Terminal',
   'settings.tab.shortcuts': 'Shortcuts',
-  'settings.tab.ai': 'AI',
   'settings.tab.syncCloud': 'Sync & Cloud',
   'settings.tab.system': 'System',
-  'settings.search.open': 'Search settings',
-  'settings.search.placeholder': 'Search settings…',
-  'settings.search.noResults': 'No matching settings',
 
   // Settings > System
   'settings.system.title': 'System',
@@ -238,7 +234,6 @@ export const enCoreMessages: Messages = {
   'tray.status.active': 'Active',
   'tray.status.inactive': 'Inactive',
   'tray.status.error': 'Error',
-  'tray.status.unknown': 'Unknown',
   'tray.recentHosts': 'Recent Hosts',
   'tray.empty.title': 'Nothing here yet',
   'tray.empty.subtitle': 'Go connect to a server, they miss you 🚀',

application/i18n/locales/en/systemManager.ts

@@ -8,12 +8,9 @@ export const enSystemManagerMessages: Messages = {
   'systemManager.empty': 'No data available.',
   'systemManager.tabs.overview': 'Overview',
   'systemManager.tabs.processes': 'Processes',
-  'systemManager.tabs.ports': 'Ports',
-  'systemManager.tabs.services': 'Services',
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': 'System manager sections',
   'systemManager.popup.loading': 'Opening terminal…',
   'systemManager.popup.startupFailed': 'The startup command did not complete successfully. Check that the target is still available and try again.',
 
@@ -28,8 +25,6 @@ export const enSystemManagerMessages: Messages = {
   'systemManager.errors.loadDockerImages': 'Failed to load images',
   'systemManager.errors.loadOverview': 'Failed to load system overview',
   'systemManager.errors.loadGpu': 'Failed to load GPU / NPU stats',
-  'systemManager.errors.loadPorts': 'Failed to load listening ports',
-  'systemManager.errors.loadServices': 'Failed to load systemd services',
   'systemManager.errors.sshChannelUnavailable': 'The server refused to open a new execution channel. Try again later, or reconnect this host.',
 
   'systemManager.overview.empty': 'No system overview data yet.',
@@ -194,34 +189,6 @@ export const enSystemManagerMessages: Messages = {
   'systemManager.docker.start': 'Start',
   'systemManager.docker.stop': 'Stop',
 
-  'systemManager.ports.unavailable': 'No listening-port tools (ss / netstat) detected on this host.',
-  'systemManager.ports.loading': 'Loading listening ports…',
-  'systemManager.ports.empty': 'No listening ports reported.',
-  'systemManager.ports.search': 'Search ports…',
-  'systemManager.ports.meta': '{{count}} listener(s)',
-  'systemManager.ports.filter.all': 'All',
-  'systemManager.ports.unknownProcess': 'Unknown process',
-  'systemManager.ports.terminate': 'Terminate',
-  'systemManager.ports.confirmTerminate': 'Send SIGTERM to process {{pid}} that holds this port?',
-
-  'systemManager.services.unavailable': 'systemctl is not available on this host.',
-  'systemManager.services.loading': 'Loading systemd services…',
-  'systemManager.services.empty': 'No systemd services found.',
-  'systemManager.services.search': 'Search services…',
-  'systemManager.services.meta': '{{count}} service(s)',
-  'systemManager.services.filter.all': 'All',
-  'systemManager.services.filter.running': 'Running',
-  'systemManager.services.filter.failed': 'Failed',
-  'systemManager.services.filter.inactive': 'Inactive',
-  'systemManager.services.start': 'Start',
-  'systemManager.services.stop': 'Stop',
-  'systemManager.services.restart': 'Restart',
-  'systemManager.services.enable': 'Enable',
-  'systemManager.services.disable': 'Disable',
-  'systemManager.services.reload': 'Reload',
-  'systemManager.services.scope.user': 'user',
-  'systemManager.services.confirmAction': '{{action}} {{name}}?',
-
   'systemManager.gpu.unavailable': 'No NVIDIA GPU or Ascend NPU tools detected on this host.',
   'systemManager.gpu.loading': 'Loading accelerator stats…',
   'systemManager.gpu.empty': 'Accelerator tools are present, but no devices were reported.',

application/i18n/locales/en/vault.ts

@@ -113,8 +113,6 @@ export const enVaultMessages: Messages = {
   'knownHosts.empty.title': 'No Known Hosts',
   'knownHosts.empty.desc':
     "Known hosts are SSH servers you've connected to before. Import from your system's known_hosts file to get started.",
-  'knownHosts.results.showingLimited':
-    'Showing {shown} of {total} hosts. Use search to find specific hosts.',
   'knownHosts.toast.scanUnavailable': 'System scan is unavailable on this platform.',
   'knownHosts.toast.scanNoFile': 'No system known_hosts file found.',
   'knownHosts.toast.scanNoEntries': 'No usable entries found in known_hosts.',
@@ -325,7 +323,6 @@ export const enVaultMessages: Messages = {
   'sftp.transfers.dragToResize': 'Drag to resize',
   'sftp.goUp': 'Go up',
   'sftp.goToTerminalCwd': 'Go to terminal directory',
-  'sftp.locatePathInTerminal': 'Open path in terminal',
   'sftp.followTerminalCwd': 'Follow terminal directory',
   'sftp.followTerminalCwd.enable': 'Enable follow terminal directory',
   'sftp.followTerminalCwd.disable': 'Disable follow terminal directory',
@@ -451,13 +448,6 @@ export const enVaultMessages: Messages = {
   'settings.tab.sftpFileAssociations': 'SFTP',
   'settings.sftp.transferConcurrency': 'Transfer Concurrency',
   'settings.sftp.transferConcurrency.desc': 'Maximum number of files transferred in parallel for the same endpoint, including folder contents and separately selected files. Higher values may improve speed but can overwhelm some servers.',
-  'settings.sftp.transferPoolIdleTtl': 'Transfer connection keep-alive',
-  'settings.sftp.transferPoolIdleTtl.desc': 'How long dedicated transfer SFTP connections stay warm after idle. Longer values reduce cold-start delay before the next upload or download. Busy transfers are never closed.',
-  'settings.sftp.transferPoolIdleTtl.1m': '1 minute',
-  'settings.sftp.transferPoolIdleTtl.5m': '5 minutes',
-  'settings.sftp.transferPoolIdleTtl.15m': '15 minutes',
-  'settings.sftp.transferPoolIdleTtl.30m': '30 minutes',
-  'settings.sftp.transferPoolIdleTtl.never': 'Until app quit',
   'settings.ssh.transportIdleTtl': 'SSH connection keep-alive',
   'settings.ssh.transportIdleTtl.desc': 'How long a shared SSH connection stays warm after the last terminal, SFTP browse, bulk transfer, or port-forward lease is released. While warm, reconnecting to the same host can skip re-authentication (including MFA). Active sessions and transfers are never closed.',
   'settings.ssh.transportIdleTtl.1m': '1 minute',
@@ -914,30 +904,8 @@ export const enVaultMessages: Messages = {
   'hostDetails.plugin.unavailable': 'The configured provider is unavailable. Configuration is preserved until the plugin is restored.',
   'hostDetails.plugin.useSsh': 'Use SSH instead',
 
-  // Host form (legacy modal)
-  'hostForm.title.edit': 'Edit Host',
-  'hostForm.title.new': 'New Host',
-  'hostForm.desc.edit': 'Update connection details for this host',
-  'hostForm.desc.new': 'Create a new SSH host entry',
-  'hostForm.field.label': 'Label',
-  'hostForm.placeholder.label': 'My Production Server',
-  'hostForm.field.hostname': 'Hostname / IP',
-  'hostForm.placeholder.hostname': '192.168.1.1',
-  'hostForm.field.port': 'Port',
-  'hostForm.field.username': 'Username',
-  'hostForm.field.osType': 'OS Type',
-  'hostForm.placeholder.selectOs': 'Select OS',
-  'hostForm.field.group': 'Group',
-  'hostForm.placeholder.group': 'e.g. AWS, DigitalOcean',
-  'hostForm.field.tags': 'Tags',
-  'hostForm.placeholder.addTag': 'Add a tag...',
-  'hostForm.auth.method': 'Authentication Method',
-  'hostForm.auth.password': 'Password',
-  'hostForm.auth.sshKey': 'SSH Key',
+  // Host form (legacy keys still referenced by TerminalAuthDialog)
   'hostForm.auth.selectKey': 'Select an SSH Key',
-  'hostForm.auth.noKeys': 'No keys available',
-  'hostForm.auth.noKeysHint': 'No SSH keys found in Keychain. Please create one first.',
-  'hostForm.saveHost': 'Save Host',
 
   // Connection logs
   'logs.table.date': 'Date',

application/i18n/locales/ru/ai.ts

@@ -42,15 +42,6 @@ export const ruAiMessages: Messages = {
   'ai.providers.contextWindow.help': 'Оставьте пустым, чтобы использовать значение из списка моделей, если оно доступно; иначе Netcatty применит безопасное значение по умолчанию.',
   'ai.providers.contextWindow.error': 'Введите положительное целое число или оставьте поле пустым.',
   'ai.providers.refreshModels': 'Обновить модели',
-  'ai.providers.test': 'Проверить',
-  'ai.providers.test.testing': 'Проверка…',
-  'ai.providers.test.ok': 'Подключено ({latency} ms)',
-  'ai.providers.test.warn': 'Эндпоинт доступен, но ответ выглядит неполным ({latency} ms)',
-  'ai.providers.test.warnSlow': 'Подключено, но медленно ({latency} ms)',
-  'ai.providers.test.error': 'Ошибка ({detail})',
-  'ai.providers.test.missingBaseUrl': 'Сначала укажите Base URL',
-  'ai.providers.test.missingApiKey': 'Сначала укажите API-ключ',
-  'ai.providers.test.unavailable': 'Проверка соединения недоступна в этой среде',
   'ai.providers.searchModel': 'Искать или ввести ID модели...',
   'ai.providers.filterModels': 'Фильтровать модели...',
   'ai.providers.loadingModels': 'Загрузка моделей...',

application/i18n/locales/ru/core.ts

@@ -88,12 +88,8 @@ export const ruCoreMessages: Messages = {
   'settings.tab.appearance': 'Внешний вид',
   'settings.tab.terminal': 'Терминал',
   'settings.tab.shortcuts': 'Горячие клавиши',
-  'settings.tab.ai': 'AI',
   'settings.tab.syncCloud': 'Синхронизация и облако',
   'settings.tab.system': 'Система',
-  'settings.search.open': 'Поиск настроек',
-  'settings.search.placeholder': 'Искать настройки…',
-  'settings.search.noResults': 'Совпадений не найдено',
 
   // Settings > System
   'settings.system.title': 'Система',
@@ -226,7 +222,6 @@ export const ruCoreMessages: Messages = {
   'tray.status.active': 'Активно',
   'tray.status.inactive': 'Неактивно',
   'tray.status.error': 'Ошибка',
-  'tray.status.unknown': 'Неизвестно',
   'tray.recentHosts': 'Недавние хосты',
   'tray.empty.title': 'Пока здесь ничего нет',
   'tray.empty.subtitle': 'Подключитесь к серверу, они по вам скучают 🚀',

application/i18n/locales/ru/systemManager.ts

@@ -8,12 +8,9 @@ export const ruSystemManagerMessages: Messages = {
   'systemManager.empty': 'Нет данных.',
   'systemManager.tabs.overview': 'Обзор',
   'systemManager.tabs.processes': 'Процессы',
-  'systemManager.tabs.ports': 'Порты',
-  'systemManager.tabs.services': 'Службы',
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': 'Разделы системного менеджера',
   'systemManager.popup.loading': 'Открытие терминала…',
   'systemManager.popup.startupFailed': 'Команда запуска не была выполнена успешно. Проверьте, что цель доступна, и повторите попытку.',
 
@@ -28,8 +25,6 @@ export const ruSystemManagerMessages: Messages = {
   'systemManager.errors.loadDockerImages': 'Не удалось загрузить образы',
   'systemManager.errors.loadOverview': 'Не удалось загрузить обзор системы',
   'systemManager.errors.loadGpu': 'Не удалось загрузить статистику GPU / NPU',
-  'systemManager.errors.loadPorts': 'Не удалось загрузить слушающие порты',
-  'systemManager.errors.loadServices': 'Не удалось загрузить службы systemd',
   'systemManager.errors.sshChannelUnavailable': 'Сервер отказался открыть новый канал выполнения. Повторите попытку позже или переподключите этот хост.',
 
   'systemManager.overview.empty': 'Данных обзора пока нет.',
@@ -194,34 +189,6 @@ export const ruSystemManagerMessages: Messages = {
   'systemManager.docker.start': 'Запустить',
   'systemManager.docker.stop': 'Остановить',
 
-  'systemManager.ports.unavailable': 'На этом хосте не обнаружены инструменты портов (ss / netstat).',
-  'systemManager.ports.loading': 'Загрузка слушающих портов…',
-  'systemManager.ports.empty': 'Слушающие порты не найдены.',
-  'systemManager.ports.search': 'Поиск портов…',
-  'systemManager.ports.meta': '{{count}} слушающих',
-  'systemManager.ports.filter.all': 'Все',
-  'systemManager.ports.unknownProcess': 'Неизвестный процесс',
-  'systemManager.ports.terminate': 'Завершить',
-  'systemManager.ports.confirmTerminate': 'Отправить SIGTERM процессу {{pid}}, занимающему этот порт?',
-
-  'systemManager.services.unavailable': 'systemctl недоступен на этом хосте.',
-  'systemManager.services.loading': 'Загрузка служб systemd…',
-  'systemManager.services.empty': 'Службы systemd не найдены.',
-  'systemManager.services.search': 'Поиск служб…',
-  'systemManager.services.meta': '{{count}} служб',
-  'systemManager.services.filter.all': 'Все',
-  'systemManager.services.filter.running': 'Запущены',
-  'systemManager.services.filter.failed': 'С ошибкой',
-  'systemManager.services.filter.inactive': 'Неактивны',
-  'systemManager.services.start': 'Запустить',
-  'systemManager.services.stop': 'Остановить',
-  'systemManager.services.restart': 'Перезапустить',
-  'systemManager.services.enable': 'Включить автозапуск',
-  'systemManager.services.disable': 'Отключить автозапуск',
-  'systemManager.services.reload': 'Перезагрузить',
-  'systemManager.services.scope.user': 'user',
-  'systemManager.services.confirmAction': '{{action}} {{name}}?',
-
   'systemManager.gpu.unavailable': 'На этом хосте не обнаружены инструменты NVIDIA GPU или Ascend NPU.',
   'systemManager.gpu.loading': 'Загрузка статистики ускорителей…',
   'systemManager.gpu.empty': 'Инструменты ускорителей найдены, но устройства не сообщены.',

application/i18n/locales/ru/vault.ts

@@ -150,8 +150,6 @@ export const ruVaultMessages: Messages = {
   'knownHosts.empty.title': 'Нет известных хостов',
   'knownHosts.empty.desc':
     'Известные хосты — это SSH-серверы, к которым вы подключались раньше. Импортируйте системный файл known_hosts, чтобы начать.',
-  'knownHosts.results.showingLimited':
-    'Показано {shown} из {total} хостов. Используйте поиск, чтобы найти нужные хосты.',
   'knownHosts.toast.scanUnavailable': 'Сканирование системы недоступно на этой платформе.',
   'knownHosts.toast.scanNoFile': 'Системный файл known_hosts не найден.',
   'knownHosts.toast.scanNoEntries': 'В known_hosts не найдено пригодных записей.',
@@ -361,7 +359,6 @@ export const ruVaultMessages: Messages = {
   'sftp.transfers.dragToResize': 'Перетащите для изменения размера',
   'sftp.goUp': 'Наверх',
   'sftp.goToTerminalCwd': 'Перейти в каталог терминала',
-  'sftp.locatePathInTerminal': 'Открыть путь в терминале',
   'sftp.followTerminalCwd': 'Следовать за каталогом терминала',
   'sftp.followTerminalCwd.enable': 'Включить следование за каталогом терминала',
   'sftp.followTerminalCwd.disable': 'Отключить следование за каталогом терминала',
@@ -487,13 +484,6 @@ export const ruVaultMessages: Messages = {
   'settings.tab.sftpFileAssociations': 'SFTP',
   'settings.sftp.transferConcurrency': 'Параллелизм передачи',
   'settings.sftp.transferConcurrency.desc': 'Максимальное число файлов, одновременно передаваемых для одной цели, включая содержимое папок и отдельно выбранные файлы. Большие значения могут ускорить передачу, но перегрузить некоторые серверы.',
-  'settings.sftp.transferPoolIdleTtl': 'Удержание transfer-соединений',
-  'settings.sftp.transferPoolIdleTtl.desc': 'Как долго простаивающие SFTP-соединения пула передачи остаются открытыми. Большее время снижает задержку перед следующей передачей. Активные передачи не закрываются.',
-  'settings.sftp.transferPoolIdleTtl.1m': '1 минута',
-  'settings.sftp.transferPoolIdleTtl.5m': '5 минут',
-  'settings.sftp.transferPoolIdleTtl.15m': '15 минут',
-  'settings.sftp.transferPoolIdleTtl.30m': '30 минут',
-  'settings.sftp.transferPoolIdleTtl.never': 'До выхода из приложения',
   'settings.ssh.transportIdleTtl': 'Удержание SSH-соединений',
   'settings.ssh.transportIdleTtl.desc': 'Как долго общее SSH-соединение остаётся открытым после освобождения последнего lease терминала, SFTP-браузера, пакетной передачи или проброса портов. Пока оно тёплое, повторное подключение к тому же хосту может обойти повторную аутентификацию (включая MFA). Активные сессии и передачи не закрываются.',
   'settings.ssh.transportIdleTtl.1m': '1 минута',
@@ -946,30 +936,8 @@ export const ruVaultMessages: Messages = {
   'hostDetails.plugin.unavailable': 'Настроенный провайдер недоступен. Конфигурация сохранится до восстановления плагина.',
   'hostDetails.plugin.useSsh': 'Использовать SSH',
 
-  // Host form (legacy modal)
-  'hostForm.title.edit': 'Редактировать хост',
-  'hostForm.title.new': 'Новый хост',
-  'hostForm.desc.edit': 'Обновите параметры подключения для этого хоста',
-  'hostForm.desc.new': 'Создайте новую запись SSH-хоста',
-  'hostForm.field.label': 'Метка',
-  'hostForm.placeholder.label': 'Мой production-сервер',
-  'hostForm.field.hostname': 'Имя хоста / IP',
-  'hostForm.placeholder.hostname': '192.168.1.1',
-  'hostForm.field.port': 'Порт',
-  'hostForm.field.username': 'Имя пользователя',
-  'hostForm.field.osType': 'Тип ОС',
-  'hostForm.placeholder.selectOs': 'Выберите ОС',
-  'hostForm.field.group': 'Группа',
-  'hostForm.placeholder.group': 'например, AWS, DigitalOcean',
-  'hostForm.field.tags': 'Теги',
-  'hostForm.placeholder.addTag': 'Добавить тег...',
-  'hostForm.auth.method': 'Метод аутентификации',
-  'hostForm.auth.password': 'Пароль',
-  'hostForm.auth.sshKey': 'SSH-ключ',
+  // Host form (legacy keys still referenced by TerminalAuthDialog)
   'hostForm.auth.selectKey': 'Выберите SSH-ключ',
-  'hostForm.auth.noKeys': 'Нет доступных ключей',
-  'hostForm.auth.noKeysHint': 'В связке ключей не найдено SSH-ключей. Сначала создайте один.',
-  'hostForm.saveHost': 'Сохранить хост',
   'vault.import.plugins.title': 'Импортёры плагинов',
   'vault.import.plugins.loading': 'Создание безопасного предварительного просмотра…',
   'vault.import.plugins.progress': 'Обработано {completed} из {total} {message}',

application/i18n/locales/zh-CN/ai.ts

@@ -61,15 +61,6 @@ export const zhCNAiMessages: Messages = {
   'ai.providers.contextWindow.help': '留空时优先使用模型列表返回的值；如果没有，Netcatty 会使用安全默认值。',
   'ai.providers.contextWindow.error': '请输入正整数，或留空。',
   'ai.providers.refreshModels': '刷新模型列表',
-  'ai.providers.test': '检测',
-  'ai.providers.test.testing': '检测中…',
-  'ai.providers.test.ok': '连接正常（{latency} ms）',
-  'ai.providers.test.warn': '已连通，但响应不完整（{latency} ms）',
-  'ai.providers.test.warnSlow': '已连通，但较慢（{latency} ms）',
-  'ai.providers.test.error': '检测失败（{detail}）',
-  'ai.providers.test.missingBaseUrl': '请先填写 Base URL',
-  'ai.providers.test.missingApiKey': '请先填写 API Key',
-  'ai.providers.test.unavailable': '当前环境无法进行连接检测',
   'ai.providers.searchModel': '搜索或输入模型 ID...',
   'ai.providers.filterModels': '筛选模型...',
   'ai.providers.loadingModels': '加载模型中...',

application/i18n/locales/zh-CN/core.ts

@@ -72,12 +72,8 @@ export const zhCNCoreMessages: Messages = {
   'settings.tab.appearance': '外观',
   'settings.tab.terminal': '终端',
   'settings.tab.shortcuts': '快捷键',
-  'settings.tab.ai': 'AI',
   'settings.tab.syncCloud': '同步与云',
   'settings.tab.system': '系统',
-  'settings.search.open': '搜索设置',
-  'settings.search.placeholder': '搜索设置项…',
-  'settings.search.noResults': '没有匹配的设置项',
   'settings.terminal.connection.verifyHostKeys': '校验 SSH 主机密钥',
   'settings.terminal.connection.verifyHostKeys.desc': '连接到新的或已变化的 SSH 主机密钥前先询问。只建议在可信内网中关闭。',
   'settings.terminal.section.sidePanel': '侧边栏',
@@ -235,7 +231,6 @@ export const zhCNCoreMessages: Messages = {
   'tray.status.active': '已启用',
   'tray.status.inactive': '未启用',
   'tray.status.error': '错误',
-  'tray.status.unknown': '未知',
   'tray.recentHosts': '最近连接的主机',
   'tray.empty.title': '一切都很安静',
   'tray.empty.subtitle': '去连接个服务器吧，它们想念你了 🚀',
@@ -737,7 +732,6 @@ export const zhCNCoreMessages: Messages = {
   'knownHosts.empty.title': '暂无已知主机',
   'knownHosts.empty.desc':
     'Known Hosts 是你之前连接过的 SSH server。导入系统的 known_hosts 文件以开始。',
-  'knownHosts.results.showingLimited': '显示 {shown}/{total} 个主机。使用搜索查找特定主机。',
   'knownHosts.toast.scanUnavailable': '当前平台无法扫描系统 known_hosts。',
   'knownHosts.toast.scanNoFile': '未找到系统 known_hosts 文件。',
   'knownHosts.toast.scanNoEntries': 'known_hosts 中没有可用条目。',
@@ -924,7 +918,6 @@ export const zhCNCoreMessages: Messages = {
   'sftp.transfers.dragToResize': '拖拽调整高度',
   'sftp.goUp': '上一级',
   'sftp.goToTerminalCwd': '定位到终端当前目录',
-  'sftp.locatePathInTerminal': '定位路径到终端',
   'sftp.followTerminalCwd': '追随终端目录',
   'sftp.followTerminalCwd.enable': '开启追随终端目录',
   'sftp.followTerminalCwd.disable': '关闭追随终端目录',

application/i18n/locales/zh-CN/systemManager.ts

@@ -8,12 +8,9 @@ export const zhCnSystemManagerMessages: Messages = {
   'systemManager.empty': '暂无数据。',
   'systemManager.tabs.overview': '概览',
   'systemManager.tabs.processes': '进程',
-  'systemManager.tabs.ports': '端口',
-  'systemManager.tabs.services': '服务',
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': '系统管理分区',
   'systemManager.popup.loading': '正在打开终端…',
   'systemManager.popup.startupFailed': '启动命令未成功。请确认目标仍然可用后重试。',
 
@@ -28,8 +25,6 @@ export const zhCnSystemManagerMessages: Messages = {
   'systemManager.errors.loadDockerImages': '加载镜像列表失败',
   'systemManager.errors.loadOverview': '加载系统概览失败',
   'systemManager.errors.loadGpu': '加载 GPU / NPU 状态失败',
-  'systemManager.errors.loadPorts': '加载监听端口失败',
-  'systemManager.errors.loadServices': '加载 systemd 服务失败',
   'systemManager.errors.sshChannelUnavailable': '服务器拒绝打开新的执行通道。请稍后重试，或重新连接当前主机。',
 
   'systemManager.overview.empty': '暂无系统概览数据。',
@@ -194,34 +189,6 @@ export const zhCnSystemManagerMessages: Messages = {
   'systemManager.docker.start': '启动',
   'systemManager.docker.stop': '停止',
 
-  'systemManager.ports.unavailable': '此主机未检测到端口工具（ss / netstat）。',
-  'systemManager.ports.loading': '正在加载监听端口…',
-  'systemManager.ports.empty': '暂无监听端口。',
-  'systemManager.ports.search': '搜索端口…',
-  'systemManager.ports.meta': '{{count}} 个监听',
-  'systemManager.ports.filter.all': '全部',
-  'systemManager.ports.unknownProcess': '未知进程',
-  'systemManager.ports.terminate': '结束进程',
-  'systemManager.ports.confirmTerminate': '向占用该端口的进程 {{pid}} 发送 SIGTERM？',
-
-  'systemManager.services.unavailable': '此主机未检测到 systemctl。',
-  'systemManager.services.loading': '正在加载 systemd 服务…',
-  'systemManager.services.empty': '暂无 systemd 服务。',
-  'systemManager.services.search': '搜索服务…',
-  'systemManager.services.meta': '{{count}} 个服务',
-  'systemManager.services.filter.all': '全部',
-  'systemManager.services.filter.running': '运行中',
-  'systemManager.services.filter.failed': '失败',
-  'systemManager.services.filter.inactive': '未运行',
-  'systemManager.services.start': '启动',
-  'systemManager.services.stop': '停止',
-  'systemManager.services.restart': '重启',
-  'systemManager.services.enable': '开机启用',
-  'systemManager.services.disable': '禁用开机',
-  'systemManager.services.reload': '重载',
-  'systemManager.services.scope.user': '用户',
-  'systemManager.services.confirmAction': '确认对 {{name}} 执行「{{action}}」？',
-
   'systemManager.gpu.unavailable': '此主机未检测到 NVIDIA GPU 或昇腾 NPU 工具。',
   'systemManager.gpu.loading': '正在加载加速卡状态…',
   'systemManager.gpu.empty': '已检测到加速卡工具，但未返回设备信息。',

application/i18n/locales/zh-CN/terminal.ts

@@ -93,13 +93,6 @@ export const zhCNTerminalMessages: Messages = {
   'settings.tab.sftpFileAssociations': 'SFTP',
   'settings.sftp.transferConcurrency': '传输并发数',
   'settings.sftp.transferConcurrency.desc': '同一目标同时传输的文件数量上限，包括文件夹内文件和单独多选的文件。较高的值可能提高速度，但可能导致某些服务器过载。',
-  'settings.sftp.transferPoolIdleTtl': '传输连接保活时间',
-  'settings.sftp.transferPoolIdleTtl.desc': '专用传输 SFTP 连接空闲多久后关闭。时间更长可减少下次上传/下载的冷启动等待；进行中的传输不会被关闭。',
-  'settings.sftp.transferPoolIdleTtl.1m': '1 分钟',
-  'settings.sftp.transferPoolIdleTtl.5m': '5 分钟',
-  'settings.sftp.transferPoolIdleTtl.15m': '15 分钟',
-  'settings.sftp.transferPoolIdleTtl.30m': '30 分钟',
-  'settings.sftp.transferPoolIdleTtl.never': '直到退出应用',
   'settings.ssh.transportIdleTtl': 'SSH 连接保活时间',
   'settings.ssh.transportIdleTtl.desc': '最后一个终端、SFTP 浏览、批量传输或端口转发释放后，共享 SSH 连接再保留多久。保留期间再次打开同主机可跳过重新认证（含 MFA）；进行中的会话与传输不会被关闭。',
   'settings.ssh.transportIdleTtl.1m': '1 分钟',

application/i18n/locales/zh-CN/vault.ts

@@ -331,29 +331,8 @@ export const zhCNVaultMessages: Messages = {
   'hostDetails.plugin.useSsh': '改用 SSH',
 
   // Host form (legacy modal)
-  'hostForm.title.edit': '编辑主机',
-  'hostForm.title.new': '新建主机',
-  'hostForm.desc.edit': '更新该主机的连接信息',
-  'hostForm.desc.new': '创建一个新的 SSH 主机条目',
-  'hostForm.field.label': '名称',
-  'hostForm.placeholder.label': 'My Production Server',
-  'hostForm.field.hostname': 'Hostname / IP',
-  'hostForm.placeholder.hostname': '192.168.1.1',
-  'hostForm.field.port': '端口',
-  'hostForm.field.username': '用户名',
-  'hostForm.field.osType': '操作系统类型',
-  'hostForm.placeholder.selectOs': '选择操作系统',
-  'hostForm.field.group': '分组',
-  'hostForm.placeholder.group': '例如：AWS、DigitalOcean',
-  'hostForm.field.tags': '标签',
-  'hostForm.placeholder.addTag': '添加标签…',
-  'hostForm.auth.method': '认证方式',
-  'hostForm.auth.password': '密码',
-  'hostForm.auth.sshKey': 'SSH密钥',
+  // Host form (legacy keys still referenced by TerminalAuthDialog)
   'hostForm.auth.selectKey': '选择 SSH密钥',
-  'hostForm.auth.noKeys': '暂无密钥',
-  'hostForm.auth.noKeysHint': '钥匙串中未找到 SSH密钥，请先创建一个。',
-  'hostForm.saveHost': '保存主机',
 
   // Connection logs
   'logs.table.date': '日期',

application/i18n/locales/zh-TW/ai.ts

@@ -61,15 +61,6 @@ export const zhTWAiMessages: Messages = {
   'ai.providers.contextWindow.help': '留空時優先使用模型列表傳回的值；如果沒有，Netcatty 會使用安全預設值。',
   'ai.providers.contextWindow.error': '請輸入正整數，或留空。',
   'ai.providers.refreshModels': '重新整理模型列表',
-  'ai.providers.test': '檢測',
-  'ai.providers.test.testing': '檢測中…',
-  'ai.providers.test.ok': '連線正常（{latency} ms）',
-  'ai.providers.test.warn': '已連通，但回應不完整（{latency} ms）',
-  'ai.providers.test.warnSlow': '已連通，但較慢（{latency} ms）',
-  'ai.providers.test.error': '檢測失敗（{detail}）',
-  'ai.providers.test.missingBaseUrl': '請先填寫 Base URL',
-  'ai.providers.test.missingApiKey': '請先填寫 API Key',
-  'ai.providers.test.unavailable': '目前環境無法進行連線檢測',
   'ai.providers.searchModel': '搜尋或輸入模型 ID...',
   'ai.providers.filterModels': '篩選模型...',
   'ai.providers.loadingModels': '載入模型中...',

application/i18n/locales/zh-TW/core.ts

@@ -72,12 +72,8 @@ export const zhTWCoreMessages: Messages = {
   'settings.tab.appearance': '外觀',
   'settings.tab.terminal': '終端',
   'settings.tab.shortcuts': '快捷鍵',
-  'settings.tab.ai': 'AI',
   'settings.tab.syncCloud': '同步與雲',
   'settings.tab.system': '系統',
-  'settings.search.open': '搜尋設定',
-  'settings.search.placeholder': '搜尋設定項…',
-  'settings.search.noResults': '沒有符合的設定項',
   'settings.terminal.connection.verifyHostKeys': '驗證 SSH 主機金鑰',
   'settings.terminal.connection.verifyHostKeys.desc': '連線到新的或已變化的 SSH 主機金鑰前先詢問。只建議在可信內網中關閉。',
   'settings.terminal.section.sidePanel': '側邊欄',
@@ -235,7 +231,6 @@ export const zhTWCoreMessages: Messages = {
   'tray.status.active': '已啟用',
   'tray.status.inactive': '未啟用',
   'tray.status.error': '錯誤',
-  'tray.status.unknown': '未知',
   'tray.recentHosts': '最近連線的主機',
   'tray.empty.title': '一切都很安靜',
   'tray.empty.subtitle': '去連線個伺服器吧，它們想念你了 🚀',
@@ -737,7 +732,6 @@ export const zhTWCoreMessages: Messages = {
   'knownHosts.empty.title': '暫無已知主機',
   'knownHosts.empty.desc':
     'Known Hosts 是你之前連線過的 SSH server。匯入系統的 known_hosts 檔案以開始。',
-  'knownHosts.results.showingLimited': '顯示 {shown}/{total} 個主機。使用搜索查詢特定主機。',
   'knownHosts.toast.scanUnavailable': '目前平台無法掃描系統 known_hosts。',
   'knownHosts.toast.scanNoFile': '未找到系統 known_hosts 檔案。',
   'knownHosts.toast.scanNoEntries': 'known_hosts 中沒有可用條目。',
@@ -924,7 +918,6 @@ export const zhTWCoreMessages: Messages = {
   'sftp.transfers.dragToResize': '拖拽調整高度',
   'sftp.goUp': '上一級',
   'sftp.goToTerminalCwd': '定位到終端目前目錄',
-  'sftp.locatePathInTerminal': '定位路徑到終端',
   'sftp.followTerminalCwd': '追隨終端目錄',
   'sftp.followTerminalCwd.enable': '開啟追隨終端目錄',
   'sftp.followTerminalCwd.disable': '關閉追隨終端目錄',

application/i18n/locales/zh-TW/systemManager.ts

@@ -8,12 +8,9 @@ export const zhTwSystemManagerMessages: Messages = {
   'systemManager.empty': '暫無資料。',
   'systemManager.tabs.overview': '概覽',
   'systemManager.tabs.processes': '程序',
-  'systemManager.tabs.ports': '連接埠',
-  'systemManager.tabs.services': '服務',
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': '系統管理分區',
   'systemManager.popup.loading': '正在開啟終端…',
   'systemManager.popup.startupFailed': '啟動指令未順利完成。請確認目標仍可使用後再試一次。',
 
@@ -28,8 +25,6 @@ export const zhTwSystemManagerMessages: Messages = {
   'systemManager.errors.loadDockerImages': '載入映像列表失敗',
   'systemManager.errors.loadOverview': '載入系統概覽失敗',
   'systemManager.errors.loadGpu': '載入 GPU / NPU 狀態失敗',
-  'systemManager.errors.loadPorts': '載入監聽連接埠失敗',
-  'systemManager.errors.loadServices': '載入 systemd 服務失敗',
   'systemManager.errors.sshChannelUnavailable': '伺服器拒絕開啟新的執行通道。請稍後重試，或重新連線目前主機。',
 
   'systemManager.overview.empty': '暫無系統概覽資料。',
@@ -194,34 +189,6 @@ export const zhTwSystemManagerMessages: Messages = {
   'systemManager.docker.start': '啟動',
   'systemManager.docker.stop': '停止',
 
-  'systemManager.ports.unavailable': '此主機未偵測到連接埠工具（ss / netstat）。',
-  'systemManager.ports.loading': '正在載入監聽連接埠…',
-  'systemManager.ports.empty': '暫無監聽連接埠。',
-  'systemManager.ports.search': '搜尋連接埠…',
-  'systemManager.ports.meta': '{{count}} 個監聽',
-  'systemManager.ports.filter.all': '全部',
-  'systemManager.ports.unknownProcess': '未知程序',
-  'systemManager.ports.terminate': '結束程序',
-  'systemManager.ports.confirmTerminate': '向佔用該連接埠的程序 {{pid}} 傳送 SIGTERM？',
-
-  'systemManager.services.unavailable': '此主機未偵測到 systemctl。',
-  'systemManager.services.loading': '正在載入 systemd 服務…',
-  'systemManager.services.empty': '暫無 systemd 服務。',
-  'systemManager.services.search': '搜尋服務…',
-  'systemManager.services.meta': '{{count}} 個服務',
-  'systemManager.services.filter.all': '全部',
-  'systemManager.services.filter.running': '執行中',
-  'systemManager.services.filter.failed': '失敗',
-  'systemManager.services.filter.inactive': '未執行',
-  'systemManager.services.start': '啟動',
-  'systemManager.services.stop': '停止',
-  'systemManager.services.restart': '重新啟動',
-  'systemManager.services.enable': '開機啟用',
-  'systemManager.services.disable': '停用開機',
-  'systemManager.services.reload': '重新載入',
-  'systemManager.services.scope.user': '使用者',
-  'systemManager.services.confirmAction': '確認對 {{name}} 執行「{{action}}」？',
-
   'systemManager.gpu.unavailable': '此主機未偵測到 NVIDIA GPU 或昇騰 NPU 工具。',
   'systemManager.gpu.loading': '正在載入加速卡狀態…',
   'systemManager.gpu.empty': '已偵測到加速卡工具，但未回傳裝置資訊。',

application/i18n/locales/zh-TW/terminal.ts

@@ -93,13 +93,6 @@ export const zhTWTerminalMessages: Messages = {
   'settings.tab.sftpFileAssociations': 'SFTP',
   'settings.sftp.transferConcurrency': '傳輸併發數',
   'settings.sftp.transferConcurrency.desc': '同一目標同時傳輸的檔案數量上限，包括資料夾內檔案和單獨多選的檔案。較高的值可能提高速度，但可能導致某些伺服器過載。',
-  'settings.sftp.transferPoolIdleTtl': '傳輸連線保活時間',
-  'settings.sftp.transferPoolIdleTtl.desc': '專用傳輸 SFTP 連線閒置多久後關閉。時間更長可減少下次上傳/下載的冷啟動等待；進行中的傳輸不會被關閉。',
-  'settings.sftp.transferPoolIdleTtl.1m': '1 分鐘',
-  'settings.sftp.transferPoolIdleTtl.5m': '5 分鐘',
-  'settings.sftp.transferPoolIdleTtl.15m': '15 分鐘',
-  'settings.sftp.transferPoolIdleTtl.30m': '30 分鐘',
-  'settings.sftp.transferPoolIdleTtl.never': '直到結束應用',
   'settings.ssh.transportIdleTtl': 'SSH 連線保活時間',
   'settings.ssh.transportIdleTtl.desc': '最後一個終端、SFTP 瀏覽、批次傳輸或連接埠轉發釋放後，共享 SSH 連線再保留多久。保留期間再次開啟同主機可略過重新驗證（含 MFA）；進行中的工作階段與傳輸不會被關閉。',
   'settings.ssh.transportIdleTtl.1m': '1 分鐘',

application/i18n/locales/zh-TW/vault.ts

@@ -331,29 +331,8 @@ export const zhTWVaultMessages: Messages = {
   'hostDetails.plugin.useSsh': '改用 SSH',
 
   // Host form (legacy modal)
-  'hostForm.title.edit': '編輯主機',
-  'hostForm.title.new': '新建主機',
-  'hostForm.desc.edit': '更新該主機的連線資訊',
-  'hostForm.desc.new': '建立一個新的 SSH 主機條目',
-  'hostForm.field.label': '名稱',
-  'hostForm.placeholder.label': 'My Production Server',
-  'hostForm.field.hostname': 'Hostname / IP',
-  'hostForm.placeholder.hostname': '192.168.1.1',
-  'hostForm.field.port': '埠',
-  'hostForm.field.username': '使用者名稱',
-  'hostForm.field.osType': '作業系統型別',
-  'hostForm.placeholder.selectOs': '選擇作業系統',
-  'hostForm.field.group': '分組',
-  'hostForm.placeholder.group': '例如：AWS、DigitalOcean',
-  'hostForm.field.tags': '標籤',
-  'hostForm.placeholder.addTag': '新增標籤…',
-  'hostForm.auth.method': '認證方式',
-  'hostForm.auth.password': '密碼',
-  'hostForm.auth.sshKey': 'SSH金鑰',
+  // Host form (legacy keys still referenced by TerminalAuthDialog)
   'hostForm.auth.selectKey': '選擇 SSH金鑰',
-  'hostForm.auth.noKeys': '暫無金鑰',
-  'hostForm.auth.noKeysHint': '鑰匙串中未找到 SSH金鑰，請先建立一個。',
-  'hostForm.saveHost': '儲存主機',
 
   // Connection logs
   'logs.table.date': '日期',

application/state/activeChromeThemeSync.test.ts

@@ -7,7 +7,7 @@ const chromeThemeSource = readFileSync(new URL("./useActiveChromeTheme.ts", impo
 const storeSource = readFileSync(new URL("./activeTabStore.ts", import.meta.url), "utf8");
 
 test("active tab changes notify chrome theme before react subscribers", () => {
-  const setActiveTabIdBody = storeSource.match(/setActiveTabId = \(id: string(?:, options\?: \w+)?\) => \{[\s\S]*?\n {2}\};/)?.[0] ?? "";
+  const setActiveTabIdBody = storeSource.match(/setActiveTabId = \(id: string\) => \{[\s\S]*?\n {2}\};/)?.[0] ?? "";
   assert.match(setActiveTabIdBody, /this\.syncListeners\.forEach\(\(listener\) => listener\(id\)\)/);
   assert.match(setActiveTabIdBody, /this\.scheduleNotify\(\)/);
   assert.ok(

application/state/activeTabStore.test.ts

@@ -4,37 +4,6 @@ import test from 'node:test';
 import { activeTabStore, fromEditorTabId, isEditorTabId, toEditorTabId } from './activeTabStore';
 import { terminalLayoutSuppressStore } from './terminalLayoutSuppressStore';
 
-test('active tab store remembers the previous tab for restore-on-close', () => {
-  const previousWindow = (globalThis as { window?: unknown }).window;
-  (globalThis as { window?: unknown }).window ??= globalThis;
-
-  const marker = `prev-tab-${Date.now()}`;
-  const first = `${marker}-a`;
-  const second = `${marker}-b`;
-  const third = `${marker}-c`;
-  const before = activeTabStore.getActiveTabId();
-
-  try {
-    activeTabStore.setActiveTabId(first);
-    activeTabStore.setActiveTabId(second);
-    assert.equal(activeTabStore.getPreviousActiveTabId(), first);
-
-    activeTabStore.setActiveTabId(third);
-    assert.equal(activeTabStore.getPreviousActiveTabId(), second);
-
-    activeTabStore.setActiveTabId(first, { recordPrevious: false });
-    assert.equal(activeTabStore.getActiveTabId(), first);
-    assert.equal(activeTabStore.getPreviousActiveTabId(), second);
-  } finally {
-    activeTabStore.setActiveTabId(before, { recordPrevious: false });
-    if (previousWindow === undefined) {
-      delete (globalThis as { window?: unknown }).window;
-    } else {
-      (globalThis as { window?: unknown }).window = previousWindow;
-    }
-  }
-});
-
 test('editor tab helpers round trip ids', () => {
   assert.equal(toEditorTabId('file-1'), 'editor:file-1');
   assert.equal(fromEditorTabId('editor:file-1'), 'file-1');

application/state/activeTabStore.ts

@@ -16,22 +16,14 @@ export const toEditorTabId = (editorId: string): string => `${EDITOR_PREFIX}${ed
 /** Strip the "editor:" prefix to recover the internal editorTab id. */
 export const fromEditorTabId = (tabId: string): string => tabId.slice(EDITOR_PREFIX.length);
 
-type SetActiveTabOptions = {
-  /** When false, keep the previous-tab pointer unchanged (used for close restore). */
-  recordPrevious?: boolean;
-};
-
 class ActiveTabStore {
   private activeTabId: string = 'vault';
-  private previousActiveTabId: string | null = null;
   private listeners = new Set<Listener>();
   private syncListeners = new Set<SyncListener>();
   private notifyRafId: number | null = null;
 
   getActiveTabId = () => this.activeTabId;
 
-  getPreviousActiveTabId = () => this.previousActiveTabId;
-
   private scheduleNotify = () => {
     if (this.notifyRafId !== null) return;
     const schedule = typeof requestAnimationFrame === 'function'
@@ -43,11 +35,8 @@ class ActiveTabStore {
     });
   };
 
-  setActiveTabId = (id: string, options?: SetActiveTabOptions) => {
+  setActiveTabId = (id: string) => {
     if (this.activeTabId !== id) {
-      if (options?.recordPrevious !== false) {
-        this.previousActiveTabId = this.activeTabId;
-      }
       this.activeTabId = id;
       this.syncListeners.forEach((listener) => listener(id));
       // Coalesce rapid tab switches into one notification per frame and avoid

application/state/aiSessionsStore.ts

@@ -1,80 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { AISession } from '../../infrastructure/ai/types';
-import type { DraftsByScope, PanelViewByScope } from './aiStateSnapshots';
-
-type Listener = () => void;
-
-export type AISessionsSnapshot = {
-  sessions: readonly AISession[];
-  activeSessionIdMap: Readonly<Record<string, string | null>>;
-  draftsByScope: DraftsByScope;
-  panelViewByScope: PanelViewByScope;
-};
-
-const EMPTY_SESSIONS: readonly AISession[] = Object.freeze([]);
-const EMPTY_MAP: Readonly<Record<string, string | null>> = Object.freeze({});
-const EMPTY_DRAFTS: DraftsByScope = Object.freeze({});
-const EMPTY_PANEL: PanelViewByScope = Object.freeze({});
-
-export const EMPTY_AI_SESSIONS_SNAPSHOT: AISessionsSnapshot = Object.freeze({
-  sessions: EMPTY_SESSIONS,
-  activeSessionIdMap: EMPTY_MAP,
-  draftsByScope: EMPTY_DRAFTS,
-  panelViewByScope: EMPTY_PANEL,
-});
-
-/**
- * Hot AI chat state — streaming message updates must not invalidate
- * slow AI config Context consumers (providers, permissions, etc.).
- */
-class AISessionsStore {
-  private snapshot: AISessionsSnapshot = EMPTY_AI_SESSIONS_SNAPSHOT;
-  private listeners = new Set<Listener>();
-
-  getSnapshot = (): AISessionsSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: AISessionsSnapshot): void {
-    if (
-      this.snapshot.sessions === next.sessions
-      && this.snapshot.activeSessionIdMap === next.activeSessionIdMap
-      && this.snapshot.draftsByScope === next.draftsByScope
-      && this.snapshot.panelViewByScope === next.panelViewByScope
-    ) {
-      return;
-    }
-    this.snapshot = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-}
-
-export const aiSessionsStore = new AISessionsStore();
-
-export function publishAISessionsSnapshot(snapshot: AISessionsSnapshot): void {
-  aiSessionsStore.setSnapshot(snapshot);
-}
-
-export function getAISessionsSnapshot(): AISessionsSnapshot {
-  return aiSessionsStore.getSnapshot();
-}
-
-export function subscribeAISessions(listener: Listener): () => void {
-  return aiSessionsStore.subscribe(listener);
-}
-
-export function useAISessionsStore(): AISessionsSnapshot {
-  return useSyncExternalStore(
-    subscribeAISessions,
-    getAISessionsSnapshot,
-    getAISessionsSnapshot,
-  );
-}

application/state/appRuntimeBridge.test.ts

@@ -1,99 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  getAppSessionRuntime,
-  getAppSettingsRuntime,
-  getAppVaultRuntime,
-  registerAppSessionRuntime,
-  registerAppSettingsRuntime,
-  registerAppVaultRuntime,
-  subscribeAppSessionRuntime,
-  subscribeAppSettingsRuntime,
-  subscribeAppVaultRuntime,
-  type AppSessionRuntime,
-  type AppSettingsRuntime,
-  type AppVaultRuntime,
-} from './appRuntimeBridge';
-
-const vaultRuntime = (label: string) => ({ label }) as unknown as AppVaultRuntime;
-const sessionRuntime = (label: string) => ({ label }) as unknown as AppSessionRuntime;
-const settingsRuntime = (label: string) => ({ label }) as unknown as AppSettingsRuntime;
-
-test('vault slot exposes the last registered runtime and notifies on change', () => {
-  let notifications = 0;
-  const unsubscribe = subscribeAppVaultRuntime(() => {
-    notifications += 1;
-  });
-
-  const first = vaultRuntime('first');
-  registerAppVaultRuntime(first);
-  assert.equal(getAppVaultRuntime(), first);
-  assert.equal(notifications, 1);
-
-  // Re-registering the same identity is what a render with unchanged state
-  // does; it must not wake subscribers.
-  registerAppVaultRuntime(first);
-  assert.equal(notifications, 1);
-
-  const second = vaultRuntime('second');
-  registerAppVaultRuntime(second);
-  assert.equal(getAppVaultRuntime(), second);
-  assert.equal(notifications, 2);
-
-  unsubscribe();
-  registerAppVaultRuntime(null);
-  assert.equal(getAppVaultRuntime(), null);
-  assert.equal(notifications, 2, 'unsubscribed listeners stay quiet');
-});
-
-test('session slot is independent from the vault slot', () => {
-  let vaultNotifications = 0;
-  let sessionNotifications = 0;
-  const unsubscribeVault = subscribeAppVaultRuntime(() => {
-    vaultNotifications += 1;
-  });
-  const unsubscribeSession = subscribeAppSessionRuntime(() => {
-    sessionNotifications += 1;
-  });
-
-  const runtime = sessionRuntime('session');
-  registerAppSessionRuntime(runtime);
-  assert.equal(getAppSessionRuntime(), runtime);
-  assert.equal(sessionNotifications, 1);
-  assert.equal(vaultNotifications, 0);
-
-  unsubscribeVault();
-  unsubscribeSession();
-  registerAppSessionRuntime(null);
-});
-
-test('settings slot is independent from the vault and session slots', () => {
-  let settingsNotifications = 0;
-  let otherNotifications = 0;
-  const unsubscribeSettings = subscribeAppSettingsRuntime(() => {
-    settingsNotifications += 1;
-  });
-  const unsubscribeVault = subscribeAppVaultRuntime(() => {
-    otherNotifications += 1;
-  });
-  const unsubscribeSession = subscribeAppSessionRuntime(() => {
-    otherNotifications += 1;
-  });
-
-  const runtime = settingsRuntime('settings');
-  registerAppSettingsRuntime(runtime);
-  assert.equal(getAppSettingsRuntime(), runtime);
-  assert.equal(settingsNotifications, 1);
-  assert.equal(otherNotifications, 0);
-
-  // A re-render with unchanged state re-registers the same identity.
-  registerAppSettingsRuntime(runtime);
-  assert.equal(settingsNotifications, 1);
-
-  unsubscribeSettings();
-  unsubscribeVault();
-  unsubscribeSession();
-  registerAppSettingsRuntime(null);
-  assert.equal(getAppSettingsRuntime(), null);
-});

application/state/appRuntimeBridge.ts

@@ -1,138 +0,0 @@
-import { createContext, useContext } from 'react';
-
-import type { useSessionState } from './useSessionState';
-import type { useSettingsState } from './useSettingsState';
-import type { useVaultState } from './useVaultState';
-
-export type AppVaultRuntime = ReturnType<typeof useVaultState>;
-export type AppSessionRuntime = ReturnType<typeof useSessionState>;
-export type AppSettingsRuntime = ReturnType<typeof useSettingsState>;
-
-/**
- * The slice of the vault runtime that `VaultPublisher` puts on the React
- * context.
- *
- * `notes` / `noteGroups` / `connectionLogs` / `shellHistory` are deliberately
- * absent. They churn on every note keystroke, session start/exit, and history
- * append, and publishing them here would re-render every context consumer for
- * data those consumers only ever read at call time. Consumers subscribe to
- * `notesStore` / `connectionLogsStore` / `shellHistoryStore` instead, or read
- * the full runtime imperatively through `getAppVaultRuntime()`.
- *
- * `exportData` is omitted for the same reason: its callback identity tracks the
- * notes arrays, so keeping it would reintroduce the churn it is meant to avoid.
- */
-export type AppVaultContextValue = Omit<
-  AppVaultRuntime,
-  'notes' | 'noteGroups' | 'connectionLogs' | 'shellHistory' | 'exportData'
->;
-
-type Listener = () => void;
-
-/**
- * Holds the live return of one mega hook so the component that owns the hook
- * and the components that consume it no longer have to be the same component.
- *
- * `VaultPublisher` / `SessionPublisher` / `SettingsPublisher` own
- * `useVaultState` / `useSessionState` / `useSettingsState` and expose the value
- * two ways:
- *
- * - through a React context, for render-time consumers (App). Context keeps the
- *   read synchronous and non-null from the first render, which a store written
- *   in a layout effect cannot do for a descendant.
- * - through this module slot, for imperative callers that need the current
- *   runtime outside of a render (`getAppVaultRuntime()` in an event handler or
- *   a bridge callback) and for non-descendant subscribers.
- */
-class RuntimeSlot<T> {
-  private value: T | null = null;
-  private listeners = new Set<Listener>();
-
-  get = (): T | null => this.value;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  set(next: T | null): void {
-    if (this.value === next) return;
-    this.value = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-}
-
-const vaultSlot = new RuntimeSlot<AppVaultRuntime>();
-const sessionSlot = new RuntimeSlot<AppSessionRuntime>();
-const settingsSlot = new RuntimeSlot<AppSettingsRuntime>();
-
-export function registerAppVaultRuntime(runtime: AppVaultRuntime | null): void {
-  vaultSlot.set(runtime);
-}
-
-export function getAppVaultRuntime(): AppVaultRuntime | null {
-  return vaultSlot.get();
-}
-
-export function subscribeAppVaultRuntime(listener: Listener): () => void {
-  return vaultSlot.subscribe(listener);
-}
-
-export function registerAppSessionRuntime(runtime: AppSessionRuntime | null): void {
-  sessionSlot.set(runtime);
-}
-
-export function getAppSessionRuntime(): AppSessionRuntime | null {
-  return sessionSlot.get();
-}
-
-export function subscribeAppSessionRuntime(listener: Listener): () => void {
-  return sessionSlot.subscribe(listener);
-}
-
-export function registerAppSettingsRuntime(runtime: AppSettingsRuntime | null): void {
-  settingsSlot.set(runtime);
-}
-
-export function getAppSettingsRuntime(): AppSettingsRuntime | null {
-  return settingsSlot.get();
-}
-
-export function subscribeAppSettingsRuntime(listener: Listener): () => void {
-  return settingsSlot.subscribe(listener);
-}
-
-export const AppVaultRuntimeContext = createContext<AppVaultContextValue | null>(null);
-export const AppSessionRuntimeContext = createContext<AppSessionRuntime | null>(null);
-export const AppSettingsRuntimeContext = createContext<AppSettingsRuntime | null>(null);
-
-/** Read the vault runtime owned by `VaultPublisher`. */
-export function useAppVaultRuntime(): AppVaultContextValue {
-  const runtime = useContext(AppVaultRuntimeContext);
-  if (!runtime) {
-    throw new Error('useAppVaultRuntime must be rendered inside <VaultPublisher>');
-  }
-  return runtime;
-}
-
-/** Read the session runtime owned by `SessionPublisher`. */
-export function useAppSessionRuntime(): AppSessionRuntime {
-  const runtime = useContext(AppSessionRuntimeContext);
-  if (!runtime) {
-    throw new Error('useAppSessionRuntime must be rendered inside <SessionPublisher>');
-  }
-  return runtime;
-}
-
-/** Read the settings runtime owned by `SettingsPublisher`. */
-export function useAppSettingsRuntime(): AppSettingsRuntime {
-  const runtime = useContext(AppSettingsRuntimeContext);
-  if (!runtime) {
-    throw new Error('useAppSettingsRuntime must be rendered inside <SettingsPublisher>');
-  }
-  return runtime;
-}

application/state/connectionLogsStore.test.ts

@@ -1,126 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import type { ConnectionLog } from '../../domain/models.ts';
-import {
-  EMPTY_CONNECTION_LOGS_SNAPSHOT,
-  getConnectionLogsActions,
-  getConnectionLogsSnapshot,
-  getEmptyConnectionLogsSnapshot,
-  publishConnectionLogsSnapshot,
-  registerConnectionLogsActions,
-  subscribeConnectionLogs,
-  subscribeConnectionLogsActions,
-} from './connectionLogsStore.ts';
-
-const baseLog: ConnectionLog = {
-  id: 'log-1',
-  sessionId: 'session-1',
-  hostId: 'host-1',
-  hostLabel: 'Example',
-  hostname: 'example.com',
-  username: 'user',
-  protocol: 'ssh',
-  startTime: 1000,
-  localUsername: 'local',
-  localHostname: 'machine',
-  saved: false,
-};
-
-test('connectionLogsStore notifies subscribers only when the log array identity changes', () => {
-  const events: number[] = [];
-  const unsubscribe = subscribeConnectionLogs(() => {
-    events.push(getConnectionLogsSnapshot().connectionLogs.length);
-  });
-
-  const firstLogs = [baseLog];
-  publishConnectionLogsSnapshot({ connectionLogs: firstLogs });
-  assert.equal(events.at(-1), 1);
-  assert.equal(getConnectionLogsSnapshot().connectionLogs, firstLogs);
-
-  // Same identity must not wake the Vault logs section on unrelated renders.
-  publishConnectionLogsSnapshot({ connectionLogs: firstLogs });
-  assert.equal(events.length, 1);
-
-  const secondLogs = [baseLog, { ...baseLog, id: 'log-2', startTime: 2000 }];
-  publishConnectionLogsSnapshot({ connectionLogs: secondLogs });
-  assert.equal(events.at(-1), 2);
-  assert.equal(events.length, 2);
-
-  unsubscribe();
-  publishConnectionLogsSnapshot({ connectionLogs: [] });
-  assert.equal(events.length, 2);
-});
-
-test('connectionLogsStore exposes a frozen empty snapshot for gated mounts', () => {
-  assert.equal(getEmptyConnectionLogsSnapshot(), EMPTY_CONNECTION_LOGS_SNAPSHOT);
-  assert.equal(getEmptyConnectionLogsSnapshot().connectionLogs.length, 0);
-  assert.equal(Object.isFrozen(EMPTY_CONNECTION_LOGS_SNAPSHOT), true);
-});
-
-test('registerConnectionLogsActions exposes the vault log mutators', () => {
-  const calls: string[] = [];
-  const actionEvents: number[] = [];
-  const unsubscribe = subscribeConnectionLogsActions(() => {
-    actionEvents.push(actionEvents.length);
-  });
-
-  registerConnectionLogsActions({
-    updateConnectionLog: () => {
-      calls.push('update');
-    },
-    toggleConnectionLogSaved: () => {
-      calls.push('toggle');
-    },
-    deleteConnectionLog: () => {
-      calls.push('delete');
-    },
-    clearUnsavedConnectionLogs: () => {
-      calls.push('clear');
-    },
-  });
-
-  const actions = getConnectionLogsActions();
-  assert.ok(actions);
-  actions.updateConnectionLog('log-1', { saved: true });
-  actions.toggleConnectionLogSaved('log-1');
-  actions.deleteConnectionLog('log-1');
-  actions.clearUnsavedConnectionLogs();
-  assert.deepEqual(calls, ['update', 'toggle', 'delete', 'clear']);
-  assert.equal(actionEvents.length, 1);
-
-  registerConnectionLogsActions(null);
-  assert.equal(getConnectionLogsActions(), null);
-  assert.equal(actionEvents.length, 2);
-
-  unsubscribe();
-});
-
-test('connectionLogsStore keeps values and actions on independent slots', () => {
-  const valueEvents: number[] = [];
-  const actionEvents: number[] = [];
-  const unsubValues = subscribeConnectionLogs(() => {
-    valueEvents.push(valueEvents.length);
-  });
-  const unsubActions = subscribeConnectionLogsActions(() => {
-    actionEvents.push(actionEvents.length);
-  });
-
-  // Re-registering unstable mutator identities must not invalidate the logs.
-  registerConnectionLogsActions({
-    updateConnectionLog: () => {},
-    toggleConnectionLogSaved: () => {},
-    deleteConnectionLog: () => {},
-    clearUnsavedConnectionLogs: () => {},
-  });
-  assert.equal(valueEvents.length, 0);
-  assert.equal(actionEvents.length, 1);
-
-  publishConnectionLogsSnapshot({ connectionLogs: [baseLog] });
-  assert.equal(valueEvents.length, 1);
-  assert.equal(actionEvents.length, 1);
-
-  registerConnectionLogsActions(null);
-  unsubValues();
-  unsubActions();
-});

application/state/connectionLogsStore.ts

@@ -1,135 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { ConnectionLog } from '../../domain/models';
-
-type Listener = () => void;
-
-export type ConnectionLogsSnapshot = {
-  connectionLogs: readonly ConnectionLog[];
-};
-
-export type ConnectionLogsActions = {
-  updateConnectionLog: (id: string, updates: Partial<ConnectionLog>) => void;
-  toggleConnectionLogSaved: (id: string) => void;
-  deleteConnectionLog: (id: string) => void;
-  clearUnsavedConnectionLogs: () => void;
-};
-
-const EMPTY_CONNECTION_LOGS: readonly ConnectionLog[] = Object.freeze([]);
-
-export const EMPTY_CONNECTION_LOGS_SNAPSHOT: ConnectionLogsSnapshot = Object.freeze({
-  connectionLogs: EMPTY_CONNECTION_LOGS,
-});
-
-/**
- * External store for connection logs so the Vault logs section and log-view
- * replays can subscribe without keeping logs in the App domain bags. Every
- * session start/exit appends a log, which would otherwise rebuild the whole
- * shell.
- */
-class ConnectionLogsStore {
-  private snapshot: ConnectionLogsSnapshot = EMPTY_CONNECTION_LOGS_SNAPSHOT;
-  private actions: ConnectionLogsActions | null = null;
-  private listeners = new Set<Listener>();
-  private actionListeners = new Set<Listener>();
-
-  getSnapshot = (): ConnectionLogsSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: ConnectionLogsSnapshot): void {
-    if (this.snapshot.connectionLogs === next.connectionLogs) return;
-    this.snapshot = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-
-  getActions = (): ConnectionLogsActions | null => this.actions;
-
-  subscribeActions = (listener: Listener): (() => void) => {
-    this.actionListeners.add(listener);
-    return () => {
-      this.actionListeners.delete(listener);
-    };
-  };
-
-  setActions(next: ConnectionLogsActions | null): void {
-    if (this.actions === next) return;
-    this.actions = next;
-    for (const listener of this.actionListeners) {
-      listener();
-    }
-  }
-}
-
-export const connectionLogsStore = new ConnectionLogsStore();
-
-export function publishConnectionLogsSnapshot(
-  snapshot: ConnectionLogsSnapshot,
-): void {
-  connectionLogsStore.setSnapshot(snapshot);
-}
-
-export function getConnectionLogsSnapshot(): ConnectionLogsSnapshot {
-  return connectionLogsStore.getSnapshot();
-}
-
-export function subscribeConnectionLogs(listener: Listener): () => void {
-  return connectionLogsStore.subscribe(listener);
-}
-
-export function getEmptyConnectionLogsSnapshot(): ConnectionLogsSnapshot {
-  return EMPTY_CONNECTION_LOGS_SNAPSHOT;
-}
-
-export function registerConnectionLogsActions(
-  actions: ConnectionLogsActions | null,
-): void {
-  connectionLogsStore.setActions(actions);
-}
-
-export function getConnectionLogsActions(): ConnectionLogsActions | null {
-  return connectionLogsStore.getActions();
-}
-
-export function subscribeConnectionLogsActions(listener: Listener): () => void {
-  return connectionLogsStore.subscribeActions(listener);
-}
-
-const noopUpdateConnectionLog: ConnectionLogsActions['updateConnectionLog'] = () => {};
-const noopToggleConnectionLogSaved: ConnectionLogsActions['toggleConnectionLogSaved'] = () => {};
-const noopDeleteConnectionLog: ConnectionLogsActions['deleteConnectionLog'] = () => {};
-const noopClearUnsavedConnectionLogs: ConnectionLogsActions['clearUnsavedConnectionLogs'] = () => {};
-
-/** Subscribe to the connection log catalog plus its vault mutation actions. */
-export function useConnectionLogsStore(): {
-  connectionLogs: ConnectionLog[];
-  updateConnectionLog: ConnectionLogsActions['updateConnectionLog'];
-  toggleConnectionLogSaved: ConnectionLogsActions['toggleConnectionLogSaved'];
-  deleteConnectionLog: ConnectionLogsActions['deleteConnectionLog'];
-  clearUnsavedConnectionLogs: ConnectionLogsActions['clearUnsavedConnectionLogs'];
-} {
-  const snapshot = useSyncExternalStore(
-    subscribeConnectionLogs,
-    getConnectionLogsSnapshot,
-    getConnectionLogsSnapshot,
-  );
-  const actions = useSyncExternalStore(
-    subscribeConnectionLogsActions,
-    getConnectionLogsActions,
-    getConnectionLogsActions,
-  );
-  return {
-    connectionLogs: snapshot.connectionLogs as ConnectionLog[],
-    updateConnectionLog: actions?.updateConnectionLog ?? noopUpdateConnectionLog,
-    toggleConnectionLogSaved: actions?.toggleConnectionLogSaved ?? noopToggleConnectionLogSaved,
-    deleteConnectionLog: actions?.deleteConnectionLog ?? noopDeleteConnectionLog,
-    clearUnsavedConnectionLogs: actions?.clearUnsavedConnectionLogs ?? noopClearUnsavedConnectionLogs,
-  };
-}

application/state/notesStore.test.ts

@@ -81,19 +81,6 @@ test('notesStore gated helpers stay empty and never notify', () => {
   unsub();
 });
 
-test('useNotesStore source gates subscribe when enabled is false', async () => {
-  const { readFileSync } = await import('node:fs');
-  const source = readFileSync(new URL('./notesStore.ts', import.meta.url), 'utf8');
-  assert.match(source, /enabled \? subscribeNotes : subscribeNotesNoop/);
-  assert.match(source, /enabled \? subscribeNotesActions : subscribeNotesNoop/);
-  assert.match(source, /getNotesSnapshot/);
-  assert.doesNotMatch(
-    source,
-    /enabled \? getNotesSnapshot : getEmptyNotesSnapshot/,
-    'hidden notes mounts should keep the last live snapshot, not flash empty',
-  );
-});
-
 test('registerNotesActions exposes update handlers', () => {
   const calls: string[] = [];
   registerNotesActions({

application/state/notesStore.ts

@@ -10,7 +10,7 @@ export type NotesSnapshot = {
 };
 
 export type NotesActions = {
-  updateNotes: (notes: VaultNote[]) => boolean | void;
+  updateNotes: (notes: VaultNote[]) => void;
   updateNoteGroups: (groups: string[]) => void;
 };
 
@@ -112,25 +112,20 @@ const noopUpdateNoteGroups: NotesActions['updateNoteGroups'] = () => {};
 
 /**
  * Subscribe to notes catalog + vault mutation actions for Notes / AI panels.
- *
- * Pass `{ enabled: false }` for retained-but-hidden mounts (e.g. terminal
- * notes side panel) so vault note publishes do not re-render them. Snapshot
- * reads still use the live store so reopen does not flash empty data.
  */
-export function useNotesStore(options?: { enabled?: boolean }): {
+export function useNotesStore(): {
   notes: VaultNote[];
   noteGroups: string[];
   updateNotes: NotesActions['updateNotes'];
   updateNoteGroups: NotesActions['updateNoteGroups'];
 } {
-  const enabled = options?.enabled !== false;
   const snapshot = useSyncExternalStore(
-    enabled ? subscribeNotes : subscribeNotesNoop,
+    subscribeNotes,
     getNotesSnapshot,
     getNotesSnapshot,
   );
   const actions = useSyncExternalStore(
-    enabled ? subscribeNotesActions : subscribeNotesNoop,
+    subscribeNotesActions,
     getNotesActions,
     getNotesActions,
   );

application/state/sessionCapabilitiesStore.ts

@@ -15,16 +15,6 @@ function isExpired(entry: StoreEntry): boolean {
   return Date.now() > entry.expiresAt;
 }
 
-function normalizeCapabilities(capabilities: SessionCapabilities): SessionCapabilities {
-  return {
-    ...capabilities,
-    hasSs: capabilities.hasSs === true,
-    hasNetstat: capabilities.hasNetstat === true,
-    hasLsof: capabilities.hasLsof === true,
-    hasSystemctl: capabilities.hasSystemctl === true,
-  };
-}
-
 function notifySession(sessionId: string) {
   listenersBySessionId.get(sessionId)?.forEach((listener) => listener());
 }
@@ -38,13 +28,13 @@ export const sessionCapabilitiesStore = {
       notifySession(sessionId);
       return undefined;
     }
-    return normalizeCapabilities(entry.capabilities);
+    return entry.capabilities;
   },
 
   set(sessionId: string, capabilities: SessionCapabilities, ttlMs: number) {
     const entry: StoreEntry = {
       capabilities: {
-        ...normalizeCapabilities(capabilities),
+        ...capabilities,
         probedAt: Date.now(),
       },
       expiresAt: Date.now() + ttlMs,

application/state/sessionRestoreSettings.test.ts

@@ -88,13 +88,7 @@ test("session restore persistence can be disabled for non-main windows", () => {
   assert.match(hookSource, /if \(!persistSessionRestore\) return;/);
   assert.match(traySource, /useSessionState\(\{ persistSessionRestore: false \}\)/);
   assert.match(appSource, /window\.location\.hash\.startsWith\('#\/session-window'\)/);
-  // App no longer calls useSessionState; SessionPublisher owns the hook and
-  // App passes the peer-window flag down to it.
-  assert.match(appSource, /<SessionPublisher persistSessionRestore=\{!isPeerSessionWindow\}>/);
-  assert.match(
-    readFileSync(new URL("../app/publishers/SessionPublisher.tsx", import.meta.url), "utf8"),
-    /useSessionState\(\{ persistSessionRestore \}\)/,
-  );
+  assert.match(appSource, /persistSessionRestore: !isPeerSessionWindow/);
   assert.match(indexSource, /hash === '#\/session-window'/);
   assert.match(registerBridgesSource, /route: "session-window"/);
   assert.match(registerBridgesSource, /registerAsMainWindow: false/);
@@ -106,8 +100,7 @@ test("session restore persistence can be disabled for non-main windows", () => {
 });
 
 test("session peer windows do not run main-window startup effects", () => {
-  const appSource = readFileSync(new URL("../app/AppSideEffects.tsx", import.meta.url), "utf8");
-  const appRootSource = readFileSync(new URL("../../App.tsx", import.meta.url), "utf8");
+  const appSource = readFileSync(new URL("../../App.tsx", import.meta.url), "utf8");
   const autoSyncSource = readFileSync(new URL("./useAutoSync.ts", import.meta.url), "utf8");
   const startupEffectsSource = readFileSync(new URL("../app/useAppStartupEffects.ts", import.meta.url), "utf8");
   const updateCheckSource = readFileSync(new URL("./useUpdateCheck.ts", import.meta.url), "utf8");
@@ -119,13 +112,7 @@ test("session peer windows do not run main-window startup effects", () => {
   const trayPanelJumpIndex = appSource.indexOf("onTrayPanelJumpToSession");
 
   assert.match(appSource, /const isPeerSessionWindow = typeof window !== 'undefined' && window\.location\.hash\.startsWith\('#\/session-window'\)/);
-  // SettingsPublisher owns useSettingsState; App only forwards the peer-window
-  // flags to it.
-  assert.match(appRootSource, /<SettingsPublisher\s+enableSettingsSync=\{!isPeerSessionWindow\}\s+enableSystemEffects=\{!isPeerSessionWindow\}/s);
-  assert.match(
-    readFileSync(new URL("../app/publishers/SettingsPublisher.tsx", import.meta.url), "utf8"),
-    /useSettingsState\(\{ enableSettingsSync, enableSystemEffects \}\)/,
-  );
+  assert.match(appSource, /useSettingsState\(\{[^}]*enableSettingsSync: !isPeerSessionWindow[^}]*enableSystemEffects: !isPeerSessionWindow/s);
   assert.match(appSource, /useAppStartupEffects\(\{[^}]*enabled: !isPeerSessionWindow/s);
   assert.match(appSource, /useUpdateCheck\(\{[^}]*enabled: !isPeerSessionWindow/s);
   assert.match(appSource, /if \(isPeerSessionWindow \|\| !isVaultInitialized \|\| versionBackupAttemptedRef\.current\) return;/);

application/state/sessionSnapshotStore.test.ts

@@ -1,118 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import type { TerminalSession } from '../../domain/models.ts';
-import {
-  EMPTY_SESSION_SNAPSHOT,
-  getSessionSnapshot,
-  getSessionSnapshotActions,
-  publishSessionSnapshot,
-  registerSessionSnapshotActions,
-  sessionSnapshotsEqual,
-  subscribeSessionSnapshot,
-} from './sessionSnapshotStore.ts';
-
-function makeSession(id: string): TerminalSession {
-  return { id, hostLabel: id, status: 'connected' } as TerminalSession;
-}
-
-test('sessionSnapshotStore notifies only when a field identity changes', () => {
-  const seen: number[] = [];
-  const unsubscribe = subscribeSessionSnapshot(() => {
-    seen.push(getSessionSnapshot().sessions.length);
-  });
-
-  const sessions = [makeSession('s1')];
-  const snapshot = { ...EMPTY_SESSION_SNAPSHOT, sessions, orphanSessions: sessions };
-  publishSessionSnapshot(snapshot);
-  assert.deepEqual(seen, [1]);
-  assert.equal(getSessionSnapshot().sessions, sessions);
-
-  publishSessionSnapshot({ ...snapshot });
-  assert.deepEqual(seen, [1]);
-
-  // Presentation-only fields still count: rename targets drive dialog state.
-  publishSessionSnapshot({ ...snapshot, sessionRenameTarget: sessions[0] });
-  assert.deepEqual(seen, [1, 1]);
-  assert.equal(getSessionSnapshot().sessionRenameTarget, sessions[0]);
-
-  unsubscribe();
-  publishSessionSnapshot(EMPTY_SESSION_SNAPSHOT);
-  assert.deepEqual(seen, [1, 1]);
-});
-
-test('sessionSnapshotsEqual compares every published field', () => {
-  assert.equal(
-    sessionSnapshotsEqual(EMPTY_SESSION_SNAPSHOT, { ...EMPTY_SESSION_SNAPSHOT }),
-    true,
-  );
-  assert.equal(
-    sessionSnapshotsEqual(EMPTY_SESSION_SNAPSHOT, {
-      ...EMPTY_SESSION_SNAPSHOT,
-      draggingSessionId: 's1',
-    }),
-    false,
-  );
-  assert.equal(
-    sessionSnapshotsEqual(EMPTY_SESSION_SNAPSHOT, { ...EMPTY_SESSION_SNAPSHOT, logViews: [] }),
-    false,
-  );
-});
-
-test('session actions register and unregister', () => {
-  assert.equal(getSessionSnapshotActions(), null);
-  const calls: string[] = [];
-  const noop = (() => {}) as never;
-  registerSessionSnapshotActions({
-    setActiveTabId: ((id: string) => calls.push(id)) as never,
-    closeSession: noop,
-    closeSessions: noop,
-    closeWorkspace: noop,
-    openLogView: noop,
-    closeLogView: noop,
-    setDraggingSessionId: noop,
-    startSessionRename: noop,
-    renameSessionInline: noop,
-    submitSessionRename: noop,
-    resetSessionRename: noop,
-    startWorkspaceRename: noop,
-    submitWorkspaceRename: noop,
-    resetWorkspaceRename: noop,
-    removeSessionFromWorkspace: noop,
-    setWorkspaceFocusedSession: noop,
-    toggleWorkspaceViewMode: noop,
-    createLocalTerminal: noop,
-    createSerialSession: noop,
-    connectToHost: noop,
-    updateSessionStatus: noop,
-    updateSessionFontSize: noop,
-    clearSessionFontSizeOverride: noop,
-    createWorkspaceWithHosts: noop,
-    createWorkspaceFromSessions: noop,
-    addSessionToWorkspace: noop,
-    appendHostToWorkspace: noop,
-    appendLocalTerminalToWorkspace: noop,
-    createWorkspaceFromTargets: noop,
-    updateSplitSizes: noop,
-    splitSession: noop,
-    reorderWorkspaceSessions: noop,
-    moveFocusInWorkspace: noop,
-    runSnippet: noop,
-    getOrderedWorkTabs: noop,
-    reorderTabs: noop,
-    toggleBroadcast: noop,
-    isBroadcastEnabled: noop,
-    copySession: noop,
-    copyWorkspace: noop,
-    createSessionFromCloneSource: noop,
-    updateSessionRestoreCwd: noop,
-    getSessionRestoreCwd: noop,
-    updateSessionDynamicTitle: noop,
-    updateSessionCodingCliProvider: noop,
-  });
-  getSessionSnapshotActions()?.setActiveTabId('vault');
-  assert.deepEqual(calls, ['vault']);
-
-  registerSessionSnapshotActions(null);
-  assert.equal(getSessionSnapshotActions(), null);
-});

application/state/sessionSnapshotStore.ts

@@ -1,200 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { TerminalSession, Workspace } from '../../domain/models';
-import type { LogView } from './logViewState';
-import type { useSessionState } from './useSessionState';
-
-type SessionState = ReturnType<typeof useSessionState>;
-
-type Listener = () => void;
-
-/**
- * Session/workspace catalog for shell surfaces. `activeTabId` is intentionally
- * absent — it lives in `activeTabStore` so tab switches stay off this path.
- */
-export type SessionSnapshot = {
-  sessions: readonly TerminalSession[];
-  /** Sessions with no workspace and not hidden from tabs; TopTabs renders these. */
-  orphanSessions: readonly TerminalSession[];
-  workspaces: readonly Workspace[];
-  logViews: readonly LogView[];
-  draggingSessionId: string | null;
-  sessionRenameTarget: TerminalSession | null;
-  workspaceRenameTarget: Workspace | null;
-};
-
-/**
- * Session mutators the shell needs. Derived from the hook return so the store
- * contract cannot drift from `useSessionState`.
- */
-export type SessionSnapshotActions = Pick<
-  SessionState,
-  | 'setActiveTabId'
-  | 'closeSession'
-  | 'closeSessions'
-  | 'closeWorkspace'
-  | 'openLogView'
-  | 'closeLogView'
-  | 'setDraggingSessionId'
-  | 'startSessionRename'
-  | 'renameSessionInline'
-  | 'submitSessionRename'
-  | 'resetSessionRename'
-  | 'startWorkspaceRename'
-  | 'submitWorkspaceRename'
-  | 'resetWorkspaceRename'
-  | 'removeSessionFromWorkspace'
-  | 'setWorkspaceFocusedSession'
-  | 'toggleWorkspaceViewMode'
-  // Terminal / chrome mutators previously read only via App session runtime.
-  | 'createLocalTerminal'
-  | 'createSerialSession'
-  | 'connectToHost'
-  | 'updateSessionStatus'
-  | 'updateSessionFontSize'
-  | 'clearSessionFontSizeOverride'
-  | 'createWorkspaceWithHosts'
-  | 'createWorkspaceFromSessions'
-  | 'addSessionToWorkspace'
-  | 'appendHostToWorkspace'
-  | 'appendLocalTerminalToWorkspace'
-  | 'createWorkspaceFromTargets'
-  | 'updateSplitSizes'
-  | 'splitSession'
-  | 'reorderWorkspaceSessions'
-  | 'moveFocusInWorkspace'
-  | 'runSnippet'
-  | 'getOrderedWorkTabs'
-  | 'reorderTabs'
-  | 'toggleBroadcast'
-  | 'isBroadcastEnabled'
-  | 'copySession'
-  | 'copyWorkspace'
-  | 'createSessionFromCloneSource'
-  | 'updateSessionRestoreCwd'
-  | 'getSessionRestoreCwd'
-  | 'updateSessionDynamicTitle'
-  | 'updateSessionCodingCliProvider'
->;
-
-const EMPTY_SESSIONS: readonly TerminalSession[] = Object.freeze([]);
-const EMPTY_WORKSPACES: readonly Workspace[] = Object.freeze([]);
-const EMPTY_LOG_VIEWS: readonly LogView[] = Object.freeze([]);
-
-export const EMPTY_SESSION_SNAPSHOT: SessionSnapshot = Object.freeze({
-  sessions: EMPTY_SESSIONS,
-  orphanSessions: EMPTY_SESSIONS,
-  workspaces: EMPTY_WORKSPACES,
-  logViews: EMPTY_LOG_VIEWS,
-  draggingSessionId: null,
-  sessionRenameTarget: null,
-  workspaceRenameTarget: null,
-});
-
-const SNAPSHOT_KEYS = Object.keys(EMPTY_SESSION_SNAPSHOT) as (keyof SessionSnapshot)[];
-
-export function sessionSnapshotsEqual(
-  prev: SessionSnapshot,
-  next: SessionSnapshot,
-): boolean {
-  return SNAPSHOT_KEYS.every((key) => prev[key] === next[key]);
-}
-
-/**
- * External store for the session catalog so TopTabs, the terminal layer and
- * the host tree can subscribe directly instead of receiving sessions through
- * the App domain bags.
- */
-class SessionSnapshotStore {
-  private snapshot: SessionSnapshot = EMPTY_SESSION_SNAPSHOT;
-  private actions: SessionSnapshotActions | null = null;
-  private listeners = new Set<Listener>();
-  private actionListeners = new Set<Listener>();
-
-  getSnapshot = (): SessionSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: SessionSnapshot): void {
-    if (sessionSnapshotsEqual(this.snapshot, next)) return;
-    this.snapshot = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-
-  getActions = (): SessionSnapshotActions | null => this.actions;
-
-  subscribeActions = (listener: Listener): (() => void) => {
-    this.actionListeners.add(listener);
-    return () => {
-      this.actionListeners.delete(listener);
-    };
-  };
-
-  setActions(next: SessionSnapshotActions | null): void {
-    if (this.actions === next) return;
-    this.actions = next;
-    for (const listener of this.actionListeners) {
-      listener();
-    }
-  }
-}
-
-export const sessionSnapshotStore = new SessionSnapshotStore();
-
-export function publishSessionSnapshot(snapshot: SessionSnapshot): void {
-  sessionSnapshotStore.setSnapshot(snapshot);
-}
-
-export function getSessionSnapshot(): SessionSnapshot {
-  return sessionSnapshotStore.getSnapshot();
-}
-
-export function subscribeSessionSnapshot(listener: Listener): () => void {
-  return sessionSnapshotStore.subscribe(listener);
-}
-
-export function registerSessionSnapshotActions(
-  actions: SessionSnapshotActions | null,
-): void {
-  sessionSnapshotStore.setActions(actions);
-}
-
-export function getSessionSnapshotActions(): SessionSnapshotActions | null {
-  return sessionSnapshotStore.getActions();
-}
-
-export function subscribeSessionSnapshotActions(listener: Listener): () => void {
-  return sessionSnapshotStore.subscribeActions(listener);
-}
-
-/** Subscribe to the whole session catalog. Prefer a narrower selector hook. */
-export function useSessionSnapshot(): SessionSnapshot {
-  return useSyncExternalStore(
-    subscribeSessionSnapshot,
-    getSessionSnapshot,
-    getSessionSnapshot,
-  );
-}
-
-/** Subscribe to one session field so unrelated session churn stays out. */
-export function useSessionSnapshotField<K extends keyof SessionSnapshot>(
-  field: K,
-): SessionSnapshot[K] {
-  const read = () => getSessionSnapshot()[field];
-  return useSyncExternalStore(subscribeSessionSnapshot, read, read);
-}
-
-export function useSessionSnapshotActions(): SessionSnapshotActions | null {
-  return useSyncExternalStore(
-    subscribeSessionSnapshotActions,
-    getSessionSnapshotActions,
-    getSessionSnapshotActions,
-  );
-}

application/state/sessionWorkspaceDetach.test.ts

@@ -147,7 +147,6 @@ test("closing one split pane keeps the other terminal as an orphan tab", () => {
       workspaceId: "ws-1",
       layoutResult,
       remainingSessions: nextSessions,
-      preferredTabId: "s-outside",
     }),
     "s2",
   );
@@ -198,81 +197,6 @@ test("closing the last visible solo tab does not fall back to a hidden MCP sessi
   );
 });
 
-test("closing a temporary solo tab restores the previously focused tab", () => {
-  const standalone = (id: string, status: TerminalSession["status"] = "connected"): TerminalSession => ({
-    ...session(id),
-    workspaceId: undefined,
-    status,
-  });
-  const remainingSessions = [
-    standalone("s1", "disconnected"),
-    standalone("s2"),
-    standalone("s3"),
-    standalone("s4"),
-    standalone("s5", "disconnected"),
-    standalone("s6"),
-  ];
-  const layoutResult = closeSessionWorkspaceLayoutState([], undefined, "s7");
-
-  assert.equal(
-    resolveActiveTabAfterCloseSession({
-      currentActiveTabId: "s7",
-      closedSessionId: "s7",
-      workspaceId: undefined,
-      layoutResult,
-      remainingSessions,
-      preferredTabId: "s5",
-    }),
-    "s5",
-  );
-});
-
-test("closing a temporary solo tab ignores a preferred tab that no longer exists", () => {
-  const standalone = (id: string): TerminalSession => ({
-    ...session(id),
-    workspaceId: undefined,
-  });
-  const remainingSessions = [standalone("s1"), standalone("s2"), standalone("s6")];
-  const layoutResult = closeSessionWorkspaceLayoutState([], undefined, "s7");
-
-  assert.equal(
-    resolveActiveTabAfterCloseSession({
-      currentActiveTabId: "s7",
-      closedSessionId: "s7",
-      workspaceId: undefined,
-      layoutResult,
-      remainingSessions,
-      preferredTabId: "s5",
-    }),
-    "s6",
-  );
-});
-
-test("closeSessionsState restores the previous tab instead of the newest remaining tab", () => {
-  const standaloneSession = (id: string): TerminalSession => ({
-    ...session(id),
-    workspaceId: undefined,
-  });
-
-  const result = closeSessionsState({
-    sessions: [
-      standaloneSession("s1"),
-      standaloneSession("s2"),
-      standaloneSession("s5"),
-      standaloneSession("s6"),
-      standaloneSession("s7"),
-    ],
-    workspaces: [],
-    sessionIds: ["s7"],
-    currentActiveTabId: "s7",
-    preferredTabId: "s5",
-    tabOrder: ["s1", "s2", "s5", "s6", "s7"],
-  });
-
-  assert.equal(result.activeTabId, "s5");
-  assert.deepEqual(result.sessions.map((candidate) => candidate.id), ["s1", "s2", "s5", "s6"]);
-});
-
 test("closing several standalone sessions removes the whole batch", () => {
   const standaloneSession = (id: string): TerminalSession => ({
     ...session(id),

application/state/sessionWorkspaceDetach.ts

@@ -129,64 +129,22 @@ export function applyCloseSessionToSessions(
   ));
 }
 
-export function isPreferredTabAvailableAfterClose(
-  input: {
-    preferredTabId: string | null | undefined;
-    closedSessionId: string;
-    layoutResult: CloseSessionWorkspaceLayoutResult;
-    remainingSessions: readonly TerminalSession[];
-  },
-): input is {
-  preferredTabId: string;
-  closedSessionId: string;
-  layoutResult: CloseSessionWorkspaceLayoutResult;
-  remainingSessions: readonly TerminalSession[];
-} {
-  const { preferredTabId, closedSessionId, layoutResult, remainingSessions } = input;
-  if (!preferredTabId || preferredTabId === closedSessionId) return false;
-  if (
-    preferredTabId === layoutResult.dissolvedWorkspaceId
-    || preferredTabId === layoutResult.removedWorkspaceId
-  ) {
-    return false;
-  }
-  if (preferredTabId === "vault" || preferredTabId === "sftp") return true;
-  if (layoutResult.workspaces.some((workspace) => workspace.id === preferredTabId)) return true;
-  return remainingSessions.some((session) => (
-    session.id === preferredTabId
-    && !session.workspaceId
-    && !session.hiddenFromTabs
-  ));
-}
-
 export function resolveActiveTabAfterCloseSession({
   currentActiveTabId,
   closedSessionId,
   workspaceId,
   layoutResult,
   remainingSessions,
-  preferredTabId,
 }: {
   currentActiveTabId: string | null;
   closedSessionId: string;
   workspaceId: string | undefined;
   layoutResult: CloseSessionWorkspaceLayoutResult;
   remainingSessions: readonly TerminalSession[];
-  preferredTabId?: string | null;
 }): string | null {
   const fallbackWorkspace = layoutResult.workspaces[layoutResult.workspaces.length - 1];
   const fallbackSolo = remainingSessions.filter((session) => !session.workspaceId && !session.hiddenFromTabs).slice(-1)[0];
-  const preferredInput = {
-    preferredTabId,
-    closedSessionId,
-    layoutResult,
-    remainingSessions,
-  };
-  const preferredFallback = isPreferredTabAvailableAfterClose(preferredInput)
-    ? preferredInput.preferredTabId
-    : undefined;
   const fallback = layoutResult.lastRemainingSessionId
-    ?? preferredFallback
     ?? fallbackWorkspace?.id
     ?? fallbackSolo?.id
     ?? "vault";
@@ -208,14 +166,12 @@ export function closeSessionsState({
   workspaces,
   sessionIds,
   currentActiveTabId,
-  preferredTabId,
   tabOrder,
 }: {
   sessions: readonly TerminalSession[];
   workspaces: readonly Workspace[];
   sessionIds: readonly string[];
   currentActiveTabId: string | null;
-  preferredTabId?: string | null;
   tabOrder: readonly string[];
 }): CloseSessionsStateResult {
   let nextSessions = [...sessions];
@@ -251,7 +207,6 @@ export function closeSessionsState({
       workspaceId,
       layoutResult,
       remainingSessions: nextSessions,
-      preferredTabId,
     });
     if (activeTabAfterClose) {
       nextActiveTabId = activeTabAfterClose;

application/state/settingsChromeStore.test.ts

@@ -1,170 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-import {
-  DEFAULT_SETTINGS_CHROME_SNAPSHOT,
-  getSettingsChromeActions,
-  getSettingsChromeSnapshot,
-  publishSettingsChromeSnapshot,
-  registerSettingsChromeActions,
-  settingsChromeSnapshotsEqual,
-  subscribeSettingsChrome,
-  subscribeSettingsChromeActions,
-  type SettingsChromeSnapshot,
-} from './settingsChromeStore.ts';
-
-type SnapshotKey = keyof SettingsChromeSnapshot;
-
-/**
- * Derive the probe value instead of hard-coding a field list: the chrome slice
- * grows as surfaces move off the App settings bag, and this suite is about the
- * dedupe contract, not about which fields happen to be in it today.
- */
-function mutate(value: unknown): unknown {
-  if (typeof value === 'boolean') return !value;
-  if (typeof value === 'number') return value + 1;
-  if (typeof value === 'string') return `${value}-changed`;
-  throw new Error(`Unsupported snapshot field type: ${typeof value}`);
-}
-
-test('settingsChromeStore ignores structurally identical republishes', () => {
-  const base = getSettingsChromeSnapshot();
-  let events = 0;
-  const unsubscribe = subscribeSettingsChrome(() => {
-    events += 1;
-  });
-
-  // useSettingsState rebuilds this object literal on every render, so a fresh
-  // identity with unchanged fields must not wake chrome consumers.
-  publishSettingsChromeSnapshot({ ...base });
-  publishSettingsChromeSnapshot({ ...base });
-  assert.equal(events, 0);
-  assert.equal(getSettingsChromeSnapshot(), base);
-
-  unsubscribe();
-});
-
-test('settingsChromeStore notifies on any single chrome field change', () => {
-  const base = getSettingsChromeSnapshot();
-  const keys = Object.keys(base) as SnapshotKey[];
-  assert.ok(keys.length > 0, 'chrome snapshot must publish at least one field');
-
-  for (const key of keys) {
-    let events = 0;
-    const unsubscribe = subscribeSettingsChrome(() => {
-      events += 1;
-    });
-
-    const changed = { ...base, [key]: mutate(base[key]) } as SettingsChromeSnapshot;
-    publishSettingsChromeSnapshot(changed);
-    assert.equal(events, 1, `expected a notification for ${key}`);
-    assert.equal(getSettingsChromeSnapshot()[key], changed[key]);
-
-    publishSettingsChromeSnapshot({ ...changed });
-    assert.equal(events, 1, `expected no repeat notification for ${key}`);
-
-    publishSettingsChromeSnapshot(base);
-    assert.equal(events, 2, `expected a restore notification for ${key}`);
-
-    unsubscribe();
-  }
-
-  assert.equal(getSettingsChromeSnapshot(), base);
-});
-
-test('settingsChromeStore stops notifying after unsubscribe', () => {
-  const base = getSettingsChromeSnapshot();
-  const [firstKey] = Object.keys(base) as SnapshotKey[];
-  let events = 0;
-  const unsubscribe = subscribeSettingsChrome(() => {
-    events += 1;
-  });
-
-  unsubscribe();
-  publishSettingsChromeSnapshot({
-    ...base,
-    [firstKey]: mutate(base[firstKey]),
-  } as SettingsChromeSnapshot);
-  assert.equal(events, 0);
-
-  publishSettingsChromeSnapshot(base);
-});
-
-test('chrome snapshot fields stay in sync with what useSettingsState publishes', () => {
-  // The whole point of the slice is that chrome leaves can stop reading the
-  // App settings bag. A field the publisher forgets would silently freeze at
-  // its default, so pin the two shapes together.
-  const source = readFileSync(new URL('./useSettingsState.ts', import.meta.url), 'utf8');
-  const callStart = source.indexOf('publishSettingsChromeSnapshot({');
-  assert.notEqual(callStart, -1, 'useSettingsState must publish the chrome slice');
-  const callEnd = source.indexOf('});', callStart);
-  assert.notEqual(callEnd, -1);
-
-  const published = source
-    .slice(callStart, callEnd)
-    .split('\n')
-    .slice(1)
-    .map((line) => line.trim().match(/^([A-Za-z0-9_]+)\s*[:,]/)?.[1])
-    .filter((name): name is string => Boolean(name));
-
-  assert.deepEqual(
-    published.slice().sort(),
-    Object.keys(DEFAULT_SETTINGS_CHROME_SNAPSHOT).sort(),
-  );
-});
-
-test('settingsChromeSnapshotsEqual compares by field, not object identity', () => {
-  const base = DEFAULT_SETTINGS_CHROME_SNAPSHOT;
-  assert.equal(settingsChromeSnapshotsEqual({ ...base }, { ...base }), true);
-  assert.equal(
-    settingsChromeSnapshotsEqual(base, { ...base, windowOpacity: 0.8 }),
-    false,
-  );
-  assert.equal(
-    settingsChromeSnapshotsEqual(base, { ...base, showSftpTab: !base.showSftpTab }),
-    false,
-  );
-});
-
-test('registerSettingsChromeActions exposes the theme and opacity setters', () => {
-  const calls: string[] = [];
-  let actionEvents = 0;
-  const unsubscribe = subscribeSettingsChromeActions(() => {
-    actionEvents += 1;
-  });
-
-  registerSettingsChromeActions({
-    setTheme: () => calls.push('theme'),
-    setWindowOpacity: () => calls.push('opacity'),
-  });
-
-  const actions = getSettingsChromeActions();
-  assert.ok(actions);
-  actions.setTheme('light');
-  actions.setWindowOpacity(0.5);
-  assert.deepEqual(calls, ['theme', 'opacity']);
-  assert.equal(actionEvents, 1);
-
-  registerSettingsChromeActions(null);
-  assert.equal(getSettingsChromeActions(), null);
-  assert.equal(actionEvents, 2);
-
-  unsubscribe();
-});
-
-test('setter churn never invalidates the chrome value snapshot', () => {
-  // useSettingsState re-registers on every setter identity change; chrome
-  // consumers of the value snapshot must not re-render for that.
-  let valueEvents = 0;
-  const unsubscribe = subscribeSettingsChrome(() => {
-    valueEvents += 1;
-  });
-
-  registerSettingsChromeActions({ setTheme: () => {}, setWindowOpacity: () => {} });
-  registerSettingsChromeActions({ setTheme: () => {}, setWindowOpacity: () => {} });
-  assert.equal(valueEvents, 0);
-
-  registerSettingsChromeActions(null);
-  unsubscribe();
-});

application/state/settingsChromeStore.ts

@@ -1,181 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type { UILanguage } from '../../domain/models/connection';
-import type { DynamicTabTitleMode } from '../../domain/models/terminal';
-import type { HostClickBehavior } from '../../domain/hostClickBehavior';
-import type { TerminalSidePanelAutoOpenTab } from '../../domain/terminalSidePanelAutoOpen';
-
-type Listener = () => void;
-
-export type SettingsChromeTheme = 'dark' | 'light' | 'system';
-
-/**
- * Chrome-facing settings slice. Keep this aligned with what AppView / TopTabs /
- * HostTree actually read. Unrelated settings edits must not rebuild App chrome
- * domain bags — leaves subscribe here instead of receiving the whole settings
- * object through domain props.
- */
-export type SettingsChromeSnapshot = {
-  theme: SettingsChromeTheme;
-  resolvedTheme: 'light' | 'dark';
-  lightUiThemeId: string;
-  darkUiThemeId: string;
-  uiLanguage: UILanguage;
-  windowOpacity: number;
-  showSftpTab: boolean;
-  showHostTreeSidebar: boolean;
-  showRecentHosts: boolean;
-  hostClickBehavior: HostClickBehavior;
-  showOnlyUngroupedHostsInRoot: boolean;
-  dynamicTabTitleMode: DynamicTabTitleMode;
-  disableTerminalFontZoom: boolean;
-  restoreTerminalCwd: boolean;
-  terminalSidePanelAutoOpen: boolean;
-  terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
-};
-
-/**
- * Setters chrome leaves need. Kept on a separate slot from the value snapshot:
- * `useSettingsState` rebuilds these callbacks on its own cadence, and that must
- * never invalidate the value snapshot.
- */
-export type SettingsChromeActions = {
-  setTheme: (theme: SettingsChromeTheme) => void;
-  setWindowOpacity: (opacity: number) => void;
-};
-
-export const DEFAULT_SETTINGS_CHROME_SNAPSHOT: SettingsChromeSnapshot = Object.freeze({
-  theme: 'system',
-  resolvedTheme: 'dark',
-  lightUiThemeId: 'default',
-  darkUiThemeId: 'default',
-  uiLanguage: 'en',
-  windowOpacity: 1,
-  showSftpTab: true,
-  showHostTreeSidebar: true,
-  showRecentHosts: true,
-  hostClickBehavior: 'connect',
-  showOnlyUngroupedHostsInRoot: false,
-  dynamicTabTitleMode: 'off',
-  disableTerminalFontZoom: false,
-  restoreTerminalCwd: true,
-  terminalSidePanelAutoOpen: false,
-  terminalSidePanelAutoOpenTab: 'ai',
-} satisfies SettingsChromeSnapshot);
-
-export function settingsChromeSnapshotsEqual(
-  a: SettingsChromeSnapshot,
-  b: SettingsChromeSnapshot,
-): boolean {
-  return a.theme === b.theme
-    && a.resolvedTheme === b.resolvedTheme
-    && a.lightUiThemeId === b.lightUiThemeId
-    && a.darkUiThemeId === b.darkUiThemeId
-    && a.uiLanguage === b.uiLanguage
-    && a.windowOpacity === b.windowOpacity
-    && a.showSftpTab === b.showSftpTab
-    && a.showHostTreeSidebar === b.showHostTreeSidebar
-    && a.showRecentHosts === b.showRecentHosts
-    && a.hostClickBehavior === b.hostClickBehavior
-    && a.showOnlyUngroupedHostsInRoot === b.showOnlyUngroupedHostsInRoot
-    && a.dynamicTabTitleMode === b.dynamicTabTitleMode
-    && a.disableTerminalFontZoom === b.disableTerminalFontZoom
-    && a.restoreTerminalCwd === b.restoreTerminalCwd
-    && a.terminalSidePanelAutoOpen === b.terminalSidePanelAutoOpen
-    && a.terminalSidePanelAutoOpenTab === b.terminalSidePanelAutoOpenTab;
-}
-
-class SettingsChromeStore {
-  private snapshot: SettingsChromeSnapshot = DEFAULT_SETTINGS_CHROME_SNAPSHOT;
-  private actions: SettingsChromeActions | null = null;
-  private listeners = new Set<Listener>();
-  private actionListeners = new Set<Listener>();
-
-  getSnapshot = (): SettingsChromeSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: SettingsChromeSnapshot): void {
-    if (settingsChromeSnapshotsEqual(this.snapshot, next)) return;
-    this.snapshot = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-
-  getActions = (): SettingsChromeActions | null => this.actions;
-
-  subscribeActions = (listener: Listener): (() => void) => {
-    this.actionListeners.add(listener);
-    return () => {
-      this.actionListeners.delete(listener);
-    };
-  };
-
-  setActions(next: SettingsChromeActions | null): void {
-    if (this.actions === next) return;
-    this.actions = next;
-    for (const listener of this.actionListeners) {
-      listener();
-    }
-  }
-}
-
-export const settingsChromeStore = new SettingsChromeStore();
-
-export function publishSettingsChromeSnapshot(
-  snapshot: SettingsChromeSnapshot,
-): void {
-  settingsChromeStore.setSnapshot(snapshot);
-}
-
-export function getSettingsChromeSnapshot(): SettingsChromeSnapshot {
-  return settingsChromeStore.getSnapshot();
-}
-
-export function subscribeSettingsChrome(listener: Listener): () => void {
-  return settingsChromeStore.subscribe(listener);
-}
-
-export function registerSettingsChromeActions(
-  actions: SettingsChromeActions | null,
-): void {
-  settingsChromeStore.setActions(actions);
-}
-
-export function getSettingsChromeActions(): SettingsChromeActions | null {
-  return settingsChromeStore.getActions();
-}
-
-export function subscribeSettingsChromeActions(listener: Listener): () => void {
-  return settingsChromeStore.subscribeActions(listener);
-}
-
-export function useSettingsChromeStore(): SettingsChromeSnapshot {
-  return useSyncExternalStore(
-    subscribeSettingsChrome,
-    getSettingsChromeSnapshot,
-    getSettingsChromeSnapshot,
-  );
-}
-
-const noopSetTheme: SettingsChromeActions['setTheme'] = () => {};
-const noopSetWindowOpacity: SettingsChromeActions['setWindowOpacity'] = () => {};
-
-/** Chrome setters, safe to call before `useSettingsState` has registered. */
-export function useSettingsChromeActions(): SettingsChromeActions {
-  const actions = useSyncExternalStore(
-    subscribeSettingsChromeActions,
-    getSettingsChromeActions,
-    getSettingsChromeActions,
-  );
-  return {
-    setTheme: actions?.setTheme ?? noopSetTheme,
-    setWindowOpacity: actions?.setWindowOpacity ?? noopSetWindowOpacity,
-  };
-}

application/state/sftp/compressedUploadControl.test.ts

@@ -1,31 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import { resumeCompressedUploadSafely } from "./compressedUploadControl.ts";
-
-test("live compressed resume failure stays paused instead of starting a second transfer", async () => {
-  const outcome = await resumeCompressedUploadSafely({
-    transferId: "compressed-live",
-    reconnectRequired: false,
-    resume: async () => ({ success: false, reason: "Upload resume is unavailable" }),
-  });
-  assert.deepEqual(outcome, { kind: "failed", reason: "Upload resume is unavailable" });
-});
-
-test("restored compressed task may restart when its old worker no longer exists", async () => {
-  const outcome = await resumeCompressedUploadSafely({
-    transferId: "compressed-restored",
-    reconnectRequired: true,
-    resume: async () => ({ success: false, reason: "Compression is not active" }),
-  });
-  assert.deepEqual(outcome, { kind: "restart", reason: "Compression is not active" });
-});
-
-test("successful compressed resume rejoins the existing job", async () => {
-  const outcome = await resumeCompressedUploadSafely({
-    transferId: "compressed-live",
-    reconnectRequired: false,
-    resume: async () => ({ success: true }),
-  });
-  assert.deepEqual(outcome, { kind: "resumed" });
-});

application/state/sftp/compressedUploadControl.ts

@@ -1,16 +0,0 @@
-export type CompressedUploadResumeOutcome =
-  | { kind: "resumed" }
-  | { kind: "restart"; reason?: string }
-  | { kind: "failed"; reason: string };
-
-export async function resumeCompressedUploadSafely(params: {
-  transferId: string;
-  reconnectRequired: boolean;
-  resume?: (transferId: string) => Promise<{ success: boolean; reason?: string }>;
-}): Promise<CompressedUploadResumeOutcome> {
-  const result = await (params.resume?.(params.transferId)
-    ?? { success: false, reason: "Resume unavailable" });
-  if (result.success) return { kind: "resumed" };
-  if (params.reconnectRequired) return { kind: "restart", reason: result.reason };
-  return { kind: "failed", reason: result.reason ?? "Could not resume the compressed upload." };
-}

application/state/sftp/types.ts

@@ -111,9 +111,4 @@ export interface SftpStateOptions {
    * This keeps side-panel tab switches on the already-authenticated SSH transport.
    */
   resolveBrowseSourceSessionId?: (hostId: string, host?: Host) => string | undefined;
-  /**
-   * @deprecated Transfer channels no longer park independently. SSH keep-alive
-   * is controlled by sshTransportIdleTtlMs in settings.
-   */
-  transferPoolIdleTtlMs?: number;
 }

application/state/sftp/utils.ts

@@ -1,11 +1,13 @@
 import { SftpFileEntry, TransferTask } from "../../../domain/models";
+import { formatBytes } from "../../../domain/formatBytes";
 
 export const formatFileSize = (bytes: number): string => {
-  if (bytes === 0) return "--";
-  const units = ["Bytes", "KB", "MB", "GB", "TB"];
-  const i = Math.floor(Math.log(bytes) / Math.log(1024));
-  const size = bytes / Math.pow(1024, i);
-  return `${size.toFixed(i === 0 ? 0 : 2)} ${units[i]}`;
+  return formatBytes(bytes, {
+    zeroDisplay: "--",
+    includeTB: true,
+    fractionDigits: 2,
+    byteUnit: "Bytes",
+  });
 };
 
 /**

application/state/sftpTransferCenterStore.ts

@@ -2318,7 +2318,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
 const browserPersistence: StorePersistence | undefined = typeof globalThis.localStorage === "undefined"
   ? undefined
   : {
-      read: () => globalThis.localStorage.getItem(STORAGE_KEY_SFTP_TRANSFER_CENTER),
+      read: () => localStorageAdapter.readString(STORAGE_KEY_SFTP_TRANSFER_CENTER),
       write: (value) => { localStorageAdapter.writeString(STORAGE_KEY_SFTP_TRANSFER_CENTER, value); },
     };
 

application/state/systemManagerTabLayout.test.ts

@@ -1,54 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  normalizeToolbarItemLayout,
-  partitionToolbarItems,
-  setToolbarItemPlacement,
-} from '../../domain/toolbarItemLayout.ts';
-import {
-  SYSTEM_MANAGER_TAB_DEFAULT_ORDER,
-  SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS,
-} from './systemManagerTabLayout.ts';
-
-test('system manager tab layout defaults include every known section', () => {
-  assert.deepEqual(
-    [...SYSTEM_MANAGER_TAB_DEFAULT_ORDER],
-    ['overview', 'processes', 'ports', 'services', 'tmux', 'docker', 'gpu'],
-  );
-  assert.deepEqual(SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS.lockedIds, ['overview']);
-});
-
-test('system manager overview cannot be hidden', () => {
-  const layout = normalizeToolbarItemLayout(null, SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS);
-  const next = setToolbarItemPlacement(
-    layout,
-    'overview',
-    'hide',
-    SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS,
-  );
-  assert.equal(next.placement.overview, 'show');
-});
-
-test('system manager partition filters to available host tabs', () => {
-  const layout = normalizeToolbarItemLayout(
-    {
-      order: [...SYSTEM_MANAGER_TAB_DEFAULT_ORDER],
-      placement: {
-        overview: 'show',
-        processes: 'show',
-        ports: 'collapse',
-        services: 'hide',
-        tmux: 'show',
-        docker: 'show',
-        gpu: 'show',
-      },
-    },
-    SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS,
-  );
-
-  const part = partitionToolbarItems(layout, ['overview', 'processes', 'ports', 'services']);
-  assert.deepEqual(part.shown, ['overview', 'processes']);
-  assert.deepEqual(part.collapsed, ['ports']);
-  assert.deepEqual(part.hidden, ['services']);
-});

application/state/systemManagerTabLayout.ts

@@ -1,25 +0,0 @@
-import type { SystemManagerSubTab } from '../../domain/systemManager/types';
-import type { ToolbarItemLayoutDefaults } from '../../domain/toolbarItemLayout';
-
-/** Canonical System Manager sub-tab order (all known sections). */
-export const SYSTEM_MANAGER_TAB_DEFAULT_ORDER: readonly SystemManagerSubTab[] = [
-  'overview',
-  'processes',
-  'ports',
-  'services',
-  'tmux',
-  'docker',
-  'gpu',
-] as const;
-
-/**
- * Persistable layout defaults for System Manager sub-tabs.
- * Overview is locked so the panel never loses every reachable section.
- */
-export const SYSTEM_MANAGER_TAB_LAYOUT_DEFAULTS: ToolbarItemLayoutDefaults = {
-  order: [...SYSTEM_MANAGER_TAB_DEFAULT_ORDER],
-  placement: Object.fromEntries(
-    SYSTEM_MANAGER_TAB_DEFAULT_ORDER.map((id) => [id, 'show' as const]),
-  ),
-  lockedIds: ['overview'],
-};

application/state/systemSettingsEffects.ts

@@ -62,25 +62,20 @@ export function useSystemSettingsEffects({
   // Persist and sync toggle window hotkey setting
   useEffect(() => {
     if (!enabled) return;
-    let cancelled = false;
-    let didRegister = false;
     // Register/unregister the global hotkey in main process (needed on mount)
     const bridge = netcattyBridge.get();
     if (bridge?.registerGlobalHotkey) {
       if (toggleWindowHotkey && globalHotkeyEnabled) {
         setHotkeyRegistrationError(null);
-        didRegister = true;
         bridge
           .registerGlobalHotkey(toggleWindowHotkey)
           .then((result) => {
-            if (cancelled) return;
             if (result?.success === false) {
               console.warn('[GlobalHotkey] Hotkey registration failed:', result.error);
               setHotkeyRegistrationError(result.error || 'Failed to register hotkey');
             }
           })
           .catch((err) => {
-            if (cancelled) return;
             console.warn('[GlobalHotkey] Failed to register hotkey:', err);
             setHotkeyRegistrationError(err?.message || 'Failed to register hotkey');
           });
@@ -92,20 +87,9 @@ export function useSystemSettingsEffects({
       }
     }
     localStorageAdapter.writeString(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY, toggleWindowHotkey);
-    // Skip settings-sync IPC on initial mount; still return cleanup below.
-    if (persistMountedRef.current) {
-      notifySettingsChanged(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY, toggleWindowHotkey);
-    }
-    return () => {
-      cancelled = true;
-      // Drop Mount1's registration before Mount2 re-registers (StrictMode), and
-      // release the accelerator on real unmount / disable transitions.
-      if (didRegister) {
-        bridge?.unregisterGlobalHotkey?.().catch((err) => {
-          console.warn('[GlobalHotkey] Failed to unregister hotkey on cleanup', err);
-        });
-      }
-    };
+    // Skip IPC on initial mount
+    if (!persistMountedRef.current) return;
+    notifySettingsChanged(STORAGE_KEY_TOGGLE_WINDOW_HOTKEY, toggleWindowHotkey);
   }, [
     toggleWindowHotkey,
     enabled,

application/state/terminalSettingsStore.ts

@@ -1,201 +0,0 @@
-import { useSyncExternalStore } from 'react';
-
-import type {
-  HotkeyScheme,
-  KeyBinding,
-  SessionLogFormat,
-  TerminalSettings,
-} from '../../domain/models';
-import { normalizeTerminalSettings } from '../../domain/models';
-import type { useSettingsState } from './useSettingsState';
-
-type SettingsState = ReturnType<typeof useSettingsState>;
-
-type Listener = () => void;
-
-/**
- * Terminal-facing settings slice. Mirrors `settingsChromeStore`: values and
- * actions live on separate slots so setter identity churn never invalidates
- * the value snapshot TerminalHost / terminal domain bags subscribe to.
- */
-export type TerminalSettingsSnapshot = {
-  terminalThemeId: string;
-  terminalThemeDarkId: string;
-  terminalThemeLightId: string;
-  followAppTerminalTheme: boolean;
-  terminalFontFamilyId: string;
-  terminalFontSize: number;
-  terminalSettings: TerminalSettings;
-  hotkeyScheme: HotkeyScheme;
-  keyBindings: readonly KeyBinding[];
-  isHotkeyRecording: boolean;
-  sftpDoubleClickBehavior: 'open' | 'transfer';
-  sftpAutoSync: boolean;
-  sftpShowHiddenFiles: boolean;
-  sftpUseCompressedUpload: boolean;
-  sftpAutoOpenSidebar: boolean;
-  sftpFollowTerminalCwd: boolean;
-  sftpDefaultViewMode: 'list' | 'tree';
-  editorWordWrap: boolean;
-  sessionLogsEnabled: boolean;
-  sessionLogsDir: string;
-  sessionLogsFormat: SessionLogFormat;
-  sessionLogsTimestampsEnabled: boolean;
-  sshDebugLogsEnabled: boolean;
-};
-
-export type TerminalSettingsActions = Pick<
-  SettingsState,
-  | 'setTerminalThemeId'
-  | 'setTerminalThemeDarkId'
-  | 'setTerminalThemeLightId'
-  | 'setFollowAppTerminalTheme'
-  | 'setTerminalFontFamilyId'
-  | 'setTerminalFontSize'
-  | 'updateTerminalSetting'
-  | 'setSftpFollowTerminalCwd'
-  | 'setEditorWordWrap'
-  | 'applyAppTheme'
->;
-
-export const DEFAULT_TERMINAL_SETTINGS_SNAPSHOT: TerminalSettingsSnapshot = Object.freeze({
-  terminalThemeId: 'default',
-  terminalThemeDarkId: 'default',
-  terminalThemeLightId: 'default',
-  followAppTerminalTheme: true,
-  terminalFontFamilyId: 'default',
-  terminalFontSize: 14,
-  terminalSettings: normalizeTerminalSettings(),
-  hotkeyScheme: 'mac',
-  keyBindings: Object.freeze([]) as readonly KeyBinding[],
-  isHotkeyRecording: false,
-  sftpDoubleClickBehavior: 'open',
-  sftpAutoSync: false,
-  sftpShowHiddenFiles: false,
-  sftpUseCompressedUpload: false,
-  sftpAutoOpenSidebar: false,
-  sftpFollowTerminalCwd: false,
-  sftpDefaultViewMode: 'list',
-  editorWordWrap: true,
-  sessionLogsEnabled: false,
-  sessionLogsDir: '',
-  sessionLogsFormat: 'txt',
-  sessionLogsTimestampsEnabled: false,
-  sshDebugLogsEnabled: false,
-});
-
-export function terminalSettingsSnapshotsEqual(
-  a: TerminalSettingsSnapshot,
-  b: TerminalSettingsSnapshot,
-): boolean {
-  return a.terminalThemeId === b.terminalThemeId
-    && a.terminalThemeDarkId === b.terminalThemeDarkId
-    && a.terminalThemeLightId === b.terminalThemeLightId
-    && a.followAppTerminalTheme === b.followAppTerminalTheme
-    && a.terminalFontFamilyId === b.terminalFontFamilyId
-    && a.terminalFontSize === b.terminalFontSize
-    && a.terminalSettings === b.terminalSettings
-    && a.hotkeyScheme === b.hotkeyScheme
-    && a.keyBindings === b.keyBindings
-    && a.isHotkeyRecording === b.isHotkeyRecording
-    && a.sftpDoubleClickBehavior === b.sftpDoubleClickBehavior
-    && a.sftpAutoSync === b.sftpAutoSync
-    && a.sftpShowHiddenFiles === b.sftpShowHiddenFiles
-    && a.sftpUseCompressedUpload === b.sftpUseCompressedUpload
-    && a.sftpAutoOpenSidebar === b.sftpAutoOpenSidebar
-    && a.sftpFollowTerminalCwd === b.sftpFollowTerminalCwd
-    && a.sftpDefaultViewMode === b.sftpDefaultViewMode
-    && a.editorWordWrap === b.editorWordWrap
-    && a.sessionLogsEnabled === b.sessionLogsEnabled
-    && a.sessionLogsDir === b.sessionLogsDir
-    && a.sessionLogsFormat === b.sessionLogsFormat
-    && a.sessionLogsTimestampsEnabled === b.sessionLogsTimestampsEnabled
-    && a.sshDebugLogsEnabled === b.sshDebugLogsEnabled;
-}
-
-class TerminalSettingsStore {
-  private snapshot: TerminalSettingsSnapshot = DEFAULT_TERMINAL_SETTINGS_SNAPSHOT;
-  private actions: TerminalSettingsActions | null = null;
-  private listeners = new Set<Listener>();
-  private actionListeners = new Set<Listener>();
-
-  getSnapshot = (): TerminalSettingsSnapshot => this.snapshot;
-
-  subscribe = (listener: Listener): (() => void) => {
-    this.listeners.add(listener);
-    return () => {
-      this.listeners.delete(listener);
-    };
-  };
-
-  setSnapshot(next: TerminalSettingsSnapshot): void {
-    if (terminalSettingsSnapshotsEqual(this.snapshot, next)) return;
-    this.snapshot = next;
-    for (const listener of this.listeners) {
-      listener();
-    }
-  }
-
-  getActions = (): TerminalSettingsActions | null => this.actions;
-
-  subscribeActions = (listener: Listener): (() => void) => {
-    this.actionListeners.add(listener);
-    return () => {
-      this.actionListeners.delete(listener);
-    };
-  };
-
-  setActions(next: TerminalSettingsActions | null): void {
-    if (this.actions === next) return;
-    this.actions = next;
-    for (const listener of this.actionListeners) {
-      listener();
-    }
-  }
-}
-
-export const terminalSettingsStore = new TerminalSettingsStore();
-
-export function publishTerminalSettingsSnapshot(
-  snapshot: TerminalSettingsSnapshot,
-): void {
-  terminalSettingsStore.setSnapshot(snapshot);
-}
-
-export function getTerminalSettingsSnapshot(): TerminalSettingsSnapshot {
-  return terminalSettingsStore.getSnapshot();
-}
-
-export function subscribeTerminalSettings(listener: Listener): () => void {
-  return terminalSettingsStore.subscribe(listener);
-}
-
-export function registerTerminalSettingsActions(
-  actions: TerminalSettingsActions | null,
-): void {
-  terminalSettingsStore.setActions(actions);
-}
-
-export function getTerminalSettingsActions(): TerminalSettingsActions | null {
-  return terminalSettingsStore.getActions();
-}
-
-export function subscribeTerminalSettingsActions(listener: Listener): () => void {
-  return terminalSettingsStore.subscribeActions(listener);
-}
-
-export function useTerminalSettingsStore(): TerminalSettingsSnapshot {
-  return useSyncExternalStore(
-    subscribeTerminalSettings,
-    getTerminalSettingsSnapshot,
-    getTerminalSettingsSnapshot,
-  );
-}
-
-export function useTerminalSettingsActions(): TerminalSettingsActions | null {
-  return useSyncExternalStore(
-    subscribeTerminalSettingsActions,
-    getTerminalSettingsActions,
-    getTerminalSettingsActions,
-  );
-}

application/state/uiFontStore.ts

@@ -172,15 +172,6 @@ export const useUIFontsLoaded = (): boolean => {
   );
 };
 
-/**
- * Check if a font ID is valid
- */
-export const isValidUiFontId = (fontId: string): boolean => {
-  // Local fonts are always considered valid (they start with 'local-')
-  if (fontId.startsWith('local-')) return true;
-  return uiFontStore.getAvailableFonts().some(f => f.id === fontId);
-};
-
 /**
  * Initialize UI fonts eagerly
  */

application/state/useAIState.ts

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
 import {
   STORAGE_KEY_AI_PROVIDERS,
@@ -50,7 +50,6 @@ import {
 } from './aiDraftState';
 import { convertFilesToUploads } from './useFileUpload';
 import { removeProviderReferences } from './aiProviderCleanup';
-import { publishAISessionsSnapshot } from './aiSessionsStore';
 import {
   AI_STATE_CHANGED_DRAFTS_BY_SCOPE,
   AI_STATE_CHANGED_PANEL_VIEW_BY_SCOPE,
@@ -73,11 +72,6 @@ import {
   type PanelViewByScope,
 } from './aiStateSnapshots';
 import { AI_STATE_CHANGED_EVENT, emitAIStateChanged } from './aiStateEvents';
-import {
-  handoffDissolvedWorkspaceAIScope,
-  retargetWorkspaceActiveChatAfterMemberLoss,
-  seedWorkspaceAIActiveSessionFromMembers,
-} from '../../domain/workspaceAiScopeHandoff';
 export function useAIState() {
   // ── Provider Config ──
   const [providers, setProvidersRaw] = useState<ProviderConfig[]>(() =>
@@ -973,112 +967,6 @@ export function useAIState() {
     setPanelViewByScopeRaw(latestAIPanelViewByScopeSnapshot ?? {});
   }, []);
 
-  const seedWorkspaceActiveSessionFromMembers = useCallback((input: {
-    workspaceId: string;
-    memberTerminalIds: readonly string[];
-    preferredTerminalId?: string | null;
-  }) => {
-    const currentMap =
-      latestAIActiveSessionMapSnapshot
-      ?? localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP)
-      ?? {};
-    const nextMap = seedWorkspaceAIActiveSessionFromMembers({
-      activeSessionIdMap: currentMap,
-      workspaceId: input.workspaceId,
-      memberTerminalIds: input.memberTerminalIds,
-      preferredTerminalId: input.preferredTerminalId,
-    });
-    if (!nextMap) return;
-    setLatestAIActiveSessionMapSnapshot(nextMap);
-    localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, nextMap);
-    emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
-    setActiveSessionIdMapRaw(nextMap);
-  }, []);
-
-  const handoffDissolvedWorkspaceScope = useCallback((input: {
-    workspaceId: string;
-    terminalIds: readonly string[];
-    preferredTerminalId?: string | null;
-  }) => {
-    const currentMap =
-      latestAIActiveSessionMapSnapshot
-      ?? localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP)
-      ?? {};
-    const currentSessions =
-      latestAISessionsSnapshot
-      ?? localStorageAdapter.read<AISession[]>(STORAGE_KEY_AI_SESSIONS)
-      ?? [];
-    const currentPanelViewByScope = latestAIPanelViewByScopeSnapshot ?? {};
-    const result = handoffDissolvedWorkspaceAIScope({
-      activeSessionIdMap: currentMap,
-      sessions: currentSessions,
-      workspaceId: input.workspaceId,
-      terminalIds: input.terminalIds,
-      preferredTerminalId: input.preferredTerminalId,
-      panelViewByScope: currentPanelViewByScope,
-    });
-    if (!result.changed) return;
-
-    if (result.activeSessionIdMap !== currentMap) {
-      setLatestAIActiveSessionMapSnapshot(result.activeSessionIdMap);
-      localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, result.activeSessionIdMap);
-      emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
-      setActiveSessionIdMapRaw(result.activeSessionIdMap);
-    }
-
-    if (result.sessions !== currentSessions) {
-      sessionsRef.current = result.sessions;
-      setLatestAISessionsSnapshot(result.sessions);
-      persistSessions(result.sessions);
-      setSessionsRaw(result.sessions);
-    }
-
-    if (result.panelViewByScope !== currentPanelViewByScope) {
-      setLatestAIPanelViewByScopeSnapshot(result.panelViewByScope);
-      emitAIStateChanged(AI_STATE_CHANGED_PANEL_VIEW_BY_SCOPE);
-      setPanelViewByScopeRaw(result.panelViewByScope);
-    }
-  }, [persistSessions]);
-
-  const retargetWorkspaceActiveChatForMemberLoss = useCallback((input: {
-    workspaceId: string;
-    previousMemberTerminalIds: readonly string[];
-    currentMemberTerminalIds: readonly string[];
-    preferredTerminalId?: string | null;
-  }) => {
-    const currentMap =
-      latestAIActiveSessionMapSnapshot
-      ?? localStorageAdapter.read<Record<string, string | null>>(STORAGE_KEY_AI_ACTIVE_SESSION_MAP)
-      ?? {};
-    const currentSessions =
-      latestAISessionsSnapshot
-      ?? localStorageAdapter.read<AISession[]>(STORAGE_KEY_AI_SESSIONS)
-      ?? [];
-    const result = retargetWorkspaceActiveChatAfterMemberLoss({
-      activeSessionIdMap: currentMap,
-      sessions: currentSessions,
-      workspaceId: input.workspaceId,
-      previousMemberTerminalIds: input.previousMemberTerminalIds,
-      currentMemberTerminalIds: input.currentMemberTerminalIds,
-      preferredTerminalId: input.preferredTerminalId,
-    });
-    if (!result.changed) return;
-
-    if (result.activeSessionIdMap !== currentMap) {
-      setLatestAIActiveSessionMapSnapshot(result.activeSessionIdMap);
-      localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, result.activeSessionIdMap);
-      emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
-      setActiveSessionIdMapRaw(result.activeSessionIdMap);
-    }
-
-    if (result.sessions !== currentSessions) {
-      sessionsRef.current = result.sessions;
-      setLatestAISessionsSnapshot(result.sessions);
-      persistSessions(result.sessions);
-      setSessionsRaw(result.sessions);
-    }
-  }, [persistSessions]);
-
   // ── Provider CRUD helpers ──
   const addProvider = useCallback((provider: ProviderConfig) => {
     setProviders(prev => [...prev, provider]);
@@ -1116,17 +1004,6 @@ export function useAIState() {
   // ── Computed ──
   const activeProvider = providers.find(p => p.id === activeProviderId) ?? null;
 
-  // Stream/message updates publish here so AIConfig Context consumers do not
-  // re-render on every token. AIChatPanelsHost reads aiSessionsStore instead.
-  useLayoutEffect(() => {
-    publishAISessionsSnapshot({
-      sessions,
-      activeSessionIdMap,
-      draftsByScope,
-      panelViewByScope,
-    });
-  }, [sessions, activeSessionIdMap, draftsByScope, panelViewByScope]);
-
   return useMemo(() => ({
     providers,
     setProviders,
@@ -1162,8 +1039,10 @@ export function useAIState() {
     setWebSearchConfig,
     quickMessages,
     setQuickMessages,
-    // sessions / activeSessionIdMap / draftsByScope / panelViewByScope live in
-    // aiSessionsStore so streaming updates do not rebuild this config object.
+    sessions,
+    activeSessionIdMap,
+    draftsByScope,
+    panelViewByScope,
     setActiveSessionId,
     ensureDraftForScope,
     updateDraft,
@@ -1182,9 +1061,6 @@ export function useAIState() {
     updateMessageById,
     persistContextCompaction,
     cleanupOrphanedSessions,
-    seedWorkspaceActiveSessionFromMembers,
-    handoffDissolvedWorkspaceScope,
-    retargetWorkspaceActiveChatForMemberLoss,
   }), [
     providers,
     setProviders,
@@ -1220,6 +1096,10 @@ export function useAIState() {
     setWebSearchConfig,
     quickMessages,
     setQuickMessages,
+    sessions,
+    activeSessionIdMap,
+    draftsByScope,
+    panelViewByScope,
     setActiveSessionId,
     ensureDraftForScope,
     updateDraft,
@@ -1238,8 +1118,5 @@ export function useAIState() {
     updateMessageById,
     persistContextCompaction,
     cleanupOrphanedSessions,
-    seedWorkspaceActiveSessionFromMembers,
-    handoffDissolvedWorkspaceScope,
-    retargetWorkspaceActiveChatForMemberLoss,
   ]);
 }

application/state/useAutoSync.ts

@@ -7,7 +7,7 @@
  * - Debounced sync to avoid too frequent API calls
  */
 
-import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useCloudSync } from './useCloudSync';
 import { useI18n } from '../i18n/I18nProvider';
 import { getCloudSyncManager } from '../../infrastructure/services/CloudSyncManager';
@@ -49,7 +49,6 @@ import {
   shouldRunRuntimeRemoteCheck,
 } from './autoSyncRemoteSchedule';
 import { resolveAutoSyncHashDecision } from './autoSyncHashDecision';
-import { getNotesSnapshot, subscribeNotes } from './notesStore';
 
 interface AutoSyncConfig {
   enabled?: boolean;
@@ -164,9 +163,6 @@ interface RemoteVersionCheckOptions {
 
 export const useAutoSync = (config: AutoSyncConfig) => {
   const enabled = config.enabled !== false;
-  // Subscribe so note edits still trigger getSyncSnapshot rebuilds even when
-  // App omits notes props (notes live in notesStore, not App render).
-  const notesSnapshot = useSyncExternalStore(subscribeNotes, getNotesSnapshot, getNotesSnapshot);
   const { t } = useI18n();
   const tRef = useRef(t);
   useEffect(() => {
@@ -258,10 +254,8 @@ export const useAutoSync = (config: AutoSyncConfig) => {
       snippets: config.snippets,
       customGroups: config.customGroups,
       snippetPackages: config.snippetPackages,
-      // Prefer explicit overrides (tests); otherwise read the live notes store so
-      // App does not have to re-render on every note edit to keep sync current.
-      notes: config.notes ?? (notesSnapshot.notes as SyncPayload['notes']),
-      noteGroups: config.noteGroups ?? (notesSnapshot.noteGroups as SyncPayload['noteGroups']),
+      notes: config.notes,
+      noteGroups: config.noteGroups,
       portForwardingRules: getEffectivePortForwardingRulesForSync(config.portForwardingRules),
       groupConfigs: config.groupConfigs,
     };
@@ -277,8 +271,6 @@ export const useAutoSync = (config: AutoSyncConfig) => {
     config.noteGroups,
     config.portForwardingRules,
     config.groupConfigs,
-    notesSnapshot.notes,
-    notesSnapshot.noteGroups,
   ]);
 
   // Build sync payload (includes plugin sidecars when host is available)

application/state/useExternalMcpToggleState.test.ts

@@ -15,11 +15,9 @@ import {
   readExternalMcpSilentSessions,
   readExternalMcpStoredEnabled,
   resetExternalMcpStartupReadyForTests,
-  resetExternalMcpStartupSyncOnceForTests,
   shouldStartExternalMcpOnStartup,
   shouldWaitForExternalMcpStartupReady,
   syncExternalMcpStartupState,
-  syncExternalMcpStartupStateOnce,
   waitForExternalMcpStartupReady,
   writeExternalMcpFocusOnHostOpen,
   writeExternalMcpSilentSessions,
@@ -180,17 +178,17 @@ describe('useExternalMcpToggleState startup ready gate', () => {
 
   it('wires App startup reconcile to release the gate after enable settles', async () => {
     const appSource = await import('node:fs').then((fs) =>
-      fs.readFileSync(new URL('../app/AppSideEffects.tsx', import.meta.url), 'utf8'),
+      fs.readFileSync(new URL('../../App.tsx', import.meta.url), 'utf8'),
     );
     const hookSource = await import('node:fs').then((fs) =>
       fs.readFileSync(new URL('./useExternalMcpToggleState.ts', import.meta.url), 'utf8'),
     );
-    assert.match(appSource, /await syncExternalMcpStartupStateOnce\(netcattyBridge\.get\(\)\)/);
+    assert.match(appSource, /await syncExternalMcpStartupState\(netcattyBridge\.get\(\)\)/);
     assert.match(appSource, /markExternalMcpStartupReady\(\)/);
     assert.ok(
-      appSource.indexOf('await syncExternalMcpStartupStateOnce(netcattyBridge.get())')
+      appSource.indexOf('await syncExternalMcpStartupState(netcattyBridge.get())')
         < appSource.indexOf('markExternalMcpStartupReady()'),
-      'startup ready must be marked only after await syncExternalMcpStartupStateOnce',
+      'startup ready must be marked only after await syncExternalMcpStartupState',
     );
     assert.match(hookSource, /export async function syncExternalMcpStartupState/);
     assert.match(hookSource, /await Promise\.resolve\(bridge\?\.externalMcpSetEnabled\?\.\(plan\.runtimeEnabled\)\)/);
@@ -199,36 +197,6 @@ describe('useExternalMcpToggleState startup ready gate', () => {
     assert.match(hookSource, /if \(isPeerSessionWindow \|\| !enabled\) return;/);
   });
 
-  it('restores saved permission before enabling persistent External MCP', async () => {
-    const restore = installMemoryLocalStorage();
-    try {
-      const storageKeys = await import('../../infrastructure/config/storageKeys.ts');
-      globalThis.localStorage.setItem(storageKeys.STORAGE_KEY_AI_EXTERNAL_MCP_ENABLED, 'true');
-      globalThis.localStorage.setItem(storageKeys.STORAGE_KEY_AI_EXTERNAL_MCP_MODE, 'persistent');
-      globalThis.localStorage.setItem(storageKeys.STORAGE_KEY_AI_PERMISSION_MODE, 'auto');
-
-      const calls: string[] = [];
-      await syncExternalMcpStartupState({
-        aiMcpSetPermissionMode: async (mode) => {
-          calls.push(`permission:${mode}`);
-          return { ok: true };
-        },
-        externalMcpSetConfig: async () => {
-          calls.push('config');
-          return { ok: true };
-        },
-        externalMcpSetEnabled: async (enabled) => {
-          calls.push(`enabled:${enabled}`);
-          return { ok: true, enabled };
-        },
-      });
-
-      assert.deepEqual(calls, ['permission:auto', 'config', 'enabled:true']);
-    } finally {
-      restore();
-    }
-  });
-
   it('re-reads storage after config await so concurrent top-bar toggles win', async () => {
     const restore = installMemoryLocalStorage();
     try {
@@ -279,51 +247,6 @@ describe('useExternalMcpToggleState startup ready gate', () => {
   });
 });
 
-describe('syncExternalMcpStartupStateOnce single-flight', () => {
-  it('reaches the bridge once when the startup effect is invoked twice', async () => {
-    const restore = installMemoryLocalStorage();
-    try {
-      resetExternalMcpStartupReadyForTests();
-      resetExternalMcpStartupSyncOnceForTests();
-      const storageKeys = await import('../../infrastructure/config/storageKeys.ts');
-      globalThis.localStorage.setItem(storageKeys.STORAGE_KEY_AI_EXTERNAL_MCP_ENABLED, 'true');
-      globalThis.localStorage.setItem(storageKeys.STORAGE_KEY_AI_EXTERNAL_MCP_MODE, 'persistent');
-
-      const configCalls: unknown[] = [];
-      const enabledCalls: boolean[] = [];
-      const bridge = {
-        externalMcpSetConfig: async (config: unknown) => {
-          configCalls.push(config);
-          return { ok: true };
-        },
-        externalMcpSetEnabled: async (enabled: boolean) => {
-          enabledCalls.push(enabled);
-          return { ok: true, enabled };
-        },
-      };
-
-      // Mount, cleanup, mount again: both effect runs share one reconcile.
-      const first = syncExternalMcpStartupStateOnce(bridge);
-      const second = syncExternalMcpStartupStateOnce(bridge);
-      assert.equal(first, second);
-
-      const [firstPlan, secondPlan] = await Promise.all([first, second]);
-      assert.equal(firstPlan, secondPlan);
-      assert.equal(firstPlan.runtimeEnabled, true);
-      assert.equal(configCalls.length, 1);
-      assert.deepEqual(enabledCalls, [true]);
-
-      // A later remount awaits the settled promise instead of re-sending IPC.
-      await syncExternalMcpStartupStateOnce(bridge);
-      assert.equal(configCalls.length, 1);
-      assert.deepEqual(enabledCalls, [true]);
-    } finally {
-      resetExternalMcpStartupSyncOnceForTests();
-      restore();
-    }
-  });
-});
-
 describe('syncExternalMcpStartupState generation guard', () => {
   it('skips stale startup enable after concurrent top-bar toggle generation bump', async () => {
     const restore = installMemoryLocalStorage();

application/state/useExternalMcpToggleState.ts

@@ -5,10 +5,8 @@ import {
   STORAGE_KEY_AI_EXTERNAL_MCP_IDLE_TIMEOUT_MINUTES,
   STORAGE_KEY_AI_EXTERNAL_MCP_MODE,
   STORAGE_KEY_AI_EXTERNAL_MCP_SILENT_SESSIONS,
-  STORAGE_KEY_AI_PERMISSION_MODE,
   STORAGE_KEY_AI_SESSION_IDLE_TIMEOUT_MINUTES,
 } from '../../infrastructure/config/storageKeys';
-import type { AIPermissionMode } from '../../infrastructure/ai/types';
 import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 import { AI_STATE_CHANGED_EVENT, emitAIStateChanged } from './aiStateEvents';
@@ -66,7 +64,6 @@ export function resetExternalMcpStartupReadyForTests(): void {
   externalMcpStartupReadyWaitPromise = null;
   externalMcpStartupReadyWaitResolve = null;
   externalMcpEnableGeneration = 0;
-  externalMcpStartupSyncPromise = null;
 }
 
 export function getExternalMcpEnableGenerationForTests(): number {
@@ -107,7 +104,6 @@ type ExternalMcpConfig = {
 };
 
 type ExternalMcpBridge = {
-  aiMcpSetPermissionMode?: (mode: AIPermissionMode) => Promise<unknown> | unknown;
   externalMcpSetConfig?: (config: ExternalMcpConfig) => Promise<unknown> | unknown;
   externalMcpSetEnabled?: (enabled: boolean) => Promise<unknown> | unknown;
   externalMcpGetStatus?: () => Promise<{
@@ -129,11 +125,6 @@ export function normalizeExternalMcpMode(value: string | null): ExternalMcpMode
   return value === 'persistent' ? 'persistent' : 'temporary';
 }
 
-function readAIPermissionMode(): AIPermissionMode {
-  const stored = localStorageAdapter.readString(STORAGE_KEY_AI_PERMISSION_MODE);
-  return stored === 'observer' || stored === 'auto' ? stored : 'confirm';
-}
-
 export function normalizeExternalMcpIdleTimeoutMinutes(value: number | null): number {
   if (!Number.isFinite(value)) return DEFAULT_EXTERNAL_MCP_IDLE_TIMEOUT_MINUTES;
   return Math.min(
@@ -288,13 +279,6 @@ export async function syncExternalMcpStartupState(
   // toggle during boot wins over a stale enable/disable decision.
   const startupGeneration = externalMcpEnableGeneration;
   const initialPlan = readExternalMcpStartupSyncPlan();
-  try {
-    // External MCP discovery is written while enabling, so restore the saved
-    // permission first instead of exposing the main-process default (confirm).
-    await Promise.resolve(bridge?.aiMcpSetPermissionMode?.(readAIPermissionMode()));
-  } catch {
-    // Permission sync is best-effort; the main process keeps its safe default.
-  }
   try {
     await Promise.resolve(bridge?.externalMcpSetConfig?.(initialPlan.config));
   } catch {
@@ -326,26 +310,6 @@ export async function syncExternalMcpStartupState(
   return plan;
 }
 
-let externalMcpStartupSyncPromise: Promise<ExternalMcpStartupSyncPlan> | null = null;
-
-/**
- * Startup reconcile runs exactly once per renderer load. A remounted App must
- * await the same settled promise instead of pushing a second enable/disable to
- * the main process, which would fight the user's live toggle.
- */
-export function syncExternalMcpStartupStateOnce(
-  bridge: ExternalMcpBridge | undefined = netcattyBridge.get(),
-): Promise<ExternalMcpStartupSyncPlan> {
-  if (!externalMcpStartupSyncPromise) {
-    externalMcpStartupSyncPromise = syncExternalMcpStartupState(bridge);
-  }
-  return externalMcpStartupSyncPromise;
-}
-
-export function resetExternalMcpStartupSyncOnceForTests(): void {
-  externalMcpStartupSyncPromise = null;
-}
-
 export function useExternalMcpToggleState() {
   // UI mirrors the stored switch. Startup reconcile (App mount, main window only)
   // decides whether temporary mode should clear/persist and start the runtime.

application/state/useManualTerminalChromeSurfaceInjection.test.ts

@@ -2,11 +2,7 @@ import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 import test from 'node:test';
 
-const appSource = [
-  readFileSync(new URL('../app/AppSideEffects.tsx', import.meta.url), 'utf8'),
-  readFileSync(new URL('../app/hosts/TerminalHost.tsx', import.meta.url), 'utf8'),
-  readFileSync(new URL('../app/hosts/ChromeHost.tsx', import.meta.url), 'utf8'),
-].join('\n');
+const appSource = readFileSync(new URL('../../App.tsx', import.meta.url), 'utf8');
 const hookSource = readFileSync(new URL('./useManualTerminalChromeSurfaceInjection.ts', import.meta.url), 'utf8');
 const bridgeSource = readFileSync(new URL('../../components/terminalLayer/TerminalLayerTabBridge.tsx', import.meta.url), 'utf8');
 const varsSource = readFileSync(new URL('../../infrastructure/theme/terminalAppearanceVars.ts', import.meta.url), 'utf8');
@@ -16,9 +12,7 @@ test('manual mode injects chrome surfaces from focused session theme', () => {
   assert.match(bridgeSource, /useManualTerminalChromeSurfaceInjection/);
   assert.match(bridgeSource, /!s\.followAppTerminalTheme && isTerminalLayerVisible/);
   assert.match(readFileSync(new URL('../app/AppHostTreeLayer.tsx', import.meta.url), 'utf8'), /useManualTerminalChromeSurfaceInjection/);
-  // App feeds the focused-session resolver to AppActiveTabChrome through the
-  // memoized shell chrome bag (AppShell spreads it onto the chrome component).
-  assert.match(appSource, /resolveSessionAppearance: resolveFocusedAppearance/);
+  assert.match(appSource, /resolveSessionAppearance=\{resolveFocusedAppearance\}/);
   assert.match(hookSource, /applyTopTabsChromeThemeVars\(theme\)/);
   assert.match(hookSource, /injectTerminalLayerChromeSurfaceVars\(theme\)/);
   assert.match(hookSource, /if \(wasEnabled\) \{[\s\S]*clearTerminalLayerChromeSurfaceVars\(\)/);

application/state/useOutputTriggers.ts

@@ -782,6 +782,9 @@ export function useOutputTriggers({
       resetTriggerScanState();
     },
     schedule: (callback) => {
+      // Prefer setTimeout over rAF: terminal output can continue while the
+      // Electron renderer is hidden/minimized, when rAF is throttled or paused.
+      // Pending scan buffers are capped, so delayed flushes can drop matches.
       const timer = globalThis.setTimeout(callback, OUTPUT_TRIGGER_SCAN_DELAY_MS);
       return () => globalThis.clearTimeout(timer);
     },

application/state/usePortForwardingAutoStart.ts

@@ -18,7 +18,6 @@ import {
   syncWithBackend,
 } from "../../infrastructure/services/portForwardingService";
 import { logger } from "../../lib/logger";
-import { applyPortForwardingRuntimeStatus } from "./usePortForwardingState";
 
 export interface UsePortForwardingAutoStartOptions {
   enabled?: boolean;
@@ -329,12 +328,24 @@ export const usePortForwardingAutoStart = ({
     [resolveEffectiveHost],
   );
 
-  // Runtime phases stay in the in-memory projection only (#2288). Writing
-  // active/connecting/error into localStorage would churn sync hashes and
-  // fight the main-process authority model.
   const updateStoredRuleStatus = useCallback(
     (ruleId: string, status: PortForwardingRule["status"], error?: string) => {
-      applyPortForwardingRuntimeStatus(ruleId, status, error);
+      const currentRules = localStorageAdapter.read<PortForwardingRule[]>(
+        STORAGE_KEY_PORT_FORWARDING,
+      ) ?? [];
+
+      const updatedRules = currentRules.map((rule) =>
+        rule.id === ruleId
+          ? {
+              ...rule,
+              status,
+              error,
+              lastUsedAt: status === "active" ? Date.now() : rule.lastUsedAt,
+            }
+          : rule,
+      );
+
+      localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, updatedRules);
     },
     [],
   );

application/state/usePortForwardingState.storageSync.test.ts

@@ -2,14 +2,12 @@ import test from "node:test";
 import assert from "node:assert/strict";
 
 import type { Host, PortForwardingRule } from "../../domain/models.ts";
-import { toPersistedPortForwardingRules } from "../../domain/portForwardingPersistence.ts";
 import { STORAGE_KEY_PORT_FORWARDING } from "../../infrastructure/config/storageKeys.ts";
 import {
   startPortForward,
   stopAndCleanupRuleAndWait,
 } from "../../infrastructure/services/portForwardingService.ts";
 import {
-  applyPortForwardingRuntimeStatus,
   createPortForwardingStorageSyncHandlers,
   havePortForwardingRuntimeStatesChanged,
   hasPortForwardingRuntimePresenceChanged,
@@ -27,7 +25,6 @@ const rule: PortForwardingRule = {
   autoStart: true,
   createdAt: 1,
   status: "inactive",
-  bindAddress: "127.0.0.1",
 };
 
 const host: Host = {
@@ -83,27 +80,32 @@ function installEnvironment() {
   };
 }
 
-test("runtime status updates refresh the visible rule without writing storage", async (t) => {
+test("same-window auto-start status writes refresh the visible rule from the live tunnel", async (t) => {
   const env = installEnvironment();
   t.after(async () => {
     await stopAndCleanupRuleAndWait(rule.id);
     env.restore();
   });
 
-  env.storage.setItem(
-    STORAGE_KEY_PORT_FORWARDING,
-    JSON.stringify(toPersistedPortForwardingRules([rule])),
-  );
+  env.storage.setItem(STORAGE_KEY_PORT_FORWARDING, JSON.stringify([rule]));
   await startPortForward(rule, host, [host], [], [], () => undefined, true);
   env.emitStatus("active");
-  applyPortForwardingRuntimeStatus(rule.id, "active");
 
-  const stored = JSON.parse(env.storage.getItem(STORAGE_KEY_PORT_FORWARDING) || "[]") as PortForwardingRule[];
-  assert.equal(stored[0]?.status, "inactive");
-  assert.equal(stored[0]?.error, undefined);
+  const snapshots: PortForwardingRule[][] = [];
+  const handlers = createPortForwardingStorageSyncHandlers({
+    onRules: (rules) => snapshots.push(rules),
+  });
+
+  handlers.handleAdapterChange({
+    type: "netcatty:local-storage-adapter-changed",
+    detail: { key: STORAGE_KEY_PORT_FORWARDING },
+  } as unknown as CustomEvent<{ key: string }>);
+
+  assert.equal(snapshots.length, 1);
+  assert.equal(snapshots[0]?.[0]?.status, "active");
 });
 
-test("legacy cross-window active status is migrated away on config sync", (t) => {
+test("cross-window status writes stay active before this window discovers the tunnel", (t) => {
   const env = installEnvironment();
   t.after(() => env.restore());
 
@@ -123,20 +125,7 @@ test("legacy cross-window active status is migrated away on config sync", (t) =>
   } as StorageEvent);
 
   assert.equal(snapshots.length, 1);
-  // Runtime is no longer trusted from storage. Before an authoritative snapshot
-  // succeeds, the projection must be unknown — never a false inactive.
-  assert.equal(snapshots[0]?.[0]?.status, "unknown");
-});
-
-test("normalizeRulesWithConnections stays inactive only after authority succeeds", () => {
-  const normalized = normalizeRulesWithConnections([{
-    ...rule,
-    id: "authority-ok-rule",
-    status: "active",
-  }], {
-    snapshotAvailable: true,
-  });
-  assert.equal(normalized[0]?.status, "inactive");
+  assert.equal(snapshots[0]?.[0]?.status, "active");
 });
 
 test("cross-window stale status cannot override a known live tunnel", async (t) => {
@@ -175,16 +164,6 @@ test("same-window synchronization preserves an error without a runtime tunnel",
     status: "error",
     error: "Host not found",
   }]));
-  // Authority already confirmed — diagnostic error may remain without a tunnel.
-  const normalized = normalizeRulesWithConnections([{
-    ...rule,
-    id: "failed-start-rule",
-    status: "error",
-    error: "Host not found",
-  }], { snapshotAvailable: true });
-  assert.equal(normalized[0]?.status, "error");
-  assert.equal(normalized[0]?.error, "Host not found");
-
   const snapshots: PortForwardingRule[][] = [];
   const handlers = createPortForwardingStorageSyncHandlers({
     onRules: (rules) => snapshots.push(rules),
@@ -195,8 +174,8 @@ test("same-window synchronization preserves an error without a runtime tunnel",
     detail: { key: STORAGE_KEY_PORT_FORWARDING },
   } as unknown as CustomEvent<{ key: string }>);
 
-  // Without a successful snapshot in this module, storage sync projects unknown.
-  assert.equal(snapshots[0]?.[0]?.status, "unknown");
+  assert.equal(snapshots[0]?.[0]?.status, "error");
+  assert.equal(snapshots[0]?.[0]?.error, "Host not found");
 });
 
 test("heartbeat normalization preserves an error without a runtime tunnel", () => {
@@ -205,7 +184,7 @@ test("heartbeat normalization preserves an error without a runtime tunnel", () =
     id: "heartbeat-error-rule",
     status: "error",
     error: "Authentication failed",
-  }], { snapshotAvailable: true });
+  }]);
 
   assert.equal(normalized[0]?.status, "error");
   assert.equal(normalized[0]?.error, "Authentication failed");
@@ -217,27 +196,12 @@ test("heartbeat normalization clears an error for a reconciled-away tunnel", ()
     id: "cleanup-error-rule",
     status: "error",
     error: "Failed to stop tunnel",
-  }], {
-    reconciledGoneRuleIds: new Set(["cleanup-error-rule"]),
-    snapshotAvailable: true,
-  });
+  }], new Set(["cleanup-error-rule"]));
 
   assert.equal(normalized[0]?.status, "inactive");
   assert.equal(normalized[0]?.error, undefined);
 });
 
-test("snapshot failure projects unknown instead of inactive", () => {
-  const normalized = normalizeRulesWithConnections([{
-    ...rule,
-    id: "stale-rule",
-    status: "inactive",
-  }], {
-    snapshotAvailable: false,
-  });
-
-  assert.equal(normalized[0]?.status, "unknown");
-});
-
 test("heartbeat writes only when a visible runtime state changes", () => {
   const current = [{ ...rule, status: "inactive" as const }];
   const unchanged = [{ ...rule, status: "inactive" as const }];

application/state/usePortForwardingState.ts

@@ -1,9 +1,5 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Host, Identity, KnownHost, PortForwardingRule, SSHKey } from "../../domain/models";
-import {
-  migratePortForwardingRulesFromStorage,
-  toPersistedPortForwardingRules,
-} from "../../domain/portForwardingPersistence";
 import { getNextVaultOrder, normalizeVaultOrder, reorderVaultItems, sortByVaultOrder, type VaultOrderPosition } from "../../domain/vaultOrder";
 import {
   STORAGE_KEY_PF_PREFER_FORM_MODE,
@@ -14,11 +10,9 @@ import {
   LOCAL_STORAGE_ADAPTER_CHANGED_EVENT,
   localStorageAdapter,
 } from "../../infrastructure/persistence/localStorageAdapter";
-import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
 import {
   clearReconnectTimer,
   getActiveConnection,
-  getPortForwardRuntimeAuthority,
   initReconnectCancelListener,
   reconcileWithBackend,
   startPortForward,
@@ -38,8 +32,6 @@ let reconnectCancelListenerRefs = 0;
 let reconnectCancelCleanup: (() => void) | undefined;
 let heartbeatRefs = 0;
 let heartbeatIntervalId: ReturnType<typeof setInterval> | undefined;
-let runtimeSubscriptionRefs = 0;
-let runtimeSubscriptionCleanup: (() => void) | undefined;
 
 export type { ViewMode };
 
@@ -99,8 +91,6 @@ export interface UsePortForwardingStateResult {
 // Global Store State
 let globalRules: PortForwardingRule[] = [];
 let isInitialized = false;
-// Until the first successful authoritative snapshot, treat runtime as unknown.
-let snapshotAvailable = false;
 const listeners = new Set<(rules: PortForwardingRule[]) => void>();
 
 // Store Actions
@@ -108,50 +98,16 @@ const notifyListeners = () => {
   listeners.forEach((listener) => listener(globalRules));
 };
 
-const persistPortForwardingConfig = (rules: PortForwardingRule[]) => {
-  localStorageAdapter.write(
-    STORAGE_KEY_PORT_FORWARDING,
-    toPersistedPortForwardingRules(rules),
-  );
-};
-
-/** Persist configuration only — never write runtime phases to storage. */
 const setGlobalRules = (newRules: PortForwardingRule[]) => {
   globalRules = normalizeVaultOrder(newRules);
   notifyListeners();
-  persistPortForwardingConfig(globalRules);
+  localStorageAdapter.write(STORAGE_KEY_PORT_FORWARDING, globalRules);
 };
 
-/** Update the in-memory projection without touching localStorage. */
-const setRuntimeProjection = (newRules: PortForwardingRule[]) => {
-  globalRules = normalizeVaultOrder(newRules);
-  notifyListeners();
-};
-
-export type NormalizeRulesOptions = {
-  reconciledGoneRuleIds?: ReadonlySet<string>;
-  snapshotAvailable?: boolean;
-};
-
-const isGoneRuleIdSet = (
-  value: ReadonlySet<string> | NormalizeRulesOptions,
-): value is ReadonlySet<string> => (
-  typeof (value as ReadonlySet<string>).has === "function"
-  && !("snapshotAvailable" in (value as object))
-  && !("reconciledGoneRuleIds" in (value as object))
-);
-
 export const normalizeRulesWithConnections = (
   rules: PortForwardingRule[],
-  reconciledGoneRuleIdsOrOptions: ReadonlySet<string> | NormalizeRulesOptions = new Set(),
+  reconciledGoneRuleIds: ReadonlySet<string> = new Set(),
 ): PortForwardingRule[] => {
-  const options: NormalizeRulesOptions = isGoneRuleIdSet(reconciledGoneRuleIdsOrOptions)
-    ? { reconciledGoneRuleIds: reconciledGoneRuleIdsOrOptions }
-    : reconciledGoneRuleIdsOrOptions;
-
-  const reconciledGoneRuleIds = options.reconciledGoneRuleIds ?? new Set<string>();
-  const authorityAvailable = options.snapshotAvailable ?? snapshotAvailable;
-
   return rules.map((rule): PortForwardingRule => {
     const connection = getActiveConnection(rule.id);
     if (connection) {
@@ -170,13 +126,6 @@ export const normalizeRulesWithConnections = (
       };
     }
 
-    if (!authorityAvailable) {
-      return {
-        ...rule,
-        status: "unknown" as const,
-      };
-    }
-
     if (rule.status === "error") return rule;
 
     return {
@@ -206,42 +155,15 @@ export const hasPortForwardingRuntimePresenceChanged = (reconciliation: {
 }): boolean => reconciliation.gone.length > 0 || reconciliation.appeared.length > 0;
 
 const mergeRulesWithKnownConnections = (rules: PortForwardingRule[]): PortForwardingRule[] => {
-  return normalizeRulesWithConnections(
-    migratePortForwardingRulesFromStorage(rules),
-    { snapshotAvailable },
-  );
-};
-
-/**
- * Apply a runtime status update to the in-memory projection only.
- * Auto-start and reconnect paths use this instead of writing localStorage.
- */
-export const applyPortForwardingRuntimeStatus = (
-  ruleId: string,
-  status: PortForwardingRule["status"],
-  error?: string,
-): void => {
-  if (globalRules.length === 0) {
-    const stored = localStorageAdapter.read<PortForwardingRule[]>(
-      STORAGE_KEY_PORT_FORWARDING,
-    );
-    if (stored && Array.isArray(stored)) {
-      globalRules = normalizeVaultOrder(
-        migratePortForwardingRulesFromStorage(stored),
-      );
-    }
-  }
-
-  const updated = globalRules.map((rule) => {
-    if (rule.id !== ruleId) return rule;
+  return rules.map((rule): PortForwardingRule => {
+    const connection = getActiveConnection(rule.id);
+    if (!connection) return rule;
     return {
       ...rule,
-      status,
-      error,
-      lastUsedAt: status === "active" ? Date.now() : rule.lastUsedAt,
+      status: connection.status,
+      error: connection.error,
     };
   });
-  setRuntimeProjection(updated);
 };
 
 const isPortForwardingStorageEvent = (event: Event): boolean => {
@@ -277,121 +199,21 @@ export const createPortForwardingStorageSyncHandlers = ({
   };
 };
 
-const applyRuntimeSnapshotProjection = (
-  goneRuleIds: ReadonlySet<string> = new Set(),
-  authorityAvailable = snapshotAvailable,
-) => {
-  const normalizedRules = normalizeRulesWithConnections(globalRules, {
-    reconciledGoneRuleIds: goneRuleIds,
-    snapshotAvailable: authorityAvailable,
-  });
-  if (havePortForwardingRuntimeStatesChanged(globalRules, normalizedRules)) {
-    setRuntimeProjection(normalizedRules);
-  } else if (hasPortForwardingRuntimePresenceChanged({
-    gone: [...goneRuleIds],
-    appeared: [],
-  })) {
-    globalRules = normalizedRules;
-    notifyListeners();
-  }
-};
-
 // Initialization Logic
 const initializeStore = async () => {
   if (isInitialized) return;
   isInitialized = true;
 
   await syncWithBackend();
-  snapshotAvailable = getPortForwardRuntimeAuthority().available;
 
   const saved = localStorageAdapter.read<PortForwardingRule[]>(
     STORAGE_KEY_PORT_FORWARDING,
   );
   if (saved && Array.isArray(saved)) {
-    // Hydrate config from storage, then overlay the live runtime projection.
-    // Do not re-persist — that would churn storage with migrated status fields.
-    const migrated = migratePortForwardingRulesFromStorage(saved);
-    setRuntimeProjection(normalizeRulesWithConnections(migrated, {
-      snapshotAvailable,
-    }));
+    setGlobalRules(normalizeRulesWithConnections(saved));
   }
 };
 
-const subscribeToPortForwardRuntime = (): (() => void) => {
-  const bridge = netcattyBridge.get();
-  if (!bridge?.subscribePortForwardRuntime || !bridge.onPortForwardRuntime) {
-    return () => undefined;
-  }
-
-  let disposed = false;
-  let unsubscribeEvent: (() => void) | undefined;
-  let observedEpoch: string | undefined;
-  let observedRevision = -1;
-  let syncChain: Promise<void> = Promise.resolve();
-
-  const enqueueRuntimeSync = (task: () => Promise<void>) => {
-    syncChain = syncChain.then(async () => {
-      if (disposed) return;
-      await task();
-    }).catch(() => undefined);
-    return syncChain;
-  };
-
-  const resyncFromSnapshot = async () => {
-    try {
-      const snapshot = await bridge.subscribePortForwardRuntime!();
-      if (disposed) return;
-      observedEpoch = snapshot.epoch;
-      observedRevision = snapshot.revision;
-      // Reconcile (not sync-only) so tunnels absent after an epoch change are pruned.
-      const reconciliation = await reconcileWithBackend();
-      if (disposed) return;
-      snapshotAvailable = reconciliation.snapshotAvailable;
-      if (!reconciliation.snapshotAvailable) {
-        applyRuntimeSnapshotProjection(new Set(), false);
-        return;
-      }
-      applyRuntimeSnapshotProjection(new Set(reconciliation.gone), true);
-    } catch {
-      if (disposed) return;
-      snapshotAvailable = false;
-      applyRuntimeSnapshotProjection(new Set(), false);
-    }
-  };
-
-  unsubscribeEvent = bridge.onPortForwardRuntime((event) => {
-    if (disposed) return;
-    if (observedEpoch && event.epoch !== observedEpoch) {
-      void enqueueRuntimeSync(resyncFromSnapshot);
-      return;
-    }
-    if (observedRevision >= 0 && event.revision > observedRevision + 1) {
-      void enqueueRuntimeSync(resyncFromSnapshot);
-      return;
-    }
-    observedEpoch = event.epoch;
-    observedRevision = event.revision;
-    void enqueueRuntimeSync(async () => {
-      const reconciliation = await reconcileWithBackend();
-      if (disposed) return;
-      snapshotAvailable = reconciliation.snapshotAvailable;
-      if (!reconciliation.snapshotAvailable) {
-        applyRuntimeSnapshotProjection(new Set(), false);
-        return;
-      }
-      applyRuntimeSnapshotProjection(new Set(reconciliation.gone), true);
-    });
-  });
-
-  void enqueueRuntimeSync(resyncFromSnapshot);
-
-  return () => {
-    disposed = true;
-    unsubscribeEvent?.();
-    void bridge.unsubscribePortForwardRuntime?.();
-  };
-};
-
 export const usePortForwardingState = (): UsePortForwardingStateResult => {
   const [rules, setRules] = useState<PortForwardingRule[]>(globalRules);
   const [selectedRuleId, setSelectedRuleId] = useState<string | null>(null);
@@ -431,9 +253,9 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
     };
   }, [rules]);
 
-  // Config sync across windows. Runtime phases are no longer written to
-  // storage, so these handlers only refresh rule configuration and overlay
-  // whatever live tunnels this window already knows about.
+  // Listen for both browser storage events (other windows) and adapter
+  // events (this window). Auto-start writes statuses outside this hook, so
+  // relying on the browser event alone leaves the launching window stale.
   useEffect(() => {
     const target = globalThis as typeof globalThis & {
       addEventListener?: (type: string, listener: EventListener) => void;
@@ -481,22 +303,6 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
     };
   }, []);
 
-  // Authoritative runtime subscription (snapshot + ordered events). Heartbeat
-  // below remains as a recovery fallback for revision gaps / missed events.
-  useEffect(() => {
-    runtimeSubscriptionRefs++;
-    if (runtimeSubscriptionRefs === 1) {
-      runtimeSubscriptionCleanup = subscribeToPortForwardRuntime();
-    }
-    return () => {
-      runtimeSubscriptionRefs--;
-      if (runtimeSubscriptionRefs === 0 && runtimeSubscriptionCleanup) {
-        runtimeSubscriptionCleanup();
-        runtimeSubscriptionCleanup = undefined;
-      }
-    };
-  }, []);
-
   // Periodic heartbeat: reconcile renderer state with the backend every 4s.
   // Ref-counted — same pattern as the reconnect cancel listener.
   useEffect(() => {
@@ -507,24 +313,19 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
 
       const tick = async () => {
         const reconciliation = await reconcileWithBackend();
-        snapshotAvailable = reconciliation.snapshotAvailable;
-        if (!reconciliation.snapshotAvailable) {
-          // Snapshot failure must surface as unknown/stale — never as inactive.
-          applyRuntimeSnapshotProjection(new Set(), false);
-          return;
-        }
-        // Always re-derive the visible state from the live connection map.
-        // Runtime phases stay in memory only.
+        if (!reconciliation.snapshotAvailable) return;
+        // Always re-derive the visible state. This also repairs a stale
+        // cross-window storage write when the backend map itself did not change.
         const normalizedRules = normalizeRulesWithConnections(
           globalRules,
-          {
-            reconciledGoneRuleIds: new Set(reconciliation.gone),
-            snapshotAvailable: true,
-          },
+          new Set(reconciliation.gone),
         );
         if (havePortForwardingRuntimeStatesChanged(globalRules, normalizedRules)) {
-          setRuntimeProjection(normalizedRules);
+          setGlobalRules(normalizedRules);
         } else if (hasPortForwardingRuntimePresenceChanged(reconciliation)) {
+          // Runtime presence affects Start/Stop actions even when the visible
+          // status and error already match. Notify React without rewriting the
+          // unchanged persisted configuration.
           globalRules = normalizedRules;
           notifyListeners();
         }
@@ -669,14 +470,21 @@ export const usePortForwardingState = (): UsePortForwardingStateResult => {
         stopAndCleanupRule(existing.id);
       }
     }
-    setGlobalRules(normalizeRulesWithConnections(
-      migratePortForwardingRulesFromStorage(newRules),
-    ));
+    setGlobalRules(normalizeRulesWithConnections(newRules));
   }, []);
 
   const setRuleStatus = useCallback(
     (id: string, status: PortForwardingRule["status"], error?: string) => {
-      applyPortForwardingRuntimeStatus(id, status, error);
+      const updated = globalRules.map((r) => {
+        if (r.id !== id) return r;
+        return {
+          ...r,
+          status,
+          error,
+          lastUsedAt: status === "active" ? Date.now() : r.lastUsedAt,
+        };
+      });
+      setGlobalRules(updated);
     },
     [],
   );

application/state/useServerStats.ts

@@ -183,6 +183,16 @@ function clearServerStatsTimers(session: SharedServerStatsSession): void {
   session.pollIntervalMs = null;
 }
 
+function resetServerStatsSession(session: SharedServerStatsSession): void {
+  clearServerStatsTimers(session);
+  session.connectedAt = 0;
+  session.hasFetched = false;
+  session.fetchGeneration += 1;
+  session.consecutiveFailures = 0;
+  session.givenUp = false;
+  updateServerStatsState(session, createInitialState());
+}
+
 function getActiveServerStatsClients(session: SharedServerStatsSession): ServerStatsClient[] {
   return Array.from(session.clients.values()).filter((client) => (
     client.enabled && client.isSupportedOs && client.isConnected
@@ -302,16 +312,7 @@ function reconcileSharedServerStatsSession(session: SharedServerStatsSession): v
   const activeClients = getActiveServerStatsClients(session);
 
   if (activeClients.length === 0) {
-    // Pause polling only. Keep the last successful stats so remounting Overview
-    // (or re-enabling a terminal stats strip) can paint immediately instead of
-    // flashing "No system overview data yet." Still clear give-up / failure so a
-    // later resume can auto-retry (old reset wiped stats + flags together).
-    clearServerStatsTimers(session);
-    session.givenUp = false;
-    session.consecutiveFailures = 0;
-    if (session.state.isLoading) {
-      updateServerStatsState(session, { isLoading: false });
-    }
+    resetServerStatsSession(session);
     return;
   }
 

application/state/useSessionState.ts

@@ -542,7 +542,6 @@ export const useSessionState = ({
       workspaces: workspacesRef.current,
       sessionIds,
       currentActiveTabId: activeTabStore.getActiveTabId(),
-      preferredTabId: activeTabStore.getPreviousActiveTabId(),
       tabOrder: tabOrderRef.current,
     });
 
@@ -550,10 +549,9 @@ export const useSessionState = ({
     setSessions(result.sessions);
     setTabOrder(result.tabOrder);
     if (result.activeTabId) {
-      // Closing must not rewrite previous-tab history to the closed tab.
-      activeTabStore.setActiveTabId(result.activeTabId, { recordPrevious: false });
+      setActiveTabId(result.activeTabId);
     }
-  }, []);
+  }, [setActiveTabId]);
 
   const closeSession = useCallback((sessionId: string, e?: MouseEvent) => {
     e?.stopPropagation();

application/state/useSettingsState.ts

@@ -2,14 +2,6 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, typ
 
 import { runThemeTransition, type ThemeTransitionMode } from './themeTransition';
 import { publishAppearanceChromeSnapshot } from './appearanceChromeStore';
-import {
-  publishSettingsChromeSnapshot,
-  registerSettingsChromeActions,
-} from './settingsChromeStore';
-import {
-  publishTerminalSettingsSnapshot,
-  registerTerminalSettingsActions,
-} from './terminalSettingsStore';
 import { SyncConfig, TerminalSettings, HotkeyScheme, CustomKeyBindings, DEFAULT_KEY_BINDINGS, KeyBinding, UILanguage, SessionLogFormat, normalizeTerminalSettings } from '../../domain/models';
 import {
   DEFAULT_HTTP_NETWORK_PROXY,
@@ -756,10 +748,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
 
   // Push idle TTL to the main-process transport registry on load and whenever
   // it changes (including cross-window IPC/storage updates to local state).
-  const lastPushedSshTransportIdleTtlRef = useRef<number | null>(null);
   useEffect(() => {
-    if (lastPushedSshTransportIdleTtlRef.current === sshTransportIdleTtlMs) return;
-    lastPushedSshTransportIdleTtlRef.current = sshTransportIdleTtlMs;
     notifySettingsChanged(STORAGE_KEY_SSH_TRANSPORT_IDLE_TTL_MS, sshTransportIdleTtlMs);
   }, [sshTransportIdleTtlMs, notifySettingsChanged]);
 
@@ -1645,13 +1634,11 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     notifySettingsChanged,
   });
 
-  // Mark persist effects mounted AFTER all persist useEffects so React runs
-  // this last (declaration order). Cleanup clears the latch for remount.
+  // Fix 1: Mark all persist effects as mounted.
+  // This MUST be declared AFTER all persist useEffects so that React runs it last
+  // during the initial mount cycle (effects fire in declaration order).
   useEffect(() => {
     persistMountedRef.current = true;
-    return () => {
-      persistMountedRef.current = false;
-    };
   }, []);
 
   // Get merged key bindings (defaults + custom overrides)
@@ -1722,142 +1709,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     applyThemeTokens(theme, resolvedTheme, tokens, accentMode, customAccent);
   }, [theme, resolvedTheme, lightUiThemeId, darkUiThemeId, accentMode, customAccent]);
 
-  const setEditorWordWrap = useCallback((enabled: boolean) => {
-    setEditorWordWrapState(enabled);
-    localStorageAdapter.writeString(STORAGE_KEY_EDITOR_WORD_WRAP, String(enabled));
-    notifySettingsChanged(STORAGE_KEY_EDITOR_WORD_WRAP, enabled);
-  }, [notifySettingsChanged]);
-
-  // Main-window chrome subscribes to this slice instead of receiving the whole
-  // settings object through the App domain bags. The store dedupes field by
-  // field, so unrelated settings churn never notifies chrome consumers.
-  useLayoutEffect(() => {
-    publishSettingsChromeSnapshot({
-      theme,
-      resolvedTheme,
-      lightUiThemeId,
-      darkUiThemeId,
-      uiLanguage,
-      windowOpacity,
-      showSftpTab,
-      showHostTreeSidebar,
-      showRecentHosts,
-      hostClickBehavior,
-      showOnlyUngroupedHostsInRoot,
-      dynamicTabTitleMode: terminalSettings.dynamicTabTitleMode,
-      disableTerminalFontZoom,
-      restoreTerminalCwd,
-      terminalSidePanelAutoOpen,
-      terminalSidePanelAutoOpenTab,
-    });
-  }, [
-    darkUiThemeId,
-    disableTerminalFontZoom,
-    hostClickBehavior,
-    lightUiThemeId,
-    resolvedTheme,
-    restoreTerminalCwd,
-    showHostTreeSidebar,
-    showOnlyUngroupedHostsInRoot,
-    showRecentHosts,
-    showSftpTab,
-    terminalSettings.dynamicTabTitleMode,
-    terminalSidePanelAutoOpen,
-    terminalSidePanelAutoOpenTab,
-    theme,
-    uiLanguage,
-    windowOpacity,
-  ]);
-
-  useLayoutEffect(() => {
-    registerSettingsChromeActions({ setTheme, setWindowOpacity });
-    return () => {
-      registerSettingsChromeActions(null);
-    };
-  }, [setTheme, setWindowOpacity]);
-
-  // TerminalHost / terminal domain bags subscribe here instead of receiving
-  // settings through the App mega-subscriber.
-  useLayoutEffect(() => {
-    publishTerminalSettingsSnapshot({
-      terminalThemeId,
-      terminalThemeDarkId,
-      terminalThemeLightId,
-      followAppTerminalTheme,
-      terminalFontFamilyId,
-      terminalFontSize,
-      terminalSettings,
-      hotkeyScheme,
-      keyBindings,
-      isHotkeyRecording,
-      sftpDoubleClickBehavior,
-      sftpAutoSync,
-      sftpShowHiddenFiles,
-      sftpUseCompressedUpload,
-      sftpAutoOpenSidebar,
-      sftpFollowTerminalCwd,
-      sftpDefaultViewMode,
-      editorWordWrap,
-      sessionLogsEnabled,
-      sessionLogsDir,
-      sessionLogsFormat,
-      sessionLogsTimestampsEnabled,
-      sshDebugLogsEnabled,
-    });
-  }, [
-    editorWordWrap,
-    followAppTerminalTheme,
-    hotkeyScheme,
-    isHotkeyRecording,
-    keyBindings,
-    sessionLogsDir,
-    sessionLogsEnabled,
-    sessionLogsFormat,
-    sessionLogsTimestampsEnabled,
-    sftpAutoOpenSidebar,
-    sftpAutoSync,
-    sftpDefaultViewMode,
-    sftpDoubleClickBehavior,
-    sftpFollowTerminalCwd,
-    sftpShowHiddenFiles,
-    sftpUseCompressedUpload,
-    sshDebugLogsEnabled,
-    terminalFontFamilyId,
-    terminalFontSize,
-    terminalSettings,
-    terminalThemeDarkId,
-    terminalThemeId,
-    terminalThemeLightId,
-  ]);
-
-  useLayoutEffect(() => {
-    registerTerminalSettingsActions({
-      setTerminalThemeId,
-      setTerminalThemeDarkId,
-      setTerminalThemeLightId,
-      setFollowAppTerminalTheme: setFollowAppTerminalThemeState,
-      setTerminalFontFamilyId,
-      setTerminalFontSize,
-      updateTerminalSetting,
-      setSftpFollowTerminalCwd,
-      setEditorWordWrap,
-      applyAppTheme,
-    });
-    return () => {
-      registerTerminalSettingsActions(null);
-    };
-  }, [
-    applyAppTheme,
-    setEditorWordWrap,
-    setSftpFollowTerminalCwd,
-    setTerminalFontFamilyId,
-    setTerminalFontSize,
-    setTerminalThemeDarkId,
-    setTerminalThemeId,
-    setTerminalThemeLightId,
-    updateTerminalSetting,
-  ]);
-
   return {
     theme,
     setTheme,
@@ -1947,7 +1798,11 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setSshTransportIdleTtlMs,
     // Editor Settings
     editorWordWrap,
-    setEditorWordWrap,
+    setEditorWordWrap: useCallback((enabled: boolean) => {
+      setEditorWordWrapState(enabled);
+      localStorageAdapter.writeString(STORAGE_KEY_EDITOR_WORD_WRAP, String(enabled));
+      notifySettingsChanged(STORAGE_KEY_EDITOR_WORD_WRAP, enabled);
+    }, [notifySettingsChanged]),
     // Session Logs
     sessionLogsEnabled,
     setSessionLogsEnabled,

application/state/useSystemManagerBackend.ts

@@ -1,11 +1,5 @@
 import { useCallback, useMemo } from 'react';
-import type {
-  DockerContainerAction,
-  DockerImageManageAction,
-  SystemdUnitAction,
-  SystemdUnitInfo,
-  TmuxManageAction,
-} from '../../domain/systemManager/types';
+import type { DockerContainerAction, DockerImageManageAction, TmuxManageAction } from '../../domain/systemManager/types';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 
 export function useSystemManagerBackend() {
@@ -126,35 +120,6 @@ export function useSystemManagerBackend() {
     return bridge.listAccelerators(sessionId);
   }, []);
 
-  const listListeningPorts = useCallback(async (sessionId: string) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.listListeningPorts) {
-      return { success: false as const, error: 'listListeningPorts unavailable' };
-    }
-    return bridge.listListeningPorts(sessionId);
-  }, []);
-
-  const listSystemServices = useCallback(async (sessionId: string) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.listSystemServices) {
-      return { success: false as const, error: 'listSystemServices unavailable' };
-    }
-    return bridge.listSystemServices(sessionId);
-  }, []);
-
-  const systemServiceAction = useCallback(async (options: {
-    sessionId: string;
-    unitName: string;
-    action: SystemdUnitAction;
-    scope?: SystemdUnitInfo['scope'];
-  }) => {
-    const bridge = netcattyBridge.get();
-    if (!bridge?.systemServiceAction) {
-      return { success: false as const, error: 'systemServiceAction unavailable' };
-    }
-    return bridge.systemServiceAction(options);
-  }, []);
-
   const dockerInspect = useCallback(async (options: { sessionId: string; containerId: string }) => {
     const bridge = netcattyBridge.get();
     if (!bridge?.dockerInspect) {
@@ -216,9 +181,6 @@ export function useSystemManagerBackend() {
     listDockerImages,
     getDockerStats,
     listAccelerators,
-    listListeningPorts,
-    listSystemServices,
-    systemServiceAction,
     dockerInspect,
     dockerImageInspect,
     dockerAction,
@@ -238,9 +200,6 @@ export function useSystemManagerBackend() {
     listDockerImages,
     getDockerStats,
     listAccelerators,
-    listListeningPorts,
-    listSystemServices,
-    systemServiceAction,
     dockerInspect,
     dockerImageInspect,
     dockerAction,

application/state/useTerminalAiContexts.ts

@@ -59,7 +59,6 @@ export function useTerminalAiContexts({
             .map((sessionId) => sessionById.get(sessionId)?.hostId)
             .filter((hostId): hostId is string => !!hostId),
           scopeLabel: workspace.title,
-          focusedSessionId: workspace.focusedSessionId,
           terminalSessions: sessionIds.map((sessionId) =>
             buildAITerminalSessionInfo(
               sessionById.get(sessionId),

application/state/useTerminalSidePanelLayoutState.ts

@@ -123,7 +123,6 @@ export function useTerminalSidePanelLayoutState() {
     setSidePanelOpenTabs,
     sidePanelOpenTabsRef,
     sidePanelLayouts,
-    setSidePanelLayouts,
     sidePanelLayoutsRef,
     focusPane,
     splitPane,

application/state/useThemeRuntime.accentStability.test.ts

@@ -1,42 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const runtimeSource = readFileSync(new URL('./useThemeRuntime.ts', import.meta.url), 'utf8');
-const terminalHostSource = readFileSync(
-  new URL('../app/hosts/TerminalHost.tsx', import.meta.url),
-  'utf8',
-);
-
-test('published currentTerminalTheme resolves without live custom accent', () => {
-  // Base global appearance must use accentMode: 'theme' so HSL drag does not
-  // mint a new theme object into TerminalHost / AppShell domain bags.
-  assert.match(
-    runtimeSource,
-    /accentMode: 'theme',\s*\n\s*customAccent: '',/,
-    'globalAppearance must ignore live custom accent',
-  );
-  assert.match(runtimeSource, /accentedGlobalAppearance/);
-  assert.match(
-    runtimeSource,
-    /currentTerminalTheme: globalAppearance\.theme/,
-    'published theme must come from the stable base appearance',
-  );
-});
-
-test('TerminalHost injects accented appearance without bridging it', () => {
-  assert.match(
-    terminalHostSource,
-    /useTerminalAppearanceInjection\(accentedGlobalAppearance/,
-    'CSS vars still track live accent during drag',
-  );
-  const bridgeStart = terminalHostSource.indexOf('const themeBridgeActions = useMemo');
-  assert.notEqual(bridgeStart, -1);
-  const bridge = terminalHostSource.slice(bridgeStart, bridgeStart + 900);
-  assert.match(bridge, /globalAppearance,/);
-  assert.doesNotMatch(
-    bridge,
-    /accentedGlobalAppearance/,
-    'theme bridge must not republish on accented appearance identity churn',
-  );
-});

application/state/useThemeRuntime.ts

@@ -65,10 +65,8 @@ export function useThemeRuntime(settings: ThemeRuntimeSettings) {
   const accentRef = useRef({ accentMode, customAccent });
   accentRef.current = { accentMode, customAccent };
 
-  // Live accent settings are only for CSS-var injection. The published bag must
-  // resolve against a stable base theme so accent drag does not rebuild
-  // TerminalHost / AppShell domains every HSL tick.
-  const appearanceSettingsForInject = useMemo((): TerminalAppearanceSettings => ({
+  // Chrome / injection consumers need live accent on every settings change.
+  const appearanceSettings = useMemo((): TerminalAppearanceSettings => ({
     ...appearanceSettingsBase,
     accentMode,
     customAccent,
@@ -76,19 +74,9 @@ export function useThemeRuntime(settings: ThemeRuntimeSettings) {
 
   const globalAppearance = useMemo(() => resolveGlobalTerminalAppearance({
     userIntent,
-    settings: {
-      ...appearanceSettingsBase,
-      accentMode: 'theme',
-      customAccent: '',
-    },
+    settings: appearanceSettings,
     customThemes,
-  }), [userIntent, appearanceSettingsBase, customThemes]);
-
-  const accentedGlobalAppearance = useMemo(() => resolveGlobalTerminalAppearance({
-    userIntent,
-    settings: appearanceSettingsForInject,
-    customThemes,
-  }), [userIntent, appearanceSettingsForInject, customThemes]);
+  }), [userIntent, appearanceSettings, customThemes]);
 
   // Read accent from a ref so this callback identity does not churn on drag.
   // Callers that invoke it after an accent-only update still get the latest
@@ -137,12 +125,10 @@ export function useThemeRuntime(settings: ThemeRuntimeSettings) {
   }, []);
 
   // Stable bag identity so App domain memos can depend on members (or the
-  // bag) without thrashing on every parent render. Accented appearance is
-  // intentionally excluded — injection reads it separately.
+  // bag) without thrashing on every parent render.
   return useMemo(() => ({
     userIntent,
     globalAppearance,
-    accentedGlobalAppearance,
     resolveFocusedAppearance,
     pickTheme,
     clearIntent,
@@ -151,7 +137,6 @@ export function useThemeRuntime(settings: ThemeRuntimeSettings) {
   }), [
     userIntent,
     globalAppearance,
-    accentedGlobalAppearance,
     resolveFocusedAppearance,
     pickTheme,
     clearIntent,

application/state/useUpdateCheck.ts

@@ -667,9 +667,7 @@ export function useUpdateCheck(options?: { autoUpdateEnabled?: boolean; enabled?
     hasCheckedOnStartupRef.current = true;
     debugLog('Starting delayed update check for version:', updateState.currentVersion);
 
-    let checkArmed = true;
     startupCheckTimeoutRef.current = setTimeout(async () => {
-      checkArmed = false;
       // Re-check the toggle at fire time — the user may have toggled it
       // after the timer was scheduled.
       const stillEnabled = localStorageAdapter.readString(STORAGE_KEY_AUTO_UPDATE_ENABLED);
@@ -713,12 +711,6 @@ export function useUpdateCheck(options?: { autoUpdateEnabled?: boolean; enabled?
     return () => {
       if (startupCheckTimeoutRef.current) {
         clearTimeout(startupCheckTimeoutRef.current);
-        startupCheckTimeoutRef.current = null;
-      }
-      // A remount clears the timer before it fires — allow the next effect to
-      // schedule again instead of permanently skipping the check.
-      if (checkArmed) {
-        hasCheckedOnStartupRef.current = false;
       }
     };
   }, [enabled, updateState.currentVersion, autoUpdateEnabled, performCheck]);

application/state/useVaultAgentBridge.test.ts

@@ -1,11 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import {
-  haveSameVaultAgentSnapshot,
-  resolveVaultAgentEffectiveHost,
-  resolveVaultAgentNotes,
-} from './useVaultAgentBridge';
-import { publishNotesSnapshot } from './notesStore';
+import { haveSameVaultAgentSnapshot, resolveVaultAgentEffectiveHost } from './useVaultAgentBridge';
 
 type Snapshot = Parameters<typeof haveSameVaultAgentSnapshot>[0];
 
@@ -39,13 +34,3 @@ describe('resolveVaultAgentEffectiveHost', () => {
     );
   });
 });
-
-describe('resolveVaultAgentNotes', () => {
-  it('prefers the live notes store when App omitted the notes prop', () => {
-    const stale: Snapshot['notes'] = [];
-    const live = [{ id: 'n1', title: 'Live', content: 'x', updatedAt: 1 }] as Snapshot['notes'];
-    publishNotesSnapshot({ notes: live, noteGroups: [] });
-    assert.equal(resolveVaultAgentNotes(undefined, stale as never), live);
-    assert.equal(resolveVaultAgentNotes(stale as never, stale as never), stale);
-  });
-});

application/state/useVaultAgentBridge.ts

@@ -15,7 +15,6 @@ import {
   rememberKeyPassphrase,
   resolveDefaultKeyPassphraseAliases,
 } from '../defaultKeyPassphrases';
-import { getNotesActions, getNotesSnapshot, subscribeNotes } from './notesStore';
 
 export interface UseVaultAgentBridgeInput {
   hosts: Host[];
@@ -36,10 +35,8 @@ export interface UseVaultAgentBridgeInput {
   updateGroupConfigs: (configs: GroupConfig[]) => void;
   updateManagedSources: (sources: ManagedSource[]) => void;
   updatePortForwardingRules: (rules: PortForwardingRule[]) => void;
-  /** Optional override; defaults to notesStore so App need not subscribe to notes. */
-  notes?: VaultNote[];
-  /** Optional override; defaults to notesStore actions. */
-  updateNotes?: (notes: VaultNote[]) => void;
+  notes: VaultNote[];
+  updateNotes: (notes: VaultNote[]) => void;
   startTunnel: VaultAgentApiDeps['startTunnel'];
   stopTunnel: VaultAgentApiDeps['stopTunnel'];
   stopRuleTunnels: VaultAgentApiDeps['stopRuleTunnels'];
@@ -62,7 +59,7 @@ type VaultAgentSnapshot = {
 const selectVaultAgentSnapshot = (input: UseVaultAgentBridgeInput): VaultAgentSnapshot => ({
   hosts: input.hosts,
   keys: input.keys,
-  notes: input.notes ?? (getNotesSnapshot().notes as VaultNote[]),
+  notes: input.notes,
   snippets: input.snippets,
   customGroups: input.customGroups,
   groupConfigs: input.groupConfigs,
@@ -70,16 +67,6 @@ const selectVaultAgentSnapshot = (input: UseVaultAgentBridgeInput): VaultAgentSn
   managedSources: input.managedSources,
 });
 
-/** Resolve notes for agent ops: live store wins when App omitted the prop. */
-export function resolveVaultAgentNotes(
-  notesOverride: VaultNote[] | undefined,
-  snapshotNotes: VaultNote[],
-): VaultNote[] {
-  return notesOverride !== undefined
-    ? snapshotNotes
-    : (getNotesSnapshot().notes as VaultNote[]);
-}
-
 export const haveSameVaultAgentSnapshot = (
   left: VaultAgentSnapshot,
   right: VaultAgentSnapshot,
@@ -115,34 +102,12 @@ export function useVaultAgentBridge(input: UseVaultAgentBridgeInput): void {
     lastSyncedVaultInputRef.current = selectedSnapshot;
   }
 
-  // Keep notes fresh without forcing App to re-render on every note edit.
-  // Write in place: this object is also `lastSyncedVaultInputRef.current`, and
-  // the agent op handlers below rely on that aliasing so their writes survive
-  // the render-time comparison above. Replacing the object would break it.
-  useEffect(() => {
-    if (input.notes !== undefined) return;
-    const syncNotes = () => {
-      vaultSnapshotRef.current.notes = getNotesSnapshot().notes as VaultNote[];
-    };
-    syncNotes();
-    return subscribeNotes(syncNotes);
-  }, [input.notes]);
-
   useEffect(() => {
     registerVaultAgentHandler(async (op, params) => {
       const current = inputRef.current;
-      const applyUpdateNotes = current.updateNotes
-        ?? getNotesActions()?.updateNotes
-        ?? ((notes: VaultNote[]) => {
-          console.warn('[useVaultAgentBridge] updateNotes unavailable');
-          void notes;
-        });
       return handleVaultAgentOp(op, params, {
         getHosts: () => vaultSnapshotRef.current.hosts,
-        getNotes: () => resolveVaultAgentNotes(
-          current.notes,
-          vaultSnapshotRef.current.notes,
-        ),
+        getNotes: () => vaultSnapshotRef.current.notes,
         getCustomGroups: () => vaultSnapshotRef.current.customGroups,
         getGroupConfigs: () => vaultSnapshotRef.current.groupConfigs,
         getPortForwardingRules: () => vaultSnapshotRef.current.portForwardingRules,
@@ -220,7 +185,7 @@ export function useVaultAgentBridge(input: UseVaultAgentBridgeInput): void {
         }),
         updateNotes: (notes) => {
           vaultSnapshotRef.current.notes = notes;
-          applyUpdateNotes(notes);
+          current.updateNotes(notes);
         },
         updateSnippets: (nextSnippets) => {
           vaultSnapshotRef.current.snippets = nextSnippets;

application/state/useVaultState.snippetsDelete.test.ts

@@ -1,237 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { readFileSync } from "node:fs";
-
-const source = readFileSync(new URL("./useVaultState.ts", import.meta.url), "utf8");
-
-test("deleteSelectedSnippets merges into persisted vault under the shared lock", () => {
-  assert.match(source, /const deleteSelectedSnippets = useCallback\(async/);
-  assert.match(
-    source,
-    /deleteSelectedSnippets[\s\S]*withVaultImportLock\("vault"/,
-  );
-  assert.match(
-    source,
-    /deleteSelectedSnippetsFromVault\(\s*latestSnippets\s*,\s*latestHosts\s*,\s*selectedSnippetIds,?\s*\)/,
-  );
-  assert.match(
-    source,
-    /deleteSelectedSnippets[\s\S]*commitPluginImporterTransaction\(localStorageAdapter, \[[\s\S]*STORAGE_KEY_HOSTS[\s\S]*STORAGE_KEY_SNIPPETS/,
-  );
-  // Persistence rejection must be caught: callers void the promise after the
-  // confirm dialog closes, so an uncaught throw would leave no retry feedback.
-  assert.match(
-    source,
-    /deleteSelectedSnippets[\s\S]*try \{\s*commitPluginImporterTransaction[\s\S]*catch \{[\s\S]*notify\.error\([\s\S]*Snippets could not be deleted/,
-  );
-  // Must not rebuild hosts from a per-window in-memory snapshot (popup race).
-  assert.doesNotMatch(
-    source,
-    /deleteSelectedSnippetsFromVault\(\s*snippetsRef\.current\s*,\s*hostsRef\.current/,
-  );
-  // Paired writes must not publish in-memory state if only one key lands.
-  assert.doesNotMatch(
-    source,
-    /deleteSelectedSnippets[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_HOSTS, encryptedHosts\)[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS/,
-  );
-});
-
-test("updateHosts prunes stale snippet bindings under the vault lock", () => {
-  // Cross-window bulk-delete can land while a host writer is queued with a
-  // pre-delete encrypted blob. Re-check the live snippet catalog under the lock
-  // before persisting so login/connect bindings are not restored.
-  assert.match(
-    source,
-    /commitEncryptedHostsUnderVaultLock[\s\S]*pruneHostsStaleSnippetBindings\(hostsToPersist, latestSnippets\)/,
-  );
-  assert.match(
-    source,
-    /const writePromise = encryptPromise\.then\(async \(enc\) => \{[\s\S]*return commitEncryptedHostsUnderVaultLock\(ver, cleaned, enc\)/,
-  );
-});
-
-test("importData replaces snippets instead of additive-rebasing", () => {
-  // Sync restore / backup import must match the selected snapshot. Additive
-  // rebase would keep concurrent disk-only ids and report a successful restore
-  // that still contains snippets absent from the imported payload.
-  assert.match(
-    source,
-    /updateSnippets\(payload\.snippets,\s*\{\s*replace:\s*true\s*\}\)/,
-  );
-});
-
-test("updateSnippets disk writes take the shared vault lock", () => {
-  // Unlocked snippet saves can interleave with bulk-delete's journaled commit
-  // and discard concurrent edits. Ordinary writers must queue on the same lock
-  // and be visible to waitForPendingVaultWrites.
-  assert.match(
-    source,
-    /const updateSnippets = useCallback\(\(\s*data: Snippet\[\],\s*options\?: \{ replace\?: boolean \},\s*\) => \{[\s\S]*withVaultImportLock\("vault", async \(\) => \{[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, rebased\)/,
-  );
-  assert.match(
-    source,
-    /snippetsWritePendingRef\.current = writePromise/,
-  );
-  assert.match(
-    source,
-    /waitForPendingVaultWrites[\s\S]*snippetsWritePendingRef\.current/,
-  );
-  assert.doesNotMatch(
-    source,
-    /const updateSnippets = useCallback\(\([\s\S]*?\) => \{[\s\S]*setSnippets\(cleaned\);\s*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, cleaned\);\s*\}, \[\]\);/,
-  );
-});
-
-test("updateSnippets rebases onto the latest persisted snapshot under the lock", () => {
-  // Web Locks serialize writers but do not merge snapshots. A popup bulk-delete
-  // that lands while a main-window save is queued must not be resurrected.
-  assert.match(
-    source,
-    /rebaseSnippetVaultWrite\(\{\s*base,\s*ours: cleaned,\s*theirs:/,
-  );
-  assert.match(
-    source,
-    /snippetsWriteOwnerRef\.current !== ver/,
-  );
-});
-
-test("clearVaultData replaces snippets without additive rebase", () => {
-  // Clear All Local Data must not preserve concurrent disk-only snippet adds
-  // that rebaseSnippetVaultWrite would otherwise keep.
-  assert.match(
-    source,
-    /updateSnippets\(\[\],\s*\{\s*replace:\s*true\s*\}\)/,
-  );
-  assert.match(
-    source,
-    /const replace =\s*options\?\.replace === true \|\| snippetsWriteReplaceRef\.current/,
-  );
-  assert.match(
-    source,
-    /replace\s*\?\s*cleaned\s*:\s*rebaseSnippetVaultWrite/,
-  );
-  assert.match(
-    source,
-    /if \(replace\) \{\s*\/\/ Restore\/import\/clear[\s\S]*snippetsWriteBaseRef\.current = null/,
-  );
-});
-
-test("updateSnippets preserves replace mode across superseded local saves", () => {
-  // A clear/restore queued behind the vault lock must not lose replacement
-  // intent when a later create/edit becomes the write owner — otherwise that
-  // save additively rebases against the stale disk catalog and resurrects
-  // every pre-replacement snippet.
-  assert.match(
-    source,
-    /const snippetsWriteReplaceRef = useRef\(false\)/,
-  );
-  assert.match(
-    source,
-    /if \(options\?\.replace === true\) \{\s*snippetsWriteReplaceRef\.current = true;\s*\}/,
-  );
-  assert.match(
-    source,
-    /snippetsWriteBaseRef\.current = null;\s*snippetsWriteReplaceRef\.current = false;/,
-  );
-});
-
-test("updateSnippets keeps the persisted rebase ancestor across superseded saves", () => {
-  // Two queued local saves must not let the second treat the first save's
-  // optimistic in-memory array as base — that array never hit disk, so an add
-  // would look like a concurrent delete and be dropped.
-  assert.match(
-    source,
-    /const snippetsWriteBaseRef = useRef<Snippet\[\] \| null>\(null\)/,
-  );
-  assert.match(
-    source,
-    /const base = snippetsWriteBaseRef\.current \?\? snippetsRef\.current/,
-  );
-  assert.match(
-    source,
-    /if \(snippetsWriteBaseRef\.current === null\) \{\s*snippetsWriteBaseRef\.current = base;\s*\}/,
-  );
-  assert.match(
-    source,
-    /const persisted = localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, rebased\)/,
-  );
-  // Quota failure must keep the ancestor; clearing it would drop a local add on
-  // the next save after space is freed.
-  assert.match(
-    source,
-    /if \(!persisted\) \{[\s\S]*return "failed" as const;[\s\S]*\}\s*\/\/ Disk caught up[\s\S]*snippetsWriteBaseRef\.current = null/,
-  );
-  assert.match(
-    source,
-    /if \(!persisted\) \{[\s\S]*Snippets could not be saved/,
-  );
-});
-
-test("snippet storage events keep queued local edits and their rebase ancestor", () => {
-  // A cross-window write must not clear snippetsWriteBaseRef / replace optimistic
-  // state while a local owner is still queued — the next edit would supersede
-  // that owner from a remote-only snapshot and drop the first local mutation.
-  assert.match(
-    source,
-    /if \(key === STORAGE_KEY_SNIPPETS\) \{[\s\S]*const pendingBase = snippetsWriteBaseRef\.current;\s*if \(pendingBase !== null\) \{[\s\S]*rebaseSnippetVaultWrite\(\{\s*base: pendingBase,\s*ours: snippetsRef\.current,\s*theirs: next,\s*\}\)/,
-  );
-  assert.doesNotMatch(
-    source,
-    /if \(key === STORAGE_KEY_SNIPPETS\) \{[\s\S]*snippetsWriteBaseRef\.current = null;\s*snippetsRef\.current = next/,
-  );
-});
-
-test("snippet storage events retain outstanding replace snapshots", () => {
-  // clear/restore sets replace with base null. Adopting a remote old catalog
-  // before the lock is acquired would pollute memory; a later local edit would
-  // still replace disk with that polluted snapshot.
-  assert.match(
-    source,
-    /if \(key === STORAGE_KEY_SNIPPETS\) \{[\s\S]*if \(snippetsWriteReplaceRef\.current\) \{[\s\S]*return;\s*\}[\s\S]*snippetsRef\.current = next/,
-  );
-});
-
-test("snippet storage events reject payloads older than current disk", () => {
-  // After a queued replace commits, snippetsWriteReplaceRef is false again. A
-  // delayed peer StorageEvent still carries the pre-replacement newValue; if
-  // adopted, the next edit would persist that resurrected catalog.
-  assert.match(
-    source,
-    /if \(key === STORAGE_KEY_SNIPPETS\) \{[\s\S]*event\.newValue !== localStorageAdapter\.readString\(STORAGE_KEY_SNIPPETS\)[\s\S]*return;/,
-  );
-});
-
-test("startup host re-encryption uses the locked prune writer", () => {
-  // A second renderer migrating saved hosts must not write the pre-delete
-  // encryption blob unlocked after bulk-delete cleared login/connect bindings.
-  assert.match(
-    source,
-    /migrateHostsFromLegacyLineTimestamps[\s\S]*commitEncryptedHostsUnderVaultLock\(ver, sanitized, enc\)/,
-  );
-  assert.match(
-    source,
-    /migrateHostsFromLegacyLineTimestamps[\s\S]*hostsWritePendingRef\.current = writePromise/,
-  );
-  assert.doesNotMatch(
-    source,
-    /migrateHostsFromLegacyLineTimestamps[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_HOSTS, enc\)/,
-  );
-});
-
-test("startup snippet order backfill uses the locked vault writer", () => {
-  // An initializing renderer must not rewrite a pre-delete snippet snapshot
-  // unlocked after peer bulk-delete cleared host bindings — that resurrects
-  // every selected snippet while binding cleanup remains committed.
-  assert.match(
-    source,
-    /needsOrderPersist[\s\S]*withVaultImportLock\("vault", async \(\) => \{[\s\S]*readStoredArray<Snippet>\([\s\S]*STORAGE_KEY_SNIPPETS[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, latest\)/,
-  );
-  assert.match(
-    source,
-    /needsOrderPersist[\s\S]*snippetsWritePendingRef\.current = writePromise/,
-  );
-  assert.doesNotMatch(
-    source,
-    /const orderedSnippets = normalizeVaultOrder\(savedSnippets\);\s*setSnippets\(orderedSnippets\);\s*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, orderedSnippets\);/,
-  );
-});

application/state/useVaultState.ts

@@ -58,30 +58,20 @@ import {
 } from "../../domain/globalHistory";
 import {
   buildTerminalDataMapFromLogs,
+  connectionLogTerminalDataMapsEqual,
   mergeConnectionLogsFromStorage,
   mergeTerminalDataIntoLogs,
   mergeTerminalDataMapsForStorage,
   type ConnectionLogTerminalDataMap,
 } from "../../domain/connectionLogTerminalData";
 import { getNextVaultOrder, normalizeVaultOrder } from "../../domain/vaultOrder";
-import {
-  deleteSelectedSnippetsFromVault,
-  pruneHostsStaleSnippetBindings,
-  rebaseSnippetVaultWrite,
-} from "../../domain/snippetSelection";
 import { loadSanitizedShellHistory } from "./shellHistoryPersistence";
-import {
-  publishConnectionLogsSnapshot,
-  registerConnectionLogsActions,
-} from "./connectionLogsStore";
 import {
   publishNotesSnapshot,
   registerNotesActions,
 } from "./notesStore";
-import { commitVaultNotesWrite } from "./vaultNotesPersistence";
 import { publishShellHistorySnapshot } from "./shellHistoryStore";
 import { setVaultInitialized } from "./vaultInitStore";
-import { notify } from "../notification";
 import {
   decryptGroupConfigs,
   decryptHosts,
@@ -272,7 +262,7 @@ const writeConnectionLogTerminalDataMap = (
     localMaps,
     buildPersistedLogIds(logs, usePersistedLogIdsFromDisk),
   );
-  if (JSON.stringify(existing) === JSON.stringify(pruned)) return true;
+  if (connectionLogTerminalDataMapsEqual(existing, pruned)) return true;
   return localStorageAdapter.write(STORAGE_KEY_CONNECTION_LOG_TERMINAL_DATA, pruned);
 };
 
@@ -295,14 +285,11 @@ export const useVaultState = () => {
   const customGroupsRef = useRef<string[]>([]);
   const managedSourcesRef = useRef<ManagedSource[]>([]);
   const hostsRef = useRef<Host[]>([]);
-  const snippetsRef = useRef<Snippet[]>([]);
   const notesRef = useRef<VaultNote[]>([]);
   const noteGroupsRef = useRef<string[]>([]);
-  const notesPersistFailureNotifiedAtRef = useRef(0);
   customGroupsRef.current = customGroups;
   managedSourcesRef.current = managedSources;
   hostsRef.current = hosts;
-  snippetsRef.current = snippets;
   notesRef.current = notes;
   noteGroupsRef.current = noteGroups;
 
@@ -314,18 +301,6 @@ export const useVaultState = () => {
   const identitiesWriteVersion = useRef(0);
   const proxyProfilesWriteVersion = useRef(0);
   const snippetsWriteVersion = useRef(0);
-  // Tracks the latest local updateSnippets schedule. Storage events also bump
-  // snippetsWriteVersion (to invalidate naive writers), so queued saves must
-  // key supersede checks off this owner instead of that shared counter.
-  const snippetsWriteOwnerRef = useRef(0);
-  // Last persisted ancestor for in-flight updateSnippets rebases. Superseded
-  // saves must not advance this to an optimistic in-memory array that never
-  // landed on disk — that would make a local add look like a concurrent delete.
-  const snippetsWriteBaseRef = useRef<Snippet[] | null>(null);
-  // Outstanding clear/restore/import replace must survive a superseding local
-  // save. Otherwise the later owner rebases additively against the old disk
-  // catalog and resurrects every pre-replacement snippet.
-  const snippetsWriteReplaceRef = useRef(false);
   const customGroupsWriteVersion = useRef(0);
   const groupConfigsWriteVersion = useRef(0);
   // Encrypt-phase promises can always be awaited, even under the vault lock.
@@ -339,7 +314,6 @@ export const useVaultState = () => {
   const keysWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
   const identitiesWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
   const groupConfigsWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
-  const snippetsWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
 
   const waitForPendingVaultWrites = useCallback(async () => {
     while (true) {
@@ -364,7 +338,6 @@ export const useVaultState = () => {
         keysWritePendingRef.current,
         identitiesWritePendingRef.current,
         groupConfigsWritePendingRef.current,
-        snippetsWritePendingRef.current,
       ];
       await Promise.all(writePending);
       if (
@@ -372,7 +345,6 @@ export const useVaultState = () => {
         && writePending[1] === keysWritePendingRef.current
         && writePending[2] === identitiesWritePendingRef.current
         && writePending[3] === groupConfigsWritePendingRef.current
-        && writePending[4] === snippetsWritePendingRef.current
         && encryptPending[0] === hostsEncryptPendingRef.current
         && encryptPending[1] === keysEncryptPendingRef.current
         && encryptPending[2] === identitiesEncryptPendingRef.current
@@ -473,37 +445,6 @@ export const useVaultState = () => {
     return mergeConnectionLogsFromStorage(prev, storedLogs, terminalDataMap);
   }, []);
 
-  // Encrypt outside the lock, then under the lock prune script bindings against
-  // the latest snippet catalog so a queued full-array write cannot restore
-  // login/connect ids cleared by a concurrent bulk-delete in another window.
-  const commitEncryptedHostsUnderVaultLock = useCallback(async (
-    ver: number,
-    hostsToPersist: Host[],
-    encrypted: Awaited<ReturnType<typeof encryptHosts>>,
-  ) => {
-    return withVaultImportLock("vault", async () => {
-      if (ver !== hostsWriteVersion.current) return "superseded" as const;
-      const latestSnippets = normalizeVaultOrder(
-        readStoredArray<Snippet>(
-          STORAGE_KEY_SNIPPETS,
-          localStorageAdapter.readString(STORAGE_KEY_SNIPPETS),
-        ),
-      );
-      const pruned = pruneHostsStaleSnippetBindings(hostsToPersist, latestSnippets);
-      let payload = encrypted;
-      if (pruned !== hostsToPersist) {
-        const normalized = normalizeVaultOrder(pruned);
-        payload = await encryptHosts(normalized);
-        if (ver !== hostsWriteVersion.current) return "superseded" as const;
-        hostsRef.current = normalized;
-        setHosts(normalized);
-      }
-      return localStorageAdapter.write(STORAGE_KEY_HOSTS, payload)
-        ? "written" as const
-        : "failed" as const;
-    });
-  }, []);
-
   const updateHosts = useCallback((data: Host[] | ((prev: Host[]) => Host[])) => {
     // Keep object identity for hosts that did not actually change. Callers that
     // do `hosts.map(h => h.id === id ? patch(h) : h)` already pass through
@@ -536,11 +477,14 @@ export const useVaultState = () => {
     hostsEncryptPendingRef.current = encryptPromise.then(() => undefined);
     const writePromise = encryptPromise.then(async (enc) => {
       if (ver !== hostsWriteVersion.current) return "superseded" as const;
-      return commitEncryptedHostsUnderVaultLock(ver, cleaned, enc);
+      return withVaultImportLock("vault", async () => {
+        if (ver !== hostsWriteVersion.current) return "superseded" as const;
+        return localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
+      });
     });
     hostsWritePendingRef.current = writePromise;
     return writePromise;
-  }, [commitEncryptedHostsUnderVaultLock]);
+  }, []);
 
   const readPersistedHosts = useCallback(async (): Promise<Host[]> => {
     // Always drain what is safe to wait for. Under the vault lock this is only
@@ -642,195 +586,26 @@ export const useVaultState = () => {
     });
   }, []);
 
-  const updateSnippets = useCallback((
-    data: Snippet[],
-    options?: { replace?: boolean },
-  ) => {
-    // Capture the pre-update snapshot for a 3-way rebase once we hold the lock.
-    // Callers pass a full array derived from this window's view; a popup delete
-    // (or another window's import) may land on disk before our write runs.
-    // Keep the first outstanding ancestor across superseded local saves so a
-    // second edit does not rebase against the first save's optimistic memory.
-    const replace =
-      options?.replace === true || snippetsWriteReplaceRef.current;
-    const base = snippetsWriteBaseRef.current ?? snippetsRef.current;
-    if (options?.replace === true) {
-      snippetsWriteReplaceRef.current = true;
-    }
-    if (replace) {
-      // Restore/import/clear must not keep an additive ancestor — storage events
-      // would otherwise merge disk-only ids back into memory while replace waits.
-      // Keep this cleared when a later create/edit supersedes the replacement
-      // owner so that save stays in replace mode instead of capturing []/restored
-      // memory as an additive rebase base against the stale disk catalog.
-      snippetsWriteBaseRef.current = null;
-    } else if (snippetsWriteBaseRef.current === null) {
-      snippetsWriteBaseRef.current = base;
-    }
+  const updateSnippets = useCallback((data: Snippet[]) => {
     const cleaned = normalizeVaultOrder(data);
-    const ver = ++snippetsWriteVersion.current;
-    snippetsWriteOwnerRef.current = ver;
-    // Keep live snapshot ahead of React commit so same-tick readers (delete,
-    // agent bridge) do not observe a stale pre-write array.
-    snippetsRef.current = cleaned;
+    ++snippetsWriteVersion.current;
     setSnippets(cleaned);
-    // Serialize with deleteSelectedSnippets / plugin importer under the shared
-    // vault lock, then rebase onto the latest persisted snapshot so a queued
-    // full-array write cannot resurrect concurrently deleted snippets (or drop
-    // concurrent additions). Explicit replace (clear / sync restore / import)
-    // skips the additive rebase so a concurrent disk-only add cannot survive.
-    const writePromise = withVaultImportLock("vault", async () => {
-      if (snippetsWriteOwnerRef.current !== ver) return "superseded" as const;
-      const rebased = normalizeVaultOrder(
-        replace
-          ? cleaned
-          : rebaseSnippetVaultWrite({
-              base,
-              ours: cleaned,
-              theirs: normalizeVaultOrder(
-                readStoredArray<Snippet>(
-                  STORAGE_KEY_SNIPPETS,
-                  localStorageAdapter.readString(STORAGE_KEY_SNIPPETS),
-                ),
-              ),
-            }),
-      );
-      const persisted = localStorageAdapter.write(STORAGE_KEY_SNIPPETS, rebased);
-      if (!persisted) {
-        // Keep the pre-update ancestor. Clearing it here would make the next
-        // save rebase against the optimistic array while disk still lacks the
-        // add, so rebase would treat the add as a concurrent delete.
-        notify.error(
-          "Snippets could not be saved. Free some local storage space and try again.",
-          "Scripts",
-        );
-        return "failed" as const;
-      }
-      // Disk caught up; next save should treat this write as its ancestor.
-      snippetsWriteBaseRef.current = null;
-      snippetsWriteReplaceRef.current = false;
-      if (snippetsWriteOwnerRef.current === ver) {
-        snippetsRef.current = rebased;
-        setSnippets(rebased);
-      }
-      return "written" as const;
-    });
-    snippetsWritePendingRef.current = writePromise;
-    return writePromise;
+    localStorageAdapter.write(STORAGE_KEY_SNIPPETS, cleaned);
   }, []);
 
-  // Cross-window safe: merge binding cleanup into the latest persisted
-  // hosts/snippets under the shared vault lock. Popup terminals own a separate
-  // useVaultState instance — writing hostsRef from that window can discard a
-  // main-window host edit, or a storage-event version bump can cancel the host
-  // write after snippets were already removed.
-  const deleteSelectedSnippets = useCallback(async (selectedSnippetIds: ReadonlySet<string>) => {
-    if (selectedSnippetIds.size === 0) {
-      return {
-        snippets: snippetsRef.current,
-        hosts: hostsRef.current,
-        deletedCount: 0,
-      };
-    }
-
-    while (true) {
-      await waitForPendingVaultWrites();
-      const attempt = await withVaultImportLock("vault", async () => {
-        const writeVersions = {
-          hosts: hostsWriteVersion.current,
-          snippets: snippetsWriteVersion.current,
-        };
-        const rawHosts = localStorageAdapter.readString(STORAGE_KEY_HOSTS);
-        const rawSnippets = localStorageAdapter.readString(STORAGE_KEY_SNIPPETS);
-        const storedHosts = readStoredArray<Host>(STORAGE_KEY_HOSTS, rawHosts);
-        const storedSnippets = readStoredArray<Snippet>(STORAGE_KEY_SNIPPETS, rawSnippets);
-        const latestHosts = normalizeVaultOrder(
-          (await decryptHosts(storedHosts)).map((host) => sanitizeHost(host)),
-        );
-        const latestSnippets = normalizeVaultOrder(storedSnippets);
-        const result = deleteSelectedSnippetsFromVault(
-          latestSnippets,
-          latestHosts,
-          selectedSnippetIds,
-        );
-        if (result.deletedCount === 0) return result;
-
-        const encryptedHosts = await encryptHosts(result.hosts);
-        const changedWhilePreparing = (
-          writeVersions.hosts !== hostsWriteVersion.current
-          || writeVersions.snippets !== snippetsWriteVersion.current
-          || localStorageAdapter.readString(STORAGE_KEY_HOSTS) !== rawHosts
-          || localStorageAdapter.readString(STORAGE_KEY_SNIPPETS) !== rawSnippets
-        );
-        if (changedWhilePreparing) return null;
-
-        ++hostsWriteVersion.current;
-        ++snippetsWriteVersion.current;
-        // Journaled pair write: a partial hosts/snippets persist would drop
-        // login/connect bindings on restart while leaving the snippets behind.
-        // Callers fire-and-forget this promise after closing the confirm dialog,
-        // so storage rejection must not become an unhandled rejection.
-        try {
-          commitPluginImporterTransaction(localStorageAdapter, [
-            [STORAGE_KEY_HOSTS, encryptedHosts],
-            [STORAGE_KEY_SNIPPETS, result.snippets],
-          ]);
-        } catch {
-          notify.error(
-            "Snippets could not be deleted. Free some local storage space and try again.",
-            "Scripts",
-          );
-          return {
-            snippets: latestSnippets,
-            hosts: latestHosts,
-            deletedCount: 0,
-          };
-        }
-        hostsRef.current = result.hosts;
-        snippetsRef.current = result.snippets;
-        // Persisted delete is the new ancestor; drop any stale rebase base from
-        // a superseded/queued updateSnippets that never landed.
-        snippetsWriteBaseRef.current = null;
-        snippetsWriteReplaceRef.current = false;
-        setHosts(result.hosts);
-        setSnippets(result.snippets);
-        hostsWritePendingRef.current = Promise.resolve("unchanged" as const);
-        snippetsWritePendingRef.current = Promise.resolve("unchanged" as const);
-        return result;
-      });
-      if (attempt !== null) return attempt;
-    }
-  }, [waitForPendingVaultWrites]);
-
   const updateSnippetPackages = useCallback((data: string[]) => {
     setSnippetPackages(data);
     localStorageAdapter.write(STORAGE_KEY_SNIPPET_PACKAGES, data);
   }, []);
 
   const updateNotes = useCallback((data: Partial<VaultNote>[]) => {
-    const { notes: cleaned, persisted } = commitVaultNotesWrite({
-      data,
-      write: (key, value) => localStorageAdapter.write(key, value),
-    });
-    // Keep the in-session catalog updated so an autosave quota failure does not
-    // snap the editor back to stale props and discard the user's draft. Disk
-    // may still be behind — surface that explicitly.
+    const cleaned = normalizeVaultNotes(data);
     notesRef.current = cleaned;
     setNotes(cleaned);
+    localStorageAdapter.write(STORAGE_KEY_NOTES, cleaned);
+    // Publish synchronously so Notes→AI handoff does not read a stale catalog
+    // while React state is still committing (useLayoutEffect republishes too).
     publishNotesSnapshot({ notes: cleaned, noteGroups: noteGroupsRef.current });
-    if (!persisted) {
-      const now = Date.now();
-      // Debounced autosave can hit quota repeatedly; avoid toast spam.
-      if (now - notesPersistFailureNotifiedAtRef.current > 10_000) {
-        notesPersistFailureNotifiedAtRef.current = now;
-        notify.error(
-          "Notes could not be saved. Free some local storage space and try again.",
-          "Notes",
-        );
-      }
-      return false;
-    }
-    return true;
   }, []);
 
   const updateNoteGroups = useCallback((data: unknown) => {
@@ -1038,7 +813,7 @@ export const useVaultState = () => {
     updateKeys([]);
     updateIdentities([]);
     updateProxyProfiles([]);
-    updateSnippets([], { replace: true });
+    updateSnippets([]);
     updateSnippetPackages([]);
     updateNotes([]);
     updateNoteGroups([]);
@@ -1175,28 +950,6 @@ export const useVaultState = () => {
     });
   }, [persistConnectionLogState]);
 
-  // Connection logs for Vault logs section — keep App domain bags off session churn.
-  useLayoutEffect(() => {
-    publishConnectionLogsSnapshot({ connectionLogs });
-  }, [connectionLogs]);
-
-  useLayoutEffect(() => {
-    registerConnectionLogsActions({
-      updateConnectionLog,
-      toggleConnectionLogSaved,
-      deleteConnectionLog,
-      clearUnsavedConnectionLogs,
-    });
-    return () => {
-      registerConnectionLogsActions(null);
-    };
-  }, [
-    updateConnectionLog,
-    toggleConnectionLogSaved,
-    deleteConnectionLog,
-    clearUnsavedConnectionLogs,
-  ]);
-
   // Convert a known host to a managed host
   const convertKnownHostToHost = useCallback((knownHost: KnownHost): Host => {
     const newHost: Host = {
@@ -1229,23 +982,24 @@ export const useVaultState = () => {
       hostsEncryptPendingRef.current = encryptPromise.then(() => undefined);
       const writePromise = encryptPromise.then(async (enc) => {
         if (ver !== hostsWriteVersion.current) return;
-        return commitEncryptedHostsUnderVaultLock(ver, updated, enc);
+        return withVaultImportLock("vault", async () => {
+          if (ver === hostsWriteVersion.current)
+            localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
+        });
       });
       hostsWritePendingRef.current = writePromise;
       return updated;
     });
 
     return newHost;
-  }, [commitEncryptedHostsUnderVaultLock, hosts]);
+  }, [hosts]);
 
   useEffect(() => {
-    let cancelled = false;
     const init = async () => {
       try {
         await withVaultImportLock("vault", async () => {
           recoverPluginImporterTransaction(localStorageAdapter, PLUGIN_IMPORT_TRANSACTION_KEYS);
         });
-        if (cancelled) return;
         const savedHosts = localStorageAdapter.read<Host[]>(STORAGE_KEY_HOSTS);
 
         if (savedHosts) {
@@ -1254,7 +1008,6 @@ export const useVaultState = () => {
           // and causes this stale result to be discarded.
           const ver = ++hostsWriteVersion.current;
           const decrypted = await decryptHosts(savedHosts);
-          if (cancelled) return;
           if (ver === hostsWriteVersion.current) {
             const sanitized = normalizeVaultOrder(
               migrateHostsFromLegacyLineTimestamps(
@@ -1262,21 +1015,15 @@ export const useVaultState = () => {
                 readLegacyLineTimestampsEnabled(),
               ),
             );
-            hostsRef.current = sanitized;
             setHosts(sanitized);
             // Always re-encrypt the batch. Stale enc:v1 placeholders are left
             // unchanged by encryptCredentialValue (no double-wrap); plaintext
             // siblings still need encryption when safeStorage was previously
-            // unavailable for some records. Route through the locked writer so
-            // a concurrent snippet delete can prune login/connect bindings
-            // before this migration blob lands.
-            const encryptPromise = encryptHosts(sanitized);
-            hostsEncryptPendingRef.current = encryptPromise.then(() => undefined);
-            const writePromise = encryptPromise.then(async (enc) => {
-              if (ver !== hostsWriteVersion.current) return;
-              return commitEncryptedHostsUnderVaultLock(ver, sanitized, enc);
+            // unavailable for some records.
+            encryptHosts(sanitized).then((enc) => {
+              if (ver === hostsWriteVersion.current)
+                localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
             });
-            hostsWritePendingRef.current = writePromise;
           }
         } else {
           updateHosts(INITIAL_HOSTS);
@@ -1307,7 +1054,6 @@ export const useVaultState = () => {
           // Decrypt sensitive fields (passphrase, privateKey)
           const keyVer = ++keysWriteVersion.current;
           const decryptedKeys = await decryptKeys(migratedKeys);
-          if (cancelled) return;
           if (keyVer === keysWriteVersion.current) {
             const orderedKeys = normalizeVaultOrder(decryptedKeys);
             setKeys(orderedKeys);
@@ -1328,7 +1074,6 @@ export const useVaultState = () => {
         if (savedIdentities) {
           const idVer = ++identitiesWriteVersion.current;
           const decryptedIds = await decryptIdentities(savedIdentities);
-          if (cancelled) return;
           if (idVer === identitiesWriteVersion.current) {
             const orderedIdentities = normalizeVaultOrder(decryptedIds);
             setIdentities(orderedIdentities);
@@ -1344,7 +1089,6 @@ export const useVaultState = () => {
         if (savedProxyProfiles) {
           const proxyVer = ++proxyProfilesWriteVersion.current;
           const decryptedProfiles = await decryptProxyProfiles(savedProxyProfiles);
-          if (cancelled) return;
           if (proxyVer === proxyProfilesWriteVersion.current) {
             const orderedProfiles = normalizeVaultOrder(decryptedProfiles);
             setProxyProfiles(orderedProfiles);
@@ -1355,8 +1099,6 @@ export const useVaultState = () => {
           }
         }
 
-        if (cancelled) return;
-
         // Read remaining non-encrypted data fresh after all async gaps above
         const savedGroups = localStorageAdapter.read<string[]>(STORAGE_KEY_GROUPS);
         const savedSnippets =
@@ -1369,43 +1111,8 @@ export const useVaultState = () => {
 
         if (savedSnippets) {
           const orderedSnippets = normalizeVaultOrder(savedSnippets);
-          snippetsRef.current = orderedSnippets;
           setSnippets(orderedSnippets);
-          // Persist order backfill only when fields changed. Never rewrite the
-          // pre-lock snapshot unlocked: another renderer can delete under the
-          // vault lock after this read and before this write, resurrecting
-          // snippets while host-binding cleanup stays committed. Re-normalize
-          // the live disk catalog under the same lock as deleteSelectedSnippets.
-          const needsOrderPersist = orderedSnippets.some(
-            (snippet, index) => snippet !== savedSnippets[index],
-          );
-          if (needsOrderPersist) {
-            const ver = ++snippetsWriteVersion.current;
-            snippetsWriteOwnerRef.current = ver;
-            const writePromise = withVaultImportLock("vault", async () => {
-              if (snippetsWriteOwnerRef.current !== ver) return "superseded" as const;
-              const latest = normalizeVaultOrder(
-                readStoredArray<Snippet>(
-                  STORAGE_KEY_SNIPPETS,
-                  localStorageAdapter.readString(STORAGE_KEY_SNIPPETS),
-                ),
-              );
-              const persisted = localStorageAdapter.write(STORAGE_KEY_SNIPPETS, latest);
-              if (!persisted) {
-                notify.error(
-                  "Snippets could not be saved. Free some local storage space and try again.",
-                  "Scripts",
-                );
-                return "failed" as const;
-              }
-              if (snippetsWriteOwnerRef.current === ver) {
-                snippetsRef.current = latest;
-                setSnippets(latest);
-              }
-              return "written" as const;
-            });
-            snippetsWritePendingRef.current = writePromise;
-          }
+          localStorageAdapter.write(STORAGE_KEY_SNIPPETS, orderedSnippets);
         }
         else updateSnippets(INITIAL_SNIPPETS);
 
@@ -1468,7 +1175,6 @@ export const useVaultState = () => {
         if (savedGroupConfigs) {
           const gcVer = ++groupConfigsWriteVersion.current;
           const decryptedGC = await decryptGroupConfigs(savedGroupConfigs);
-          if (cancelled) return;
           if (gcVer === groupConfigsWriteVersion.current) {
             const sanitizedGC = normalizeVaultOrder(decryptedGC.map(sanitizeGroupConfig));
             setGroupConfigs(sanitizedGC);
@@ -1479,20 +1185,13 @@ export const useVaultState = () => {
           }
         }
       } finally {
-        // StrictMode remount cancels the first init; only the surviving effect
-        // may publish "vault ready" or terminals can boot against empty keys.
-        if (!cancelled) {
-          setIsInitialized(true);
-          setVaultInitialized(true);
-        }
+        setIsInitialized(true);
+        setVaultInitialized(true);
       }
     };
 
-    void init();
-    return () => {
-      cancelled = true;
-    };
-  }, [commitEncryptedHostsUnderVaultLock, updateHosts, updateSnippets]);
+    init();
+  }, [updateHosts, updateSnippets]);
 
   useEffect(() => {
     if (!isInitialized) return;
@@ -1597,44 +1296,9 @@ export const useVaultState = () => {
       }
 
       if (key === STORAGE_KEY_SNIPPETS) {
-        // StorageEvent.newValue is the value at fire time. A peer write can be
-        // delivered only after this window's replace already committed and
-        // cleared snippetsWriteReplaceRef — adopting that older payload would
-        // resurrect the pre-replacement catalog in memory (and on the next edit).
-        if (event.newValue !== localStorageAdapter.readString(STORAGE_KEY_SNIPPETS)) {
-          return;
-        }
-        const next = normalizeVaultOrder(safeParse<Snippet[]>(event.newValue) ?? []);
-        // Invalidate write-version readers, but do not clear snippetsWriteOwnerRef:
-        // an in-flight updateSnippets rebases onto this disk snapshot under the
-        // vault lock instead of being cancelled (which would drop local edits).
+        const next = safeParse<Snippet[]>(event.newValue) ?? [];
         ++snippetsWriteVersion.current;
-        const pendingBase = snippetsWriteBaseRef.current;
-        if (pendingBase !== null) {
-          // A queued local save still owns an outstanding ancestor. Replacing
-          // optimistic state with the remote snapshot (and clearing that base)
-          // would make the next local edit derive from remote-only and drop the
-          // first mutation when it supersedes the queued owner.
-          const merged = normalizeVaultOrder(
-            rebaseSnippetVaultWrite({
-              base: pendingBase,
-              ours: snippetsRef.current,
-              theirs: next,
-            }),
-          );
-          snippetsRef.current = merged;
-          setSnippets(merged);
-          return;
-        }
-        if (snippetsWriteReplaceRef.current) {
-          // Clear/restore/import left base null while replace is outstanding.
-          // Adopting the remote catalog here would pollute memory; a later local
-          // edit would still run in replace mode and overwrite disk with the old
-          // catalog plus that edit.
-          return;
-        }
-        snippetsRef.current = next;
-        setSnippets(next);
+        setSnippets(normalizeVaultOrder(next));
         return;
       }
 
@@ -1749,12 +1413,15 @@ export const useVaultState = () => {
       hostsEncryptPendingRef.current = encryptPromise.then(() => undefined);
       const writePromise = encryptPromise.then(async (enc) => {
         if (ver !== hostsWriteVersion.current) return;
-        return commitEncryptedHostsUnderVaultLock(ver, next, enc);
+        return withVaultImportLock("vault", async () => {
+          if (ver === hostsWriteVersion.current)
+            localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
+        });
       });
       hostsWritePendingRef.current = writePromise;
       return next;
     });
-  }, [commitEncryptedHostsUnderVaultLock]);
+  }, []);
 
   const updateHostDistro = useCallback((hostId: string, distro: string) => {
     const normalized = normalizeDistroId(distro);
@@ -1767,12 +1434,15 @@ export const useVaultState = () => {
       hostsEncryptPendingRef.current = encryptPromise.then(() => undefined);
       const writePromise = encryptPromise.then(async (enc) => {
         if (ver !== hostsWriteVersion.current) return;
-        return commitEncryptedHostsUnderVaultLock(ver, next, enc);
+        return withVaultImportLock("vault", async () => {
+          if (ver === hostsWriteVersion.current)
+            localStorageAdapter.write(STORAGE_KEY_HOSTS, enc);
+        });
       });
       hostsWritePendingRef.current = writePromise;
       return next;
     });
-  }, [commitEncryptedHostsUnderVaultLock]);
+  }, []);
 
   const exportData = useCallback(
     (): ExportableVaultData => ({
@@ -1798,13 +1468,7 @@ export const useVaultState = () => {
       if (payload.keys) encryptedWrites.push(updateKeys(payload.keys));
       if (payload.identities) encryptedWrites.push(updateIdentities(payload.identities));
       if (Array.isArray(payload.proxyProfiles)) encryptedWrites.push(updateProxyProfiles(payload.proxyProfiles));
-      if (payload.snippets) {
-        // Full-snapshot restore/import must replace, not additive-rebase; otherwise
-        // a concurrent disk-only snippet survives and the restore looks incomplete.
-        encryptedWrites.push(
-          updateSnippets(payload.snippets, { replace: true }).then(() => undefined),
-        );
-      }
+      if (payload.snippets) updateSnippets(payload.snippets);
       if (payload.customGroups) updateCustomGroups(payload.customGroups);
       if (payload.snippetPackages) updateSnippetPackages(payload.snippetPackages);
       if (payload.notes) updateNotes(payload.notes);
@@ -1951,9 +1615,6 @@ export const useVaultState = () => {
           [STORAGE_KEY_GROUP_CONFIGS, encryptedGroupConfigs],
         ]);
         customGroupsRef.current = nextGroups;
-        snippetsRef.current = nextSnippets;
-        snippetsWriteBaseRef.current = null;
-        snippetsWriteReplaceRef.current = false;
         setHosts(nextHosts);
         setKeys(nextKeys);
         setIdentities(nextIdentities);
@@ -1999,7 +1660,6 @@ export const useVaultState = () => {
     updateIdentities,
     updateProxyProfiles,
     updateSnippets,
-    deleteSelectedSnippets,
     updateSnippetPackages,
     updateNotes,
     updateNoteGroups,

application/state/vaultHostTreeActionsStore.ts

@@ -6,7 +6,6 @@ import type { VaultOrderPosition } from '../../domain/vaultOrder';
 export interface VaultHostTreeActions {
   onDeleteHost: (host: Host) => void;
   onDuplicateHost: (host: Host) => void;
-  onCopyHostname?: (host: Host) => void;
   onCopyCredentials: (host: Host) => void;
   onRenameHost: (host: Host) => void;
   onNewGroup: (parentPath?: string) => void;

application/state/vaultNotesPersistence.test.ts

@@ -1,55 +0,0 @@
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import test from "node:test";
-
-import { STORAGE_KEY_NOTES } from "../../infrastructure/config/storageKeys.ts";
-import { commitVaultNotesWrite } from "./vaultNotesPersistence.ts";
-
-test("commitVaultNotesWrite reports failure when the storage write returns false", () => {
-  const writes: Array<{ key: string; value: unknown }> = [];
-  const result = commitVaultNotesWrite({
-    data: [{
-      id: "note-1",
-      title: "Draft",
-      content: "body",
-      createdAt: 1,
-      updatedAt: 2,
-    }],
-    write: (key, value) => {
-      writes.push({ key, value });
-      return false;
-    },
-  });
-
-  assert.equal(result.persisted, false);
-  assert.equal(writes.length, 1);
-  assert.equal(writes[0]?.key, STORAGE_KEY_NOTES);
-  assert.equal(result.notes[0]?.title, "Draft");
-});
-
-test("commitVaultNotesWrite returns persisted notes when the write succeeds", () => {
-  const result = commitVaultNotesWrite({
-    data: [{
-      id: "note-1",
-      title: "Saved",
-      content: "ok",
-      createdAt: 1,
-      updatedAt: 2,
-    }],
-    write: () => true,
-  });
-
-  assert.equal(result.persisted, true);
-  assert.equal(result.notes[0]?.title, "Saved");
-});
-
-test("useVaultState updateNotes surfaces storage write failures", () => {
-  const source = readFileSync(new URL("./useVaultState.ts", import.meta.url), "utf8");
-
-  assert.match(source, /commitVaultNotesWrite/);
-  assert.match(source, /notify\.error/);
-  assert.match(source, /!persisted|persisted === false/);
-  assert.match(source, /return false/);
-  assert.match(source, /notesPersistFailureNotifiedAtRef/);
-  assert.match(source, /10_000/);
-});