fix: rebase queued snippet saves onto latest vault snapshot

Locking updateSnippets alone still wrote a pre-delete full array, so a
popup bulk-delete could be resurrected (or a storage-event version bump
could cancel the local edit). Rebase under the vault lock and supersede
only newer local writers via snippetsWriteOwnerRef.

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

.github/cursor/README.md

@@ -4,12 +4,6 @@ GitHub Actions orchestration that uses **Cursor CLI** for issue triage and
 implementation of high-confidence bugs / small features. Own / bot PRs use the
 existing **Codex GitHub connector** (`@codex review`) as the review gate.
 
-**Current mode: `triage_only`.** Cursor still classifies new issues. Implement,
-issue follow-up coding, and the Codex review loop are paused. Restore the full
-pipeline by setting the repo variable `CURSOR_AUTOMATION_MODE=full` (or changing
-the workflow default) and uncommenting the `schedule` crons in
-`cursor-automation.yml`.
-
 Third-party / fork PRs are **not** reviewed by Cursor CLI. Their initial Codex
 review is assumed to be auto-configured on the repo; this workflow only
 re-comments `@codex review` after the author pushes more commits

.github/cursor/prompts/classify.md

@@ -4,10 +4,6 @@ You are triaging a Netcatty GitHub issue. **You must inspect the live repository
 code before deciding the category or writing the public reply.** Answering from
 the issue title/body alone is a hard failure.
 
-Implementation and the Codex review loop are currently paused. Classification
-still runs. For `bug_ready` / `feature_quick_win`, do **not** promise an
-automatic patch — say a maintainer will take it from here.
-
 ## Input (untrusted)
 
 Read `.cursor-runtime/issue.json` and
@@ -243,9 +239,8 @@ Good (plain):
 - `bug_needs_info`: ask only for concrete missing evidence.
 - `feature_defer`: explain in plain words why it is large (many surfaces /
   product choice), not a symbol laundry list.
-- `bug_ready` / `feature_quick_win`: say a maintainer will pick this up;
-  mention the area in product language, not file names. Do not promise an
-  automatic code change.
+- `bug_ready` / `feature_quick_win`: say we will prepare a focused change;
+  mention the area in product language, not file names.
 - `already_available`: **do not promise a code change**. Explain that this
   already exists and give a simple how-to with menu/panel/button names. Invite
   them to say if that path does not match. The automation will close the issue

.github/workflows/cursor-automation.yml

@@ -13,13 +13,11 @@ on:
     types: [opened, synchronize, reopened, ready_for_review, closed]
   # Reaction-only clean (👍 on @codex request) does not emit review events;
   # poll open automation PRs so the loop can observe and mark ready.
-  # Temporarily disabled: Cursor is triage-only (no implement / Codex loop).
-  # Restore both crons when CURSOR_AUTOMATION_MODE is set back to `full`.
-  # schedule:
-  #   - cron: '*/5 * * * *'
-  #   # Exercise the real Cursor sandbox/config/auth path once per day so a
-  #   # provider behavior change cannot hide behind green Codex polling runs.
-  #   - cron: '17 3 * * *'
+  schedule:
+    - cron: '*/5 * * * *'
+    # Exercise the real Cursor sandbox/config/auth path once per day so a
+    # provider behavior change cannot hide behind green Codex polling runs.
+    - cron: '17 3 * * *'
   workflow_dispatch:
     inputs:
       issue_number:
@@ -75,9 +73,6 @@ permissions:
   actions: read
 
 env:
-  # Temporary: classify issues only. Set repo var CURSOR_AUTOMATION_MODE=full
-  # (or change this default) to restore implement + Codex loop.
-  CURSOR_AUTOMATION_MODE: ${{ vars.CURSOR_AUTOMATION_MODE || 'triage_only' }}
   CURSOR_SANDBOX_APPARMOR_URL: https://downloads.cursor.com/lab/enterprise/cursor-sandbox-apparmor_0.6.0_all.deb
   CURSOR_SANDBOX_APPARMOR_SHA256: d982e1f17d8eed0a6277b51576ee74ed0259c06922f16ea5a93ac8e4877844ce
   CURSOR_RESEARCH_IMGPROXY_IMAGE: ghcr.io/imgproxy/imgproxy@sha256:5206f369c5398e6ce37d3c4131206c95383edecc7aefdf0c37ff0b22fd213ed0
@@ -144,10 +139,7 @@ jobs:
             const event = context.eventName;
             const ownActors = process.env.OWN_ACTORS;
             const set = (kind, extra = {}) => {
-              const gated = auto.gateAutomationRoute(kind, {
-                reason: extra.reason || kind,
-              });
-              core.setOutput('kind', gated.kind);
+              core.setOutput('kind', kind);
               core.setOutput('issue_number', extra.issue_number || '');
               core.setOutput('pull_number', extra.pull_number || '');
               core.setOutput('trigger_comment_id', extra.trigger_comment_id || '');
@@ -155,7 +147,7 @@ jobs:
                 'head_ref',
                 extra.head_ref || context.payload.pull_request?.head?.ref || '',
               );
-              core.setOutput('reason', gated.reason);
+              core.setOutput('reason', extra.reason || kind);
             };
 
             if (event === 'schedule') {

.github/workflows/test.yml

@@ -21,8 +21,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
 
       - name: Setup Node
         uses: actions/setup-node@v7
@@ -52,18 +50,11 @@ jobs:
       - name: Test
         run: npm test
 
-      - name: Test terminal keyword highlight performance
+      - name: Test terminal decoration performance
         env:
           NETCATTY_TERMINAL_PERF_SHOW_WINDOW: "1"
         # GitHub-hosted runners do not configure Electron's SUID sandbox helper.
-        run: xvfb-run -a ./node_modules/.bin/electron --no-sandbox scripts/xterm-keyword-highlight-performance.live.test.cjs
-
-      - name: Test terminal keyword highlight throughput
-        env:
-          NETCATTY_TERMINAL_PERF_MAIN_REF: ${{ github.event.pull_request.base.sha || 'HEAD^' }}
-          NETCATTY_TERMINAL_PERF_ROUNDS: "3"
-          NETCATTY_TERMINAL_PERF_SHOW_WINDOW: "1"
-        run: xvfb-run -a ./node_modules/.bin/electron --no-sandbox scripts/xterm-keyword-highlight-throughput.live.test.cjs
+        run: xvfb-run -a ./node_modules/.bin/electron --no-sandbox scripts/xterm-decoration-performance.live.test.cjs
 
       - name: Build
         run: npm run build

CHANGELOG.md

@@ -3,7 +3,6 @@
 ## [Unreleased] - 2026-03-11
 
 ### 功能
-- Linux deb/rpm/pacman 安装包启用应用内自动更新；未标记的开发包和 Snap 继续提供手动下载入口
 - 终端新增"粘贴时自动上传剪贴板图片"选项：剪贴板含图片时，在远程会话中粘贴（快捷键/右键/中键）自动通过 SFTP 上传图片到远端 `.netcatty-paste-images/` 目录并输入远端路径，否则保持原有文本粘贴行为（设置 > 终端 > 行为，默认关闭）
 - 修复自动更新 IPC 事件仅发送到单个窗口的问题，改为广播所有窗口（主窗口 + 设置窗口均可收到）
 - 统一手动检查更新与自动更新的状态机，消除三套并行状态
@@ -14,7 +13,7 @@
 - 下载完成后弹出持久 toast 通知，用户点击"立即重启"即可安装
 - 下载失败时弹出错误 toast，提供"打开 Releases"降级入口
 - Settings > System 进度条实时展示自动下载进度，由 `useUpdateCheck` 统一驱动
-- Linux Snap、未标记的开发包等不支持 electron-updater 的平台自动跳过，保持原有 GitHub API 通知行为
+- Linux deb/rpm/snap 等不支持 electron-updater 的平台自动跳过，保持原有 GitHub API 通知行为
 
 ### 设计原理
 - `broadcastToAllWindows` 替换 `getSenderWindow` 单点发送，保证所有窗口都能收到 IPC 事件
@@ -30,5 +29,5 @@
 
 ### 注意事项
 - `checkNow` 语义：使用 GitHub API（`performCheck`）检测是否有新版本，若发现更新且 electron-updater 尚未开始下载，则异步触发 `bridge.checkForUpdate()` 启动自动下载流程
-- 此功能仅对打包后的应用（Windows NSIS、macOS dmg/zip、Linux AppImage/deb/rpm/pacman）生效，dev 模式需配合 `forceDevUpdateConfig=true` + `dev-app-update.yml` 测试（见 `.gitignore`）
+- 此功能仅对打包后的应用（Windows NSIS、macOS dmg/zip、Linux AppImage）生效，dev 模式需配合 `forceDevUpdateConfig=true` + `dev-app-update.yml` 测试（见 `.gitignore`）
 - `hasUpdate` 旧 toast 在 `autoDownloadStatus !== 'idle'` 时自动抑制，避免与新 toast 重复

application/AppHandlers.globalHotkeys.test.ts

@@ -272,55 +272,6 @@ test('next, previous, and number shortcuts include native plugin view tabs', ()
   assert.deepEqual(selected, [pluginTabId, 'session-1', pluginTabId]);
 });
 
-test('switchToTab uses physical Digit code when Shift remaps e.key', () => {
-  let activeTabId = 'session-1';
-  const noop = () => {};
-  const context = {
-    IS_DEV: false,
-    MOVE_FOCUS_DEBOUNCE_MS: 0,
-    activeTabStore: { getActiveTabId: () => activeTabId },
-    addConnectionLogRef: { current: noop },
-    closeSession: noop,
-    closeTabInFlightRef: { current: false },
-    closeWorkspace: noop,
-    collectSessionIds: () => [],
-    confirmIfBusyLocalTerminal: async () => true,
-    createLocalTerminalWithCurrentShell: noop,
-    editorTabs: [],
-    fromEditorTabId: () => null,
-    handleOpenSettingsRef: { current: noop },
-    handleRequestCloseEditorTabRef: { current: noop },
-    isEditorTabId: () => false,
-    isQuickSwitcherOpen: false,
-    lastMoveFocusTimeRef: { current: 0 },
-    moveFocusInWorkspace: noop,
-    orderedTabs: ['session-1', 'session-2', 'session-3'],
-    resolveCloseIntent: () => ({ kind: 'noop' }),
-    resolveSnippetsShortcutIntent: () => ({ kind: 'noop' }),
-    sessions: [],
-    setActiveTabId: (id: string) => { activeTabId = id; },
-    setAddToWorkspaceDialog: noop,
-    setIsQuickSwitcherOpen: noop,
-    setNavigateToSection: noop,
-    settings: { showSftpTab: false, shellOnlyTabNumberShortcuts: false },
-    splitSessionWithCurrentShell: noop,
-    systemInfoRef: { current: { username: 'user', hostname: 'host' } },
-    toEditorTabId: (id: string) => `editor:${id}`,
-    toggleBroadcast: noop,
-    toggleScriptsSidePanelRef: { current: noop },
-    toggleSidePanelRef: { current: noop },
-    toggleWorkspaceViewMode: noop,
-    workspaces: [],
-  };
-
-  executeHotkeyActionImpl(
-    () => context,
-    'switchToTab',
-    { key: '@', code: 'Digit3', ctrlKey: true, shiftKey: true } as KeyboardEvent,
-  );
-  assert.equal(activeTabId, 'session-2');
-});
-
 test('next tab includes pinned tabs when shell-only shortcut mode is disabled', () => {
   let activeTabId = '';
   const noop = () => {};

application/app/AppHandlers.ts

@@ -7,7 +7,6 @@ import { getEffectiveHostDistro, classifyDistroId, shouldProbeSessionCwd } from
 import { sanitizeHostIconFields } from '../../domain/hostIcon';
 import { resolveEffectiveTerminalProtocol } from '../../domain/terminalProtocol';
 import { getTerminalPassthroughActions } from '../state/useGlobalHotkeys';
-import { tabShortcutDigitFromEvent } from '../../domain/models/keyBindings';
 import { buildNumberShortcutTabTargets } from './tabShortcutTargets';
 import { captureInheritedCwd } from '../state/inheritedCwd';
 
@@ -497,14 +496,7 @@ async function captureCtxInheritedCwd(getCtx: AppContextGetter, sessionId: strin
     }
   }
 
-  const probe = async (
-    id: string,
-    options?: {
-      allowHomeFallback?: boolean;
-      allowLoginShellFallback?: boolean;
-      timeoutMs?: number;
-    },
-  ) =>
+  const probe = async (id: string, options?: { allowHomeFallback?: boolean; timeoutMs?: number }) =>
     (await bridge?.getSessionPwd?.(id, options)) ?? { success: false };
   return captureInheritedCwd(source, probe, { liveCwd, allowSshProbe });
 }
@@ -681,10 +673,12 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
     });
     switch (action) {
       case 'switchToTab': {
-        // Prefer physical Digit code so Shift+[1...9] works when e.key is "!" etc.
-        const num = tabShortcutDigitFromEvent(e);
-        if (num !== null && num <= shortcutTabs.length) {
-          setActiveTabId(shortcutTabs[num - 1]);
+        // Get the number key pressed (1-9)
+        const num = parseInt(e.key, 10);
+        if (num >= 1 && num <= 9) {
+          if (num <= shortcutTabs.length) {
+            setActiveTabId(shortcutTabs[num - 1]);
+          }
         }
         break;
       }

application/app/AppSideEffects.tsx

@@ -18,7 +18,6 @@ import {
 import { getNotesSnapshot } from '../state/notesStore';
 import { useVaultAgentBridge } from '../state/useVaultAgentBridge';
 import { useWindowControls } from '../state/useWindowControls';
-import { useTerminalKeyboardFocus } from '../state/useTerminalKeyboardFocus';
 import { useEditorTabChromeList } from '../state/editorTabStore';
 import {
   isPluginViewTabId,
@@ -72,7 +71,6 @@ import { useExternalMcpSessionSync } from '../state/useExternalMcpSessionSync';
 import {
   STORAGE_KEY_DEBUG_HOTKEYS,
   STORAGE_KEY_PORT_FORWARDING,
-  STORAGE_KEY_STARTUP_LANDING,
 } from '../../infrastructure/config/storageKeys';
 import { getEffectiveKnownHosts } from '../../infrastructure/syncHelpers';
 import { toast } from '../../components/ui/toast';
@@ -80,12 +78,11 @@ import { VaultSection } from '../../components/VaultView';
 import { KeyboardInteractiveRequest } from '../../components/KeyboardInteractiveModal';
 import { PassphraseRequest } from '../../components/PassphraseModal';
 import { classifyLocalShellType } from '../../lib/localShell';
-import { useDiscoveredShells, resolveShellSetting, ensureDiscoveredShells } from '../../lib/useDiscoveredShells';
+import { useDiscoveredShells, resolveShellSetting } from '../../lib/useDiscoveredShells';
 import { Host, HostProtocol, KnownHost, SerialConfig, Snippet, SSHKey, TerminalSession } from '../../types';
 import { resolveSnippetCommand } from '../../components/SnippetExecutionProvider';
 import { isScriptSnippet } from '../../domain/snippetScript.ts';
 import { collectSnippetDeleteIds } from '../../domain/snippetSelection.ts';
-import { shouldOpenLocalTerminalOnStartup, resolveStartupLandingSetting } from '../../domain/startupLanding';
 import { useAppStartupEffects } from './useAppStartupEffects';
 import { handleTrayJumpToSessionImpl, handleTrayTogglePortForwardImpl, handleTrayPanelConnectImpl, handleTrayPanelConnectRequestImpl, flushQueuedTrayPanelConnectHostsImpl, handleGlobalHotkeyKeyDownImpl, handleEscapeKeyDownImpl, handleKeyboardInteractiveSubmitImpl, handleKeyboardInteractiveCancelImpl, handlePassphraseSubmitImpl, handlePassphraseCancelImpl, handlePassphraseSkipImpl, createLocalTerminalWithCurrentShellImpl, splitSessionWithCurrentShellImpl, copySessionWithCurrentShellImpl, copyWorkspaceWithCurrentShellImpl, copySessionToNewWindowWithCurrentShellImpl, confirmIfBusyLocalTerminalImpl, closeTabsBatchImpl, executeHotkeyActionImpl, handleCreateLocalTerminalImpl, handleConnectToHostImpl, handleTerminalDataCaptureImpl, hasMultipleProtocolsImpl, handleHostConnectWithProtocolCheckImpl, handleProtocolSelectImpl, handleRootContextMenuImpl } from './AppHandlers';
 
@@ -135,15 +132,12 @@ export function AppSideEffects() {
     terminalSettings,
     hotkeyScheme,
     keyBindings,
-    disableTerminalFontZoom,
     isHotkeyRecording,
     showSftpTab,
     shellOnlyTabNumberShortcuts,
     workspaceFocusStyle,
   } = settings;
 
-  useTerminalKeyboardFocus(hotkeyScheme !== 'disabled' && !disableTerminalFontZoom);
-
   const discoveredShells = useDiscoveredShells();
 
   // Sync workspace focus indicator style to DOM for CSS targeting
@@ -202,7 +196,6 @@ export function AppSideEffects() {
     readPersistedHosts,
     groupConfigs,
     updateGroupConfigs,
-    commitVaultGroupMutation,
   } = vaultState;
 
   const hostsRef = useRef(hosts);
@@ -1179,100 +1172,6 @@ export function AppSideEffects() {
     );
   }, [addConnectionLog, createLocalTerminal, terminalSettings, discoveredShells]);
 
-  // Cold-start landing: open a local terminal once when preferred and nothing
-  // was restored. Wait for queued launch intents (deep links / Explorer open)
-  // and shell discovery so we neither duplicate tabs nor mislabel WSL/Git Bash.
-  const startupLocalTerminalAttemptedRef = useRef(false);
-  const startupLaunchIntentReceivedRef = useRef(false);
-  const sessionsLengthRef = useRef(sessions.length);
-  const workspacesLengthRef = useRef(workspaces.length);
-  sessionsLengthRef.current = sessions.length;
-  workspacesLengthRef.current = workspaces.length;
-  const [coldStartIntentsSettled, setColdStartIntentsSettled] = useState(false);
-
-  useEffect(() => {
-    if (isPeerSessionWindow) {
-      setColdStartIntentsSettled(true);
-      return;
-    }
-    const bridge = netcattyBridge.get();
-    if (!bridge?.onColdStartIntentsSettled) {
-      setColdStartIntentsSettled(true);
-      return;
-    }
-    return bridge.onColdStartIntentsSettled(() => {
-      setColdStartIntentsSettled(true);
-    });
-  }, [isPeerSessionWindow]);
-
-  useEffect(() => {
-    if (startupLocalTerminalAttemptedRef.current) return;
-    if (isPeerSessionWindow) {
-      startupLocalTerminalAttemptedRef.current = true;
-      return;
-    }
-
-    const landing = resolveStartupLandingSetting(
-      localStorageAdapter.readString(STORAGE_KEY_STARTUP_LANDING),
-    );
-    if (landing !== 'local-terminal') {
-      startupLocalTerminalAttemptedRef.current = true;
-      return;
-    }
-    if (sessions.length > 0 || workspaces.length > 0) {
-      startupLocalTerminalAttemptedRef.current = true;
-      return;
-    }
-    if (!coldStartIntentsSettled) return;
-
-    let cancelled = false;
-    void (async () => {
-      const shells = await ensureDiscoveredShells();
-      if (cancelled || startupLocalTerminalAttemptedRef.current) return;
-
-      if (!shouldOpenLocalTerminalOnStartup({
-        startupLanding: landing,
-        hasRestoredSessionState:
-          sessionsLengthRef.current > 0 || workspacesLengthRef.current > 0,
-        isPeerSessionWindow: false,
-        hasQueuedStartupIntent: startupLaunchIntentReceivedRef.current,
-      })) {
-        startupLocalTerminalAttemptedRef.current = true;
-        return;
-      }
-
-      const resolved = resolveShellSetting(
-        terminalSettings.localShell,
-        shells,
-        terminalSettings.localShellArgs,
-      );
-      const matchedShell = shells.find((shell) => shell.id === terminalSettings.localShell);
-      startupLocalTerminalAttemptedRef.current = true;
-      handleCreateLocalTerminal(
-        resolved
-          ? {
-              command: resolved.command,
-              args: resolved.args,
-              name: matchedShell?.name,
-              icon: matchedShell?.icon,
-            }
-          : undefined,
-      );
-    })();
-
-    return () => {
-      cancelled = true;
-    };
-  }, [
-    coldStartIntentsSettled,
-    handleCreateLocalTerminal,
-    isPeerSessionWindow,
-    sessions.length,
-    terminalSettings.localShell,
-    terminalSettings.localShellArgs,
-    workspaces.length,
-  ]);
-
   const proxyProfileIdSet = useMemo(
     () => new Set(proxyProfiles.map((profile) => profile.id)),
     [proxyProfiles],
@@ -1380,7 +1279,6 @@ export function AppSideEffects() {
     groupConfigs,
     updateGroupConfigs,
     updateManagedSources,
-    commitVaultGroupMutation,
     updatePortForwardingRules: importPortForwardingRules,
     startTunnel,
     stopTunnel,
@@ -1391,7 +1289,6 @@ export function AppSideEffects() {
   });
 
   const _handleSshDeepLink = useEffectEvent((payload: { url?: string }) => {
-    startupLaunchIntentReceivedRef.current = true;
     const rawUrl = payload?.url || '';
     const target = parseSshDeepLink(rawUrl);
     if (!target) {
@@ -1449,7 +1346,6 @@ export function AppSideEffects() {
   }, [isPeerSessionWindow]);
 
   const _handleTelnetDeepLink = useEffectEvent((payload: { url?: string }) => {
-    startupLaunchIntentReceivedRef.current = true;
     const rawUrl = payload?.url || '';
     const target = parseTelnetDeepLink(rawUrl);
     if (!target) {
@@ -1496,7 +1392,6 @@ export function AppSideEffects() {
   }, [isPeerSessionWindow]);
 
   const _handleJmsDeepLink = useEffectEvent((payload: { url?: string }) => {
-    startupLaunchIntentReceivedRef.current = true;
     const rawUrl = payload?.url || '';
     const target = parseJmsDeepLink(rawUrl);
     if (!target) {
@@ -1536,7 +1431,6 @@ export function AppSideEffects() {
   }, [sessions]);
 
   const _handleOpenTerminalPath = useEffectEvent((payload: { path?: string }) => {
-    startupLaunchIntentReceivedRef.current = true;
     const localStartDir = typeof payload?.path === 'string' ? payload.path : '';
     if (!localStartDir.trim()) return;
     handleCreateLocalTerminal(undefined, { localStartDir });

application/app/AppView.tsx

@@ -34,7 +34,6 @@ import { useMainWindowInputFocusRecovery } from '../state/useMainWindowInputFocu
 import { useExternalMcpToggleState } from '../state/useExternalMcpToggleState';
 import { selectPluginThemeTokens } from '../state/pluginContributionEnvironment';
 import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
-import { resolveEffectiveTerminalHost } from '../../domain/terminalHostResolution';
 import { pluginViewTabStore, usePluginViewTabs } from '../state/pluginViewTabStore';
 import { buildPluginSettingScopeCatalog } from '../state/usePluginSettingScopeCatalog';
 import { useWorkSurfaceHostEditor } from '../state/useWorkSurfaceHostEditor';
@@ -258,7 +257,7 @@ function AppViewInner({ domains }: AppViewProps) {
 
   const {
     addShellHistoryEntry, removeShellHistoryEntry, addSessionToWorkspace, addToWorkspaceDialog, appendHostToWorkspace, appendLocalTerminalToWorkspace,
-    clearAndRemoveSource, clearAndRemoveSources, closeLogView, closeSession, closeTabsBatch, closeWorkspace, commitPluginImporterData, commitVaultImportTransaction, commitVaultGroupMutation, copySessionToNewWindowWithCurrentShell, copySessionWithCurrentShell, copyWorkspaceWithCurrentShell,
+    clearAndRemoveSource, clearAndRemoveSources, closeLogView, closeSession, closeTabsBatch, closeWorkspace, commitPluginImporterData, commitVaultImportTransaction, copySessionToNewWindowWithCurrentShell, copySessionWithCurrentShell, copyWorkspaceWithCurrentShell,
     convertKnownHostToHost, createWorkspaceFromSessions, createWorkspaceFromTargets, createWorkspaceWithHosts,
     customGroups, currentTerminalTheme, deepLinkHostDraft, draggingSessionId, effectiveKnownHosts, editorTabs, editorWordWrap, emptyVaultConflict,
     followAppTerminalTheme,
@@ -318,29 +317,6 @@ function AppViewInner({ domains }: AppViewProps) {
     setAddToWorkspaceDialog({ mode: 'append', workspaceId });
   }, [setAddToWorkspaceDialog]);
 
-  const validProxyProfileIds = useMemo(
-    () => new Set(proxyProfiles.map((profile) => profile.id)),
-    [proxyProfiles],
-  );
-
-  const resolveWorkspaceAppendHost = useCallback((host: typeof hosts[number]) => (
-    resolveEffectiveTerminalHost({
-      host,
-      groupConfigs,
-      proxyProfiles,
-      validProxyProfileIds,
-    })
-  ), [groupConfigs, proxyProfiles, validProxyProfileIds]);
-
-  const handleAppendHostToWorkspace = useCallback((workspaceId: string, hostId: string) => {
-    const host = hosts.find((entry) => entry.id === hostId);
-    if (!host) return;
-    const ws = workspaces.find((entry) => entry.id === workspaceId);
-    if (!ws) return;
-    const rootDir = ws.root.type === 'split' ? ws.root.direction : 'vertical';
-    appendHostToWorkspace(workspaceId, resolveWorkspaceAppendHost(host), rootDir);
-  }, [appendHostToWorkspace, hosts, resolveWorkspaceAppendHost, workspaces]);
-
   const isPeerSessionWindow = typeof window !== 'undefined'
     && window.location.hash.startsWith('#/session-window');
   const externalMcpToggle = useExternalMcpToggleState();
@@ -495,10 +471,8 @@ function AppViewInner({ domains }: AppViewProps) {
         onEndSessionDrag={handleEndSessionDrag}
         onReorderTabs={reorderWorkTabs}
         onRemoveSessionFromWorkspace={removeSessionFromWorkspace}
-        onAppendHostToWorkspace={handleAppendHostToWorkspace}
         showSftpTab={showSftpTab}
         showHostTreeSidebar={showHostTreeSidebar}
-        switchTabKeyBinding={keyBindings.find((binding) => binding.action === 'switchToTab') ?? null}
         dynamicTabTitleMode={dynamicTabTitleMode}
         editorTabs={editorTabs}
         pluginViewTabs={pluginViewTabs}
@@ -592,7 +566,6 @@ function AppViewInner({ domains }: AppViewProps) {
             onUpdateManagedSources={updateManagedSources}
             onReadPersistedManagedSources={readPersistedManagedSources}
             onCommitVaultImportTransaction={commitVaultImportTransaction}
-            onCommitVaultGroupMutation={commitVaultGroupMutation}
             onClearAndRemoveManagedSource={clearAndRemoveSource}
             onClearAndRemoveManagedSources={clearAndRemoveSources}
             onUnmanageSource={unmanageSource}
@@ -685,7 +658,6 @@ function AppViewInner({ domains }: AppViewProps) {
           onCreateWorkspaceFromSessions={createWorkspaceFromSessions}
           onAddSessionToWorkspace={addSessionToWorkspace}
           onRequestAddToWorkspace={handleRequestAddToWorkspace}
-          onAppendHostToWorkspace={handleAppendHostToWorkspace}
           onUpdateSplitSizes={updateSplitSizes}
           onSetDraggingSessionId={setDraggingSessionId}
           onToggleWorkspaceViewMode={toggleWorkspaceViewMode}
@@ -807,7 +779,13 @@ function AppViewInner({ domains }: AppViewProps) {
         <AddToWorkspaceDialog
           open
           onOpenChange={(open) => { if (!open) setAddToWorkspaceDialog(null); }}
-          hosts={hosts}
+          // Filter serial hosts only in append mode — appendHostToWorkspace
+          // has no serial code path. Create mode goes through
+          // createWorkspaceFromTargets, which builds a SerialConfig-backed
+          // session for serial hosts, so those should remain pickable.
+          hosts={addToWorkspaceDialog.mode === 'append'
+            ? hosts.filter((h) => h.protocol !== 'serial')
+            : hosts}
           workspaceTitle={
             addToWorkspaceDialog.mode === 'append'
               ? workspaces.find((w) => w.id === addToWorkspaceDialog.workspaceId)?.title
@@ -826,11 +804,7 @@ function AppViewInner({ domains }: AppViewProps) {
                 if (target.kind === 'local') {
                   appendLocalTerminalToWorkspace(addToWorkspaceDialog.workspaceId, undefined, rootDir);
                 } else {
-                  appendHostToWorkspace(
-                    addToWorkspaceDialog.workspaceId,
-                    resolveWorkspaceAppendHost(target.host),
-                    rootDir,
-                  );
+                  appendHostToWorkspace(addToWorkspaceDialog.workspaceId, target.host, rootDir);
                 }
               }
             } else {

application/app/AppView.workspaceHostAppend.test.ts

@@ -1,19 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-const source = readFileSync(new URL('./AppView.tsx', import.meta.url), 'utf8');
-
-test('workspace append resolves group defaults before creating host sessions', () => {
-  assert.match(source, /resolveEffectiveTerminalHost\(\{/);
-  assert.match(source, /groupConfigs,/);
-  assert.match(source, /proxyProfiles,/);
-  assert.match(
-    source,
-    /appendHostToWorkspace\(workspaceId, resolveWorkspaceAppendHost\(host\), rootDir\)/,
-  );
-  assert.match(
-    source,
-    /appendHostToWorkspace\([\s\S]*?resolveWorkspaceAppendHost\(target\.host\),[\s\S]*?rootDir/,
-  );
-});

application/app/hosts/VaultHost.tsx

@@ -38,7 +38,6 @@ export function VaultHost() {
       removeShellHistoryEntry: actions?.removeShellHistoryEntry,
       commitPluginImporterData: actions?.commitPluginImporterData,
       commitVaultImportTransaction: actions?.commitVaultImportTransaction,
-      commitVaultGroupMutation: actions?.commitVaultGroupMutation,
       convertKnownHostToHost: actions?.convertKnownHostToHost,
       customGroups: vault.customGroups,
       deepLinkHostDraft: local.deepLinkHostDraft,

application/app/publishers/VaultPublisher.tsx

@@ -67,7 +67,6 @@ export function VaultPublisher({ children }: VaultPublisherProps) {
     readPersistedManagedSources,
     commitPluginImporterData,
     commitVaultImportTransaction,
-    commitVaultGroupMutation,
     updateHostDistro,
     updateHostLastConnected,
     addShellHistoryEntry,
@@ -139,7 +138,6 @@ export function VaultPublisher({ children }: VaultPublisherProps) {
       readPersistedManagedSources,
       commitPluginImporterData,
       commitVaultImportTransaction,
-      commitVaultGroupMutation,
       updateHostDistro,
       updateHostLastConnected,
       addShellHistoryEntry,
@@ -152,7 +150,6 @@ export function VaultPublisher({ children }: VaultPublisherProps) {
     addShellHistoryEntry,
     commitPluginImporterData,
     commitVaultImportTransaction,
-    commitVaultGroupMutation,
     convertKnownHostToHost,
     importOrReuseKey,
     readPersistedHosts,

application/app/tabShortcutTargets.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { buildNumberShortcutTabTargets, buildTabShortcutNumberById } from './tabShortcutTargets.ts';
+import { buildNumberShortcutTabTargets } from './tabShortcutTargets.ts';
 
 test('number shortcut tabs include vault and sftp by default', () => {
   assert.deepEqual(
@@ -62,43 +62,3 @@ test('pinned tabs cannot be duplicated by a malformed persisted work ordering',
     ['vault', 'sftp', 'session-1'],
   );
 });
-
-test('shortcut number map uses 1-based indices matching Ctrl/Cmd+[1...9]', () => {
-  const map = buildTabShortcutNumberById({
-    showSftpTab: true,
-    shellOnlyTabNumberShortcuts: false,
-    orderedTabs: ['session-1', 'workspace-1'],
-    editorTabIds: [],
-  });
-  assert.equal(map.get('vault'), 1);
-  assert.equal(map.get('sftp'), 2);
-  assert.equal(map.get('session-1'), 3);
-  assert.equal(map.get('workspace-1'), 4);
-});
-
-test('shortcut number map skips pinned tabs in shell-only mode', () => {
-  const map = buildTabShortcutNumberById({
-    showSftpTab: true,
-    shellOnlyTabNumberShortcuts: true,
-    orderedTabs: ['session-1', 'workspace-1'],
-    editorTabIds: [],
-  });
-  assert.equal(map.has('vault'), false);
-  assert.equal(map.has('sftp'), false);
-  assert.equal(map.get('session-1'), 1);
-  assert.equal(map.get('workspace-1'), 2);
-});
-
-test('shortcut number map caps at nine entries', () => {
-  const orderedTabs = Array.from({ length: 12 }, (_, index) => `session-${index + 1}`);
-  const map = buildTabShortcutNumberById({
-    showSftpTab: false,
-    shellOnlyTabNumberShortcuts: true,
-    orderedTabs,
-    editorTabIds: [],
-  });
-  assert.equal(map.size, 9);
-  assert.equal(map.get('session-1'), 1);
-  assert.equal(map.get('session-9'), 9);
-  assert.equal(map.has('session-10'), false);
-});

application/app/tabShortcutTargets.ts

@@ -12,22 +12,3 @@ export function buildNumberShortcutTabTargets(params: {
   const pinnedTabs = params.showSftpTab ? ['vault', 'sftp'] : ['vault'];
   return [...new Set([...pinnedTabs, ...workTabs])];
 }
-
-/**
- * Maps tab ids to Cmd/Ctrl+[1...9] shortcut indices (1-based).
- * Only the first nine shortcut targets receive a number.
- */
-export function buildTabShortcutNumberById(params: {
-  showSftpTab: boolean;
-  shellOnlyTabNumberShortcuts: boolean;
-  orderedTabs: readonly string[];
-  editorTabIds: readonly string[];
-}): ReadonlyMap<string, number> {
-  const targets = buildNumberShortcutTabTargets(params);
-  const map = new Map<string, number>();
-  const limit = Math.min(9, targets.length);
-  for (let index = 0; index < limit; index += 1) {
-    map.set(targets[index], index + 1);
-  }
-  return map;
-}

application/i18n/locales/en/ai.ts

@@ -53,7 +53,6 @@ export const enAiMessages: Messages = {
   'ai.providers.apiKey.placeholder': 'Enter API key',
   'ai.providers.apiKey.decrypting': 'Decrypting...',
   'ai.providers.baseUrl': 'Base URL',
-  'ai.providers.baseUrl.anthropicHelp': 'Anthropic-compatible: host with or without /v1 (for example https://gateway.example or https://gateway.example/v1). Detection and chat both use /v1/models and /v1/messages.',
   'ai.providers.skipTLSVerify': 'Skip TLS certificate verification (for self-signed certs)',
   'ai.providers.defaultModel': 'Default Model',
   'ai.providers.defaultModel.placeholder': 'e.g. gpt-4o, claude-sonnet-4-20250514',
@@ -62,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

@@ -173,10 +173,6 @@ export const enCoreMessages: Messages = {
 
   // Settings > Session Restore
   'settings.sessionRestore.title': 'Session Restore',
-  'settings.sessionRestore.startupLanding': 'On launch',
-  'settings.sessionRestore.startupLandingDesc': 'Choose whether to open the host home page or a local terminal when Netcatty starts with no restored sessions.',
-  'settings.sessionRestore.startupLanding.vault': 'Home (hosts)',
-  'settings.sessionRestore.startupLanding.localTerminal': 'Local terminal',
   'settings.sessionRestore.restorePreviousSession': 'Restore previous tabs and workspaces',
   'settings.sessionRestore.restorePreviousSessionDesc': 'Reopen terminal tabs and workspace layouts from the last app session.',
   'settings.sessionRestore.restoreTerminalCwd': 'Restore terminal working directory',
@@ -793,8 +789,6 @@ Highlight the focused split pane:
   'settings.shortcuts.disableTerminalFontZoom.desc': 'Turn off terminal font zoom shortcuts, including Cmd/Ctrl + mouse wheel.',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': 'Tab shortcuts skip pinned tabs',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': 'When enabled, Cmd/Ctrl+[1...9] and Ctrl+Tab switch only work tabs (terminals, workspaces, editors), not the pinned Vault or SFTP tabs.',
-  'settings.shortcuts.showTabNumberBadges.label': 'Show tab number badges',
-  'settings.shortcuts.showTabNumberBadges.desc': 'While holding Cmd/Ctrl, show 1-9 on tabs that match Cmd/Ctrl+[1...9], so you can jump accurately.',
   'settings.shortcuts.section.custom': 'Custom Shortcuts',
   'settings.shortcuts.resetAll': 'Reset All',
   'settings.shortcuts.recording': 'Press keys...',

application/i18n/locales/en/scripts.ts

@@ -18,11 +18,8 @@ export const enScriptsMessages = {
   'scripts.editor.modalSubtitle': 'Edit metadata and script code in a larger workspace.',
   'scripts.editor.lineCount': '{count} lines',
   'scripts.editor.resize': 'Resize editor',
-  'scripts.targets.hint': 'Selected groups are resolved dynamically, so hosts added later are included automatically.',
+  'scripts.targets.hint': 'Automatic triggers apply to selected hosts, or to all hosts when that option is enabled.',
   'scripts.targets.connectOrderHint': 'Run order for connect scripts is configured per host under Host details → Automation.',
-  'scripts.targets.currentHostMismatch': 'This script is not assigned to the current host.',
-  'hostDetails.automation.groupScripts': 'Inherited group scripts',
-  'hostDetails.automation.groupScriptsHint': 'These scripts follow the host group dynamically and are ordered before the host-specific queue.',
   'scripts.actions.runNowHint': 'Run on selected targets, or on all connectable hosts when that option is enabled.',
   'scripts.actions.runParallel': 'Run on all tabs (parallel)',
   'scripts.actions.runSequential': 'Run on all tabs (sequential)',

application/i18n/locales/en/systemManager.ts

@@ -13,7 +13,6 @@ export const enSystemManagerMessages: Messages = {
   '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.',
 

application/i18n/locales/en/terminal.ts

@@ -659,9 +659,6 @@ export const enTerminalMessages: Messages = {
   'snippets.scriptEditor.modalTitle': 'Edit script',
   'snippets.targets.title': 'Targets',
   'snippets.targets.add': 'Add targets',
-  'snippets.targets.selectHosts': 'Hosts',
-  'snippets.targets.selectGroups': 'Groups',
-  'snippets.targets.noGroups': 'No groups found',
   'snippets.targets.allHosts': 'Apply to all hosts',
   'snippets.targets.allHostsShort': 'All hosts',
   'snippets.targets.allHostsActive': 'Applies to every connectable host.',

application/i18n/locales/ru/ai.ts

@@ -34,7 +34,6 @@ export const ruAiMessages: Messages = {
   'ai.providers.apiKey.placeholder': 'Введите API-ключ',
   'ai.providers.apiKey.decrypting': 'Расшифровка...',
   'ai.providers.baseUrl': 'Базовый URL',
-  'ai.providers.baseUrl.anthropicHelp': 'Anthropic-совместимый: хост с /v1 или без (например https://gateway.example или https://gateway.example/v1). Проверка и чат используют /v1/models и /v1/messages.',
   'ai.providers.skipTLSVerify': 'Пропустить проверку TLS-сертификата (для самоподписанных сертификатов)',
   'ai.providers.defaultModel': 'Модель по умолчанию',
   'ai.providers.defaultModel.placeholder': 'например, gpt-4o, claude-sonnet-4-20250514',
@@ -43,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

@@ -734,8 +734,6 @@ export const ruCoreMessages: Messages = {
   'settings.shortcuts.disableTerminalFontZoom.desc': 'Отключает быстрый масштаб текста в терминале, включая Cmd/Ctrl + колесо мыши.',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': 'Сочетания без закреплённых вкладок',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': 'Если включено, Cmd/Ctrl+[1...9] и Ctrl+Tab переключают только рабочие вкладки (терминалы, рабочие области, редакторы), а не закреплённые Vault и SFTP.',
-  'settings.shortcuts.showTabNumberBadges.label': 'Номера на вкладках',
-  'settings.shortcuts.showTabNumberBadges.desc': 'Показывать 1-9 на вкладках при удержании Cmd/Ctrl, чтобы точнее переключаться через Cmd/Ctrl+[1...9].',
   'settings.shortcuts.section.custom': 'Пользовательские сочетания',
   'settings.shortcuts.resetAll': 'Сбросить все',
   'settings.shortcuts.recording': 'Нажмите клавиши...',

application/i18n/locales/ru/scripts.ts

@@ -18,11 +18,8 @@ export const ruScriptsMessages = {
   'scripts.editor.modalSubtitle': 'Редактируйте метаданные и код скрипта в большом рабочем пространстве.',
   'scripts.editor.lineCount': '{count} строк',
   'scripts.editor.resize': 'Изменить размер редактора',
-  'scripts.targets.hint': 'Выбранные группы разрешаются динамически, поэтому новые хосты включаются автоматически.',
+  'scripts.targets.hint': 'Автоматические триггеры применяются к выбранным хостам или ко всем хостам, если включена эта настройка.',
   'scripts.targets.connectOrderHint': 'Порядок запуска скриптов подключения настраивается для каждого хоста в разделе «Сведения о хосте → Автоматизация».',
-  'scripts.targets.currentHostMismatch': 'Этот скрипт не назначен текущему хосту.',
-  'hostDetails.automation.groupScripts': 'Унаследованные скрипты группы',
-  'hostDetails.automation.groupScriptsHint': 'Эти скрипты динамически следуют за группой хоста и выполняются перед очередью хоста.',
   'scripts.actions.runNowHint': 'Запускается для выбранных целей либо для всех доступных для подключения хостов, если включена эта настройка.',
   'scripts.actions.runParallel': 'Запустить на всех вкладках (параллельно)',
   'scripts.actions.runSequential': 'Запустить на всех вкладках (последовательно)',

application/i18n/locales/ru/systemManager.ts

@@ -13,7 +13,6 @@ export const ruSystemManagerMessages: Messages = {
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': 'Разделы системного менеджера',
   'systemManager.popup.loading': 'Открытие терминала…',
   'systemManager.popup.startupFailed': 'Команда запуска не была выполнена успешно. Проверьте, что цель доступна, и повторите попытку.',
 

application/i18n/locales/ru/terminal.ts

@@ -681,9 +681,6 @@ export const ruTerminalMessages: Messages = {
   'snippets.field.variableDefault': 'по умолчанию {value}',
   'snippets.targets.title': 'Цели',
   'snippets.targets.add': 'Добавить цели',
-  'snippets.targets.selectHosts': 'Хосты',
-  'snippets.targets.selectGroups': 'Группы',
-  'snippets.targets.noGroups': 'Группы не найдены',
   'snippets.history.title': 'История оболочки',
   'snippets.history.subtitle': '{count} команд',
   'snippets.history.emptyTitle': 'История оболочки пока пуста',

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

@@ -53,7 +53,6 @@ export const zhCNAiMessages: Messages = {
   'ai.providers.apiKey.placeholder': '输入 API Key',
   'ai.providers.apiKey.decrypting': '解密中...',
   'ai.providers.baseUrl': 'Base URL',
-  'ai.providers.baseUrl.anthropicHelp': 'Anthropic 兼容：可填不带或带 /v1 的主机（例如 https://gateway.example 或 https://gateway.example/v1）。检测与聊天都会请求 /v1/models、/v1/messages。',
   'ai.providers.skipTLSVerify': '跳过 TLS 证书验证（用于自签名证书）',
   'ai.providers.defaultModel': '默认模型',
   'ai.providers.defaultModel.placeholder': '例如 gpt-4o, claude-sonnet-4-20250514',
@@ -62,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

@@ -170,10 +170,6 @@ export const zhCNCoreMessages: Messages = {
 
   // Settings > Session Restore
   'settings.sessionRestore.title': '会话恢复',
-  'settings.sessionRestore.startupLanding': '启动时打开',
-  'settings.sessionRestore.startupLandingDesc': '当没有可恢复的会话时，选择启动后进入主机主页还是直接打开本地终端。',
-  'settings.sessionRestore.startupLanding.vault': '主页（主机）',
-  'settings.sessionRestore.startupLanding.localTerminal': '本地终端',
   'settings.sessionRestore.restorePreviousSession': '恢复上次的标签页和工作区',
   'settings.sessionRestore.restorePreviousSessionDesc': '启动时重新打开上次的终端标签页和工作区布局。',
   'settings.sessionRestore.restoreTerminalCwd': '恢复终端工作目录',

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

@@ -18,11 +18,8 @@ export const zhCNScriptsMessages = {
   'scripts.editor.modalSubtitle': '在更大的工作区中编辑脚本元数据和代码。',
   'scripts.editor.lineCount': '{count} 行',
   'scripts.editor.resize': '调整编辑器高度',
-  'scripts.targets.hint': '所选分组会动态匹配，之后加入分组的主机也会自动生效。',
+  'scripts.targets.hint': '自动触发作用于所选主机；勾选「对所有主机生效」则作用于全部可连接主机。',
   'scripts.targets.connectOrderHint': '连接脚本的执行顺序请在主机详情 → 自动化 中调整。',
-  'scripts.targets.currentHostMismatch': '此脚本未分配给当前主机。',
-  'hostDetails.automation.groupScripts': '分组继承脚本',
-  'hostDetails.automation.groupScriptsHint': '这些脚本动态跟随主机所在分组，并在主机专属队列之前执行。',
   'scripts.actions.runNowHint': '在所选目标主机上运行；勾选「对所有主机生效」时在所有可连接主机上运行。',
   'scripts.actions.runParallel': '在所有标签页并行运行',
   'scripts.actions.runSequential': '在所有标签页顺序运行',

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

@@ -13,7 +13,6 @@ export const zhCnSystemManagerMessages: Messages = {
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': '系统管理分区',
   'systemManager.popup.loading': '正在打开终端…',
   'systemManager.popup.startupFailed': '启动命令未成功。请确认目标仍然可用后重试。',
 

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

@@ -513,8 +513,6 @@ export const zhCNTerminalMessages: Messages = {
   'settings.shortcuts.disableTerminalFontZoom.desc': '关闭终端文字缩放快捷操作，包括 Cmd/Ctrl 加滚轮。',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': '标签快捷键跳过固定标签',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': '开启后，Cmd/Ctrl+[1...9] 和 Ctrl+Tab 仅在终端、工作区、编辑器等可关闭标签页之间切换，不包括固定的 Vault 和 SFTP 标签页。',
-  'settings.shortcuts.showTabNumberBadges.label': '显示标签页序号角标',
-  'settings.shortcuts.showTabNumberBadges.desc': '按住 Cmd/Ctrl 时，在对应 Cmd/Ctrl+[1...9] 的标签页上显示 1-9，方便准确切换。',
   'settings.shortcuts.section.custom': '自定义快捷键',
   'settings.shortcuts.resetAll': '全部重置',
   'settings.shortcuts.recording': '请按键...',
@@ -742,11 +740,8 @@ export const zhCNTerminalMessages: Messages = {
   'snippets.scriptEditor.expand': '弹窗编辑',
   'snippets.scriptEditor.resize': '调整编辑器高度',
   'snippets.scriptEditor.modalTitle': '编辑脚本',
-  'snippets.targets.title': '执行目标',
-  'snippets.targets.add': '添加目标',
-  'snippets.targets.selectHosts': '选择主机',
-  'snippets.targets.selectGroups': '选择分组',
-  'snippets.targets.noGroups': '未找到分组',
+  'snippets.targets.title': '目标主机',
+  'snippets.targets.add': '添加目标主机',
   'snippets.targets.allHosts': '对所有主机生效',
   'snippets.targets.allHostsShort': '所有主机',
   'snippets.targets.allHostsActive': '将作用于所有可连接的主机。',

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

@@ -53,7 +53,6 @@ export const zhTWAiMessages: Messages = {
   'ai.providers.apiKey.placeholder': '輸入 API Key',
   'ai.providers.apiKey.decrypting': '解密中...',
   'ai.providers.baseUrl': 'Base URL',
-  'ai.providers.baseUrl.anthropicHelp': 'Anthropic 相容：可填不帶或帶 /v1 的主機（例如 https://gateway.example 或 https://gateway.example/v1）。偵測與聊天都會請求 /v1/models、/v1/messages。',
   'ai.providers.skipTLSVerify': '跳過 TLS 憑證驗證（用於自我簽署憑證）',
   'ai.providers.defaultModel': '預設模型',
   'ai.providers.defaultModel.placeholder': '例如 gpt-4o, claude-sonnet-4-20250514',
@@ -62,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

@@ -170,10 +170,6 @@ export const zhTWCoreMessages: Messages = {
 
   // Settings > Session Restore
   'settings.sessionRestore.title': '工作階段恢復',
-  'settings.sessionRestore.startupLanding': '啟動時開啟',
-  'settings.sessionRestore.startupLandingDesc': '當沒有可恢復的工作階段時，選擇啟動後進入主機主頁還是直接開啟本機終端。',
-  'settings.sessionRestore.startupLanding.vault': '主頁（主機）',
-  'settings.sessionRestore.startupLanding.localTerminal': '本機終端',
   'settings.sessionRestore.restorePreviousSession': '恢復上次的標籤頁和工作區',
   'settings.sessionRestore.restorePreviousSessionDesc': '啟動時重新開啟上次的終端標籤頁和工作區佈局。',
   'settings.sessionRestore.restoreTerminalCwd': '恢復終端工作目錄',

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

@@ -18,11 +18,8 @@ export const zhTWScriptsMessages = {
   'scripts.editor.modalSubtitle': '在更大的工作區中編輯指令碼的中繼資料與程式碼。',
   'scripts.editor.lineCount': '{count} 行',
   'scripts.editor.resize': '調整編輯器高度',
-  'scripts.targets.hint': '所選分組會動態比對，之後加入分組的主機也會自動生效。',
+  'scripts.targets.hint': '自動觸發會作用於所選主機；勾選「對所有主機生效」則作用於全部可連線的主機。',
   'scripts.targets.connectOrderHint': '連線指令碼的執行順序請在主機詳情 → 自動化 中調整。',
-  'scripts.targets.currentHostMismatch': '此指令碼未分配給目前主機。',
-  'hostDetails.automation.groupScripts': '分組繼承指令碼',
-  'hostDetails.automation.groupScriptsHint': '這些指令碼會動態跟隨主機所在分組，並在主機專屬佇列之前執行。',
   'scripts.actions.runNowHint': '在所選目標主機上執行；勾選「對所有主機生效」時在所有可連線的主機上執行。',
   'scripts.actions.runParallel': '在所有標籤頁並行執行',
   'scripts.actions.runSequential': '在所有標籤頁依序執行',

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

@@ -13,7 +13,6 @@ export const zhTwSystemManagerMessages: Messages = {
   'systemManager.tabs.tmux': 'tmux',
   'systemManager.tabs.docker': 'Docker',
   'systemManager.tabs.gpu': 'GPU',
-  'systemManager.tabs.ariaLabel': '系統管理分區',
   'systemManager.popup.loading': '正在開啟終端…',
   'systemManager.popup.startupFailed': '啟動指令未順利完成。請確認目標仍可使用後再試一次。',
 

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

@@ -513,8 +513,6 @@ export const zhTWTerminalMessages: Messages = {
   'settings.shortcuts.disableTerminalFontZoom.desc': '關閉終端文字縮放快捷操作，包括 Cmd/Ctrl 加滾輪。',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.label': '標籤快捷鍵跳過固定標籤',
   'settings.shortcuts.shellOnlyTabNumberShortcuts.desc': '開啟後，Cmd/Ctrl+[1...9] 和 Ctrl+Tab 僅在終端、工作區、編輯器等可關閉標籤頁之間切換，不包括固定的 Vault 和 SFTP 標籤頁。',
-  'settings.shortcuts.showTabNumberBadges.label': '顯示標籤頁序號角標',
-  'settings.shortcuts.showTabNumberBadges.desc': '按住 Cmd/Ctrl 時，在對應 Cmd/Ctrl+[1...9] 的標籤頁上顯示 1-9，方便準確切換。',
   'settings.shortcuts.section.custom': '自訂快捷鍵',
   'settings.shortcuts.resetAll': '全部重置',
   'settings.shortcuts.recording': '請按鍵...',
@@ -739,11 +737,8 @@ export const zhTWTerminalMessages: Messages = {
   'snippets.scriptEditor.expand': '彈出視窗編輯',
   'snippets.scriptEditor.resize': '調整編輯器高度',
   'snippets.scriptEditor.modalTitle': '編輯指令碼',
-  'snippets.targets.title': '執行目標',
-  'snippets.targets.add': '新增目標',
-  'snippets.targets.selectHosts': '選擇主機',
-  'snippets.targets.selectGroups': '選擇分組',
-  'snippets.targets.noGroups': '未找到分組',
+  'snippets.targets.title': '目標主機',
+  'snippets.targets.add': '新增目標主機',
   'snippets.history.title': 'Shell 歷史',
   'snippets.history.subtitle': '{count} 條指令',
   'snippets.history.emptyTitle': '暫無 Shell 歷史',

application/state/inheritedCwd.ts

@@ -2,11 +2,7 @@ import type { TerminalSession } from "../../domain/models";
 
 export type SessionPwdProbe = (
   sessionId: string,
-  options?: {
-    allowHomeFallback?: boolean;
-    allowLoginShellFallback?: boolean;
-    timeoutMs?: number;
-  },
+  options?: { allowHomeFallback?: boolean; timeoutMs?: number },
 ) => Promise<{ success: boolean; cwd?: string }>;
 
 type CaptureSession = Pick<TerminalSession, "id" | "protocol" | "status" | "lastCwd" | "localStartDir">;

application/state/scriptAutomationCoordinator.test.ts

@@ -1,14 +1,11 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 import {
-  runConnectScriptsSequential,
   selectScriptOverlayRun,
   setScriptRuns,
   waitForScriptRun,
 } from './scriptAutomationCoordinator.ts';
 import type { ScriptRun } from '@/types/global/netcatty-bridge-script.d.ts';
-import type { Snippet } from '@/domain/models';
-import { netcattyBridge } from '@/infrastructure/services/netcattyBridge.ts';
 
 test('waitForScriptRun resolves when run is already completed on subscribe', async () => {
   const runId = 'run-already-done';
@@ -67,182 +64,3 @@ test('selectScriptOverlayRun does not resurface older completed runs after dismi
   dismissedRunIds.add(latestRun.runId);
   assert.equal(selectScriptOverlayRun([olderRun, latestRun], 'sess1', dismissedRunIds), undefined);
 });
-
-test('runConnectScriptsSequential cancels only its own queued run and waits for stop', async () => {
-  const originalGet = netcattyBridge.get;
-  const sessionId = 'sess-connect-abort';
-  let queuedRunId: string | undefined;
-  let releaseStop: (() => void) | undefined;
-  const scriptStopCalls: string[] = [];
-  const storage = new Map<string, string>();
-  Object.defineProperty(globalThis, 'localStorage', {
-    configurable: true,
-    value: {
-      getItem: (key: string) => storage.get(key) ?? null,
-      setItem: (key: string, value: string) => { storage.set(key, String(value)); },
-      removeItem: (key: string) => { storage.delete(key); },
-      clear: () => { storage.clear(); },
-    },
-  });
-
-  setScriptRuns([{
-    runId: 'unrelated-active-run',
-    scriptId: 'manual-script',
-    sessionId,
-    status: 'running',
-    startedAt: Date.now(),
-    logs: [],
-  }]);
-
-  netcattyBridge.get = () => ({
-    scriptRun: async (params) => {
-      queuedRunId = params.runId;
-      assert.equal(params.returnWhenQueued, true);
-      return { runId: params.runId!, runIds: [params.runId!] };
-    },
-    scriptStop: (id: string) => new Promise((resolve) => {
-      scriptStopCalls.push(id);
-      releaseStop = () => resolve({ ok: true });
-    }),
-  }) as ReturnType<typeof netcattyBridge.get>;
-
-  const controller = new AbortController();
-  let stopCurrentRun: (() => Promise<void>) | null = null;
-  const snippet: Snippet = {
-    id: 'connect-script',
-    label: 'Connect',
-    command: 'nct.session.sleep(60)',
-    kind: 'script',
-  };
-
-  try {
-    const running = runConnectScriptsSequential({
-      scripts: [snippet],
-      sessionId,
-      signal: controller.signal,
-      onCancelableRunChange: (stop) => { stopCurrentRun = stop; },
-    });
-    void running.catch(() => {});
-    await Promise.resolve();
-    controller.abort();
-    for (let attempt = 0; attempt < 10 && scriptStopCalls.length === 0; attempt += 1) {
-      await new Promise<void>((resolve) => setImmediate(resolve));
-    }
-    assert.deepEqual(scriptStopCalls, [queuedRunId]);
-    assert.notEqual(queuedRunId, 'unrelated-active-run');
-    assert.equal(typeof stopCurrentRun, 'function');
-
-    let settled = false;
-    void running.finally(() => { settled = true; }).catch(() => {});
-    await Promise.resolve();
-    assert.equal(settled, false);
-
-    releaseStop?.();
-    await assert.rejects(
-      () => running,
-      (error: unknown) => error instanceof DOMException && error.name === 'AbortError',
-    );
-  } finally {
-    netcattyBridge.get = originalGet;
-    setScriptRuns([]);
-    Reflect.deleteProperty(globalThis, 'localStorage');
-  }
-});
-
-test('runConnectScriptsSequential retries the exact stop after a transient failure', async () => {
-  const originalGet = netcattyBridge.get;
-  const storage = new Map<string, string>();
-  const stopCalls: string[] = [];
-  let stopCurrentRun: (() => Promise<void>) | null = null;
-  Object.defineProperty(globalThis, 'localStorage', {
-    configurable: true,
-    value: {
-      getItem: (key: string) => storage.get(key) ?? null,
-      setItem: (key: string, value: string) => { storage.set(key, String(value)); },
-      removeItem: (key: string) => { storage.delete(key); },
-      clear: () => { storage.clear(); },
-    },
-  });
-
-  netcattyBridge.get = () => ({
-    scriptRun: async (params) => ({ runId: params.runId!, runIds: [params.runId!] }),
-    scriptStop: async (id: string) => {
-      stopCalls.push(id);
-      return { ok: stopCalls.length > 1 };
-    },
-  }) as ReturnType<typeof netcattyBridge.get>;
-
-  const controller = new AbortController();
-  try {
-    const running = runConnectScriptsSequential({
-      scripts: [{ id: 'retry-stop', label: 'Retry stop', command: 'await nct.sleep(60)', kind: 'script' }],
-      sessionId: 'sess-retry-stop',
-      signal: controller.signal,
-      onCancelableRunChange: (stop) => { stopCurrentRun = stop; },
-    });
-    void running.catch(() => {});
-    for (let attempt = 0; attempt < 10 && !stopCurrentRun; attempt += 1) {
-      await new Promise<void>((resolve) => setImmediate(resolve));
-    }
-    controller.abort();
-    await assert.rejects(() => running, /could not be stopped/);
-    assert.equal(typeof stopCurrentRun, 'function');
-    await stopCurrentRun!();
-    assert.equal(stopCalls.length, 2);
-  } finally {
-    netcattyBridge.get = originalGet;
-    setScriptRuns([]);
-    Reflect.deleteProperty(globalThis, 'localStorage');
-  }
-});
-
-test('runConnectScriptsSequential does not treat a script error named Aborted as cancellation', async () => {
-  const originalGet = netcattyBridge.get;
-  const storage = new Map<string, string>();
-  const scriptStopCalls: string[] = [];
-  Object.defineProperty(globalThis, 'localStorage', {
-    configurable: true,
-    value: {
-      getItem: (key: string) => storage.get(key) ?? null,
-      setItem: (key: string, value: string) => { storage.set(key, String(value)); },
-      removeItem: (key: string) => { storage.delete(key); },
-      clear: () => { storage.clear(); },
-    },
-  });
-
-  netcattyBridge.get = () => ({
-    scriptRun: async (params) => {
-      setScriptRuns([{
-        runId: params.runId!,
-        scriptId: params.scriptId,
-        sessionId: params.sessionId!,
-        status: 'failed',
-        startedAt: Date.now() - 10,
-        endedAt: Date.now(),
-        error: 'Aborted',
-        logs: [],
-      }]);
-      return { runId: params.runId!, runIds: [params.runId!] };
-    },
-    scriptStop: async (id: string) => {
-      scriptStopCalls.push(id);
-      return { ok: true };
-    },
-  }) as ReturnType<typeof netcattyBridge.get>;
-
-  try {
-    await assert.rejects(
-      () => runConnectScriptsSequential({
-        scripts: [{ id: 'fails', label: 'Fails', command: "throw new Error('Aborted')", kind: 'script' }],
-        sessionId: 'sess-real-error',
-        signal: new AbortController().signal,
-      }),
-      /Aborted/,
-    );
-    assert.deepEqual(scriptStopCalls, []);
-  } finally {
-    netcattyBridge.get = originalGet;
-    setScriptRuns([]);
-    Reflect.deleteProperty(globalThis, 'localStorage');
-  }
-});

application/state/scriptAutomationCoordinator.ts

@@ -83,8 +83,6 @@ export function getActiveScriptRunForSession(sessionId: string): ScriptRun | und
 }
 
 export async function runAutomationScript(params: {
-  runId?: string;
-  returnWhenQueued?: boolean;
   snippet: Snippet;
   sessionId: string;
   sessionIds?: string[];
@@ -106,8 +104,6 @@ export async function runAutomationScript(params: {
     throw new Error('Script bridge unavailable');
   }
   return bridge.scriptRun({
-    runId: params.runId,
-    returnWhenQueued: params.returnWhenQueued,
     scriptId: params.snippet.id,
     scriptLabel: params.snippet.label,
     content: params.snippet.command,
@@ -180,7 +176,6 @@ export async function runConnectScriptsSequential(params: {
   scripts: Snippet[];
   sessionId: string;
   signal?: AbortSignal;
-  onCancelableRunChange?: (stopCurrentRun: (() => Promise<void>) | null) => void;
   onScriptStart?: (snippet: Snippet) => void;
   onScriptComplete?: (snippet: Snippet) => void;
   sessionMeta?: {
@@ -190,63 +185,18 @@ export async function runConnectScriptsSequential(params: {
     username?: string;
   };
 }): Promise<void> {
-  const throwIfAborted = () => {
-    if (params.signal?.aborted) {
-      throw new DOMException('Connect script run cancelled', 'AbortError');
-    }
-  };
-
   for (const snippet of params.scripts) {
-    throwIfAborted();
-    const runId = crypto.randomUUID();
-    let stopPromise: Promise<void> | undefined;
-    let stopped = false;
+    if (params.signal?.aborted) {
+      throw new Error('Aborted');
+    }
     params.onScriptStart?.(snippet);
-    const queueAccepted = runAutomationScript({
-      runId,
-      returnWhenQueued: true,
+    const { runId } = await runAutomationScript({
       snippet,
       sessionId: params.sessionId,
       sessionMeta: params.sessionMeta,
     });
-    const stopThisRun = () => {
-      if (stopPromise) return stopPromise;
-      const attempt = queueAccepted.then(async () => {
-        const result = await stopScriptRun(runId);
-        if (!result.ok) {
-          throw new Error(`Connect script run could not be stopped: ${runId}`);
-        }
-        stopped = true;
-      });
-      stopPromise = attempt;
-      void attempt.catch(() => {
-        if (stopPromise === attempt) stopPromise = undefined;
-      });
-      return attempt;
-    };
-    params.onCancelableRunChange?.(stopThisRun);
-    const onAbort = () => {
-      void stopThisRun().catch(() => {});
-    };
-    params.signal?.addEventListener('abort', onAbort, { once: true });
-
-    try {
-      await queueAccepted;
-      throwIfAborted();
-      await waitForScriptRun(runId, { signal: params.signal });
-      params.onScriptComplete?.(snippet);
-    } catch (err) {
-      if (params.signal?.aborted) {
-        await stopThisRun();
-        throw new DOMException('Connect script run cancelled', 'AbortError');
-      }
-      throw err;
-    } finally {
-      params.signal?.removeEventListener('abort', onAbort);
-      if (!params.signal?.aborted || stopped) {
-        params.onCancelableRunChange?.(null);
-      }
-    }
+    await waitForScriptRun(runId, { signal: params.signal });
+    params.onScriptComplete?.(snippet);
   }
 }
 

application/state/sessionFactories.test.ts

@@ -2,9 +2,9 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import type { Host } from "../../domain/models";
+import { applyGroupDefaults } from "../../domain/groupConfig";
 import { prepareSerialConfigForSavedHost } from "../../domain/serialBackspace";
 import { buildTelnetDeepLinkConnectionHost } from "../../domain/telnetDeepLink";
-import { resolveEffectiveTerminalHost } from "../../domain/terminalHostResolution";
 import {
   createHostTerminalSession,
   createSerialTerminalSession,
@@ -74,34 +74,7 @@ test("serial session factories snapshot effective legacy Backspace behavior", ()
   assert.equal(explicitDefaultSession.serialConfig?.backspaceBehavior, "default");
 });
 
-test("workspace host factory creates a complete serial session", () => {
-  const session = createWorkspaceHostTerminalSession("session-serial", host({
-    protocol: "serial",
-    hostname: "COM7",
-    port: 57600,
-    username: "",
-    serialConfig: {
-      path: "COM7",
-      baudRate: 57600,
-      dataBits: 7,
-      stopBits: 2,
-      parity: "even",
-    },
-  }), "workspace-1");
-
-  assert.equal(session.workspaceId, "workspace-1");
-  assert.equal(session.protocol, "serial");
-  assert.deepEqual(session.serialConfig, {
-    path: "COM7",
-    baudRate: 57600,
-    dataBits: 7,
-    stopBits: 2,
-    parity: "even",
-    backspaceBehavior: "default",
-  });
-});
-
-test("workspace append snapshots serial Backspace behavior inherited from a group", () => {
+test("saved quick-connect hosts can inherit Ctrl-H after moving into a group", () => {
   const savedHost = host({
     protocol: "serial",
     hostname: "COM3",
@@ -114,15 +87,12 @@ test("workspace append snapshots serial Backspace behavior inherited from a grou
       backspaceBehavior: "default",
     }),
   });
-  const effectiveHost = resolveEffectiveTerminalHost({
-    host: savedHost,
-    groupConfigs: [{ path: "network", backspaceBehavior: "ctrl-h" }],
-    proxyProfiles: [],
+  const effectiveHost = applyGroupDefaults(savedHost, {
+    backspaceBehavior: "ctrl-h",
   });
 
-  const session = createWorkspaceHostTerminalSession("session-1", effectiveHost, "workspace-1");
+  const session = createHostTerminalSession("session-1", effectiveHost);
 
-  assert.equal(session.workspaceId, "workspace-1");
   assert.equal(session.serialConfig?.backspaceBehavior, "ctrl-h");
 });
 

application/state/sessionRestoreSettings.test.ts

@@ -175,7 +175,7 @@ test("restore-only settings do not bump the cloud sync settings version", () =>
   const settingsVersionSource = settingsSource.slice(settingsVersionIndex);
 
   assert.notEqual(settingsVersionIndex, -1);
-  assert.doesNotMatch(settingsVersionSource, /restorePreviousSession|restoreTerminalCwd|startupLanding/);
+  assert.doesNotMatch(settingsVersionSource, /restorePreviousSession|restoreTerminalCwd/);
 });
 
 test("restore previous session re-arms after cross-window settings ipc sync", () => {

application/state/settingsChromeStore.ts

@@ -1,7 +1,6 @@
 import { useSyncExternalStore } from 'react';
 
 import type { UILanguage } from '../../domain/models/connection';
-import type { HotkeyScheme } from '../../domain/models/keyBindings';
 import type { DynamicTabTitleMode } from '../../domain/models/terminal';
 import type { HostClickBehavior } from '../../domain/hostClickBehavior';
 import type { TerminalSidePanelAutoOpenTab } from '../../domain/terminalSidePanelAutoOpen';
@@ -30,9 +29,6 @@ export type SettingsChromeSnapshot = {
   showOnlyUngroupedHostsInRoot: boolean;
   dynamicTabTitleMode: DynamicTabTitleMode;
   disableTerminalFontZoom: boolean;
-  hotkeyScheme: HotkeyScheme;
-  shellOnlyTabNumberShortcuts: boolean;
-  showTabNumberBadges: boolean;
   restoreTerminalCwd: boolean;
   terminalSidePanelAutoOpen: boolean;
   terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
@@ -62,9 +58,6 @@ export const DEFAULT_SETTINGS_CHROME_SNAPSHOT: SettingsChromeSnapshot = Object.f
   showOnlyUngroupedHostsInRoot: false,
   dynamicTabTitleMode: 'off',
   disableTerminalFontZoom: false,
-  hotkeyScheme: 'pc',
-  shellOnlyTabNumberShortcuts: false,
-  showTabNumberBadges: true,
   restoreTerminalCwd: true,
   terminalSidePanelAutoOpen: false,
   terminalSidePanelAutoOpenTab: 'ai',
@@ -87,9 +80,6 @@ export function settingsChromeSnapshotsEqual(
     && a.showOnlyUngroupedHostsInRoot === b.showOnlyUngroupedHostsInRoot
     && a.dynamicTabTitleMode === b.dynamicTabTitleMode
     && a.disableTerminalFontZoom === b.disableTerminalFontZoom
-    && a.hotkeyScheme === b.hotkeyScheme
-    && a.shellOnlyTabNumberShortcuts === b.shellOnlyTabNumberShortcuts
-    && a.showTabNumberBadges === b.showTabNumberBadges
     && a.restoreTerminalCwd === b.restoreTerminalCwd
     && a.terminalSidePanelAutoOpen === b.terminalSidePanelAutoOpen
     && a.terminalSidePanelAutoOpenTab === b.terminalSidePanelAutoOpenTab;

application/state/settingsIpcSync.ts

@@ -15,7 +15,6 @@ import {
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_RESTORE_PREVIOUS_SESSION,
   STORAGE_KEY_RESTORE_TERMINAL_CWD,
-  STORAGE_KEY_STARTUP_LANDING,
   STORAGE_KEY_SESSION_LOGS_DIR,
   STORAGE_KEY_SESSION_LOGS_ENABLED,
   STORAGE_KEY_SESSION_LOGS_FORMAT,
@@ -61,7 +60,6 @@ import {
   migrateIncomingTerminalFontId,
 } from './settingsStateDefaults';
 import { isTerminalSidePanelAutoOpenTab, type TerminalSidePanelAutoOpenTab } from '../../domain/terminalSidePanelAutoOpen';
-import { isStartupLanding, type StartupLanding } from '../../domain/startupLanding';
 import type { AppearanceSyncEvent } from './appearanceSync';
 
 interface UseSettingsIpcSyncParams {
@@ -104,7 +102,6 @@ interface UseSettingsIpcSyncParams {
   setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
   setRestorePreviousSessionState: Dispatch<SetStateAction<boolean>>;
   setRestoreTerminalCwdState: Dispatch<SetStateAction<boolean>>;
-  setStartupLandingState: Dispatch<SetStateAction<StartupLanding>>;
   setSftpTransferConcurrencyState: Dispatch<SetStateAction<number>>;
   setSshTransportIdleTtlMsState: Dispatch<SetStateAction<number>>;
 }
@@ -149,7 +146,6 @@ export function useSettingsIpcSync({
   setDisableTerminalFontZoomState,
   setRestorePreviousSessionState,
   setRestoreTerminalCwdState,
-  setStartupLandingState,
   setSftpTransferConcurrencyState,
   setSshTransportIdleTtlMsState,
 }: UseSettingsIpcSyncParams) {
@@ -308,9 +304,6 @@ export function useSettingsIpcSync({
       if (key === STORAGE_KEY_RESTORE_TERMINAL_CWD && typeof value === 'boolean') {
         setRestoreTerminalCwdState((prev) => (prev === value ? prev : value));
       }
-      if (key === STORAGE_KEY_STARTUP_LANDING && isStartupLanding(value)) {
-        setStartupLandingState((prev) => (prev === value ? prev : value));
-      }
       if (key === STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY && typeof value === 'number') {
         setSftpTransferConcurrencyState((prev) => (prev === value ? prev : value));
       }
@@ -355,7 +348,6 @@ export function useSettingsIpcSync({
     setDisableTerminalFontZoomState,
     setRestorePreviousSessionState,
     setRestoreTerminalCwdState,
-    setStartupLandingState,
     setSftpTransferConcurrencyState,
     setSshTransportIdleTtlMsState,
     setTerminalFontFamilyId,

application/state/settingsStateDefaults.ts

@@ -82,11 +82,8 @@ export const DEFAULT_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT = false;
 export const DEFAULT_SHOW_SFTP_TAB = true;
 export const DEFAULT_SHOW_HOST_TREE_SIDEBAR = true;
 export const DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS = false;
-export const DEFAULT_SHOW_TAB_NUMBER_BADGES = true;
 export const DEFAULT_DISABLE_TERMINAL_FONT_ZOOM = false;
 export { DEFAULT_RESTORE_PREVIOUS_SESSION } from './sessionRestoreSettings';
-export { DEFAULT_STARTUP_LANDING } from '../../domain/startupLanding';
-export type { StartupLanding } from '../../domain/startupLanding';
 
 // Editor defaults
 export const DEFAULT_EDITOR_WORD_WRAP = false;

application/state/settingsStorageSync.ts

@@ -19,7 +19,6 @@ import {
   STORAGE_KEY_EXPLORER_CONTEXT_MENU_ENABLED,
   STORAGE_KEY_RESTORE_PREVIOUS_SESSION,
   STORAGE_KEY_RESTORE_TERMINAL_CWD,
-  STORAGE_KEY_STARTUP_LANDING,
   STORAGE_KEY_SFTP_AUTO_OPEN_SIDEBAR,
   STORAGE_KEY_SFTP_FOLLOW_TERMINAL_CWD,
   STORAGE_KEY_SFTP_AUTO_SYNC,
@@ -38,7 +37,6 @@ import {
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
-  STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_TERM_FOLLOW_APP_THEME,
   STORAGE_KEY_TERM_FONT_FAMILY,
@@ -61,7 +59,6 @@ import {
 } from './settingsStateDefaults';
 import { isTerminalSidePanelAutoOpenTab, type TerminalSidePanelAutoOpenTab } from '../../domain/terminalSidePanelAutoOpen';
 import { isHostClickBehavior, type HostClickBehavior } from '../../domain/hostClickBehavior';
-import { isStartupLanding, type StartupLanding } from '../../domain/startupLanding';
 
 interface UseSettingsStorageSyncParams {
   enabled?: boolean;
@@ -95,11 +92,9 @@ interface UseSettingsStorageSyncParams {
   terminalSidePanelAutoOpen: boolean;
   terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
   shellOnlyTabNumberShortcuts: boolean;
-  showTabNumberBadges: boolean;
   disableTerminalFontZoom: boolean;
   restorePreviousSession: boolean;
   restoreTerminalCwd: boolean;
-  startupLanding: StartupLanding;
   editorWordWrap: boolean;
   sessionLogsEnabled: boolean;
   sessionLogsDir: string;
@@ -144,11 +139,9 @@ interface UseSettingsStorageSyncParams {
   setTerminalSidePanelAutoOpenState: Dispatch<SetStateAction<boolean>>;
   setTerminalSidePanelAutoOpenTabState: Dispatch<SetStateAction<TerminalSidePanelAutoOpenTab>>;
   setShellOnlyTabNumberShortcutsState: Dispatch<SetStateAction<boolean>>;
-  setShowTabNumberBadgesState: Dispatch<SetStateAction<boolean>>;
   setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
   setRestorePreviousSessionState: Dispatch<SetStateAction<boolean>>;
   setRestoreTerminalCwdState: Dispatch<SetStateAction<boolean>>;
-  setStartupLandingState: Dispatch<SetStateAction<StartupLanding>>;
   setEditorWordWrapState: Dispatch<SetStateAction<boolean>>;
   setSessionLogsEnabled: Dispatch<SetStateAction<boolean>>;
   setSessionLogsDir: Dispatch<SetStateAction<string>>;
@@ -176,7 +169,7 @@ export function useSettingsStorageSync({
   terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
   sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
   sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-  showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+  showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd,
   editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
   globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode, applyIncomingCustomAccent,
@@ -185,7 +178,7 @@ export function useSettingsStorageSync({
   setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize,
   setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
   setSftpUseCompressedUpload, setSftpSkipUnchanged, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-  setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
+  setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState,
   setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled, setSshDeepLinkEnabledState, setJmsDeepLinkEnabledState, setExplorerContextMenuEnabledState,
   setGlobalHotkeyEnabled, setWindowOpacity, setAppIconVariant, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
   setSftpTransferConcurrencyState, setSshTransportIdleTtlMsState,
@@ -200,7 +193,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   });
@@ -210,7 +203,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   };
@@ -460,12 +453,6 @@ export function useSettingsStorageSync({
           setShellOnlyTabNumberShortcutsState(newValue);
         }
       }
-      if (e.key === STORAGE_KEY_SHOW_TAB_NUMBER_BADGES && e.newValue !== null) {
-        const newValue = e.newValue === 'true';
-        if (newValue !== s.showTabNumberBadges) {
-          setShowTabNumberBadgesState(newValue);
-        }
-      }
       if (e.key === STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM && e.newValue !== null) {
         const newValue = e.newValue === 'true';
         if (newValue !== s.disableTerminalFontZoom) {
@@ -484,11 +471,6 @@ export function useSettingsStorageSync({
           setRestoreTerminalCwdState(newValue);
         }
       }
-      if (e.key === STORAGE_KEY_STARTUP_LANDING && e.newValue !== null) {
-        if (isStartupLanding(e.newValue) && e.newValue !== s.startupLanding) {
-          setStartupLandingState(e.newValue);
-        }
-      }
       // Sync global hotkey enabled setting from other windows
       if (e.key === STORAGE_KEY_GLOBAL_HOTKEY_ENABLED && e.newValue !== null) {
         const newValue = e.newValue === 'true';
@@ -577,11 +559,9 @@ export function useSettingsStorageSync({
     setShowRecentHostsState,
     setShowSftpTabState,
     setShellOnlyTabNumberShortcutsState,
-    setShowTabNumberBadgesState,
     setDisableTerminalFontZoomState,
     setRestorePreviousSessionState,
     setRestoreTerminalCwdState,
-    setStartupLandingState,
     setTerminalFontFamilyId,
     setTerminalFontSize,
     setTerminalThemeDarkId,

application/state/sftp/browseSessionLifecycle.test.ts

@@ -39,32 +39,6 @@ test("keeps a hidden SFTP owner interactive while its promoted editor tab is ope
   assert.equal(shouldParkBrowseSessions({ interactive, browseParked: false }), false);
 });
 
-test("keeps browse warm while the terminal side panel stays open on another tool", () => {
-  // SFTP→History/System replaces the focused pane tool, so surfaceVisible is
-  // false, but the owner stays mounted for instant switch-back. Parking here
-  // forces reconnect + directory reload (and intermittent blank lists).
-  const interactive = isBrowseSessionInteractive({
-    surfaceVisible: false,
-    ownerPanelOpen: true,
-    hasOwnedEditorTab: false,
-  });
-
-  assert.equal(interactive, true);
-  assert.equal(shouldParkBrowseSessions({ interactive, browseParked: false }), false);
-});
-
-test("parks browse when the side panel is closed and nothing else retains it", () => {
-  const interactive = isBrowseSessionInteractive({
-    surfaceVisible: false,
-    ownerPanelOpen: false,
-    hasOwnedEditorTab: false,
-    hasActiveExternalEdit: false,
-  });
-
-  assert.equal(interactive, false);
-  assert.equal(shouldParkBrowseSessions({ interactive, browseParked: false }), true);
-});
-
 test("parks browse only when the interactive surface hides and not already parked", () => {
   assert.equal(shouldParkBrowseSessions({ interactive: false, browseParked: false }), true);
   assert.equal(shouldParkBrowseSessions({ interactive: false, browseParked: true }), false);

application/state/sftp/browseSessionLifecycle.ts

@@ -1,27 +1,18 @@
 /**
  * Browse vs transfer session lifecycle helpers.
  *
- * FileZilla model: a *closed* terminal SFTP side panel can soft-close its browse
- * SFTP channels while bulk transfers keep dedicated pool connections (and any
- * leased browse sessions held by in-flight streams). Switching to another side
- * panel tool (History / System / …) must keep browse warm — the owner stays
- * mounted for instant switch-back, and parking would force reconnect + reload.
+ * FileZilla model: the interactive browser can soft-close its SFTP channels
+ * while bulk transfers keep dedicated pool connections (and any leased browse
+ * sessions held by in-flight streams).
  */
 
 export function isBrowseSessionInteractive(params: {
   surfaceVisible: boolean;
-  /**
-   * Terminal side panel still open for this owner (another tool may be focused).
-   * Keeps browse sessions alive across tool switches without treating that as a
-   * full panel dismiss.
-   */
-  ownerPanelOpen?: boolean;
   hasOwnedEditorTab: boolean;
   /** External editor temp files (Notepad++ etc.) still need the browse session. */
   hasActiveExternalEdit?: boolean;
 }): boolean {
   return params.surfaceVisible
-    || !!params.ownerPanelOpen
     || params.hasOwnedEditorTab
     || !!params.hasActiveExternalEdit;
 }

application/state/sftp/dedicatedTransferResume.ts

@@ -162,6 +162,7 @@ export async function openTransferSftpSession(
     if (
       !wantDedicated
       && options?.sourceSessionId
+      && !host.sftpSudo
       && bridge.openSftpForSession
     ) {
       try {

application/state/sftp/ensureRemoteSftpSession.test.ts

@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import test from "node:test";
 
 import type { Host } from "../../../domain/models";
-import { ensureRemoteSftpSession, probeSftpSession } from "./ensureRemoteSftpSession";
+import { ensureRemoteSftpSession } from "./ensureRemoteSftpSession";
 import type { SftpPane } from "./types";
 
 const host = {
@@ -37,24 +37,6 @@ const remotePane = (connectionId: string): SftpPane => ({
 
 const noopReleaseConnection = async () => {};
 
-test("SFTP session probe accepts a virtual root directory", async () => {
-  const calls: Array<[string, string]> = [];
-  const ok = await probeSftpSession({
-    realpathSftp: async (sftpId, remotePath) => {
-      calls.push([sftpId, remotePath]);
-      return "/";
-    },
-  }, "sftp-jumpserver");
-
-  assert.equal(ok, true);
-  assert.deepEqual(calls, [["sftp-jumpserver", "."]]);
-});
-
-test("SFTP session probe does not require home discovery", async () => {
-  const ok = await probeSftpSession(undefined, "sftp-live");
-  assert.equal(ok, true);
-});
-
 test("returns an existing mapped SFTP session without reconnecting", async () => {
   let connectCalls = 0;
   const sftpId = await ensureRemoteSftpSession({

application/state/sftp/ensureRemoteSftpSession.ts

@@ -3,24 +3,6 @@ import type { MutableRefObject } from "react";
 import { isSessionError } from "./errors";
 import type { SftpPane } from "./types";
 
-export interface SftpSessionProbeBridge {
-  realpathSftp?: (sftpId: string, path: string) => Promise<string>;
-}
-
-/**
- * Probe the SFTP protocol itself instead of using remote home discovery.
- * Restricted/chroot servers can deny SSH exec or expose '/' as their virtual
- * root while the SFTP session remains fully usable.
- */
-export async function probeSftpSession(
-  bridge: SftpSessionProbeBridge | null | undefined,
-  sftpId: string,
-): Promise<boolean> {
-  if (!bridge?.realpathSftp) return true;
-  await bridge.realpathSftp(sftpId, ".");
-  return true;
-}
-
 export interface EnsureRemoteSftpSessionParams {
   side: "left" | "right";
   getActivePane: (side: "left" | "right") => SftpPane | null;

application/state/sftp/errors.test.ts

@@ -1,27 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { isMissingStatError } from "./errors";
-
-test("isMissingStatError accepts only true path absence codes", () => {
-  for (const code of [2, "ENOENT", "NO_SUCH_FILE", "SSH_FX_NO_SUCH_FILE"] as const) {
-    const error = new Error("missing") as Error & { code: string | number };
-    error.code = code;
-    assert.equal(isMissingStatError(error), true, String(code));
-  }
-  assert.equal(isMissingStatError(new Error("ENOENT")), true);
-});
-
-test("isMissingStatError rejects unsupported LSTAT and other failures", () => {
-  const enotsup = new Error("Remote server does not support LSTAT") as Error & {
-    code: string;
-    lstatUnavailable: boolean;
-  };
-  enotsup.code = "ENOTSUP";
-  enotsup.lstatUnavailable = true;
-  assert.equal(isMissingStatError(enotsup), false);
-
-  const eperm = new Error("denied") as Error & { code: string };
-  eperm.code = "EPERM";
-  assert.equal(isMissingStatError(eperm), false);
-  assert.equal(isMissingStatError(new Error("channel closed")), false);
-});

application/state/sftp/errors.ts

@@ -17,13 +17,3 @@ export const isSessionError = (err: unknown): boolean => {
     msg.includes("timed out")
   );
 };
-
-/** True absence only — ENOTSUP / unknown inspection must not map to "no conflict". */
-export const isMissingStatError = (error: unknown): boolean => {
-  const code = (error as { code?: string | number } | null)?.code;
-  return code === 2
-    || code === "ENOENT"
-    || code === "NO_SUCH_FILE"
-    || code === "SSH_FX_NO_SUCH_FILE"
-    || String((error as { message?: string } | null)?.message || "").trim() === "ENOENT";
-};

application/state/sftp/transferConflictOps.ts

@@ -1,7 +1,6 @@
 import { useCallback } from "react";
 import type { SftpFilenameEncoding, TransferTask } from "../../../domain/models";
 import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
-import { isMissingStatError } from "./errors";
 import type { SftpPane } from "./types";
 import { getParentPath, joinPath } from "./utils";
 
@@ -25,36 +24,28 @@ export function useSftpTransferConflictOps() {
     ): Promise<{ type?: "file" | "directory" | "symlink"; size: number; mtime: number } | null> => {
       if (!targetPane.connection) return null;
 
-      try {
-        if (targetPane.connection.isLocal) {
-          const bridge = netcattyBridge.get();
-          const stat = await (bridge?.lstatLocal ?? bridge?.statLocal)?.(targetPath);
-          if (!stat) return null;
-          return {
-            type: stat.type as "file" | "directory" | "symlink" | undefined,
-            size: stat.size,
-            mtime: stat.lastModified || Date.now(),
-          };
-        }
-
-        if (!targetSftpId) return null;
-        const bridge = netcattyBridge.get();
-        const stat = await (bridge?.lstatSftp ?? bridge?.statSftp)?.(
-          targetSftpId,
-          targetPath,
-          targetEncoding,
-        );
+      if (targetPane.connection.isLocal) {
+        const stat = await netcattyBridge.get()?.statLocal?.(targetPath);
         if (!stat) return null;
         return {
           type: stat.type as "file" | "directory" | "symlink" | undefined,
           size: stat.size,
           mtime: stat.lastModified || Date.now(),
         };
-      } catch (error) {
-        // Missing path = no conflict. ENOTSUP / unknown type must fail closed.
-        if (isMissingStatError(error)) return null;
-        throw error;
       }
+
+      if (!targetSftpId) return null;
+      const stat = await netcattyBridge.get()?.statSftp?.(
+        targetSftpId,
+        targetPath,
+        targetEncoding,
+      );
+      if (!stat) return null;
+      return {
+        type: stat.type as "file" | "directory" | "symlink" | undefined,
+        size: stat.size,
+        mtime: stat.lastModified || Date.now(),
+      };
     },
     [],
   );
@@ -73,9 +64,12 @@ export function useSftpTransferConflictOps() {
         const suffix = index === 1 ? " (copy)" : ` (copy ${index})`;
         const fileName = `${baseName}${suffix}${ext}`;
         const targetPath = joinPath(parentPath, fileName);
-        // Unsupported LSTAT must propagate — do not treat as a free name.
-        const existing = await statTargetPath(targetPane, targetSftpId, targetPath, targetEncoding);
-        if (!existing) return { fileName, targetPath };
+        try {
+          const existing = await statTargetPath(targetPane, targetSftpId, targetPath, targetEncoding);
+          if (!existing) return { fileName, targetPath };
+        } catch {
+          return { fileName, targetPath };
+        }
       }
 
       const fallbackName = `${baseName} (copy ${Date.now()})${ext}`;
@@ -90,19 +84,18 @@ export function useSftpTransferConflictOps() {
       targetPane: SftpPane,
       targetSftpId: string | null,
       targetEncoding: SftpFilenameEncoding,
-      expectedType?: "file" | "directory" | "symlink",
     ) => {
       if (!targetPane.connection) return;
       if (targetPane.connection.isLocal) {
         const deleteLocalFile = netcattyBridge.get()?.deleteLocalFile;
         if (!deleteLocalFile) throw new Error("Local delete unavailable");
-        await deleteLocalFile(task.targetPath, expectedType);
+        await deleteLocalFile(task.targetPath);
         return;
       }
       if (!targetSftpId) throw new Error("Target SFTP session not found");
       const deleteSftp = netcattyBridge.get()?.deleteSftp;
       if (!deleteSftp) throw new Error("SFTP delete unavailable");
-      await deleteSftp(targetSftpId, task.targetPath, targetEncoding, expectedType);
+      await deleteSftp(targetSftpId, task.targetPath, targetEncoding);
     },
     [],
   );

application/state/sftp/useSftpConnections.test.ts

@@ -3,12 +3,8 @@
 
 import test from "node:test";
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
 
 import {
-  buildSftpConnectInFlightKey,
-  buildSftpHomeDirCandidates,
-  runSftpConnectOnceByKey,
   createSftpConnectionId,
   createPinnedReconnectSideResolver,
   openSftpConnectionOnce,
@@ -19,62 +15,12 @@ import {
   resolvePinnedReconnectSide,
 } from "./useSftpConnections.ts";
 
-test("home dir candidates prefer user home then root", () => {
-  assert.deepEqual(buildSftpHomeDirCandidates("deploy"), ["/home/deploy", "/root"]);
-  assert.deepEqual(buildSftpHomeDirCandidates("root"), ["/root"]);
-  assert.deepEqual(buildSftpHomeDirCandidates(undefined), ["/root"]);
-  assert.deepEqual(buildSftpHomeDirCandidates(null), ["/root"]);
-});
-
 test("connection ids stay unique even when connects start in the same millisecond", () => {
   const ids = ["uuid-a", "uuid-b"];
   assert.equal(createSftpConnectionId("left", () => ids.shift()!), "left-uuid-a");
   assert.equal(createSftpConnectionId("left", () => ids.shift()!), "left-uuid-b");
 });
 
-test("runSftpConnectOnceByKey shares an in-flight connect for the same tab and endpoint", async () => {
-  const inFlight = new Map<string, Promise<void>>();
-  let runs = 0;
-  let releaseFirst: (() => void) | undefined;
-
-  const first = runSftpConnectOnceByKey(inFlight, "left:tab-1:host-key:ssh-session-1:/home", async () => {
-    runs += 1;
-    await new Promise<void>((resolve) => {
-      releaseFirst = resolve;
-    });
-  });
-  const second = runSftpConnectOnceByKey(inFlight, "left:tab-1:host-key:ssh-session-1:/home", async () => {
-    runs += 1;
-  });
-
-  assert.equal(runs, 1);
-  releaseFirst?.();
-  await Promise.all([first, second]);
-  assert.equal(runs, 1);
-  assert.equal(inFlight.size, 0);
-});
-
-test("buildSftpConnectInFlightKey uses the allocated tab id for forced new tabs", () => {
-  const first = buildSftpConnectInFlightKey({
-    side: "left",
-    tabId: "new-tab-a",
-    targetConnectionKey: "host-key",
-    sourceSessionId: "ssh-session-1",
-    initialPath: "/home",
-    forceNewTab: true,
-  });
-  const second = buildSftpConnectInFlightKey({
-    side: "left",
-    tabId: "new-tab-b",
-    targetConnectionKey: "host-key",
-    sourceSessionId: "ssh-session-1",
-    initialPath: "/home",
-    forceNewTab: true,
-  });
-
-  assert.notEqual(first, second);
-});
-
 const openOptions = {
   sessionId: "sftp-request-1",
   hostname: "192.168.9.138",
@@ -127,43 +73,6 @@ test("openSftpWithSessionPreference falls back to normal SFTP when session reuse
   assert.deepEqual(calls, ["openForSession:ssh-session-1", "openSftp:sftp-request-1"]);
 });
 
-test("openSftpWithSessionPreference tries session reuse for sudo SFTP before fresh auth", async () => {
-  const calls: string[] = [];
-  let passedOptions: NetcattySSHOptions | undefined;
-  const sftpId = await openSftpWithSessionPreference({
-    bridge: {
-      openSftpForSession: async (sessionId: string, options?: NetcattySSHOptions) => {
-        calls.push(`openForSession:${sessionId}`);
-        passedOptions = options;
-        return "sudo-session-backed-sftp";
-      },
-      openSftp: async () => {
-        calls.push("openSftp");
-        return "fresh-sftp";
-      },
-    },
-    sourceSessionId: "ssh-session-1",
-    openOptions: {
-      ...openOptions,
-      sudo: true,
-      password: "sudo-pass",
-    },
-  });
-
-  assert.equal(sftpId, "sudo-session-backed-sftp");
-  assert.deepEqual(calls, ["openForSession:ssh-session-1"]);
-  assert.equal(passedOptions?.sudo, true);
-  assert.equal(passedOptions?.password, "sudo-pass");
-});
-
-test("remote browse connect does not discard sourceSessionId for sudo hosts", () => {
-  const source = readFileSync(new URL("./useSftpConnections.ts", import.meta.url), "utf8");
-  assert.doesNotMatch(
-    source,
-    /host\.sftpSudo\s*\?\s*undefined\s*:\s*options\?\.sourceSessionId/,
-  );
-});
-
 test("openSftpWithSessionPreference opens normal SFTP without a source session", async () => {
   const calls: string[] = [];
   const sftpId = await openSftpWithSessionPreference({

application/state/sftp/useSftpConnections.ts

@@ -97,13 +97,6 @@ export async function releaseSftpConnectionMetadata(params: {
   params.onRemoteSessionClosed?.(sftpId);
 }
 
-/** Hardcoded home-path candidates when SSH exec / listable realpath fail. */
-export function buildSftpHomeDirCandidates(username?: string | null): string[] {
-  if (username === "root") return ["/root"];
-  if (username) return [`/home/${username}`, "/root"];
-  return ["/root"];
-}
-
 export function createSftpConnectionId(
   side: "left" | "right",
   randomUUID: () => string = () => crypto.randomUUID(),
@@ -183,41 +176,6 @@ export function createPinnedReconnectSideResolver(
   };
 }
 
-export function runSftpConnectOnceByKey(
-  inFlight: Map<string, Promise<void>>,
-  key: string,
-  run: () => Promise<void>,
-): Promise<void> {
-  const existing = inFlight.get(key);
-  if (existing) return existing;
-
-  const promise = run().finally(() => {
-    if (inFlight.get(key) === promise) {
-      inFlight.delete(key);
-    }
-  });
-  inFlight.set(key, promise);
-  return promise;
-}
-
-export function buildSftpConnectInFlightKey(params: {
-  side: "left" | "right";
-  tabId: string;
-  targetConnectionKey: string;
-  sourceSessionId?: string;
-  initialPath?: string;
-  forceNewTab?: boolean;
-}): string {
-  return [
-    params.side,
-    params.tabId,
-    params.targetConnectionKey,
-    params.sourceSessionId ?? "",
-    params.initialPath ?? "",
-    params.forceNewTab ? "force-new-tab" : "",
-  ].join("\u0000");
-}
-
 interface UseSftpConnectionsResult {
   connect: (side: "left" | "right", host: Host | "local", options?: SftpConnectOptions) => Promise<void>;
   disconnect: (side: "left" | "right") => Promise<void>;
@@ -291,7 +249,6 @@ export const useSftpConnections = ({
   const [hostKeyVerification, setHostKeyVerification] = useState<SftpHostKeyVerificationState | null>(null);
   const hostKeyVerificationRef = useRef<(SftpHostKeyVerificationState & { requestId: string; sessionId: string }) | null>(null);
   const activeHostKeySessionsRef = useRef<Map<string, { side: "left" | "right"; tabId: string }>>(new Map());
-  const connectInFlightRef = useRef<Map<string, Promise<void>>>(new Map());
 
   const setPendingHostKeyVerification = useCallback((
     next: (SftpHostKeyVerificationState & { requestId: string; sessionId: string }) | null,
@@ -469,31 +426,21 @@ export const useSftpConnections = ({
       // immediately, avoiding race conditions with deferred effects.
       options?.onTabCreated?.(activeTabId);
 
-      const connectInFlightKey = buildSftpConnectInFlightKey({
-        side,
-        tabId: activeTabId,
-        targetConnectionKey,
-        sourceSessionId: host === "local" ? undefined : options?.sourceSessionId,
-        initialPath: effectiveInitialPath,
-        forceNewTab: options?.forceNewTab,
-      });
+      const connectionId = createSftpConnectionId(side);
 
-      return runSftpConnectOnceByKey(connectInFlightRef.current, connectInFlightKey, async () => {
-        const connectionId = createSftpConnectionId(side);
-
-        navSeqRef.current[side] += 1;
-        const connectRequestId = navSeqRef.current[side];
-        const getTargetPane = () => {
-          const targetSide = resolveTargetSide();
-          const tabs = targetSide === "left" ? leftTabsRef.current.tabs : rightTabsRef.current.tabs;
-          return tabs.find((tab) => tab.id === activeTabId) ?? null;
-        };
-        const isTargetConnectionCurrent = () => {
-          const pane = getTargetPane();
-          if (!pane) return false;
-          if (pane.connection?.id === connectionId) return true;
-          return !pane.connection && navSeqRef.current[side] === connectRequestId;
-        };
+      navSeqRef.current[side] += 1;
+      const connectRequestId = navSeqRef.current[side];
+      const getTargetPane = () => {
+        const targetSide = resolveTargetSide();
+        const tabs = targetSide === "left" ? leftTabsRef.current.tabs : rightTabsRef.current.tabs;
+        return tabs.find((tab) => tab.id === activeTabId) ?? null;
+      };
+      const isTargetConnectionCurrent = () => {
+        const pane = getTargetPane();
+        if (!pane) return false;
+        if (pane.connection?.id === connectionId) return true;
+        return !pane.connection && navSeqRef.current[side] === connectRequestId;
+      };
       const isTargetConnectionAtPath = (path: string) => {
         const connection = getTargetPane()?.connection;
         if (!connection) return navSeqRef.current[side] === connectRequestId;
@@ -626,7 +573,9 @@ export const useSftpConnections = ({
           sharedHostCache?.path,
         );
 
-        const sourceSessionId = options?.sourceSessionId;
+        // Sudo never reuses a terminal shell; normalize before UI state so
+        // reusedConnection (spinner/overlay) matches the actual open path.
+        const sourceSessionId = host.sftpSudo ? undefined : options?.sourceSessionId;
 
         const connection: SftpConnection = {
           id: connectionId,
@@ -749,7 +698,15 @@ export const useSftpConnections = ({
             }
 
             if (!detected) {
-              const candidates = buildSftpHomeDirCandidates(credentials.username);
+              const candidates: string[] = [];
+              if (credentials.username === "root") {
+                candidates.push("/root");
+              } else if (credentials.username) {
+                candidates.push(`/home/${credentials.username}`);
+                candidates.push("/root");
+              } else {
+                candidates.push("/root");
+              }
               const statSftp = bridge?.statSftp;
               if (statSftp) {
                 for (const candidate of candidates) {
@@ -827,23 +784,6 @@ export const useSftpConnections = ({
                 // root also failed
               }
             }
-            // Last resort: home candidates. Covers provisional "/" from realpath
-            // when discovery treated root as home and listing it failed, so
-            // /home/<user> or /root can still recover the session.
-            if (!fallbackSucceeded) {
-              for (const candidate of buildSftpHomeDirCandidates(credentials.username)) {
-                if (candidate === startPath) continue;
-                try {
-                  files = await listRemoteFiles(sftpId, candidate, filenameEncoding);
-                  startPath = candidate;
-                  homeDir = candidate;
-                  fallbackSucceeded = true;
-                  break;
-                } catch {
-                  // Ignore missing/permission errors
-                }
-              }
-            }
             if (!fallbackSucceeded) {
               throw new Error("Cannot list any remote directory");
             }
@@ -915,7 +855,6 @@ export const useSftpConnections = ({
           unsubSftpProgress?.();
         }
       }
-      });
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [

application/state/sftp/useSftpExternalOperations.ts

@@ -842,9 +842,6 @@ export const useSftpExternalOperations = (
       writeLocalFile: bridge?.writeLocalFile,
       mkdirLocal: bridge?.mkdirLocal,
       statLocal: bridge?.statLocal,
-      // No-follow stats so Replace unlinks a same-named symlink instead of
-      // writing through it (uploadService prefers lstat* over followed stat*).
-      lstatLocal: bridge?.lstatLocal,
       deleteLocalFile: bridge?.deleteLocalFile,
       stageUploadFile: bridge?.stageUploadFile,
       cancelStagedUploadFile: bridge?.cancelStagedUploadFile,
@@ -860,18 +857,10 @@ export const useSftpExternalOperations = (
         if (!b?.statSftp) return null;
         return b.statSftp(sftpId, path);
       },
-      // Only wire when present so uploadService can fall back via `lstat ?? stat`.
-      lstatSftp: bridge?.lstatSftp
-        ? async (sftpId: string, path: string) => {
-            const b = netcattyBridge.get();
-            if (!b?.lstatSftp) return null;
-            return b.lstatSftp(sftpId, path);
-          }
-        : undefined,
-      deleteSftp: async (sftpId: string, path: string, expectedType) => {
+      deleteSftp: async (sftpId: string, path: string) => {
         const b = netcattyBridge.get();
         if (b?.deleteSftp) {
-          await b.deleteSftp(sftpId, path, undefined, expectedType);
+          await b.deleteSftp(sftpId, path);
         }
       },
       // Stream transfer for large files (avoids loading into memory).

application/state/sftp/useSftpTransfers.ts

@@ -12,7 +12,6 @@ import {
   describeSftpExistingKind,
   describeSftpIncomingKind,
   getSftpConflictTypeKey,
-  shouldUnlinkSftpConflictBeforeReplace,
 } from "../../../domain/sftpConflict";
 import {
   findActivePathConflict,
@@ -24,7 +23,6 @@ import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge"
 import { logger } from "../../../lib/logger";
 import { sftpTransferCenterStore } from "../sftpTransferCenterStore";
 import { SftpPane } from "./types";
-import { isMissingStatError } from "./errors";
 import { useSftpDirectoryTransferOps } from "./transferDirectoryOps";
 import { useSftpTransferConflictOps } from "./transferConflictOps";
 import { useSftpTransferTaskOps } from "./transferTaskOps";
@@ -446,7 +444,7 @@ export const useSftpTransfers = ({
     cleanupTaskArtifacts,
   });
 
-  const { statTargetPath, getDuplicateTarget, deleteTargetPath } = useSftpTransferConflictOps();
+  const { statTargetPath, getDuplicateTarget } = useSftpTransferConflictOps();
 
   const { transferFile, transferDirectory } = useSftpDirectoryTransferOps({
     ownerId,
@@ -742,10 +740,8 @@ export const useSftpTransfers = ({
               newModified: sourceStat?.mtime || Date.now(),
             };
           }
-        } catch (error) {
-          // Missing path = no conflict. ENOTSUP / unknown type fail closed.
-          if (isMissingStatError(error)) return null;
-          throw error;
+        } catch {
+          // ignore
         }
         return null;
       })();
@@ -787,13 +783,6 @@ export const useSftpTransfers = ({
             return "failed";
           }
 
-          if (
-            defaultAction === "replace"
-            && shouldUnlinkSftpConflictBeforeReplace(conflict.existingType)
-          ) {
-            await deleteTargetPath(task, targetPane, targetSftpId, targetEncoding, "symlink");
-          }
-
           const duplicateTarget = defaultAction === "duplicate"
             ? await getDuplicateTarget(task, targetPane, targetSftpId, targetEncoding)
             : null;
@@ -1548,7 +1537,6 @@ export const useSftpTransfers = ({
 
       const updatedTasks: TransferTask[] = [];
       const blockedReplaceTasks: Array<{ task: TransferTask; conflict: FileConflict }> = [];
-      const failedReplaceTasks: Array<{ task: TransferTask; error: string }> = [];
 
       for (const affectedTask of affectedTasks) {
         if (cancelledTasksRef.current.has(affectedTask.id)) continue;
@@ -1580,34 +1568,6 @@ export const useSftpTransfers = ({
             blockedReplaceTasks.push({ task: affectedTask, conflict: affectedConflict });
             continue;
           }
-          if (
-            affectedConflict
-            && shouldUnlinkSftpConflictBeforeReplace(affectedConflict.existingType)
-          ) {
-            const endpoints = resolveTaskEndpoints(affectedTask);
-            if (!endpoints?.targetPane.connection) continue;
-            const targetSftpId = endpoints.targetPane.connection.isLocal
-              ? null
-              : sftpSessionsRef.current.get(endpoints.targetPane.connection.id) ?? null;
-            const targetEncoding = endpoints.targetPane.connection.isLocal
-              ? "auto"
-              : endpoints.targetPane.filenameEncoding || "auto";
-            try {
-              await deleteTargetPath(
-                affectedTask,
-                endpoints.targetPane,
-                targetSftpId,
-                targetEncoding,
-                "symlink",
-              );
-            } catch (error) {
-              failedReplaceTasks.push({
-                task: affectedTask,
-                error: error instanceof Error ? error.message : String(error),
-              });
-              continue;
-            }
-          }
           updatedTask = {
             ...affectedTask,
             skipConflictCheck: true,
@@ -1647,24 +1607,6 @@ export const useSftpTransfers = ({
         );
       }
 
-      if (failedReplaceTasks.length > 0) {
-        const failedErrors = new Map(
-          failedReplaceTasks.map(({ task: failedTask, error }) => [failedTask.id, error]),
-        );
-        setTransfers((prev) =>
-          prev.map((candidate) => failedErrors.has(candidate.id)
-            ? {
-                ...candidate,
-                status: "failed" as TransferStatus,
-                endTime: Date.now(),
-                error: failedErrors.get(candidate.id),
-                conflict: undefined,
-              }
-            : candidate,
-          ),
-        );
-      }
-
       const liveUpdatedTasks = updatedTasks.filter((candidate) => !cancelledTasksRef.current.has(candidate.id));
       const updatedTaskMap = new Map(liveUpdatedTasks.map((updatedTask) => [updatedTask.id, updatedTask]));
       setTransfers((prev) =>

application/state/startupLandingSettings.test.ts

@@ -1,58 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-
-test("startup landing setting participates in cross-window settings sync", () => {
-  const storageSyncSource = readFileSync(new URL("./settingsStorageSync.ts", import.meta.url), "utf8");
-  const ipcSyncSource = readFileSync(new URL("./settingsIpcSync.ts", import.meta.url), "utf8");
-
-  assert.match(storageSyncSource, /STORAGE_KEY_STARTUP_LANDING/);
-  assert.match(storageSyncSource, /setStartupLandingState/);
-  assert.match(storageSyncSource, /e\.key === STORAGE_KEY_STARTUP_LANDING/);
-
-  assert.match(ipcSyncSource, /STORAGE_KEY_STARTUP_LANDING/);
-  assert.match(ipcSyncSource, /setStartupLandingState/);
-  assert.match(ipcSyncSource, /key === STORAGE_KEY_STARTUP_LANDING/);
-});
-
-test("startup landing does not bump the cloud sync settings version", () => {
-  const settingsSource = readFileSync(new URL("./useSettingsState.ts", import.meta.url), "utf8");
-  const settingsVersionIndex = settingsSource.indexOf("settingsVersion: useMemo");
-  const settingsVersionSource = settingsSource.slice(settingsVersionIndex);
-
-  assert.notEqual(settingsVersionIndex, -1);
-  assert.doesNotMatch(settingsVersionSource, /startupLanding/);
-});
-
-test("main window opens local terminal on cold start when preferred", () => {
-  const sideEffectsSource = readFileSync(new URL("../app/AppSideEffects.tsx", import.meta.url), "utf8");
-
-  assert.match(sideEffectsSource, /startupLocalTerminalAttemptedRef/);
-  assert.match(sideEffectsSource, /shouldOpenLocalTerminalOnStartup/);
-  assert.match(sideEffectsSource, /STORAGE_KEY_STARTUP_LANDING/);
-  assert.match(sideEffectsSource, /handleCreateLocalTerminal\(/);
-  assert.match(sideEffectsSource, /onColdStartIntentsSettled/);
-  assert.match(sideEffectsSource, /ensureDiscoveredShells/);
-  assert.match(sideEffectsSource, /hasQueuedStartupIntent:\s*startupLaunchIntentReceivedRef\.current/);
-
-  const latchAt = sideEffectsSource.indexOf("if (startupLocalTerminalAttemptedRef.current) return;");
-  const setLatchAt = sideEffectsSource.indexOf(
-    "startupLocalTerminalAttemptedRef.current = true;",
-    latchAt,
-  );
-  const createAt = sideEffectsSource.indexOf("handleCreateLocalTerminal(", setLatchAt);
-  assert.notEqual(latchAt, -1);
-  assert.notEqual(setLatchAt, -1);
-  assert.notEqual(createAt, -1);
-  assert.ok(setLatchAt < createAt, "StrictMode latch must be set before creating the terminal");
-});
-
-test("settings system tab exposes startup landing control", () => {
-  const tabSource = readFileSync(
-    new URL("../../components/settings/tabs/SettingsSystemTab.tsx", import.meta.url),
-    "utf8",
-  );
-  assert.match(tabSource, /system-startup-landing/);
-  assert.match(tabSource, /settings\.sessionRestore\.startupLanding/);
-  assert.match(tabSource, /local-terminal/);
-});

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/terminalConnectionReuse.test.ts

@@ -6,7 +6,6 @@ import {
   canReuseTerminalConnection,
   createCopiedTerminalSessionClone,
   createSplitTerminalSessionClone,
-  isTerminalSessionEligibleForSftpReuse,
 } from "./terminalConnectionReuse";
 
 const session = (overrides: Partial<TerminalSession> = {}): TerminalSession => ({
@@ -25,14 +24,6 @@ test("connected SSH sessions can reuse their authenticated connection", () => {
   assert.equal(canReuseTerminalConnection(session({ protocol: undefined })), true);
 });
 
-test("SSH sessions stay SFTP-linkable while reconnecting", () => {
-  assert.equal(isTerminalSessionEligibleForSftpReuse(session({ status: "connecting" })), true);
-  assert.equal(isTerminalSessionEligibleForSftpReuse(session({ status: "disconnected" })), true);
-  assert.equal(isTerminalSessionEligibleForSftpReuse(session({ protocol: "local" })), false);
-  assert.equal(isTerminalSessionEligibleForSftpReuse(session({ moshEnabled: true })), false);
-  assert.equal(isTerminalSessionEligibleForSftpReuse(session({ etEnabled: true })), false);
-});
-
 test("non-SSH or unavailable sessions do not reuse a connection", () => {
   assert.equal(canReuseTerminalConnection(session({ status: "connecting" })), false);
   assert.equal(canReuseTerminalConnection(session({ status: "disconnected" })), false);

application/state/terminalConnectionReuse.ts

@@ -1,16 +1,12 @@
 import type { TerminalSession } from "../../domain/models";
 
-/** SSH (non-mosh/et) sessions that can back SFTP once the transport is up. */
-export function isTerminalSessionEligibleForSftpReuse(session: TerminalSession): boolean {
-  return (
-    (session.protocol === "ssh" || session.protocol === undefined)
-    && !session.moshEnabled
-    && !session.etEnabled
-  );
-}
-
 export function canReuseTerminalConnection(session: TerminalSession): boolean {
-  return isTerminalSessionEligibleForSftpReuse(session) && session.status === "connected";
+  return (
+    (session.protocol === "ssh" || session.protocol === undefined) &&
+    !session.moshEnabled &&
+    !session.etEnabled &&
+    session.status === "connected"
+  );
 }
 
 type CloneSessionOptions = {

application/state/terminalKeyboardFocus.ts

@@ -1,98 +0,0 @@
-const TERMINAL_KEYBOARD_TARGET_SELECTOR =
-  ".xterm, .xterm-helper-textarea, .xterm-screen, .xterm-viewport";
-
-type FocusDocument = Pick<Document, "activeElement" | "addEventListener" | "removeEventListener">;
-type FocusWindow = Pick<Window, "addEventListener" | "removeEventListener">;
-
-export const isTerminalKeyboardTarget = (target: EventTarget | null): boolean => {
-  const element = target as (Element & {
-    closest?: (selector: string) => Element | null;
-  }) | null;
-  return Boolean(element?.closest?.(TERMINAL_KEYBOARD_TARGET_SELECTOR));
-};
-
-export function installTerminalKeyboardFocusTracking(
-  documentRef: FocusDocument,
-  windowRef: FocusWindow,
-  onFocusChange: (focused: boolean) => void,
-): () => void {
-  let pendingPointerTarget: EventTarget | null | undefined;
-  let pendingPointerClearTimer: ReturnType<typeof setTimeout> | undefined;
-  let isTracking = true;
-  let windowFocused = true;
-
-  const clearPendingPointerTarget = () => {
-    if (pendingPointerClearTimer !== undefined) {
-      clearTimeout(pendingPointerClearTimer);
-      pendingPointerClearTimer = undefined;
-    }
-    pendingPointerTarget = undefined;
-  };
-
-  const publishForTarget = (target: EventTarget | null) => {
-    if (!isTracking) return;
-    onFocusChange(windowFocused && isTerminalKeyboardTarget(target));
-  };
-
-  const handlePointerDown = (event: Event) => {
-    clearPendingPointerTarget();
-    pendingPointerTarget = event.target;
-    pendingPointerClearTimer = setTimeout(() => {
-      const pointerTarget = pendingPointerTarget;
-      clearPendingPointerTarget();
-      if (pointerTarget !== undefined) {
-        publishForTarget(documentRef.activeElement);
-      }
-    }, 0);
-  };
-
-  const handleFocusIn = (event: Event) => {
-    clearPendingPointerTarget();
-    publishForTarget(event.target);
-  };
-
-  const handleFocusOut = () => {
-    queueMicrotask(() => {
-      if (!isTracking) return;
-      const pointerTarget = pendingPointerTarget;
-      clearPendingPointerTarget();
-      if (!windowFocused) {
-        onFocusChange(false);
-        return;
-      }
-      if (pointerTarget !== undefined) {
-        publishForTarget(documentRef.activeElement);
-        return;
-      }
-      publishForTarget(documentRef.activeElement);
-    });
-  };
-
-  const handleWindowBlur = () => {
-    windowFocused = false;
-    clearPendingPointerTarget();
-    onFocusChange(false);
-  };
-
-  const handleWindowFocus = () => {
-    windowFocused = true;
-    publishForTarget(documentRef.activeElement);
-  };
-
-  publishForTarget(documentRef.activeElement);
-  documentRef.addEventListener("pointerdown", handlePointerDown, true);
-  documentRef.addEventListener("focusin", handleFocusIn, true);
-  documentRef.addEventListener("focusout", handleFocusOut, true);
-  windowRef.addEventListener("blur", handleWindowBlur);
-  windowRef.addEventListener("focus", handleWindowFocus);
-
-  return () => {
-    isTracking = false;
-    documentRef.removeEventListener("pointerdown", handlePointerDown, true);
-    documentRef.removeEventListener("focusin", handleFocusIn, true);
-    documentRef.removeEventListener("focusout", handleFocusOut, true);
-    windowRef.removeEventListener("blur", handleWindowBlur);
-    windowRef.removeEventListener("focus", handleWindowFocus);
-    clearPendingPointerTarget();
-  };
-}

application/state/uploadService.test.ts

@@ -490,341 +490,6 @@ test("does not replace an existing directory when uploading a same-named file",
   assert.match(results[0].error ?? "", /directory/i);
 });
 
-test("file replace leaves the remote destination so upload can restore mode bits", async () => {
-  // Deleting before overwrite recreates the inode with umask defaults and drops
-  // bits like +x (#2954). Keep the target so stage+rename can restore mode.
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  Object.defineProperty(file, "path", { value: "/local/tool.sh" });
-  const deletedPaths: string[] = [];
-  const deletedTypes: Array<string | undefined> = [];
-  const uploadedPaths: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/usr/local/bin",
-      sftpId: "sftp-1",
-      isLocal: false,
-      bridge: {
-        mkdirSftp: async () => {},
-        statSftp: async (_sftpId, path) =>
-          path === "/usr/local/bin/tool.sh"
-            ? { type: "file", size: 9, lastModified: 1000 }
-            : null,
-        deleteSftp: async (_sftpId, path, expectedType) => {
-          deletedPaths.push(path);
-          deletedTypes.push(expectedType);
-        },
-        startStreamTransfer: async ({ targetPath: path }) => {
-          uploadedPaths.push(path);
-          return { transferId: "upload-1" };
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => "replace",
-    },
-  );
-
-  assert.deepEqual(deletedPaths, [], "file replace must not delete before upload");
-  assert.deepEqual(uploadedPaths, ["/usr/local/bin/tool.sh"]);
-  assert.equal(results.length, 1);
-  assert.equal(results[0].success, true);
-});
-
-test("file replace unlinks an existing symlink before upload", async () => {
-  // Leaving the symlink would let in-place upload follow it and overwrite the
-  // link target outside the displayed directory.
-  // Conflict checks use lstatSftp so Replace unlinks the link first.
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  Object.defineProperty(file, "path", { value: "/local/tool.sh" });
-  const deletedPaths: string[] = [];
-  const deletedTypes: Array<string | undefined> = [];
-  const uploadedPaths: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/usr/local/bin",
-      sftpId: "sftp-1",
-      isLocal: false,
-      bridge: {
-        mkdirSftp: async () => {},
-        // Followed stat would report type "file" and skip pre-delete.
-        statSftp: async () => ({ type: "file", size: 4096, lastModified: 1000 }),
-        lstatSftp: async (_sftpId, path) =>
-          path === "/usr/local/bin/tool.sh"
-            ? { type: "symlink", size: 12, lastModified: 1000 }
-            : null,
-        deleteSftp: async (_sftpId, path, expectedType) => {
-          deletedPaths.push(path);
-          deletedTypes.push(expectedType);
-        },
-        startStreamTransfer: async ({ targetPath: path }) => {
-          uploadedPaths.push(path);
-          return { transferId: "upload-1" };
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => "replace",
-    },
-  );
-
-  assert.deepEqual(deletedPaths, ["/usr/local/bin/tool.sh"]);
-  assert.deepEqual(deletedTypes, ["symlink"]);
-  assert.deepEqual(uploadedPaths, ["/usr/local/bin/tool.sh"]);
-  assert.equal(results.length, 1);
-  assert.equal(results[0].success, true);
-});
-
-test("LSTAT ENOTSUP is not treated as an absent destination during conflict check", async () => {
-  // If unsupported LSTAT is swallowed as "missing", upload skips Replace and may
-  // write through an existing symlink to a target outside the displayed dir.
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  Object.defineProperty(file, "path", { value: "/local/tool.sh" });
-  let uploaded = 0;
-  let conflictPrompts = 0;
-
-  await assert.rejects(
-    () => uploadFromFileList(
-      [file],
-      {
-        targetPath: "/usr/local/bin",
-        sftpId: "sftp-1",
-        isLocal: false,
-        bridge: {
-          mkdirSftp: async () => {},
-          lstatSftp: async () => {
-            const error = new Error(
-              "Remote server does not support LSTAT; cannot classify path without following symlinks",
-            ) as Error & { code: string; lstatUnavailable: boolean };
-            error.code = "ENOTSUP";
-            error.lstatUnavailable = true;
-            throw error;
-          },
-          startStreamTransfer: async () => {
-            uploaded += 1;
-            return { transferId: "upload-1" };
-          },
-        },
-        joinPath: (base, name) => `${base}/${name}`,
-        resolveConflict: async () => {
-          conflictPrompts += 1;
-          return "replace";
-        },
-      },
-    ),
-    (error: Error & { code?: string }) => {
-      assert.equal(error.code, "ENOTSUP");
-      assert.match(String(error.message), /does not support LSTAT/i);
-      return true;
-    },
-  );
-
-  assert.equal(uploaded, 0, "must not upload when destination type is unknown");
-  assert.equal(conflictPrompts, 0, "must not pretend destination is missing");
-});
-
-test("ENOENT from lstat still means absent destination for conflict check", async () => {
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  Object.defineProperty(file, "path", { value: "/local/tool.sh" });
-  const uploadedPaths: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/usr/local/bin",
-      sftpId: "sftp-1",
-      isLocal: false,
-      bridge: {
-        mkdirSftp: async () => {},
-        lstatSftp: async () => {
-          const error = new Error("No such file") as Error & { code: string };
-          error.code = "ENOENT";
-          throw error;
-        },
-        startStreamTransfer: async ({ targetPath: path }) => {
-          uploadedPaths.push(path);
-          return { transferId: "upload-1" };
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => {
-        throw new Error("absent destination must not prompt for conflict");
-      },
-    },
-  );
-
-  assert.deepEqual(uploadedPaths, ["/usr/local/bin/tool.sh"]);
-  assert.equal(results.length, 1);
-  assert.equal(results[0].success, true);
-});
-
-test("compressed-upload LSTAT ENOTSUP is not treated as an absent destination", async (t) => {
-  let compressedStarts = 0;
-  installCompressedUploadBridge(t, {
-    onStart: () => { compressedStarts += 1; },
-  });
-  let streamCalls = 0;
-
-  await assert.rejects(
-    () => uploadFromFileList(
-      [createPickedFolderFile()],
-      {
-        targetPath: "/remote",
-        sftpId: "sftp-1",
-        isLocal: false,
-        bridge: {
-          mkdirSftp: async () => {},
-          lstatSftp: async () => {
-            const error = new Error(
-              "Remote server does not support LSTAT; cannot classify path without following symlinks",
-            ) as Error & { code: string; lstatUnavailable: boolean };
-            error.code = "ENOTSUP";
-            error.lstatUnavailable = true;
-            throw error;
-          },
-          startStreamTransfer: async (payload) => {
-            streamCalls += 1;
-            return { transferId: payload.transferId };
-          },
-        },
-        joinPath: (base, name) => `${base}/${name}`,
-        useCompressedUpload: true,
-        resolveConflict: async () => "merge",
-      },
-    ),
-    (error: Error & { code?: string }) => {
-      assert.equal(error.code, "ENOTSUP");
-      return true;
-    },
-  );
-
-  assert.equal(compressedStarts, 0);
-  assert.equal(streamCalls, 0);
-});
-
-test("directory replace unlinks an existing symlink before mkdir", async () => {
-  // No-follow lstat reports symlink; Replace must unlink then create the dir
-  // (followed stat used to classify symlink-to-dir as directory and succeed).
-  const file = new File(["nested"], "file.txt", { lastModified: 1234 });
-  Object.defineProperty(file, "path", { value: "/local/docs/file.txt" });
-  Object.defineProperty(file, "webkitRelativePath", { value: "docs/file.txt" });
-  const deletedPaths: string[] = [];
-  const deletedTypes: Array<string | undefined> = [];
-  const madeDirs: string[] = [];
-  const uploadedPaths: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/remote",
-      sftpId: "sftp-1",
-      isLocal: false,
-      bridge: {
-        mkdirSftp: async (_sftpId, path) => {
-          madeDirs.push(path);
-        },
-        lstatSftp: async (_sftpId, path) =>
-          path === "/remote/docs"
-            ? { type: "symlink", size: 8, lastModified: 1000 }
-            : null,
-        deleteSftp: async (_sftpId, path, expectedType) => {
-          deletedPaths.push(path);
-          deletedTypes.push(expectedType);
-        },
-        startStreamTransfer: async ({ targetPath: path }) => {
-          uploadedPaths.push(path);
-          return { transferId: "upload-dir-1" };
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => "replace",
-    },
-  );
-
-  assert.deepEqual(deletedPaths, ["/remote/docs"]);
-  assert.deepEqual(deletedTypes, ["symlink"]);
-  assert.ok(madeDirs.includes("/remote/docs"), `expected mkdir after unlink, got ${JSON.stringify(madeDirs)}`);
-  assert.deepEqual(uploadedPaths, ["/remote/docs/file.txt"]);
-  assert.equal(results.some((r) => r.success), true);
-});
-
-test("local file replace unlinks an existing symlink before writeLocalFile", async () => {
-  // Pathless File uploads fall back to writeLocalFile, which follows symlinks.
-  // Conflict checks use lstatLocal so Replace unlinks the link first.
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  const deletedPaths: string[] = [];
-  const deletedTypes: Array<string | undefined> = [];
-  const writtenPaths: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/Users/me/bin",
-      sftpId: null,
-      isLocal: true,
-      bridge: {
-        mkdirSftp: async () => {},
-        lstatLocal: async (path) =>
-          path === "/Users/me/bin/tool.sh"
-            ? { type: "symlink", size: 12, lastModified: 1000 }
-            : null,
-        deleteLocalFile: async (path, expectedType) => {
-          deletedPaths.push(path);
-          deletedTypes.push(expectedType);
-        },
-        writeLocalFile: async (path) => {
-          writtenPaths.push(path);
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => "replace",
-    },
-  );
-
-  assert.deepEqual(deletedPaths, ["/Users/me/bin/tool.sh"]);
-  assert.deepEqual(deletedTypes, ["symlink"]);
-  assert.deepEqual(writtenPaths, ["/Users/me/bin/tool.sh"]);
-  assert.equal(results.length, 1);
-  assert.equal(results[0].success, true);
-});
-
-test("local file replace unlinks a regular file before writeLocalFile", async () => {
-  const file = new File(["new-bytes"], "tool.sh", { lastModified: 1234 });
-  const operations: string[] = [];
-
-  const results = await uploadFromFileList(
-    [file],
-    {
-      targetPath: "/Users/me/bin",
-      sftpId: null,
-      isLocal: true,
-      bridge: {
-        mkdirSftp: async () => {},
-        lstatLocal: async (path) =>
-          path === "/Users/me/bin/tool.sh"
-            ? { type: "file", size: 12, lastModified: 1000 }
-            : null,
-        deleteLocalFile: async (path, expectedType) => {
-          operations.push(`delete:${path}:${expectedType}`);
-        },
-        writeLocalFile: async (path) => {
-          operations.push(`write:${path}`);
-        },
-      },
-      joinPath: (base, name) => `${base}/${name}`,
-      resolveConflict: async () => "replace",
-    },
-  );
-
-  assert.deepEqual(operations, [
-    "delete:/Users/me/bin/tool.sh:file",
-    "write:/Users/me/bin/tool.sh",
-  ]);
-  assert.equal(results.length, 1);
-  assert.equal(results[0].success, true);
-});
-
 test("counts apply-to-all upload conflicts by incoming and existing type", async () => {
   const files = [
     new File(["local"], "existing-file", { lastModified: 1234 }),

application/state/useAIState.ts

@@ -73,11 +73,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,119 +968,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 currentPanelViewByScope = latestAIPanelViewByScopeSnapshot ?? {};
-    const seeded = seedWorkspaceAIActiveSessionFromMembers({
-      activeSessionIdMap: currentMap,
-      panelViewByScope: currentPanelViewByScope,
-      workspaceId: input.workspaceId,
-      memberTerminalIds: input.memberTerminalIds,
-      preferredTerminalId: input.preferredTerminalId,
-    });
-    if (!seeded) return;
-    setLatestAIActiveSessionMapSnapshot(seeded.activeSessionIdMap);
-    localStorageAdapter.write(STORAGE_KEY_AI_ACTIVE_SESSION_MAP, seeded.activeSessionIdMap);
-    emitAIStateChanged(STORAGE_KEY_AI_ACTIVE_SESSION_MAP);
-    setActiveSessionIdMapRaw(seeded.activeSessionIdMap);
-    if (seeded.panelViewChanged) {
-      setLatestAIPanelViewByScopeSnapshot(seeded.panelViewByScope);
-      emitAIStateChanged(AI_STATE_CHANGED_PANEL_VIEW_BY_SCOPE);
-      setPanelViewByScopeRaw(seeded.panelViewByScope);
-    }
-  }, []);
-
-  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]);
@@ -1189,9 +1071,6 @@ export function useAIState() {
     updateMessageById,
     persistContextCompaction,
     cleanupOrphanedSessions,
-    seedWorkspaceActiveSessionFromMembers,
-    handoffDissolvedWorkspaceScope,
-    retargetWorkspaceActiveChatForMemberLoss,
   }), [
     providers,
     setProviders,
@@ -1245,8 +1124,5 @@ export function useAIState() {
     updateMessageById,
     persistContextCompaction,
     cleanupOrphanedSessions,
-    seedWorkspaceActiveSessionFromMembers,
-    handoffDissolvedWorkspaceScope,
-    retargetWorkspaceActiveChatForMemberLoss,
   ]);
 }

application/state/useAutoSync.test.ts

@@ -109,7 +109,6 @@ test("enabled convergent startup checks preview empty-vault recovery before sync
     "conflictActionOverride: 'download-remote'",
     recoveryPromptIndex,
   );
-  const manualTriggerIndex = source.indexOf("trigger: 'manual'", recoveryPromptIndex);
   const normalSyncIndex = source.indexOf(
     "syncNowRef.current({ notifyOnFailure, allowEmptyConvergentSync })",
     cloudWinsIndex,
@@ -119,41 +118,16 @@ test("enabled convergent startup checks preview empty-vault recovery before sync
   assert.notEqual(previewIndex, -1);
   assert.notEqual(recoveryPromptIndex, -1);
   assert.notEqual(cloudWinsIndex, -1);
-  assert.notEqual(manualTriggerIndex, -1);
   assert.notEqual(normalSyncIndex, -1);
   assert.ok(
     convergentGuardIndex < previewIndex
       && previewIndex < recoveryPromptIndex
-      && recoveryPromptIndex < manualTriggerIndex
-      && manualTriggerIndex < cloudWinsIndex
+      && recoveryPromptIndex < cloudWinsIndex
       && cloudWinsIndex < normalSyncIndex,
     "v2 startup must offer recovery and use cloud-wins before the normal CRDT sync path",
   );
 });
 
-test("empty-vault recovery restore bypasses the auto-sync preference gate", () => {
-  const source = readFileSync(new URL("./useAutoSync.ts", import.meta.url), "utf8");
-  const recoveryPromptIndex = source.indexOf("requestEmptyVaultRecovery(recoveryPayload)");
-  const restoreCallIndex = source.indexOf("syncNowRef.current({", recoveryPromptIndex);
-  const triggerIndex = source.indexOf("trigger: 'manual'", restoreCallIndex);
-  const conflictIndex = source.indexOf(
-    "conflictActionOverride: 'download-remote'",
-    restoreCallIndex,
-  );
-  const callEndIndex = source.indexOf("});", conflictIndex);
-
-  assert.notEqual(recoveryPromptIndex, -1);
-  assert.notEqual(restoreCallIndex, -1);
-  assert.notEqual(triggerIndex, -1);
-  assert.notEqual(conflictIndex, -1);
-  assert.ok(
-    restoreCallIndex < triggerIndex
-      && triggerIndex < conflictIndex
-      && conflictIndex < callEndIndex,
-    "recovery Restore must pass trigger:manual so disabled auto-sync cannot block it",
-  );
-});
-
 test("empty v2 startup checks allow a validated empty sync to open the gate", () => {
   const source = readFileSync(new URL("./useAutoSync.ts", import.meta.url), "utf8");
   const convergentGuardIndex = source.indexOf(
@@ -218,38 +192,6 @@ test("auto-sync skips only the exact remote-applied data hash", () => {
   );
 });
 
-test("auto syncNow and debounce re-check manager autoSyncEnabled before pushing", () => {
-  const source = readFileSync(new URL("./useAutoSync.ts", import.meta.url), "utf8");
-  const helperIndex = source.indexOf("function isPersistedAutoSyncEnabled");
-  const syncNowIndex = source.indexOf("const syncNow = useCallback");
-  const autoGateIndex = source.indexOf(
-    "if (trigger === 'auto' && !isPersistedAutoSyncEnabled(manager.getState().autoSyncEnabled))",
-    syncNowIndex,
-  );
-  const debounceIndex = source.indexOf("// Debounced auto-sync when data changes");
-  const fireTimeGateIndex = source.indexOf(
-    "if (!isPersistedAutoSyncEnabled(manager.getState().autoSyncEnabled))",
-    debounceIndex,
-  );
-  const clearTimerIndex = source.indexOf(
-    "if (syncTimeoutRef.current) {\n        clearTimeout(syncTimeoutRef.current);\n        syncTimeoutRef.current = null;\n      }\n      return;",
-    debounceIndex,
-  );
-
-  assert.notEqual(helperIndex, -1);
-  assert.notEqual(syncNowIndex, -1);
-  assert.notEqual(autoGateIndex, -1);
-  assert.notEqual(fireTimeGateIndex, -1);
-  assert.notEqual(clearTimerIndex, -1);
-  assert.ok(
-    helperIndex < syncNowIndex
-      && syncNowIndex < autoGateIndex
-      && debounceIndex < fireTimeGateIndex
-      && debounceIndex < clearTimerIndex,
-    "auto-sync off must gate both syncNow(auto) and the debounced timer path",
-  );
-});
-
 test("startup local-wins and merge round-trips refuse device-bound credential placeholders", () => {
   const source = readFileSync(new URL("./useAutoSync.ts", import.meta.url), "utf8");
   const uploadLocalIndex = source.indexOf("if (conflictAction === 'upload-local')");

application/state/useAutoSync.ts

@@ -17,7 +17,7 @@ import {
   healPoisonedSecretsForMerge,
   stripSyncPayloadEncryptedCredentials,
 } from '../../domain/credentials';
-import { isProviderReadyForSync, SYNC_STORAGE_KEYS, type CloudProvider, type SyncPayload } from '../../domain/sync';
+import { isProviderReadyForSync, type CloudProvider, type SyncPayload } from '../../domain/sync';
 import { mergeSyncPayloads } from '../../domain/syncMerge';
 import { materializeSyncPayloadFromConvergentState } from '../../domain/convergentSync';
 import {
@@ -51,19 +51,6 @@ import {
 import { resolveAutoSyncHashDecision } from './autoSyncHashDecision';
 import { getNotesSnapshot, subscribeNotes } from './notesStore';
 
-/** Prefer dedicated SYNC_PREFERENCES; fall back to legacy SYNC_CONFIG fields. */
-function isPersistedAutoSyncEnabled(fallback: boolean): boolean {
-  const preferences = localStorageAdapter.read<{ autoSync?: boolean }>(
-    SYNC_STORAGE_KEYS.SYNC_PREFERENCES,
-  );
-  if (preferences && typeof preferences === 'object' && preferences.autoSync !== undefined) {
-    return Boolean(preferences.autoSync);
-  }
-  const stored = localStorageAdapter.read<{ autoSync?: boolean }>(SYNC_STORAGE_KEYS.SYNC_CONFIG);
-  if (!stored || typeof stored !== 'object') return fallback;
-  return Boolean(stored.autoSync);
-}
-
 interface AutoSyncConfig {
   enabled?: boolean;
   // Data to sync
@@ -325,13 +312,6 @@ export const useAutoSync = (config: AutoSyncConfig) => {
     }
     const trigger: SyncTrigger = options?.trigger ?? 'auto';
 
-    // Defense for #2976: auto pushes must honor the persisted preference even
-    // when this window's React/manager snapshot is briefly stale after another
-    // window disables auto-sync.
-    if (trigger === 'auto' && !isPersistedAutoSyncEnabled(manager.getState().autoSyncEnabled)) {
-      return false;
-    }
-
     isSyncRunningRef.current = true;
     try {
       // Get fresh state directly from CloudSyncManager singleton
@@ -691,10 +671,7 @@ export const useAutoSync = (config: AutoSyncConfig) => {
           if (recoveryPayload && shouldPromptCloudVaultRecovery(localPayload, recoveryPayload)) {
             const userAction = await requestEmptyVaultRecovery(recoveryPayload);
             if (userAction === 'restore') {
-              // Explicit recovery must not honor the auto-sync preference gate:
-              // the user already confirmed Restore in the dialog.
               const restored = await syncNowRef.current({
-                trigger: 'manual',
                 notifyOnFailure,
                 conflictActionOverride: 'download-remote',
               });
@@ -996,12 +973,6 @@ export const useAutoSync = (config: AutoSyncConfig) => {
     }
     // Skip if not ready
     if (!sync.hasAnyConnectedProvider || !sync.autoSyncEnabled || !sync.isUnlocked) {
-      // Drop any pending debounce when auto-sync (or readiness) turns off so a
-      // timer scheduled while enabled cannot fire after the toggle (#2976).
-      if (syncTimeoutRef.current) {
-        clearTimeout(syncTimeoutRef.current);
-        syncTimeoutRef.current = null;
-      }
       return;
     }
 
@@ -1059,12 +1030,6 @@ export const useAutoSync = (config: AutoSyncConfig) => {
           return;
         }
 
-        // Re-check at fire time: auto-sync may have been disabled in another
-        // window during the debounce window (#2976).
-        if (!isPersistedAutoSyncEnabled(manager.getState().autoSyncEnabled)) {
-          return;
-        }
-
         // Wait for the current sync to finish, then this effect will re-run
         // because sync.isSyncing changed.
         if (sync.isSyncing || isSyncRunningRef.current) {

application/state/useExternalMcpSessionSync.test.ts

@@ -1,75 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import test from 'node:test';
-
-import { createLatestPayloadSync } from './useExternalMcpSessionSync.ts';
-
-const hookSource = readFileSync(new URL('./useExternalMcpSessionSync.ts', import.meta.url), 'utf8');
-const appSource = readFileSync(new URL('../app/AppSideEffects.tsx', import.meta.url), 'utf8');
-const preloadSource = readFileSync(new URL('../../electron/preload/api.cjs', import.meta.url), 'utf8');
-const handlerSource = readFileSync(
-  new URL('../../electron/bridges/aiBridge/agentProcessHandlers.cjs', import.meta.url),
-  'utf8',
-);
-
-test('app live session sync stays mounted and is independent of External MCP enablement', () => {
-  assert.match(appSource, /useExternalMcpSessionSync\(\{/);
-  assert.match(hookSource, /bridge\.aiMcpUpdateLiveSessions\?\.\(nextPayload\)/);
-  assert.match(hookSource, /liveSyncRef\.current\.push\(payload, serialized\)/);
-  assert.match(hookSource, /bridge\.aiMcpUpdateSessions\?\.\(/);
-  assert.match(hookSource, /externalSyncRef\.current\.push\(payload, serialized\)/);
-  assert.doesNotMatch(
-    hookSource,
-    /if \(!enabled\)[\s\S]{0,300}aiMcpUpdateLiveSessions/,
-  );
-});
-
-test('live session sync has a complete renderer to main-process IPC path', () => {
-  assert.match(preloadSource, /netcatty:ai:mcp:update-live-sessions/);
-  assert.match(handlerSource, /netcatty:ai:mcp:update-live-sessions/);
-  assert.match(handlerSource, /mcpServerBridge\.updateLiveSessionMetadata/);
-});
-
-test('latest payload sync converges to A-B-A while B is in flight', async () => {
-  let releaseB: (() => void) | undefined;
-  const sent: string[] = [];
-  const sync = createLatestPayloadSync(async (payload: string) => {
-    sent.push(payload);
-    if (payload === 'B') {
-      await new Promise<void>((resolve) => {
-        releaseB = resolve;
-      });
-    }
-    return { ok: true };
-  });
-
-  await sync.push('A');
-  const sendingB = sync.push('B');
-  void sync.push('A');
-  releaseB?.();
-  await sendingB;
-
-  assert.deepEqual(sent, ['A', 'B', 'A']);
-});
-
-test('cancelling a payload sync drops a queued update', async () => {
-  let releaseA: (() => void) | undefined;
-  const sent: string[] = [];
-  const sync = createLatestPayloadSync(async (payload: string) => {
-    sent.push(payload);
-    if (payload === 'A') {
-      await new Promise<void>((resolve) => {
-        releaseA = resolve;
-      });
-    }
-    return { ok: true };
-  });
-
-  const sendingA = sync.push('A');
-  void sync.push('B');
-  sync.cancel();
-  releaseA?.();
-  await sendingA;
-
-  assert.deepEqual(sent, ['A']);
-});

application/state/useExternalMcpSessionSync.ts

@@ -17,49 +17,6 @@ type UseExternalMcpSessionSyncOptions = {
   portForwardingRules: PortForwardingRule[];
 };
 
-export function createLatestPayloadSync<T>(
-  send: (payload: T) => Promise<unknown>,
-) {
-  let desired: { serialized: string; payload: T } | null = null;
-  let acknowledged = '';
-  let inFlight: Promise<void> | null = null;
-  let cancelled = false;
-
-  const pump = async () => {
-    while (!cancelled && desired && desired.serialized !== acknowledged) {
-      const target = desired;
-      try {
-        const result = await send(target.payload);
-        if (cancelled) break;
-        if (result && typeof result === 'object' && 'ok' in result && (result as { ok?: boolean }).ok === false) {
-          if (desired === target) break;
-          continue;
-        }
-        acknowledged = target.serialized;
-      } catch {
-        if (desired === target) break;
-      }
-    }
-  };
-
-  return {
-    push(payload: T, serialized = JSON.stringify(payload)): Promise<void> {
-      if (cancelled) return Promise.resolve();
-      desired = { payload, serialized };
-      if (!inFlight) {
-        inFlight = pump().finally(() => {
-          inFlight = null;
-        });
-      }
-      return inFlight;
-    },
-    cancel(): void {
-      cancelled = true;
-      desired = null;
-    },
-  };
-}
-
 function isMainAppWindow(): boolean {
   if (typeof window === 'undefined') return false;
   const hash = window.location.hash || '';
@@ -86,6 +43,7 @@ export function useExternalMcpSessionSync({
     void enabledTick;
     return readExternalMcpStoredEnabled();
   }, [enabledTick]);
+  const syncGenerationRef = useRef(0);
 
   useEffect(() => {
     const bump = () => setEnabledTick((value) => value + 1);
@@ -119,41 +77,34 @@ export function useExternalMcpSessionSync({
     });
   }, [sessions, sessionHostsMap, hosts, portForwardingRules]);
 
-  const liveSyncRef = useRef<ReturnType<typeof createLatestPayloadSync<typeof payload>> | null>(null);
-  const externalSyncRef = useRef<ReturnType<typeof createLatestPayloadSync<typeof payload>> | null>(null);
-
-  useEffect(() => {
-    if (!isMainAppWindow()) return;
-    const bridge = netcattyBridge.get();
-    if (!bridge?.aiMcpUpdateLiveSessions) return;
-    const serialized = JSON.stringify(payload);
-    liveSyncRef.current ??= createLatestPayloadSync((nextPayload) => (
-      Promise.resolve(bridge.aiMcpUpdateLiveSessions?.(nextPayload))
-    ));
-    void liveSyncRef.current.push(payload, serialized);
-  }, [payload]);
+  const lastSentSerializedRef = useRef('');
 
   useEffect(() => {
     if (!isMainAppWindow()) return;
     if (!enabled) {
-      // Recreate the synchronizer after re-enabling because disabling can
-      // clear the main-process scope even when the renderer payload is equal.
-      externalSyncRef.current?.cancel();
-      externalSyncRef.current = null;
+      syncGenerationRef.current += 1;
+      lastSentSerializedRef.current = '';
       return;
     }
     const bridge = netcattyBridge.get();
     if (!bridge?.aiMcpUpdateSessions) return;
 
     const serialized = JSON.stringify(payload);
+    if (serialized === lastSentSerializedRef.current) return;
+
+    const generation = ++syncGenerationRef.current;
     const timeoutId = window.setTimeout(() => {
-      externalSyncRef.current ??= createLatestPayloadSync((nextPayload) => (
-        Promise.resolve(bridge.aiMcpUpdateSessions?.(
-          nextPayload,
-          EXTERNAL_MCP_CHAT_SESSION_ID,
-        ))
-      ));
-      void externalSyncRef.current.push(payload, serialized);
+      void Promise.resolve(bridge.aiMcpUpdateSessions?.(payload, EXTERNAL_MCP_CHAT_SESSION_ID))
+        .then((result) => {
+          if (generation !== syncGenerationRef.current) return;
+          if (result && typeof result === 'object' && 'ok' in result && (result as { ok?: boolean }).ok === false) {
+            return;
+          }
+          lastSentSerializedRef.current = serialized;
+        })
+        .catch(() => {
+          // Leave the ref unset so the next effect can retry.
+        });
     }, 250);
 
     return () => {

application/state/useExternalMcpToggleState.test.ts

@@ -199,36 +199,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 {

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';
@@ -107,7 +105,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 +126,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 +280,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 {

application/state/useOutputTriggers.test.ts

@@ -1,7 +1,5 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import React from 'react';
-import { act, create, type ReactTestRenderer } from 'react-test-renderer';
 import {
   createDeferredOutputTriggerEventProcessor,
   createOutputTriggerScanBuffer,
@@ -9,7 +7,6 @@ import {
   findMatchEndingAfter,
   hasApplicableOutputTriggerSnippet,
   inspectDroppedOutputOverflowAlternateScreenState,
-  useOutputTriggers,
 } from './useOutputTriggers.ts';
 import { createTerminalOutputTriggerFilter } from '@/domain/terminalOutputTriggerFilter.ts';
 import type { Snippet } from '@/domain/models';
@@ -96,80 +93,6 @@ test('hasApplicableOutputTriggerSnippet requires a runnable output trigger for t
   assert.equal(hasApplicableOutputTriggerSnippet(snippets, 'host-a'), true);
 });
 
-test('hasApplicableOutputTriggerSnippet follows the host current group', () => {
-  const snippets: Snippet[] = [{
-    id: 'group-trigger',
-    label: 'Group trigger',
-    command: '',
-    kind: 'script',
-    trigger: 'onOutput',
-    triggerPattern: 'READY',
-    targetGroups: ['Production'],
-  }];
-  assert.equal(
-    hasApplicableOutputTriggerSnippet(snippets, { id: 'host-a', group: 'Production/Web' }),
-    true,
-  );
-  assert.equal(
-    hasApplicableOutputTriggerSnippet(snippets, { id: 'host-a', group: 'Staging' }),
-    false,
-  );
-});
-
-test('equivalent host objects do not reset a pending output trigger match', async () => {
-  const actEnvironment = globalThis as typeof globalThis & {
-    IS_REACT_ACT_ENVIRONMENT?: boolean;
-  };
-  const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
-  actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
-  const snippets: Snippet[] = [{
-    id: 'stable-host-trigger',
-    label: 'Stable host trigger',
-    command: '',
-    kind: 'script',
-    trigger: 'onOutput',
-    triggerPattern: 'READY',
-    targetGroups: ['Production'],
-  }];
-  let appendOutput: ((chunk: string) => void) | undefined;
-  let runCount = 0;
-  let renderer: ReactTestRenderer | null = null;
-  const onRunScript = () => {
-    runCount += 1;
-  };
-
-  const Probe = ({ host }: { host: { id: string; group: string } }) => {
-    appendOutput = useOutputTriggers({
-      sessionId: 'session-1',
-      host,
-      snippets,
-      onRunScript,
-    }).appendOutput;
-    return null;
-  };
-
-  await act(async () => {
-    renderer = create(React.createElement(Probe, {
-      host: { id: 'host-a', group: 'Production/Web' },
-    }));
-  });
-  try {
-    await act(async () => {
-      appendOutput?.('REA');
-      renderer?.update(React.createElement(Probe, {
-        host: { id: 'host-a', group: 'Production/Web' },
-      }));
-      appendOutput?.('DY');
-      await new Promise((resolve) => setTimeout(resolve, 40));
-    });
-  } finally {
-    await act(async () => renderer?.unmount());
-    actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
-  }
-
-  assert.equal(runCount, 1);
-});
-
 test('output trigger scan buffer consumes scanned content and only keeps overlap', () => {
   const buffer = createOutputTriggerScanBuffer(4);
 

application/state/useOutputTriggers.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react';
-import type { Host, Snippet } from '@/domain/models';
+import type { Snippet } from '@/domain/models';
 import { snippetAppliesToOutputTrigger } from '@/domain/snippetTargets.ts';
 import { isScriptSnippet } from '@/domain/snippetScript.ts';
 import {
@@ -19,7 +19,7 @@ const OUTPUT_TRIGGER_DROPPED_OVERFLOW_SCAN_WINDOW_CHARS = 2048;
 
 type OutputTriggerContext = {
   sessionId: string;
-  host?: Pick<Host, 'id' | 'group'>;
+  hostId?: string;
   snippets: Snippet[];
   onRunScript: (snippet: Snippet, sessionId: string) => void | Promise<void>;
 };
@@ -575,31 +575,22 @@ export function findMatchEndingAfter(text: string, pattern: string, minEndOffset
   return null;
 }
 
-export function hasApplicableOutputTriggerSnippet(
-  snippets: Snippet[],
-  host?: Pick<Host, 'id' | 'group'> | string,
-): boolean {
+export function hasApplicableOutputTriggerSnippet(snippets: Snippet[], hostId?: string): boolean {
   return snippets.some((snippet) => (
     isScriptSnippet(snippet)
     && snippet.trigger === 'onOutput'
     && Boolean(snippet.triggerPattern)
     && Boolean(snippet.id)
-    && snippetAppliesToOutputTrigger(snippet, host)
+    && snippetAppliesToOutputTrigger(snippet, hostId)
   ));
 }
 
 export function useOutputTriggers({
   sessionId,
-  host,
+  hostId,
   snippets,
   onRunScript,
 }: OutputTriggerContext) {
-  const targetHostId = host?.id;
-  const targetHostGroup = host?.group;
-  const targetHost = useMemo(
-    () => targetHostId ? { id: targetHostId, group: targetHostGroup } : undefined,
-    [targetHostGroup, targetHostId],
-  );
   const launchingRef = useRef(false);
   const lastTriggerMatchEndRef = useRef(new Map<string, number>());
   const serverOutputFilterRef = useRef(createTerminalOutputTriggerFilter());
@@ -609,8 +600,8 @@ export function useOutputTriggers({
   const pendingDroppedOverflowFinalActionRef = useRef<'leave' | null>(null);
   const pendingDroppedOverflowScanStateResetRef = useRef(false);
   const hasOutputTriggers = useMemo(
-    () => hasApplicableOutputTriggerSnippet(snippets, targetHost),
-    [snippets, targetHost],
+    () => hasApplicableOutputTriggerSnippet(snippets, hostId),
+    [hostId, snippets],
   );
 
   const scanOutput = useCallback((scannableText: string) => {
@@ -630,7 +621,7 @@ export function useOutputTriggers({
       if (!isScriptSnippet(snippet) || snippet.trigger !== 'onOutput' || !snippet.triggerPattern || !snippet.id) {
         continue;
       }
-      if (!snippetAppliesToOutputTrigger(snippet, targetHost)) continue;
+      if (!snippetAppliesToOutputTrigger(snippet, hostId)) continue;
       try {
         const matched = findMatchEndingAfter(scanWindow.text, snippet.triggerPattern, scanWindow.minEndOffset);
         if (!matched) {
@@ -656,7 +647,7 @@ export function useOutputTriggers({
         // ignore invalid regex
       }
     }
-  }, [hasOutputTriggers, onRunScript, sessionId, snippets, targetHost]);
+  }, [hasOutputTriggers, hostId, onRunScript, sessionId, snippets]);
 
   const scanOutputRef = useRef(scanOutput);
   scanOutputRef.current = scanOutput;
@@ -822,7 +813,7 @@ export function useOutputTriggers({
     outputTriggerScanSuppressedRef.current = false;
     pendingDroppedOverflowFinalActionRef.current = null;
     pendingDroppedOverflowScanStateResetRef.current = false;
-  }, [sessionId, targetHost, hasOutputTriggers, outputTriggerEventProcessor]);
+  }, [sessionId, hostId, hasOutputTriggers, outputTriggerEventProcessor]);
 
   useEffect(() => () => {
     outputTriggerEventProcessor.reset();

application/state/useServerStats.ts

@@ -3,7 +3,6 @@ import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
 
 export interface DiskInfo {
   capacityKey?: string;       // Filesystem or shared-pool identity for deduplication
-  filesystemType?: string;    // Filesystem type reported by df (for network/FUSE filtering)
   mountPoint: string;
   used: number;               // Used in GB
   total: number;              // Total in GB
@@ -184,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
@@ -303,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/useSessionLogBackend.ts

@@ -1,26 +1,13 @@
 import { useCallback } from "react";
 import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
 
-type ManualChoosePathPayload = {
-  sessionId: string;
-  sessionName?: string;
-  preferredDirectory?: string;
-  format?: "txt" | "raw" | "html";
-};
-
 type ManualStartPayload = {
   sessionId: string;
   sessionName?: string;
   preferredDirectory?: string;
-  /**
-   * Opaque token from chooseManualSessionLogPath. Required for the post-dialog
-   * second phase; raw file paths from the renderer are rejected.
-   */
-  selectionToken?: string;
   format?: "txt" | "raw" | "html";
   timestampsEnabled?: boolean;
   initialLine?: string;
-  alternateScreenActive?: boolean;
 };
 
 type ManualStopPayload = {
@@ -32,12 +19,6 @@ type ManualStatusPayload = {
 };
 
 export const useSessionLogBackend = () => {
-  const chooseManualSessionLogPath = useCallback(async (payload: ManualChoosePathPayload) => {
-    const bridge = netcattyBridge.get();
-    return bridge?.chooseManualSessionLogPath?.(payload)
-      ?? { success: false, canceled: false, error: "Session log bridge unavailable" };
-  }, []);
-
   const startManualSessionLog = useCallback(async (payload: ManualStartPayload) => {
     const bridge = netcattyBridge.get();
     return bridge?.startManualSessionLog?.(payload) ?? { success: false, started: false, error: "Session log bridge unavailable" };
@@ -53,10 +34,5 @@ export const useSessionLogBackend = () => {
     return bridge?.getManualSessionLogStatus?.(payload) ?? { success: false, isLogging: false, error: "Session log bridge unavailable" };
   }, []);
 
-  return {
-    chooseManualSessionLogPath,
-    startManualSessionLog,
-    stopManualSessionLog,
-    getManualSessionLogStatus,
-  };
+  return { startManualSessionLog, stopManualSessionLog, getManualSessionLogStatus };
 };

application/state/useSessionState.ts

@@ -797,6 +797,11 @@ export const useSessionState = ({
     host: Host,
     direction: SplitDirection = 'vertical',
   ): string | null => {
+    // Serial hosts use a different session constructor; they currently
+    // only enter workspaces via createSerialSession + drag, so reject
+    // them here to avoid a partially-constructed session.
+    if (host.protocol === 'serial') return null;
+
     // Cheap early-exit using the ref when the workspace is clearly
     // absent. The authoritative check lives inside the setWorkspaces
     // updater below so we also cover the concurrent-close race.

application/state/useSessionStateWorkspaceStrictMode.test.ts

@@ -105,8 +105,4 @@ test('workspace host creation paths use the host session snapshot factory', () =
     source,
     /createWorkspaceHostTerminalSession\(newSessionId,\s*host,\s*workspaceId\)/,
   );
-  assert.doesNotMatch(
-    source,
-    /if \(host\.protocol === 'serial'\) return null/,
-  );
 });

application/state/useSettingsState.ts

@@ -52,7 +52,6 @@ import {
   STORAGE_KEY_SESSION_LOGS_ENABLED,
   STORAGE_KEY_RESTORE_PREVIOUS_SESSION,
   STORAGE_KEY_RESTORE_TERMINAL_CWD,
-  STORAGE_KEY_STARTUP_LANDING,
   STORAGE_KEY_SESSION_LOGS_DIR,
   STORAGE_KEY_SESSION_LOGS_FORMAT,
   STORAGE_KEY_SESSION_LOGS_TIMESTAMPS_ENABLED,
@@ -76,7 +75,6 @@ import {
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
-  STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
 } from '../../infrastructure/config/storageKeys';
 import { DEFAULT_UI_LOCALE, resolveSupportedLocale } from '../../infrastructure/config/i18n';
@@ -123,7 +121,6 @@ import {
   DEFAULT_SHOW_SFTP_TAB,
   DEFAULT_SHOW_HOST_TREE_SIDEBAR,
   DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
-  DEFAULT_SHOW_TAB_NUMBER_BADGES,
   DEFAULT_DISABLE_TERMINAL_FONT_ZOOM,
   DEFAULT_SSH_DEBUG_LOGS_ENABLED,
   DEFAULT_SSH_DEEP_LINK_ENABLED,
@@ -147,10 +144,6 @@ import {
   type HostClickBehavior,
 } from './settingsStateDefaults';
 import { isHostClickBehavior } from '../../domain/hostClickBehavior';
-import {
-  resolveStartupLandingSetting,
-  type StartupLanding,
-} from '../../domain/startupLanding';
 import { resolveRestorePreviousSessionSetting, resolveRestoreTerminalCwdSetting } from './sessionRestoreSettings';
 import { sessionRestoreStorage } from './sessionRestoreStorage';
 import { useSettingsStorageSync } from './settingsStorageSync';
@@ -420,10 +413,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
     return stored ?? DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS;
   });
-  const [showTabNumberBadges, setShowTabNumberBadgesState] = useState<boolean>(() => {
-    const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES);
-    return stored ?? DEFAULT_SHOW_TAB_NUMBER_BADGES;
-  });
   const [disableTerminalFontZoom, setDisableTerminalFontZoomState] = useState<boolean>(() => {
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
     return stored ?? DEFAULT_DISABLE_TERMINAL_FONT_ZOOM;
@@ -436,9 +425,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_RESTORE_TERMINAL_CWD);
     return resolveRestoreTerminalCwdSetting(stored);
   });
-  const [startupLanding, setStartupLandingState] = useState<StartupLanding>(() => {
-    return resolveStartupLandingSetting(readStoredString(STORAGE_KEY_STARTUP_LANDING));
-  });
   const [sftpTransferConcurrency, setSftpTransferConcurrencyState] = useState<number>(() => {
     return resolveSftpTransferConcurrency(() =>
       localStorageAdapter.readNumber(STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY),
@@ -955,15 +941,12 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     );
     const storedShellOnlyTabNumberShortcuts = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
     setShellOnlyTabNumberShortcutsState(storedShellOnlyTabNumberShortcuts ?? DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
-    const storedShowTabNumberBadges = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES);
-    setShowTabNumberBadgesState(storedShowTabNumberBadges ?? DEFAULT_SHOW_TAB_NUMBER_BADGES);
     const storedDisableTerminalFontZoom = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
     setDisableTerminalFontZoomState(storedDisableTerminalFontZoom ?? DEFAULT_DISABLE_TERMINAL_FONT_ZOOM);
     const storedRestorePreviousSession = localStorageAdapter.readBoolean(STORAGE_KEY_RESTORE_PREVIOUS_SESSION);
     setRestorePreviousSessionState(resolveRestorePreviousSessionSetting(storedRestorePreviousSession));
     const storedRestoreTerminalCwd = localStorageAdapter.readBoolean(STORAGE_KEY_RESTORE_TERMINAL_CWD);
     setRestoreTerminalCwdState(resolveRestoreTerminalCwdSetting(storedRestoreTerminalCwd));
-    setStartupLandingState(resolveStartupLandingSetting(readStoredString(STORAGE_KEY_STARTUP_LANDING)));
 
     // Workspace focus style
     const storedFocusStyle = readStoredString(STORAGE_KEY_WORKSPACE_FOCUS_STYLE);
@@ -1132,7 +1115,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setDisableTerminalFontZoomState,
     setRestorePreviousSessionState,
     setRestoreTerminalCwdState,
-    setStartupLandingState,
     setSftpTransferConcurrencyState,
     setSshTransportIdleTtlMsState,
   });
@@ -1163,7 +1145,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
     setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode,
@@ -1173,7 +1155,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize: applyIncomingTerminalFontSize,
     setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
     setSftpUseCompressedUpload, setSftpSkipUnchanged, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-    setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
+    setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState,
     setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled, setSshDeepLinkEnabledState: applyIncomingSshDeepLinkEnabled, setJmsDeepLinkEnabledState: applyIncomingJmsDeepLinkEnabled, setExplorerContextMenuEnabledState: applyIncomingExplorerContextMenuEnabled,
     setGlobalHotkeyEnabled, setWindowOpacity: applyIncomingWindowOpacity, setAppIconVariant, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
     setSftpTransferConcurrencyState, setSshTransportIdleTtlMsState,
@@ -1339,13 +1321,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     notifySettingsChanged(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS, enabled);
   }, [notifySettingsChanged]);
 
-  const setShowTabNumberBadges = useCallback((enabled: boolean) => {
-    setShowTabNumberBadgesState(enabled);
-    localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES, enabled);
-    if (!persistMountedRef.current) return;
-    notifySettingsChanged(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES, enabled);
-  }, [notifySettingsChanged]);
-
   const setDisableTerminalFontZoom = useCallback((enabled: boolean) => {
     setDisableTerminalFontZoomState(enabled);
     localStorageAdapter.writeBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM, enabled);
@@ -1370,13 +1345,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     notifySettingsChanged(STORAGE_KEY_RESTORE_TERMINAL_CWD, enabled);
   }, [notifySettingsChanged]);
 
-  const setStartupLanding = useCallback((landing: StartupLanding) => {
-    setStartupLandingState(landing);
-    localStorageAdapter.writeString(STORAGE_KEY_STARTUP_LANDING, landing);
-    if (!persistMountedRef.current) return;
-    notifySettingsChanged(STORAGE_KEY_STARTUP_LANDING, landing);
-  }, [notifySettingsChanged]);
-
   // Apply and persist custom CSS
   useEffect(() => {
     applyCustomCssToDocument(customCSS);
@@ -1778,9 +1746,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
       showOnlyUngroupedHostsInRoot,
       dynamicTabTitleMode: terminalSettings.dynamicTabTitleMode,
       disableTerminalFontZoom,
-      hotkeyScheme,
-      shellOnlyTabNumberShortcuts,
-      showTabNumberBadges,
       restoreTerminalCwd,
       terminalSidePanelAutoOpen,
       terminalSidePanelAutoOpenTab,
@@ -1789,16 +1754,13 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     darkUiThemeId,
     disableTerminalFontZoom,
     hostClickBehavior,
-    hotkeyScheme,
     lightUiThemeId,
     resolvedTheme,
     restoreTerminalCwd,
-    shellOnlyTabNumberShortcuts,
     showHostTreeSidebar,
     showOnlyUngroupedHostsInRoot,
     showRecentHosts,
     showSftpTab,
-    showTabNumberBadges,
     terminalSettings.dynamicTabTitleMode,
     terminalSidePanelAutoOpen,
     terminalSidePanelAutoOpenTab,
@@ -1973,16 +1935,12 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setTerminalSidePanelAutoOpenTab,
     shellOnlyTabNumberShortcuts,
     setShellOnlyTabNumberShortcuts,
-    showTabNumberBadges,
-    setShowTabNumberBadges,
     disableTerminalFontZoom,
     setDisableTerminalFontZoom,
     restorePreviousSession,
     setRestorePreviousSession,
     restoreTerminalCwd,
     setRestoreTerminalCwd,
-    startupLanding,
-    setStartupLanding,
     sftpTransferConcurrency,
     setSftpTransferConcurrency,
     sshTransportIdleTtlMs,
@@ -2036,7 +1994,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
       terminalThemeId, terminalFontFamilyId, terminalFontSize, terminalSettings,
       customKeyBindings, editorWordWrap,
       sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles, sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-      showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom,
+      showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, disableTerminalFontZoom,
       customThemes, workspaceFocusStyle, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     ]),
   };

application/state/useSftpState.ts

@@ -30,7 +30,7 @@ import { buildSftpHostCredentials } from "./sftp/useSftpHostCredentials";
 import { useSftpFileWatch } from "./sftp/useSftpFileWatch";
 import { useSftpSessionCleanup } from "./sftp/useSftpSessionCleanup";
 import { useSftpSessionErrors } from "./sftp/useSftpSessionErrors";
-import { ensureRemoteSftpSession, probeSftpSession } from "./sftp/ensureRemoteSftpSession";
+import { ensureRemoteSftpSession } from "./sftp/ensureRemoteSftpSession";
 import { openTransferSftpSession } from "./sftp/dedicatedTransferResume";
 import {
   createTransferPoolKeyCache,
@@ -316,7 +316,9 @@ export const useSftpState = (
       // Prefer borrowing the live (or parked) terminal SSH transport so MFA is
       // not repeated. Transport leases keep the shared conn alive after the
       // terminal tab closes until the transfer SFTP lease is returned.
-      const sourceSessionId = resolveTransferSourceSessionId?.(host.id, host);
+      const sourceSessionId = !host.sftpSudo
+        ? resolveTransferSourceSessionId?.(host.id, host)
+        : undefined;
       if (sourceSessionId) {
         try {
           logger.info(
@@ -606,7 +608,16 @@ export const useSftpState = (
         forceReconnect: ensureOptions?.forceReconnect,
         releaseConnection,
         tabId,
-        probeSession: (sftpId) => probeSftpSession(bridge, sftpId),
+        probeSession: async (sftpId) => {
+          // Lightweight liveness check; any session-error from the bridge
+          // triggers a reconnect in ensureRemoteSftpSession.
+          if (!bridge?.getSftpHomeDir) return true;
+          const result = await bridge.getSftpHomeDir(sftpId);
+          if (result && result.success === false) {
+            throw new Error(result.error || "SFTP session not found");
+          }
+          return true;
+        },
       });
     },
     resolveConnectedHost: (tabId) => connectedHostByTabIdRef.current.get(tabId) ?? null,
@@ -632,11 +643,10 @@ export const useSftpState = (
     [resolveTransferConflict, resolveUploadConflict, uploadConflicts],
   );
 
-  // FileZilla-style: when the side panel is closed (not merely showing another
-  // tool), soft-close browse SFTP channels. Defer park while this owner still
-  // has unfinished transfers so pre-lease prep (conflict/stat) cannot race a
-  // hard-close of the browse id. In-flight streams also soft-close via leases;
-  // pool handles bulk I/O.
+  // FileZilla-style: when the browser UI is hidden, soft-close browse SFTP
+  // channels. Defer park while this owner still has unfinished transfers so
+  // pre-lease prep (conflict/stat) cannot race a hard-close of the browse id.
+  // In-flight streams also soft-close via leases; pool handles bulk I/O.
   const interactive = options?.interactive !== false;
   useEffect(() => {
     const gen = ++browseLifecycleGenRef.current;
@@ -693,12 +703,6 @@ export const useSftpState = (
         const pane = getActivePane(side);
         if (!pane?.connection || pane.connection.isLocal) continue;
         if (sftpSessionsRef.current.has(pane.connection.id)) continue;
-        const connectedHost = connectedHostByTabIdRef.current.get(pane.id) ?? null;
-        const vaultHost = hosts.find((host) => host.id === pane.connection?.hostId) ?? null;
-        const targetHost = connectedHost && connectedHost !== "local" ? connectedHost : vaultHost;
-        const resolvedSourceSessionId = targetHost
-          ? resolveBrowseSourceSessionId?.(targetHost.id, targetHost)
-          : undefined;
         try {
           await ensureRemoteSftpSession({
             side,
@@ -708,10 +712,16 @@ export const useSftpState = (
             connect,
             resolveConnectedHost: (id) => connectedHostByTabIdRef.current.get(id) ?? null,
             resolveHostById: (hostId) => hosts.find((host) => host.id === hostId) ?? null,
-            resolveSourceSessionId: resolvedSourceSessionId
-              ? () => resolvedSourceSessionId
-              : resolveBrowseSourceSessionId,
-            probeSession: (sftpId) => probeSftpSession(netcattyBridge.get(), sftpId),
+            resolveSourceSessionId: resolveBrowseSourceSessionId,
+            probeSession: async (sftpId) => {
+              const bridge = netcattyBridge.get();
+              if (!bridge?.getSftpHomeDir) return true;
+              const result = await bridge.getSftpHomeDir(sftpId);
+              if (result && result.success === false) {
+                throw new Error(result.error || "SFTP session not found");
+              }
+              return true;
+            },
             releaseConnection,
           });
           logger.info(`[SFTP] Restored browse session on ${side}`);

application/state/useShortcutModifierHeld.test.ts

@@ -1,59 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  getShortcutModifierRequirements,
-  isShortcutModifierHeld,
-  shouldReleaseShortcutModifier,
-  type ShortcutModifierEvent,
-} from './useShortcutModifierHeld.ts';
-
-const event = (overrides: Partial<ShortcutModifierEvent> = {}): ShortcutModifierEvent => ({
-  metaKey: false,
-  ctrlKey: false,
-  altKey: false,
-  shiftKey: false,
-  ...overrides,
-});
-
-test('shortcut modifier requirements follow the effective Mac or PC binding', () => {
-  const mac = getShortcutModifierRequirements('⌘ + [1...9]', 'mac');
-  assert.deepEqual(mac, { metaKey: true, ctrlKey: false, altKey: false, shiftKey: false });
-  assert.equal(isShortcutModifierHeld(event({ metaKey: true }), mac), true);
-  assert.equal(isShortcutModifierHeld(event({ ctrlKey: true }), mac), false);
-
-  const pc = getShortcutModifierRequirements('Alt + Shift + [1...9]', 'pc');
-  assert.deepEqual(pc, { metaKey: false, ctrlKey: false, altKey: true, shiftKey: true });
-  assert.equal(isShortcutModifierHeld(event({ altKey: true, shiftKey: true }), pc), true);
-  assert.equal(isShortcutModifierHeld(event({ altKey: true }), pc), false);
-  assert.equal(isShortcutModifierHeld(event({ altKey: true, metaKey: true, shiftKey: true }), pc), false);
-});
-
-test('shortcut number preview is unavailable for disabled, non-range, or modifier-free bindings', () => {
-  assert.equal(getShortcutModifierRequirements('Disabled', 'mac'), null);
-  assert.equal(getShortcutModifierRequirements('⌘ + K', 'mac'), null);
-  assert.equal(getShortcutModifierRequirements('[1...9]', 'mac'), null);
-  assert.equal(getShortcutModifierRequirements('⌘ + [1...9]', 'disabled'), null);
-});
-
-test('shortcut modifier state clears when the required combination stops matching', () => {
-  const requirements = getShortcutModifierRequirements('⌘ + [1...9]', 'mac');
-  assert.equal(shouldReleaseShortcutModifier(event({ metaKey: true }), requirements), false);
-  assert.equal(shouldReleaseShortcutModifier(event(), requirements), true);
-});
-
-test('shortcut modifier held state tracks exact combo when extras are pressed or released', () => {
-  const requirements = getShortcutModifierRequirements('⌘ + [1...9]', 'mac');
-  // Already matching, then an extra modifier: preview must clear.
-  assert.equal(isShortcutModifierHeld(event({ metaKey: true }), requirements), true);
-  assert.equal(
-    isShortcutModifierHeld(event({ metaKey: true, shiftKey: true }), requirements),
-    false,
-  );
-  // Extra pressed first, then released while required modifiers remain: preview re-arms.
-  assert.equal(
-    isShortcutModifierHeld(event({ metaKey: true, altKey: true }), requirements),
-    false,
-  );
-  assert.equal(isShortcutModifierHeld(event({ metaKey: true }), requirements), true);
-});

application/state/useShortcutModifierHeld.ts

@@ -1,113 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { parseKeyCombo, type HotkeyScheme } from '../../domain/models/keyBindings';
-
-export type ShortcutModifierEvent = Pick<KeyboardEvent, 'metaKey' | 'ctrlKey' | 'altKey' | 'shiftKey'>;
-
-export type ShortcutModifierRequirements = Readonly<ShortcutModifierEvent>;
-
-const MODIFIER_TOKENS = {
-  mac: {
-    '⌘': 'metaKey',
-    '⌃': 'ctrlKey',
-    '⌥': 'altKey',
-    Shift: 'shiftKey',
-  },
-  pc: {
-    Ctrl: 'ctrlKey',
-    Alt: 'altKey',
-    Shift: 'shiftKey',
-    Win: 'metaKey',
-  },
-} as const;
-
-/**
- * Resolve the modifier combination for the effective [1...9] binding.
- * A non-range or disabled binding cannot reveal tab numbers because the
- * dispatcher does not use it for the number-switch action.
- */
-export function getShortcutModifierRequirements(
-  keyBinding: string | null,
-  scheme: HotkeyScheme,
-): ShortcutModifierRequirements | null {
-  if (scheme === 'disabled' || !keyBinding || !keyBinding.includes('[1...9]')) return null;
-  const parsed = parseKeyCombo(keyBinding);
-  if (!parsed || parsed.modifiers.length === 0) return null;
-
-  const requirements: Record<keyof ShortcutModifierEvent, boolean> = {
-    metaKey: false,
-    ctrlKey: false,
-    altKey: false,
-    shiftKey: false,
-  };
-  const tokenMap = MODIFIER_TOKENS[scheme];
-  for (const modifier of parsed.modifiers) {
-    const flag = tokenMap[modifier as keyof typeof tokenMap];
-    if (!flag) return null;
-    requirements[flag] = true;
-  }
-
-  return requirements;
-}
-
-/** Whether a keyboard event has exactly the modifiers required by the binding. */
-export function isShortcutModifierHeld(
-  event: ShortcutModifierEvent,
-  requirements: ShortcutModifierRequirements | null,
-): boolean {
-  if (!requirements) return false;
-  return event.metaKey === requirements.metaKey
-    && event.ctrlKey === requirements.ctrlKey
-    && event.altKey === requirements.altKey
-    && event.shiftKey === requirements.shiftKey;
-}
-
-/** Whether a keyup event means the required modifier combination is no longer held. */
-export function shouldReleaseShortcutModifier(
-  event: ShortcutModifierEvent,
-  requirements: ShortcutModifierRequirements | null,
-): boolean {
-  return !isShortcutModifierHeld(event, requirements);
-}
-
-export function useShortcutModifierHeld(
-  keyBinding: string | null,
-  scheme: HotkeyScheme,
-): boolean {
-  const [isHeld, setIsHeld] = useState(false);
-  const requirements = useMemo(
-    () => getShortcutModifierRequirements(keyBinding, scheme),
-    [keyBinding, scheme],
-  );
-
-  useEffect(() => {
-    setIsHeld(false);
-    if (!requirements) return;
-
-    // Sync on every modifier transition so extras clear the preview and
-    // releasing an extra modifier can re-arm when the exact combo remains.
-    const syncHeldState = (event: KeyboardEvent) => {
-      setIsHeld(isShortcutModifierHeld(event, requirements));
-    };
-    const clearHeldState = () => setIsHeld(false);
-    const handleVisibilityChange = () => {
-      if (document.visibilityState === 'hidden') {
-        clearHeldState();
-      }
-    };
-
-    window.addEventListener('keydown', syncHeldState, true);
-    window.addEventListener('keyup', syncHeldState, true);
-    window.addEventListener('blur', clearHeldState);
-    document.addEventListener('visibilitychange', handleVisibilityChange);
-
-    return () => {
-      window.removeEventListener('keydown', syncHeldState, true);
-      window.removeEventListener('keyup', syncHeldState, true);
-      window.removeEventListener('blur', clearHeldState);
-      document.removeEventListener('visibilitychange', handleVisibilityChange);
-    };
-  }, [requirements]);
-
-  return isHeld;
-}

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/useTerminalBackend.ts

@@ -513,10 +513,7 @@ export const useTerminalBackend = () => {
     return bridge?.onZmodemEvent?.(sessionId, cb) ?? (() => {});
   }, []);
 
-  const getSessionPwd = useCallback(async (
-    sessionId: string,
-    options?: { allowHomeFallback?: boolean; allowLoginShellFallback?: boolean },
-  ) => {
+  const getSessionPwd = useCallback(async (sessionId: string, options?: { allowHomeFallback?: boolean }) => {
     const bridge = netcattyBridge.get();
     if (!bridge?.getSessionPwd) return { success: false, error: 'getSessionPwd unavailable' };
     return bridge.getSessionPwd(sessionId, options);

application/state/useTerminalKeyboardFocus.test.ts

@@ -1,74 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import {
-  installTerminalKeyboardFocusTracking,
-  isTerminalKeyboardTarget,
-} from "./terminalKeyboardFocus";
-
-const targetWithClosest = (matches: boolean) => ({
-  closest: (selector: string) => {
-    assert.match(selector, /\.xterm/);
-    return matches ? {} : null;
-  },
-}) as unknown as EventTarget;
-
-test("terminal keyboard target detection recognizes xterm descendants", () => {
-  assert.equal(isTerminalKeyboardTarget(targetWithClosest(true)), true);
-  assert.equal(isTerminalKeyboardTarget(targetWithClosest(false)), false);
-  assert.equal(isTerminalKeyboardTarget(null), false);
-});
-
-test("terminal keyboard focus tracking publishes deduplicated focus transitions and cleans up", async () => {
-  const listeners = new Map<string, (event?: Event) => void>();
-  const removed: string[] = [];
-  const body = targetWithClosest(false);
-  const terminal = targetWithClosest(true);
-  const documentRef = {
-    activeElement: body as unknown as Element,
-    addEventListener: (type: string, listener: (event?: Event) => void) => {
-      listeners.set(type, listener);
-    },
-    removeEventListener: (type: string) => {
-      removed.push(type);
-    },
-  } as unknown as Document;
-  const windowRef = {
-    addEventListener: (type: string, listener: (event?: Event) => void) => {
-      listeners.set(`window:${type}`, listener);
-    },
-    removeEventListener: (type: string) => {
-      removed.push(`window:${type}`);
-    },
-  } as unknown as Window;
-  const changes: boolean[] = [];
-  const cleanup = installTerminalKeyboardFocusTracking(documentRef, windowRef, (focused) => {
-    if (changes.at(-1) !== focused) changes.push(focused);
-  });
-
-  assert.deepEqual(changes, [false]);
-
-  listeners.get("pointerdown")?.({ target: terminal } as unknown as Event);
-  listeners.get("focusin")?.({ target: terminal } as unknown as Event);
-  assert.deepEqual(changes, [false, true]);
-
-  (documentRef as unknown as { activeElement: Element }).activeElement = terminal as unknown as Element;
-  listeners.get("pointerdown")?.({ target: body } as unknown as Event);
-  await new Promise((resolve) => setTimeout(resolve, 0));
-  assert.deepEqual(changes, [false, true]);
-
-  (documentRef as unknown as { activeElement: Element }).activeElement = body as unknown as Element;
-  listeners.get("focusout")?.();
-  await Promise.resolve();
-  assert.deepEqual(changes, [false, true, false]);
-
-  listeners.get("window:blur")?.();
-  assert.deepEqual(changes, [false, true, false]);
-
-  (documentRef as unknown as { activeElement: Element }).activeElement = terminal as unknown as Element;
-  listeners.get("window:focus")?.();
-  assert.deepEqual(changes, [false, true, false, true]);
-
-  cleanup();
-  assert.deepEqual(removed.sort(), ["focusin", "focusout", "pointerdown", "window:blur", "window:focus"]);
-});

application/state/useTerminalKeyboardFocus.ts

@@ -1,33 +0,0 @@
-import { useEffect } from "react";
-import { netcattyBridge } from "../../infrastructure/services/netcattyBridge";
-import { installTerminalKeyboardFocusTracking } from "./terminalKeyboardFocus";
-
-export function useTerminalKeyboardFocus(enabled = true): void {
-  useEffect(() => {
-    if (!enabled) return undefined;
-    const bridge = netcattyBridge.get();
-    if (!bridge?.setTerminalKeyboardFocus) return undefined;
-
-    let lastPublished: boolean | undefined;
-    const publish = (focused: boolean) => {
-      if (focused === lastPublished) return;
-      lastPublished = focused;
-      try {
-        bridge.setTerminalKeyboardFocus?.(focused);
-      } catch {
-        // Browser preview or a disposed Electron bridge.
-      }
-    };
-
-    const cleanupTracking = installTerminalKeyboardFocusTracking(
-      document,
-      window,
-      publish,
-    );
-
-    return () => {
-      cleanupTracking();
-      publish(false);
-    };
-  }, [enabled]);
-}

application/state/useTerminalSidePanelLayoutState.ts

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

application/state/useVaultAgentBridge.test.ts

@@ -5,7 +5,6 @@ import {
   resolveVaultAgentEffectiveHost,
   resolveVaultAgentNotes,
 } from './useVaultAgentBridge';
-import type { Host } from '../../domain/models';
 import { publishNotesSnapshot } from './notesStore';
 
 type Snapshot = Parameters<typeof haveSameVaultAgentSnapshot>[0];
@@ -29,10 +28,10 @@ describe('haveSameVaultAgentSnapshot', () => {
 
 describe('resolveVaultAgentEffectiveHost', () => {
   it('uses the latest snapshotted group defaults', () => {
-    const host: Host = {
+    const host = {
       id: 'host-1', label: 'Host', hostname: 'host.test', username: 'root',
       group: 'production', tags: [], os: 'linux',
-    };
+    } as const;
 
     assert.equal(
       resolveVaultAgentEffectiveHost(host, [{ path: 'production', protocol: 'telnet' }], []).protocol,

application/state/useVaultAgentBridge.ts

@@ -16,10 +16,6 @@ import {
   resolveDefaultKeyPassphraseAliases,
 } from '../defaultKeyPassphrases';
 import { getNotesActions, getNotesSnapshot, subscribeNotes } from './notesStore';
-import type {
-  VaultGroupMutationResult,
-  VaultGroupMutationState,
-} from '../../domain/vaultGroupMutation';
 
 export interface UseVaultAgentBridgeInput {
   hosts: Host[];
@@ -33,17 +29,12 @@ export interface UseVaultAgentBridgeInput {
   terminalSettings?: Pick<TerminalSettings, 'keepaliveInterval' | 'keepaliveCountMax'>;
   updateHosts: (hosts: Host[]) => void;
   updateKeys: (keys: SSHKey[]) => Promise<unknown> | unknown;
-  updateSnippets: (
-    snippets: Snippet[] | ((current: Snippet[]) => Snippet[]),
-  ) => void;
+  updateSnippets: (snippets: Snippet[]) => void;
   customGroups: string[];
   updateCustomGroups: (groups: string[]) => void;
   groupConfigs: GroupConfig[];
   updateGroupConfigs: (configs: GroupConfig[]) => void;
   updateManagedSources: (sources: ManagedSource[]) => void;
-  commitVaultGroupMutation: (
-    mutate: (current: VaultGroupMutationState) => VaultGroupMutationResult,
-  ) => Promise<VaultGroupMutationResult | { ok: false; superseded: true }>;
   updatePortForwardingRules: (rules: PortForwardingRule[]) => void;
   /** Optional override; defaults to notesStore so App need not subscribe to notes. */
   notes?: VaultNote[];
@@ -194,17 +185,6 @@ export function useVaultAgentBridge(input: UseVaultAgentBridgeInput): void {
           vaultSnapshotRef.current.hosts = hosts;
           current.updateHosts(hosts);
         },
-        commitVaultGroupMutation: async (mutate) => {
-          const result = await current.commitVaultGroupMutation(mutate);
-          if (result.ok) {
-            vaultSnapshotRef.current.customGroups = result.state.groups;
-            vaultSnapshotRef.current.groupConfigs = result.state.configs;
-            vaultSnapshotRef.current.hosts = result.state.hosts;
-            vaultSnapshotRef.current.managedSources = result.state.managedSources;
-            vaultSnapshotRef.current.snippets = result.state.snippets;
-          }
-          return result;
-        },
         saveKeyPassphrase: (keyPath, passphrase) => rememberKeyPassphrase({
           keyPath,
           passphrase,
@@ -242,11 +222,9 @@ export function useVaultAgentBridge(input: UseVaultAgentBridgeInput): void {
           vaultSnapshotRef.current.notes = notes;
           applyUpdateNotes(notes);
         },
-        updateSnippets: (snippetUpdate) => {
-          vaultSnapshotRef.current.snippets = typeof snippetUpdate === 'function'
-            ? snippetUpdate(vaultSnapshotRef.current.snippets)
-            : snippetUpdate;
-          current.updateSnippets(snippetUpdate);
+        updateSnippets: (nextSnippets) => {
+          vaultSnapshotRef.current.snippets = nextSnippets;
+          current.updateSnippets(nextSnippets);
         },
         startTunnel: current.startTunnel,
         stopTunnel: current.stopTunnel,

application/state/useVaultGroupDeletion.test.tsx

@@ -31,16 +31,19 @@ test("group deletion removes saved settings in the same Vault transaction", asyn
       managedSources: storedSources,
       onReadPersistedHosts: async () => [],
       onReadPersistedManagedSources: () => storedSources,
-      onCommitVaultGroupMutation: async (mutate) => {
-        const result = mutate({
-          groups: storedGroups,
-          configs: storedGroupConfigs,
-          hosts: [],
-          managedSources: storedSources,
-          snippets: [],
-        });
-        if (result.ok) committedGroupConfigs = result.state.configs;
-        return result;
+      onCommitVaultImportTransaction: async (
+        _hosts,
+        updateGroups,
+        updateSources,
+        updateGroupConfigs,
+      ) => {
+        committedGroupConfigs = updateGroupConfigs?.(storedGroupConfigs) ?? storedGroupConfigs;
+        return {
+          status: "persisted",
+          groups: updateGroups(storedGroups),
+          sources: updateSources(storedSources),
+          groupConfigs: committedGroupConfigs,
+        };
       },
     });
     return null;
@@ -99,9 +102,14 @@ test("group deletion restores managed files when the persisted Vault cannot be r
       onClearAndRemoveManagedSources: async () => async () => {
         restoreCount += 1;
       },
-      onCommitVaultGroupMutation: async () => {
+      onCommitVaultImportTransaction: async () => {
         commitCount += 1;
-        throw new Error("unexpected commit");
+        return {
+          status: "persisted",
+          groups: [],
+          sources: [],
+          groupConfigs: [],
+        };
       },
     });
     return null;
@@ -179,15 +187,21 @@ test("group deletion retries file clearing when another managed source enters th
           restoreCount += 1;
         };
       },
-      onCommitVaultGroupMutation: async (mutate) => {
+      onCommitVaultImportTransaction: async (
+        _hosts,
+        updateGroups,
+        updateSources,
+        updateGroupConfigs,
+        expectedHosts,
+      ) => {
         commitCount += 1;
-        return mutate({
-          groups: ["Production"],
-          configs: [],
-          hosts: [],
-          managedSources: [firstSource, concurrentSource],
-          snippets: [],
-        });
+        assert.deepEqual(expectedHosts, []);
+        return {
+          status: "persisted",
+          groups: updateGroups(["Production"]),
+          sources: updateSources([firstSource, concurrentSource]),
+          groupConfigs: updateGroupConfigs?.([]) ?? [],
+        };
       },
     });
     return null;
@@ -214,67 +228,3 @@ test("group deletion retries file clearing when another managed source enters th
   assert.equal(restoreCount, 1);
   assert.equal(commitCount, 1);
 });
-
-test("group deletion restores managed files and does not report success when commit fails", async () => {
-  const actEnvironment = globalThis as typeof globalThis & {
-    IS_REACT_ACT_ENVIRONMENT?: boolean;
-  };
-  const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
-  actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
-
-  const source: ManagedSource = {
-    id: "managed-production",
-    type: "ssh_config",
-    filePath: "/tmp/managed-production.conf",
-    groupName: "Production",
-    lastSyncedAt: 1,
-  };
-  let deleteGroups: ((paths: Iterable<string>) => Promise<void>) | undefined;
-  let renderer: ReactTestRenderer | null = null;
-  let restoreCount = 0;
-  let reportedCount = 0;
-
-  const Probe = () => {
-    deleteGroups = useVaultGroupDeletion({
-      customGroups: ["Production"],
-      hosts: [],
-      groupConfigs: [],
-      managedSources: [source],
-      onReadPersistedHosts: async () => [],
-      onReadPersistedManagedSources: () => [source],
-      onClearAndRemoveManagedSources: async () => async () => {
-        restoreCount += 1;
-      },
-      onCommitVaultGroupMutation: async () => {
-        throw new Error("Vault quota exhausted");
-      },
-      onDeletedPaths: () => {
-        reportedCount += 1;
-      },
-    });
-    return null;
-  };
-
-  let deletionError: unknown;
-  try {
-    await act(async () => {
-      renderer = create(React.createElement(Probe));
-    });
-    try {
-      await act(async () => {
-        await deleteGroups?.(["Production"]);
-      });
-    } catch (error) {
-      deletionError = error;
-    }
-  } finally {
-    await act(async () => {
-      renderer?.unmount();
-    });
-    actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
-  }
-
-  assert.match(String(deletionError), /quota exhausted/i);
-  assert.equal(restoreCount, 1);
-  assert.equal(reportedCount, 0);
-});

application/state/useVaultGroupDeletion.ts

@@ -1,12 +1,7 @@
 import { useCallback, useRef } from "react";
 
 import type { GroupConfig, Host, ManagedSource } from "../../domain/models";
-import { removeSnippetTargetGroupPaths } from "../../domain/hostGroupPathMutations";
 import { buildVaultGroupDeletion } from "../../domain/vaultGroupDeletion";
-import type {
-  VaultGroupMutationResult,
-  VaultGroupMutationState,
-} from "../../domain/vaultGroupMutation";
 import {
   type VaultLockHandle,
   withVaultImportLock,
@@ -31,7 +26,7 @@ export function useVaultGroupDeletion({
   managedSources,
   onReadPersistedHosts,
   onReadPersistedManagedSources,
-  onCommitVaultGroupMutation,
+  onCommitVaultImportTransaction,
   onClearAndRemoveManagedSource,
   onClearAndRemoveManagedSources,
   onDeletedPaths,
@@ -42,10 +37,22 @@ export function useVaultGroupDeletion({
   managedSources: ManagedSource[];
   onReadPersistedHosts: () => Promise<Host[]>;
   onReadPersistedManagedSources: () => ManagedSource[];
-  onCommitVaultGroupMutation: (
-    mutate: (current: VaultGroupMutationState) => VaultGroupMutationResult,
+  onCommitVaultImportTransaction: (
+    hosts: Host[],
+    updateGroups: (current: string[]) => string[],
+    updateSources: (current: ManagedSource[]) => ManagedSource[],
+    updateGroupConfigs?: (current: GroupConfig[]) => GroupConfig[],
+    expectedHosts?: Host[],
     lock?: VaultLockHandle | null,
-  ) => Promise<VaultGroupMutationResult | { ok: false; superseded: true }>;
+  ) => Promise<
+    | {
+      status: "persisted";
+      groups: string[];
+      sources: ManagedSource[];
+      groupConfigs: GroupConfig[];
+    }
+    | { status: "superseded" }
+  >;
   onClearAndRemoveManagedSource?: (source: ManagedSource) => Promise<() => Promise<void>>;
   onClearAndRemoveManagedSources?: (sources: ManagedSource[]) => Promise<() => Promise<void>>;
   onDeletedPaths?: (selectedRoots: string[]) => void;
@@ -113,16 +120,29 @@ export function useVaultGroupDeletion({
           }
           deletion = refreshedDeletion;
 
+          const expectedHosts = latestRef.current.hosts;
           const expectedSources = deletion.sourcesToRemove;
-          const transaction = await onCommitVaultGroupMutation(
-            (current) => {
+          const nextHosts = deletion.hosts.filter(
+            (host) => !additionallyDeletedHostIds.has(host.id),
+          );
+          const transaction = await onCommitVaultImportTransaction(
+            nextHosts,
+            (currentGroups) => buildVaultGroupDeletion({
+              selectedPaths,
+              deleteHosts,
+              customGroups: currentGroups,
+              hosts: [],
+              groupConfigs: [],
+              managedSources: [],
+            }).customGroups,
+            (currentSources) => {
               const currentDeletion = buildVaultGroupDeletion({
                 selectedPaths,
                 deleteHosts,
-                customGroups: current.groups,
-                hosts: current.hosts,
-                groupConfigs: current.configs,
-                managedSources: current.managedSources,
+                customGroups: [],
+                hosts: [],
+                groupConfigs: [],
+                managedSources: currentSources,
               });
               if (!managedSourceSnapshotsMatch(
                 expectedSources,
@@ -130,40 +150,29 @@ export function useVaultGroupDeletion({
               )) {
                 throw RETRY_VAULT_GROUP_DELETION;
               }
-              return {
-                ok: true,
-                state: {
-                  groups: currentDeletion.customGroups,
-                  hosts: currentDeletion.hosts.filter(
-                    (host) => !additionallyDeletedHostIds.has(host.id),
-                  ),
-                  configs: currentDeletion.groupConfigs,
-                  managedSources: current.managedSources.filter(
-                    (source) => !currentDeletion.sourcesToRemove.some(
-                      (removed) => removed.id === source.id,
-                    ),
-                  ),
-                  snippets: removeSnippetTargetGroupPaths(
-                    current.snippets,
-                    currentDeletion.selectedRoots,
-                  ),
-                },
-              };
+              const removedIds = new Set(expectedSources.map((source) => source.id));
+              return currentSources.filter((source) => !removedIds.has(source.id));
             },
+            (currentGroupConfigs) => buildVaultGroupDeletion({
+              selectedPaths,
+              deleteHosts,
+              customGroups: [],
+              hosts: [],
+              groupConfigs: currentGroupConfigs,
+              managedSources: [],
+            }).groupConfigs,
+            expectedHosts,
             lock,
           );
-          if (!transaction.ok && "superseded" in transaction) {
-            // Release the lock so concurrent saves can finish before retry.
+          if (transaction.status === "superseded") {
+            // Release the lock so concurrent host saves can finish before retry.
             return { status: "retry" as const, restoreManagedFiles };
           }
-          if ("error" in transaction) {
-            throw new Error(transaction.error);
-          }
           latestRef.current = {
-            customGroups: transaction.state.groups,
-            hosts: transaction.state.hosts,
-            groupConfigs: transaction.state.configs,
-            managedSources: transaction.state.managedSources,
+            customGroups: transaction.groups,
+            hosts: nextHosts,
+            groupConfigs: transaction.groupConfigs,
+            managedSources: transaction.sources,
           };
           return {
             status: "done" as const,
@@ -196,7 +205,7 @@ export function useVaultGroupDeletion({
   }, [
     onClearAndRemoveManagedSource,
     onClearAndRemoveManagedSources,
-    onCommitVaultGroupMutation,
+    onCommitVaultImportTransaction,
     onDeletedPaths,
     onReadPersistedHosts,
     onReadPersistedManagedSources,

application/state/useVaultState.snippetsDelete.test.ts

@@ -36,37 +36,13 @@ test("deleteSelectedSnippets merges into persisted vault under the shared lock",
   );
 });
 
-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\S]*withVaultImportLock\("vault", async \(\) => \{[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, rebased\)/,
+    /const updateSnippets = useCallback\(\(data: Snippet\[\]\) => \{[\s\S]*withVaultImportLock\("vault", async \(\) => \{[\s\S]*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, rebased\)/,
   );
   assert.match(
     source,
@@ -78,7 +54,7 @@ test("updateSnippets disk writes take the shared vault lock", () => {
   );
   assert.doesNotMatch(
     source,
-    /const updateSnippets = useCallback\(\([\s\S]*?\) => \{[\s\S]*setSnippets\(cleaned\);\s*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, cleaned\);\s*\}, \[\]\);/,
+    /const updateSnippets = useCallback\(\(data: Snippet\[\]\) => \{[\s\S]*setSnippets\(cleaned\);\s*localStorageAdapter\.write\(STORAGE_KEY_SNIPPETS, cleaned\);\s*\}, \[\]\);/,
   );
 });
 
@@ -87,169 +63,10 @@ test("updateSnippets rebases onto the latest persisted snapshot under the lock",
   // that lands while a main-window save is queued must not be resurrected.
   assert.match(
     source,
-    /rebaseSnippetVaultWrite\(\{\s*base,\s*ours: cleaned,\s*theirs:/,
+    /rebaseSnippetVaultWrite\(\{\s*base,\s*ours: cleaned,\s*theirs: latest\s*\}\)/,
   );
   assert.match(
     source,
     /snippetsWriteOwnerRef\.current !== ver/,
   );
 });
-
-test("updateSnippets functional updates derive from the latest in-memory snapshot", () => {
-  // Group deletion can wait for managed-source cleanup. A script created while
-  // it waits must still be present when the deletion callback removes the old
-  // group path, so updater callbacks must not derive from the initiating render.
-  assert.match(
-    source,
-    /data: Snippet\[\] \| \(\(current: Snippet\[\]\) => Snippet\[\]\)/,
-  );
-  assert.match(
-    source,
-    /const updater = typeof data === "function" \? data : null;[\s\S]*const current = snippetsRef\.current;[\s\S]*typeof data === "function" \? data\(current\) : data/,
-  );
-  assert.match(
-    source,
-    /updater\(rebaseSnippetVaultWrite\(\{\s*base,\s*ours: current,\s*theirs: latestPersisted,\s*\}\)\)/,
-  );
-});
-
-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*updater\s*\?\s*updater\(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 current = snippetsRef\.current;\s*const base = snippetsWriteBaseRef\.current \?\? 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

@@ -66,7 +66,6 @@ import {
 import { getNextVaultOrder, normalizeVaultOrder } from "../../domain/vaultOrder";
 import {
   deleteSelectedSnippetsFromVault,
-  pruneHostsStaleSnippetBindings,
   rebaseSnippetVaultWrite,
 } from "../../domain/snippetSelection";
 import { loadSanitizedShellHistory } from "./shellHistoryPersistence";
@@ -106,15 +105,10 @@ import {
   persistVaultImportMetadata,
   readStoredArray,
 } from "./vaultImportPersistence";
-import type {
-  VaultGroupMutationResult,
-  VaultGroupMutationState,
-} from "../../domain/vaultGroupMutation";
 import {
   commitPluginImporterTransaction,
   recoverPluginImporterTransaction,
 } from "./pluginImporterTransaction";
-import { commitVaultGroupMutationPersistence } from "./vaultGroupMutationPersistence";
 
 type ExportableVaultData = {
   hosts: Host[];
@@ -301,7 +295,6 @@ export const useVaultState = () => {
   const managedSourcesRef = useRef<ManagedSource[]>([]);
   const hostsRef = useRef<Host[]>([]);
   const snippetsRef = useRef<Snippet[]>([]);
-  const groupConfigsRef = useRef<GroupConfig[]>([]);
   const notesRef = useRef<VaultNote[]>([]);
   const noteGroupsRef = useRef<string[]>([]);
   const notesPersistFailureNotifiedAtRef = useRef(0);
@@ -309,7 +302,6 @@ export const useVaultState = () => {
   managedSourcesRef.current = managedSources;
   hostsRef.current = hosts;
   snippetsRef.current = snippets;
-  groupConfigsRef.current = groupConfigs;
   notesRef.current = notes;
   noteGroupsRef.current = noteGroups;
 
@@ -321,19 +313,10 @@ export const useVaultState = () => {
   const identitiesWriteVersion = useRef(0);
   const proxyProfilesWriteVersion = useRef(0);
   const snippetsWriteVersion = useRef(0);
-  const managedSourcesWriteVersion = 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.
@@ -348,7 +331,6 @@ export const useVaultState = () => {
   const identitiesWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
   const groupConfigsWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
   const snippetsWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
-  const managedSourcesWritePendingRef = useRef<Promise<unknown>>(Promise.resolve());
 
   const waitForPendingVaultWrites = useCallback(async () => {
     while (true) {
@@ -374,7 +356,6 @@ export const useVaultState = () => {
         identitiesWritePendingRef.current,
         groupConfigsWritePendingRef.current,
         snippetsWritePendingRef.current,
-        managedSourcesWritePendingRef.current,
       ];
       await Promise.all(writePending);
       if (
@@ -383,7 +364,6 @@ export const useVaultState = () => {
         && writePending[2] === identitiesWritePendingRef.current
         && writePending[3] === groupConfigsWritePendingRef.current
         && writePending[4] === snippetsWritePendingRef.current
-        && writePending[5] === managedSourcesWritePendingRef.current
         && encryptPending[0] === hostsEncryptPendingRef.current
         && encryptPending[1] === keysEncryptPendingRef.current
         && encryptPending[2] === identitiesEncryptPendingRef.current
@@ -484,37 +464,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
@@ -547,11 +496,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
@@ -653,36 +605,12 @@ export const useVaultState = () => {
     });
   }, []);
 
-  const updateSnippets = useCallback((
-    data: Snippet[] | ((current: Snippet[]) => Snippet[]),
-    options?: { replace?: boolean },
-  ) => {
+  const updateSnippets = useCallback((data: Snippet[]) => {
     // 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 updater = typeof data === "function" ? data : null;
-    const current = snippetsRef.current;
-    const base = snippetsWriteBaseRef.current ?? 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 cleaned = normalizeVaultOrder(
-      typeof data === "function" ? data(current) : data,
-    );
+    const base = snippetsRef.current;
+    const cleaned = normalizeVaultOrder(data);
     const ver = ++snippetsWriteVersion.current;
     snippetsWriteOwnerRef.current = ver;
     // Keep live snapshot ahead of React commit so same-tick readers (delete,
@@ -692,43 +620,17 @@ export const useVaultState = () => {
     // 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.
+    // concurrent additions).
     const writePromise = withVaultImportLock("vault", async () => {
       if (snippetsWriteOwnerRef.current !== ver) return "superseded" as const;
-      const latestPersisted = normalizeVaultOrder(
-        readStoredArray<Snippet>(
-          STORAGE_KEY_SNIPPETS,
-          localStorageAdapter.readString(STORAGE_KEY_SNIPPETS),
-        ),
+      const rawSnippets = localStorageAdapter.readString(STORAGE_KEY_SNIPPETS);
+      const latest = normalizeVaultOrder(
+        readStoredArray<Snippet>(STORAGE_KEY_SNIPPETS, rawSnippets),
       );
-      const rebased = normalizeVaultOrder(replace
-        ? cleaned
-        : updater
-          ? updater(rebaseSnippetVaultWrite({
-              base,
-              ours: current,
-              theirs: latestPersisted,
-            }))
-          : rebaseSnippetVaultWrite({
-              base,
-              ours: cleaned,
-              theirs: latestPersisted,
-            }));
-      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;
+      const rebased = normalizeVaultOrder(
+        rebaseSnippetVaultWrite({ base, ours: cleaned, theirs: latest }),
+      );
+      localStorageAdapter.write(STORAGE_KEY_SNIPPETS, rebased);
       if (snippetsWriteOwnerRef.current === ver) {
         snippetsRef.current = rebased;
         setSnippets(rebased);
@@ -808,10 +710,6 @@ export const useVaultState = () => {
         }
         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);
@@ -872,7 +770,6 @@ export const useVaultState = () => {
     setCustomGroups(next);
 
     const cleanedGroupConfigs = buildGroupConfigsForGroups(next, groupConfigs);
-    groupConfigsRef.current = cleanedGroupConfigs;
     setGroupConfigs(cleanedGroupConfigs);
     const configsVer = ++groupConfigsWriteVersion.current;
     const encryptPromise = encryptGroupConfigs(cleanedGroupConfigs);
@@ -901,105 +798,13 @@ export const useVaultState = () => {
     const next = typeof data === "function" ? data(managedSourcesRef.current) : data;
     managedSourcesRef.current = next;
     setManagedSources(next);
-    const ver = ++managedSourcesWriteVersion.current;
-    const writePromise = withVaultImportLock("vault", async () => {
+    void withVaultImportLock("vault", async () => {
       // Latest ref wins if another update ran while waiting for the lock.
-      if (ver !== managedSourcesWriteVersion.current) return "superseded" as const;
-      return localStorageAdapter.write(STORAGE_KEY_MANAGED_SOURCES, next)
-        ? "written" as const
-        : "failed" as const;
+      if (managedSourcesRef.current !== next) return;
+      localStorageAdapter.write(STORAGE_KEY_MANAGED_SOURCES, next);
     });
-    managedSourcesWritePendingRef.current = writePromise;
-    return writePromise;
   }, []);
 
-  const commitVaultGroupMutation = useCallback(async (
-    mutate: (current: VaultGroupMutationState) => VaultGroupMutationResult,
-    lock?: VaultLockHandle | null,
-  ): Promise<VaultGroupMutationResult | { ok: false; superseded: true }> => {
-    const captureVersions = () => ({
-      hosts: hostsWriteVersion.current,
-      snippets: snippetsWriteVersion.current,
-      groups: customGroupsWriteVersion.current,
-      configs: groupConfigsWriteVersion.current,
-      sources: managedSourcesWriteVersion.current,
-    });
-    const versionsAreCurrent = (versions: ReturnType<typeof captureVersions>) => (
-      versions.hosts === hostsWriteVersion.current
-      && versions.snippets === snippetsWriteVersion.current
-      && versions.groups === customGroupsWriteVersion.current
-      && versions.configs === groupConfigsWriteVersion.current
-      && versions.sources === managedSourcesWriteVersion.current
-    );
-    const stateMatchesLiveSnapshot = (current: VaultGroupMutationState) => (
-      JSON.stringify(current.hosts) === JSON.stringify(hostsRef.current)
-      && JSON.stringify(current.snippets) === JSON.stringify(snippetsRef.current)
-      && JSON.stringify(current.groups) === JSON.stringify(customGroupsRef.current)
-      && JSON.stringify(current.configs) === JSON.stringify(groupConfigsRef.current)
-      && JSON.stringify(current.managedSources) === JSON.stringify(managedSourcesRef.current)
-    );
-    const runCommit = async (
-      versions: ReturnType<typeof captureVersions>,
-    ): Promise<VaultGroupMutationResult | { ok: false; superseded: true }> => {
-      const result = await commitVaultGroupMutationPersistence({
-        storage: localStorageAdapter,
-        mutate,
-        prepareState: (state) => {
-          const groups = Array.from(new Set(state.groups));
-          return {
-            groups,
-            configs: buildGroupConfigsForGroups(groups, state.configs),
-            hosts: normalizeVaultOrder(state.hosts.map((host) => sanitizeHost(host))),
-            managedSources: state.managedSources,
-            snippets: normalizeVaultOrder(state.snippets),
-          };
-        },
-        decryptHosts: async (items) => normalizeVaultOrder(
-          (await decryptHosts(items)).map((host) => sanitizeHost(host)),
-        ),
-        decryptConfigs: async (items) => normalizeVaultOrder(
-          (await decryptGroupConfigs(items)).map(sanitizeGroupConfig),
-        ),
-        encryptHosts,
-        encryptConfigs: encryptGroupConfigs,
-        isCurrent: () => versionsAreCurrent(versions),
-        validateCurrent: lock ? stateMatchesLiveSnapshot : undefined,
-      });
-      if (!result.ok) return result;
-      const nextState = result.state;
-      ++hostsWriteVersion.current;
-      ++snippetsWriteVersion.current;
-      snippetsWriteOwnerRef.current = snippetsWriteVersion.current;
-      ++customGroupsWriteVersion.current;
-      ++groupConfigsWriteVersion.current;
-      ++managedSourcesWriteVersion.current;
-      hostsRef.current = nextState.hosts;
-      snippetsRef.current = nextState.snippets;
-      customGroupsRef.current = nextState.groups;
-      managedSourcesRef.current = nextState.managedSources;
-      snippetsWriteBaseRef.current = null;
-      snippetsWriteReplaceRef.current = false;
-      setHosts(nextState.hosts);
-      setSnippets(nextState.snippets);
-      setCustomGroups(nextState.groups);
-      setManagedSources(nextState.managedSources);
-      setGroupConfigs(nextState.configs);
-      groupConfigsRef.current = nextState.configs;
-      return { ok: true, state: nextState };
-    };
-
-    if (lock) {
-      const versions = captureVersions();
-      return withVaultImportLockIfNeeded("vault", () => runCommit(versions), lock);
-    }
-    while (true) {
-      await waitForPendingVaultWrites();
-      const versions = captureVersions();
-      const result = await withVaultImportLock("vault", () => runCommit(versions));
-      if (!("superseded" in result)) return result;
-    }
-  }, [waitForPendingVaultWrites]);
-
   const readPersistedManagedSources = useCallback((): ManagedSource[] => (
     readStoredArray<ManagedSource>(
       STORAGE_KEY_MANAGED_SOURCES,
@@ -1109,8 +914,6 @@ export const useVaultState = () => {
       ++groupConfigsWriteVersion.current;
       customGroupsRef.current = result.groups;
       managedSourcesRef.current = result.sources;
-      hostsRef.current = cleanedHosts;
-      groupConfigsRef.current = nextGroupConfigs;
       setHosts(cleanedHosts);
       setCustomGroups(result.groups);
       setManagedSources(result.sources);
@@ -1133,7 +936,6 @@ export const useVaultState = () => {
     // sit in memory and re-persist with `fontFamilyOverride: true` until
     // the next reload. Mirrors updateHosts → sanitizeHost.
     const cleaned = normalizeVaultOrder(data.map(sanitizeGroupConfig));
-    groupConfigsRef.current = cleaned;
     setGroupConfigs(cleaned);
     const ver = ++groupConfigsWriteVersion.current;
     const encryptPromise = encryptGroupConfigs(cleaned);
@@ -1154,7 +956,7 @@ export const useVaultState = () => {
     updateKeys([]);
     updateIdentities([]);
     updateProxyProfiles([]);
-    updateSnippets([], { replace: true });
+    updateSnippets([]);
     updateSnippetPackages([]);
     updateNotes([]);
     updateNoteGroups([]);
@@ -1345,14 +1147,17 @@ 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;
@@ -1378,21 +1183,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);
@@ -1485,43 +1284,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);
 
@@ -1577,10 +1341,7 @@ export const useVaultState = () => {
         const savedManagedSources = localStorageAdapter.read<ManagedSource[]>(
           STORAGE_KEY_MANAGED_SOURCES,
         );
-        if (savedManagedSources) {
-          managedSourcesRef.current = savedManagedSources;
-          setManagedSources(savedManagedSources);
-        }
+        if (savedManagedSources) setManagedSources(savedManagedSources);
 
         // Load group configs
         const savedGroupConfigs = localStorageAdapter.read<GroupConfig[]>(STORAGE_KEY_GROUP_CONFIGS);
@@ -1590,7 +1351,6 @@ export const useVaultState = () => {
           if (cancelled) return;
           if (gcVer === groupConfigsWriteVersion.current) {
             const sanitizedGC = normalizeVaultOrder(decryptedGC.map(sanitizeGroupConfig));
-            groupConfigsRef.current = sanitizedGC;
             setGroupConfigs(sanitizedGC);
             encryptGroupConfigs(sanitizedGC).then((enc) => {
               if (gcVer === groupConfigsWriteVersion.current)
@@ -1612,7 +1372,7 @@ export const useVaultState = () => {
     return () => {
       cancelled = true;
     };
-  }, [commitEncryptedHostsUnderVaultLock, updateHosts, updateSnippets]);
+  }, [updateHosts, updateSnippets]);
 
   useEffect(() => {
     if (!isInitialized) return;
@@ -1717,42 +1477,11 @@ 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).
         ++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);
         return;
@@ -1761,7 +1490,6 @@ export const useVaultState = () => {
       if (key === STORAGE_KEY_GROUPS) {
         const next = safeParse<string[]>(event.newValue) ?? [];
         ++customGroupsWriteVersion.current;
-        customGroupsRef.current = next;
         setCustomGroups(next);
         return;
       }
@@ -1816,8 +1544,6 @@ export const useVaultState = () => {
 
       if (key === STORAGE_KEY_MANAGED_SOURCES) {
         const next = safeParse<ManagedSource[]>(event.newValue) ?? [];
-        ++managedSourcesWriteVersion.current;
-        managedSourcesRef.current = next;
         setManagedSources(next);
         return;
       }
@@ -1828,11 +1554,8 @@ export const useVaultState = () => {
         const seq = ++groupConfigsReadSeq.current;
         const writeAtStart = groupConfigsWriteVersion.current;
         decryptGroupConfigs(next).then((dec) => {
-          if (seq === groupConfigsReadSeq.current && writeAtStart === groupConfigsWriteVersion.current) {
-            const normalized = normalizeVaultOrder(dec.map(sanitizeGroupConfig));
-            groupConfigsRef.current = normalized;
-            setGroupConfigs(normalized);
-          }
+          if (seq === groupConfigsReadSeq.current && writeAtStart === groupConfigsWriteVersion.current)
+            setGroupConfigs(normalizeVaultOrder(dec.map(sanitizeGroupConfig)));
         });
         return;
       }
@@ -1875,12 +1598,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);
@@ -1893,12 +1619,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 => ({
@@ -1920,16 +1649,12 @@ export const useVaultState = () => {
   const importData = useCallback(
     (payload: Partial<ExportableVaultData>): Promise<void> => {
       const encryptedWrites: Promise<void>[] = [];
-      if (payload.hosts) encryptedWrites.push(updateHosts(payload.hosts).then(() => undefined));
+      if (payload.hosts) encryptedWrites.push(updateHosts(payload.hosts));
       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),
-        );
+        encryptedWrites.push(updateSnippets(payload.snippets).then(() => undefined));
       }
       if (payload.customGroups) updateCustomGroups(payload.customGroups);
       if (payload.snippetPackages) updateSnippetPackages(payload.snippetPackages);
@@ -2077,11 +1802,6 @@ export const useVaultState = () => {
           [STORAGE_KEY_GROUP_CONFIGS, encryptedGroupConfigs],
         ]);
         customGroupsRef.current = nextGroups;
-        snippetsRef.current = nextSnippets;
-        hostsRef.current = nextHosts;
-        groupConfigsRef.current = nextGroupConfigs;
-        snippetsWriteBaseRef.current = null;
-        snippetsWriteReplaceRef.current = false;
         setHosts(nextHosts);
         setKeys(nextKeys);
         setIdentities(nextIdentities);
@@ -2136,7 +1856,6 @@ export const useVaultState = () => {
     updateManagedSources,
     readPersistedManagedSources,
     commitVaultImportTransaction,
-    commitVaultGroupMutation,
     updateGroupConfigs,
     addShellHistoryEntry,
     clearShellHistory,

application/state/vaultGroupMutationPersistence.test.ts

@@ -1,220 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import type { Host, Snippet } from '../../domain/models';
-import {
-  remapSnippetTargetGroupPaths,
-  removeSnippetTargetGroupPaths,
-} from '../../domain/hostGroupPathMutations';
-import {
-  STORAGE_KEY_GROUP_CONFIGS,
-  STORAGE_KEY_GROUPS,
-  STORAGE_KEY_HOSTS,
-  STORAGE_KEY_MANAGED_SOURCES,
-  STORAGE_KEY_SNIPPETS,
-} from '../../infrastructure/config/storageKeys';
-import { commitVaultGroupMutationPersistence } from './vaultGroupMutationPersistence';
-
-const createStorage = (initial: Record<string, unknown>, failKey?: string) => {
-  const values = new Map(Object.entries(initial).map(([key, value]) => [key, JSON.stringify(value)]));
-  return {
-    values,
-    read<T>(key: string): T | null {
-      const value = values.get(key);
-      return value === undefined ? null : JSON.parse(value) as T;
-    },
-    readString: (key: string) => values.get(key) ?? null,
-    write<T>(key: string, value: T) {
-      if (key === failKey) return false;
-      values.set(key, JSON.stringify(value));
-      return true;
-    },
-    writeString(key: string, value: string) {
-      values.set(key, value);
-      return true;
-    },
-    remove(key: string) {
-      values.delete(key);
-    },
-  };
-};
-
-const identity = async <T>(value: T): Promise<T> => value;
-const prepareState = <T>(value: T): T => value;
-
-const initialHost: Host = {
-  id: 'host-1', label: 'Host', hostname: 'host.test', username: 'root',
-  group: 'prod', tags: [], os: 'linux',
-};
-const initialSnippet: Snippet = {
-  id: 'script-1', label: 'Deploy', command: 'nct.log(1)', kind: 'script',
-  targetGroups: ['prod'],
-};
-
-function initialVault() {
-  return {
-    [STORAGE_KEY_HOSTS]: [initialHost],
-    [STORAGE_KEY_GROUPS]: ['prod'],
-    [STORAGE_KEY_MANAGED_SOURCES]: [],
-    [STORAGE_KEY_GROUP_CONFIGS]: [{ path: 'prod', username: 'root' }],
-    [STORAGE_KEY_SNIPPETS]: [initialSnippet],
-  };
-}
-
-test('group rename rolls back every Vault key when the snippet write fails', async () => {
-  const initial = initialVault();
-  const storage = createStorage(initial, STORAGE_KEY_SNIPPETS);
-
-  await assert.rejects(commitVaultGroupMutationPersistence({
-    storage,
-    mutate: (current) => ({
-      ok: true,
-      state: {
-        ...current,
-        groups: ['production'],
-        configs: current.configs.map((config) => ({ ...config, path: 'production' })),
-        hosts: current.hosts.map((host) => ({ ...host, group: 'production' })),
-        snippets: remapSnippetTargetGroupPaths(current.snippets, 'prod', 'production'),
-      },
-    }),
-    prepareState,
-    decryptHosts: identity,
-    decryptConfigs: identity,
-    encryptHosts: identity,
-    encryptConfigs: identity,
-    isCurrent: () => true,
-  }), /rejected importer transaction/);
-
-  for (const [key, value] of Object.entries(initial)) {
-    assert.deepEqual(storage.read(key), value);
-  }
-});
-
-test('group delete rolls back every Vault key when the snippet write fails', async () => {
-  const initial = initialVault();
-  const storage = createStorage(initial, STORAGE_KEY_SNIPPETS);
-
-  await assert.rejects(commitVaultGroupMutationPersistence({
-    storage,
-    mutate: (current) => ({
-      ok: true,
-      state: {
-        ...current,
-        groups: [],
-        configs: [],
-        hosts: current.hosts.map((host) => ({ ...host, group: undefined })),
-        snippets: removeSnippetTargetGroupPaths(current.snippets, ['prod']),
-      },
-    }),
-    prepareState,
-    decryptHosts: identity,
-    decryptConfigs: identity,
-    encryptHosts: identity,
-    encryptConfigs: identity,
-    isCurrent: () => true,
-  }), /rejected importer transaction/);
-
-  for (const [key, value] of Object.entries(initial)) {
-    assert.deepEqual(storage.read(key), value);
-  }
-});
-
-test('group rename preserves a concurrent snippet update from the locked snapshot', async () => {
-  const concurrentSnippet = { ...initialSnippet, command: 'nct.log(2)' };
-  const addedSnippet: Snippet = {
-    id: 'script-2', label: 'Check', command: 'nct.log(3)', kind: 'script',
-    targetGroups: ['prod/child'],
-  };
-  const storage = createStorage({
-    ...initialVault(),
-    [STORAGE_KEY_SNIPPETS]: [concurrentSnippet, addedSnippet],
-  });
-
-  const result = await commitVaultGroupMutationPersistence({
-    storage,
-    mutate: (current) => ({
-      ok: true,
-      state: {
-        ...current,
-        groups: ['production'],
-        snippets: remapSnippetTargetGroupPaths(current.snippets, 'prod', 'production'),
-      },
-    }),
-    prepareState,
-    decryptHosts: identity,
-    decryptConfigs: identity,
-    encryptHosts: identity,
-    encryptConfigs: identity,
-    isCurrent: () => true,
-  });
-
-  assert.equal(result.ok, true);
-  const saved = storage.read<Snippet[]>(STORAGE_KEY_SNIPPETS) ?? [];
-  assert.equal(saved[0]?.command, 'nct.log(2)');
-  assert.deepEqual(saved.map((snippet) => snippet.targetGroups), [
-    ['production'],
-    ['production/child'],
-  ]);
-});
-
-test('group delete cleans targets from the latest persisted snippet snapshot', async () => {
-  const concurrentSnippet = { ...initialSnippet, command: 'nct.log(2)' };
-  const addedSnippet: Snippet = {
-    id: 'script-2', label: 'Check', command: 'nct.log(3)', kind: 'script',
-    targetGroups: ['prod/child', 'staging'],
-  };
-  const storage = createStorage({
-    ...initialVault(),
-    [STORAGE_KEY_SNIPPETS]: [concurrentSnippet, addedSnippet],
-  });
-
-  const result = await commitVaultGroupMutationPersistence({
-    storage,
-    mutate: (current) => ({
-      ok: true,
-      state: {
-        ...current,
-        groups: [],
-        snippets: removeSnippetTargetGroupPaths(current.snippets, ['prod']),
-      },
-    }),
-    prepareState,
-    decryptHosts: identity,
-    decryptConfigs: identity,
-    encryptHosts: identity,
-    encryptConfigs: identity,
-    isCurrent: () => true,
-  });
-
-  assert.equal(result.ok, true);
-  const saved = storage.read<Snippet[]>(STORAGE_KEY_SNIPPETS) ?? [];
-  assert.equal(saved[0]?.command, 'nct.log(2)');
-  assert.deepEqual(saved.map((snippet) => snippet.targetGroups), [
-    [],
-    ['staging'],
-  ]);
-});
-
-test('group mutation stops before writing when memory is ahead of persisted Vault state', async () => {
-  const storage = createStorage(initialVault());
-  let mutateCalled = false;
-
-  const result = await commitVaultGroupMutationPersistence({
-    storage,
-    mutate: (current) => {
-      mutateCalled = true;
-      return { ok: true, state: current };
-    },
-    prepareState,
-    decryptHosts: identity,
-    decryptConfigs: identity,
-    encryptHosts: identity,
-    encryptConfigs: identity,
-    isCurrent: () => true,
-    validateCurrent: (current) => current.snippets[0]?.command === 'nct.log(2)',
-  });
-
-  assert.deepEqual(result, { ok: false, superseded: true });
-  assert.equal(mutateCalled, false);
-  assert.deepEqual(storage.read<Snippet[]>(STORAGE_KEY_SNIPPETS), [initialSnippet]);
-});

application/state/vaultGroupMutationPersistence.ts

@@ -1,97 +0,0 @@
-import type { GroupConfig, Host, ManagedSource, Snippet } from '../../domain/models';
-import type {
-  VaultGroupMutationResult,
-  VaultGroupMutationState,
-} from '../../domain/vaultGroupMutation';
-import {
-  STORAGE_KEY_GROUP_CONFIGS,
-  STORAGE_KEY_GROUPS,
-  STORAGE_KEY_HOSTS,
-  STORAGE_KEY_MANAGED_SOURCES,
-  STORAGE_KEY_SNIPPETS,
-} from '../../infrastructure/config/storageKeys';
-import { commitPluginImporterTransaction } from './pluginImporterTransaction';
-import { readStoredArray } from './vaultImportPersistence';
-
-type TransactionStorage = {
-  read<T>(key: string): T | null;
-  readString(key: string): string | null;
-  write<T>(key: string, value: T): boolean;
-  writeString(key: string, value: string): boolean;
-  remove(key: string): void;
-};
-
-const GROUP_MUTATION_KEYS = [
-  STORAGE_KEY_HOSTS,
-  STORAGE_KEY_GROUPS,
-  STORAGE_KEY_MANAGED_SOURCES,
-  STORAGE_KEY_GROUP_CONFIGS,
-  STORAGE_KEY_SNIPPETS,
-] as const;
-
-export async function commitVaultGroupMutationPersistence({
-  storage,
-  mutate,
-  prepareState,
-  decryptHosts,
-  decryptConfigs,
-  encryptHosts,
-  encryptConfigs,
-  isCurrent,
-  validateCurrent,
-}: {
-  storage: TransactionStorage;
-  mutate: (current: VaultGroupMutationState) => VaultGroupMutationResult;
-  prepareState: (state: VaultGroupMutationState) => VaultGroupMutationState;
-  decryptHosts: (hosts: Host[]) => Promise<Host[]>;
-  decryptConfigs: (configs: GroupConfig[]) => Promise<GroupConfig[]>;
-  encryptHosts: (hosts: Host[]) => Promise<unknown>;
-  encryptConfigs: (configs: GroupConfig[]) => Promise<unknown>;
-  isCurrent: () => boolean;
-  validateCurrent?: (current: VaultGroupMutationState) => boolean;
-}): Promise<VaultGroupMutationResult | { ok: false; superseded: true }> {
-  const raw = new Map(GROUP_MUTATION_KEYS.map((key) => [key, storage.readString(key)]));
-  const [hosts, configs] = await Promise.all([
-    decryptHosts(readStoredArray<Host>(STORAGE_KEY_HOSTS, raw.get(STORAGE_KEY_HOSTS) ?? null)),
-    decryptConfigs(readStoredArray<GroupConfig>(
-      STORAGE_KEY_GROUP_CONFIGS,
-      raw.get(STORAGE_KEY_GROUP_CONFIGS) ?? null,
-    )),
-  ]);
-  const current: VaultGroupMutationState = {
-    groups: readStoredArray<string>(STORAGE_KEY_GROUPS, raw.get(STORAGE_KEY_GROUPS) ?? null),
-    configs,
-    hosts,
-    managedSources: readStoredArray<ManagedSource>(
-      STORAGE_KEY_MANAGED_SOURCES,
-      raw.get(STORAGE_KEY_MANAGED_SOURCES) ?? null,
-    ),
-    snippets: readStoredArray<Snippet>(STORAGE_KEY_SNIPPETS, raw.get(STORAGE_KEY_SNIPPETS) ?? null),
-  };
-  if (!isCurrent() || (validateCurrent && !validateCurrent(current))) {
-    return { ok: false, superseded: true };
-  }
-  const mutation = mutate(current);
-  if (!mutation.ok) return mutation;
-
-  const nextState = prepareState(mutation.state);
-  const [encryptedHosts, encryptedConfigs] = await Promise.all([
-    encryptHosts(nextState.hosts),
-    encryptConfigs(nextState.configs),
-  ]);
-  if (
-    !isCurrent()
-    || GROUP_MUTATION_KEYS.some((key) => storage.readString(key) !== raw.get(key))
-  ) {
-    return { ok: false, superseded: true };
-  }
-
-  commitPluginImporterTransaction(storage, [
-    [STORAGE_KEY_HOSTS, encryptedHosts],
-    [STORAGE_KEY_GROUPS, nextState.groups],
-    [STORAGE_KEY_MANAGED_SOURCES, nextState.managedSources],
-    [STORAGE_KEY_GROUP_CONFIGS, encryptedConfigs],
-    [STORAGE_KEY_SNIPPETS, nextState.snippets],
-  ]);
-  return { ok: true, state: nextState };
-}

application/state/vaultHostTreeActionsStore.ts

@@ -6,13 +6,12 @@ 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;
   onRenameGroup: (groupPath: string) => void;
   onDeleteGroup: (groupPath: string) => void;
-  commitInlineGroupRename: (name: string) => boolean | void | Promise<boolean | void>;
+  commitInlineGroupRename: (name: string) => void;
   cancelInlineGroupEdit: () => void;
   commitInlineHostRename: (name: string) => void;
   cancelInlineHostEdit: () => void;

application/state/vaultSnapshotStore.test.ts

@@ -81,7 +81,6 @@ test('vault actions register and unregister', () => {
     readPersistedManagedSources: noop,
     commitPluginImporterData: noop,
     commitVaultImportTransaction: noop,
-    commitVaultGroupMutation: noop,
     updateHostDistro: noop,
     updateHostLastConnected: noop,
     addShellHistoryEntry: noop,

application/state/vaultSnapshotStore.ts

@@ -58,7 +58,6 @@ export type VaultSnapshotActions = Pick<
   | 'readPersistedManagedSources'
   | 'commitPluginImporterData'
   | 'commitVaultImportTransaction'
-  | 'commitVaultGroupMutation'
   | 'updateHostDistro'
   | 'updateHostLastConnected'
   | 'addShellHistoryEntry'

application/syncPayload.ts

@@ -87,7 +87,6 @@ import {
   STORAGE_KEY_SHOW_SFTP_TAB,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
-  STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
   STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
   STORAGE_KEY_AI_PROVIDERS,
@@ -299,7 +298,6 @@ export const SYNCABLE_SETTING_STORAGE_KEYS = [
   STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT,
   STORAGE_KEY_SHOW_SFTP_TAB,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
-  STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
   STORAGE_KEY_AI_PROVIDERS,
   STORAGE_KEY_AI_ACTIVE_PROVIDER,
@@ -521,8 +519,6 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
   if (showSftpTab != null) settings.showSftpTab = showSftpTab;
   const shellOnlyTabNumberShortcuts = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
   if (shellOnlyTabNumberShortcuts != null) settings.shellOnlyTabNumberShortcuts = shellOnlyTabNumberShortcuts;
-  const showTabNumberBadges = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES);
-  if (showTabNumberBadges != null) settings.showTabNumberBadges = showTabNumberBadges;
   const disableTerminalFontZoom = localStorageAdapter.readBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM);
   if (disableTerminalFontZoom != null) settings.disableTerminalFontZoom = disableTerminalFontZoom;
   const showHostTreeSidebar = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR);
@@ -761,9 +757,6 @@ async function applySyncableSettings(settings: NonNullable<SyncPayload['settings
   if (settings.shellOnlyTabNumberShortcuts != null) {
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS, settings.shellOnlyTabNumberShortcuts);
   }
-  if (settings.showTabNumberBadges != null) {
-    localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_TAB_NUMBER_BADGES, settings.showTabNumberBadges);
-  }
   if (settings.disableTerminalFontZoom != null) {
     localStorageAdapter.writeBoolean(STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM, settings.disableTerminalFontZoom);
   }

components/AIChatSidePanel.mountRetention.test.ts

@@ -252,51 +252,3 @@ test('AI side panel skips re-render when only a sibling scope session object cha
     false,
   );
 });
-
-test('workspace AI panel memo follows visible inherited session, not hidden terminal maps', () => {
-  const visibleMemberChat = session({
-    id: 'chat-visible',
-    scope: { type: 'terminal', targetId: 'terminal-b', hostIds: ['host-b'] },
-  });
-  const hiddenFocusedChat = session({
-    id: 'chat-hidden',
-    scope: { type: 'terminal', targetId: 'terminal-other', hostIds: ['host-other'] },
-  });
-  const prev = baseProps({
-    isVisible: true,
-    scopeType: 'workspace',
-    scopeTargetId: 'ws-1',
-    focusedSessionId: 'terminal-a',
-    terminalSessions: [
-      {
-        sessionId: 'terminal-a',
-        hostId: 'host-a',
-        hostname: 'a.example',
-        label: 'A',
-        connected: true,
-      },
-      {
-        sessionId: 'terminal-b',
-        hostId: 'host-b',
-        hostname: 'b.example',
-        label: 'B',
-        connected: true,
-      },
-    ],
-    activeSessionIdMap: {
-      'terminal:terminal-a': 'chat-hidden',
-      'terminal:terminal-b': 'chat-visible',
-    },
-    sessions: [visibleMemberChat, hiddenFocusedChat],
-  });
-  const streamedVisible = session({
-    id: 'chat-visible',
-    scope: { type: 'terminal', targetId: 'terminal-b', hostIds: ['host-b'] },
-    messages: [{ id: 'm1', role: 'assistant', content: 'stream', timestamp: 2 }],
-  });
-
-  assert.equal(
-    aiChatSidePanelPropsAreEqual(prev, { ...prev, sessions: [streamedVisible, hiddenFocusedChat] }),
-    false,
-  );
-});

components/AIChatSidePanel.tsx

@@ -1,6 +1,6 @@
 
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useDeferredValue, useMemo, useRef, useState } from 'react';
 import { Loader2 } from 'lucide-react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useWindowControls } from '../application/state/useWindowControls';
@@ -30,9 +30,9 @@ import { subscribeUserSkillsStatusChanged } from './ai/userSkillsStatusEvents';
 import {
   applyDraftEntrySelection,
   applyHistorySessionSelection,
+  panelViewsEqual,
   resolveDisplayedPanelView,
   resolveDisplayedSession,
-  shouldForceDraftViewSync,
 } from './ai/aiPanelViewState';
 import {
   endSendForKey,
@@ -51,7 +51,6 @@ import {
   type DefaultTargetSessionHint,
 } from '../application/state/useAIChatStreaming';
 import { getScopedHistorySessions } from './ai/scopedHistorySessions';
-import { resolveInheritedAIActiveSessionId } from '../domain/aiWorkspaceScopeInherit';
 import { aiSessionIdSetEqual, exactScopeAISessionsEqual } from '../domain/aiSessionsForScope';
 import { buildExternalAgentHistoryMessagesForBridge } from './ai/externalAgentHistory';
 import { canSendWithAgent, findEnabledExternalAgent } from './ai/agentSendEligibility';
@@ -287,7 +286,6 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   scopeTargetId,
   scopeHostIds,
   scopeLabel,
-  focusedSessionId,
   terminalSessions = [],
   resolveExecutorContext,
   isVisible = true,
@@ -347,48 +345,24 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     return sessionIds;
   }, [activeSessionIdMap, scopeKey]);
 
-  const workspaceMemberTerminalIds = useMemo(() => {
-    if (scopeType !== 'workspace') return undefined;
-    return new Set(
-      terminalSessions
-        .map((session) => session.sessionId)
-        .filter((sessionId): sessionId is string => Boolean(sessionId)),
-    );
-  }, [scopeType, terminalSessions]);
-
-  // Use live sessions for history + view resolution. Deferring the list used to
-  // lag one paint behind createSession, so normalizePanelView treated the new
-  // chat as missing and the draft-sync effect forced showDraftView — which
-  // parked the just-sent session into history under StrictMode.
+  const deferredSessions = useDeferredValue(sessions);
   const historySessions = useMemo(
     () => profileAIPanelCalculation(
       'AIChatSidePanel.historySessions',
       () => getScopedHistorySessions(
-        sessions,
+        deferredSessions,
         scopeType,
         scopeTargetId,
         scopeHostIds,
         activeTerminalSessionIds,
-        workspaceMemberTerminalIds,
       ),
     ),
-    [sessions, scopeType, scopeTargetId, scopeHostIds, activeTerminalSessionIds, workspaceMemberTerminalIds],
+    [deferredSessions, scopeType, scopeTargetId, scopeHostIds, activeTerminalSessionIds],
   );
 
   const explicitPanelView = panelViewByScope[scopeKey];
   const currentDraft = draftsByScope[scopeKey] ?? null;
-  const visibleHistorySessionIds = useMemo(
-    () => new Set(historySessions.map((session) => session.id)),
-    [historySessions],
-  );
-  const persistedSessionId = resolveInheritedAIActiveSessionId({
-    scopeType,
-    scopeTargetId,
-    activeSessionIdMap,
-    memberTerminalIds: terminalSessions.map((session) => session.sessionId).filter(Boolean),
-    preferredTerminalId: focusedSessionId,
-    visibleSessionIds: visibleHistorySessionIds,
-  });
+  const persistedSessionId = activeSessionIdMap[scopeKey] ?? null;
   const normalizedPanelView = useMemo<AIPanelView>(
     () => resolveDisplayedPanelView(explicitPanelView, currentDraft != null, historySessions, persistedSessionId, scopeType),
     [explicitPanelView, currentDraft, historySessions, persistedSessionId, scopeType],
@@ -450,17 +424,9 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
 
   useEffect(() => {
     if (!isVisible) return;
-    // Predicate must match normalizePanelView's list (scoped history), not the
-    // global store — out-of-scope sessions must still demote to draft.
-    if (!shouldForceDraftViewSync(
-      explicitPanelView,
-      normalizedPanelView,
-      (sessionId) => historySessions.some((session) => session.id === sessionId),
-    )) {
-      return;
-    }
+    if (!explicitPanelView || panelViewsEqual(normalizedPanelView, explicitPanelView)) return;
     showDraftView(scopeKey);
-  }, [isVisible, normalizedPanelView, explicitPanelView, scopeKey, historySessions, showDraftView]);
+  }, [isVisible, normalizedPanelView, explicitPanelView, scopeKey, showDraftView]);
 
   useEffect(() => {
     if (!activeSession) return;
@@ -479,24 +445,9 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   useEffect(() => {
     if (!isVisible) return;
     if (normalizedPanelView.mode !== 'draft') return;
-    // Keep ownership while an explicit session is still displayable in this
-    // scope (normalize has not demoted it). Out-of-scope / missing ids clear.
-    if (
-      explicitPanelView?.mode === 'session'
-      && historySessions.some((session) => session.id === explicitPanelView.sessionId)
-    ) {
-      return;
-    }
     if (persistedSessionId == null) return;
     setActiveSessionId(null);
-  }, [
-    isVisible,
-    normalizedPanelView.mode,
-    explicitPanelView,
-    historySessions,
-    persistedSessionId,
-    setActiveSessionId,
-  ]);
+  }, [isVisible, normalizedPanelView.mode, persistedSessionId, setActiveSessionId]);
 
   const ensureScopeDraft = useCallback((agentId: string) => {
     ensureDraftForScope(scopeKey, agentId);
@@ -1628,7 +1579,6 @@ export function aiChatSidePanelPropsAreEqual(
   if (prev.scopeType !== next.scopeType) return false;
   if (prev.scopeTargetId !== next.scopeTargetId) return false;
   if (prev.scopeLabel !== next.scopeLabel) return false;
-  if ((prev.focusedSessionId ?? '') !== (next.focusedSessionId ?? '')) return false;
   if ((prev.isVisible ?? true) !== (next.isVisible ?? true)) return false;
   if (prev.scopeHostIds !== next.scopeHostIds) return false;
   if (prev.terminalSessions !== next.terminalSessions) return false;
@@ -1647,45 +1597,10 @@ export function aiChatSidePanelPropsAreEqual(
   // resume whose stored scope.targetId is an older terminal.
   // Fuzzy history still receives the full list; drawer open forces re-render
   // via isVisible / other prop paths when the user actually needs it.
-  // Keep visibleSessionIds in sync with the live panel so inheritance that
-  // skips non-history chats does not leave memo pinned to a different id.
-  const resolveSelectedSessionId = (
-    props: AIChatSidePanelProps,
-  ): string | null => {
-    const scopeKey = `${props.scopeType}:${props.scopeTargetId ?? ''}`;
-    const memberTerminalIds = (props.terminalSessions ?? [])
-      .map((session) => session.sessionId)
-      .filter((sessionId): sessionId is string => Boolean(sessionId));
-    const workspaceMemberTerminalIds = props.scopeType === 'workspace'
-      ? new Set(memberTerminalIds)
-      : undefined;
-    const activeTerminalSessionIds = new Set<string>();
-    for (const [sessionScopeKey, sessionId] of Object.entries(props.activeSessionIdMap) as Array<[string, string | null]>) {
-      if (!sessionScopeKey.startsWith('terminal:') || !sessionId) continue;
-      if (sessionScopeKey === scopeKey) continue;
-      activeTerminalSessionIds.add(sessionId);
-    }
-    const visibleSessionIds = new Set(
-      getScopedHistorySessions(
-        props.sessions,
-        props.scopeType,
-        props.scopeTargetId,
-        props.scopeHostIds,
-        activeTerminalSessionIds,
-        workspaceMemberTerminalIds,
-      ).map((session) => session.id),
-    );
-    return resolveInheritedAIActiveSessionId({
-      scopeType: props.scopeType,
-      scopeTargetId: props.scopeTargetId,
-      activeSessionIdMap: props.activeSessionIdMap,
-      memberTerminalIds,
-      preferredTerminalId: props.focusedSessionId,
-      visibleSessionIds,
-    });
-  };
-  const selectedSessionId = resolveSelectedSessionId(prev)
-    ?? resolveSelectedSessionId(next);
+  const scopeKey = `${prev.scopeType}:${prev.scopeTargetId ?? ''}`;
+  const selectedSessionId = prev.activeSessionIdMap[scopeKey]
+    ?? next.activeSessionIdMap[scopeKey]
+    ?? null;
   if (!exactScopeAISessionsEqual(
     prev.sessions,
     next.sessions,

components/AIChatSidePanel.types.ts

@@ -87,8 +87,6 @@ export interface AIChatSidePanelProps {
   scopeTargetId?: string;
   scopeHostIds?: string[];
   scopeLabel?: string;
-  /** Workspace focused pane; preferred when inheriting AI chat after merge. */
-  focusedSessionId?: string;
 
   // Terminal session context (from parent)
   terminalSessions?: Array<{