fix(sftp): keep selection scroll on reconnect listing updates

revert(vault): remove SFTP sidebar option pending #3504 decision

App.tsx

@@ -11,6 +11,7 @@ import { TooltipProvider } from './components/ui/tooltip';
 import { ScriptAutomationRoot } from './components/scripts/ScriptAutomationRoot';
 import { ExternalMcpApprovalsHost } from './components/ai/ExternalMcpApprovalsHost';
 import { PluginAuthenticationHost } from './components/plugins/PluginAuthenticationHost';
+import { MultilinePasteConfirmHost } from './components/terminal/MultilinePasteConfirmDialog';
 import { useExternalMcpGrantPersister } from './components/ai/useExternalMcpGrantPersister';
 import { setupMcpApprovalBridge } from './infrastructure/ai/shared/approvalGate';
 import { setupCodexAppServerInteractionBridge } from './infrastructure/ai/shared/codexAppServerInteractions';
@@ -81,6 +82,7 @@ function AppWithProviders({ settings, appLock }: { settings: SettingsState; appL
               <ScriptAutomationRoot />
               <ExternalMcpApprovalsHost />
               <PluginAuthenticationHost />
+              <MultilinePasteConfirmHost />
               <VaultPublisher>
                 <SessionPublisher persistSessionRestore={!isPeerSessionWindow}>
                   <App />

application/AppHandlers.globalHotkeys.test.ts

@@ -698,3 +698,51 @@ test('connection log host snapshot includes custom host icon fields', () => {
     },
   );
 });
+
+for (const scenario of [
+  { name: 'single orphan', active: 'one', sessions: [{ id: 'one' }], available: false, expected: null },
+  { name: 'two orphans', active: 'one', sessions: [{ id: 'one' }, { id: 'two' }], available: true, expected: 'global' },
+  { name: 'hidden active session', active: 'hidden', sessions: [{ id: 'one' }, { id: 'two' }, { id: 'hidden', hiddenFromTabs: true }], available: true, expected: null },
+  { name: 'non-terminal tab', active: 'vault', sessions: [{ id: 'one' }, { id: 'two' }], available: true, expected: null },
+  { name: 'workspace', active: 'workspace', sessions: [{ id: 'one', workspaceId: 'workspace' }, { id: 'two', workspaceId: 'workspace' }], available: false, expected: 'workspace' },
+]) {
+  for (const scheme of ['pc', 'mac'] as const) {
+    test(`broadcast shortcut ${scheme}: ${scenario.name} only consumes an executed toggle`, () => {
+      const target = new FakeHTMLElement();
+      let prevented = 0;
+      let stopped = 0;
+      let globalEnabled = false;
+      let workspaceEnabled = false;
+      const toggles: string[] = [];
+      const event = {
+        key: 'b', code: 'KeyB', ctrlKey: scheme === 'pc', metaKey: scheme === 'mac',
+        altKey: false, shiftKey: false, target, composedPath: () => [target],
+        preventDefault: () => { prevented += 1; },
+        stopPropagation: () => { stopped += 1; },
+      } as unknown as KeyboardEvent;
+      const actionCtx = {
+        activeTabStore: { getActiveTabId: () => scenario.active },
+        editorTabs: [], orderedTabs: [], settings: {}, toEditorTabId: (id: string) => id,
+        sessions: scenario.sessions,
+        workspaces: scenario.active === 'workspace' ? [{ id: 'workspace' }] : [],
+        canUseGlobalBroadcast: scenario.available,
+        toggleGlobalBroadcast: () => { globalEnabled = !globalEnabled; toggles.push('global'); },
+        toggleBroadcast: (id: string) => { assert.equal(id, 'workspace'); workspaceEnabled = !workspaceEnabled; toggles.push('workspace'); },
+      };
+      const invoke = () => handleGlobalHotkeyKeyDownImpl(() => ({
+        HOTKEY_DEBUG: false, closeTabKeyStr: '', hotkeyScheme: scheme,
+        keyBindings: DEFAULT_KEY_BINDINGS, matchesKeyBinding,
+        executeHotkeyAction: (action: string, e: KeyboardEvent) => executeHotkeyActionImpl(() => actionCtx, action, e),
+      }), event);
+      invoke();
+      assert.equal(globalEnabled, scenario.expected === 'global');
+      assert.equal(workspaceEnabled, scenario.expected === 'workspace');
+      invoke();
+      assert.equal(globalEnabled, false);
+      assert.equal(workspaceEnabled, false);
+      assert.deepEqual(toggles, scenario.expected ? [scenario.expected, scenario.expected] : []);
+      assert.equal(prevented, scenario.expected ? 2 : 0);
+      assert.equal(stopped, scenario.expected ? 2 : 0);
+    });
+  }
+}

application/app/AppHandlers.ts

@@ -313,6 +313,16 @@ export function handleGlobalHotkeyKeyDownImpl(getCtx: AppContextGetter, e: Keybo
         continue;
       }
 
+      // An unavailable broadcast action must leave the chord to the terminal
+      // (notably tmux's Ctrl+B prefix). Dispatch once before consuming it.
+      if (binding.action === 'broadcast') {
+        if (executeHotkeyAction(binding.action, e) === true) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        return;
+      }
+
       e.preventDefault();
       e.stopPropagation();
       if (HOTKEY_DEBUG) {
@@ -963,12 +973,14 @@ export function executeHotkeyActionImpl(getCtx: AppContextGetter, action: string
         const activeWs = workspaces.find(w => w.id === currentId);
         if (activeWs) {
           toggleBroadcast(activeWs.id);
+          return true;
         } else if (sessions.some((session: TerminalSession) => (
-          session.id === currentId && !session.workspaceId
+          session.id === currentId && !session.workspaceId && !session.hiddenFromTabs
         )) && canUseGlobalBroadcast) {
           toggleGlobalBroadcast();
+          return true;
         }
-        break;
+        return false;
       }
       case 'openSettings':
         handleOpenSettingsRef.current();

application/app/AppSideEffects.tsx

@@ -252,6 +252,8 @@ export function AppSideEffects() {
     runSnippet,
     getOrderedWorkTabs,
     toggleBroadcast,
+    toggleGlobalBroadcast,
+    canUseGlobalBroadcast,
     logViews,
     closeLogView,
     copySession,
@@ -906,6 +908,8 @@ export function AppSideEffects() {
   // array thrash does not rebuild appTerminalDomain (see domain isolation).
   const sessionsRef = useRef(sessions);
   sessionsRef.current = sessions;
+  const canUseGlobalBroadcastRef = useRef(canUseGlobalBroadcast);
+  canUseGlobalBroadcastRef.current = canUseGlobalBroadcast;
   // Logs live in connectionLogsStore — keep a ref fresh without re-rendering App.
   const connectionLogsRef = useRef(getConnectionLogsSnapshot().connectionLogs);
   useEffect(() => {
@@ -1076,6 +1080,8 @@ export function AppSideEffects() {
       terminalPaneMagnificationRef,
       toEditorTabId,
       toggleBroadcast,
+      toggleGlobalBroadcast,
+      canUseGlobalBroadcast: canUseGlobalBroadcastRef.current,
       toggleScriptsSidePanelRef,
       toggleSidePanelRef,
       toggleWorkspaceViewMode,
@@ -1090,6 +1096,7 @@ export function AppSideEffects() {
     splitSessionWithCurrentShell,
     moveFocusInWorkspace,
     toggleBroadcast,
+    toggleGlobalBroadcast,
     toggleWorkspaceViewMode,
     confirmIfBusyLocalTerminal,
   ]);

application/app/AppView.tsx

@@ -300,6 +300,8 @@ function AppViewInner({ domains }: AppViewProps) {
     restoreTerminalCwd,
     terminalSidePanelAutoOpen,
     terminalSidePanelAutoOpenTab,
+    localShellSidePanelAutoOpen,
+    localShellSidePanelAutoOpenTab,
   } = useSettingsChromeStore();
   const { setTheme, setWindowOpacity } = useSettingsChromeActions();
 
@@ -752,6 +754,8 @@ function AppViewInner({ domains }: AppViewProps) {
           sftpAutoOpenSidebar={sftpAutoOpenSidebar}
           terminalSidePanelAutoOpen={terminalSidePanelAutoOpen}
           terminalSidePanelAutoOpenTab={terminalSidePanelAutoOpenTab}
+          localShellSidePanelAutoOpen={localShellSidePanelAutoOpen}
+          localShellSidePanelAutoOpenTab={localShellSidePanelAutoOpenTab}
           sftpFollowTerminalCwd={sftpFollowTerminalCwd}
           setSftpFollowTerminalCwd={setSftpFollowTerminalCwd}
           editorWordWrap={editorWordWrap}

application/app/dedicatedResumeProgress.ts

@@ -1,10 +1,12 @@
+import type { TransferOwnerObservation } from "../state/sftp/waitForTransferOwner";
 import type { TransferStatus, TransferTask } from "../../domain/models";
 
 export const DEDICATED_RESUME_LARGE_HISTORY_THRESHOLD = 4_096;
 export const DEDICATED_RESUME_CHILD_UPDATE_BATCH_SIZE = 512;
 
 export interface DedicatedResumeChildUpdateBatcher {
-  push(task: TransferTask): void;
+  push(task: TransferTask, observation?: TransferOwnerObservation): void;
+  discard(taskId: string): void;
   flush(): void;
 }
 
@@ -24,25 +26,39 @@ export function createDedicatedResumeChildUpdateBatcher(deps: {
   hasTask: (taskId: string) => boolean;
   upsertTasks: (tasks: readonly TransferTask[]) => void;
 }): DedicatedResumeChildUpdateBatcher {
-  const pending = new Map<string, TransferTask>();
+  const pending = new Map<string, { task: TransferTask; observation?: TransferOwnerObservation }>();
   const flush = () => {
     if (pending.size === 0) return;
     const batch = [...pending.values()];
     pending.clear();
-    deps.upsertTasks(batch);
+    try {
+      const updates = batch.filter(({ observation }) => !observation?.hasIdentityConflict()).map(({ task }) => task);
+      if (updates.length) deps.upsertTasks(updates);
+    } finally {
+      for (const { observation } of batch) observation?.dispose();
+    }
   };
   return {
-    push(task) {
+    push(task, observation) {
+      if (observation?.hasIdentityConflict()) {
+        pending.get(task.id)?.observation?.dispose();
+        pending.delete(task.id);
+        observation.dispose();
+        return;
+      }
       const shouldBatch = !!task.parentTaskId
         && deps.getTaskCount() >= DEDICATED_RESUME_LARGE_HISTORY_THRESHOLD
         && deps.hasTask(task.id);
       if (!shouldBatch) {
-        deps.upsertTasks([task]);
+        try { deps.upsertTasks([task]); } finally { observation?.dispose(); }
         return;
       }
-      pending.set(task.id, task);
+      const previous = pending.get(task.id);
+      if (previous?.observation && previous.observation !== observation) previous.observation.dispose();
+      pending.set(task.id, { task, observation });
       if (pending.size >= DEDICATED_RESUME_CHILD_UPDATE_BATCH_SIZE) flush();
     },
+    discard: (taskId) => { pending.get(taskId)?.observation?.dispose(); pending.delete(taskId); },
     flush,
   };
 }

application/app/topTabsChromeTheme.test.ts

@@ -28,35 +28,3 @@ test("top tabs chrome theme keeps accent foreground in sync", () => {
   assert.match(supportSource, /removeStylePropertyIfSet\(tabsRoot, '--primary-foreground'\)/);
   assert.match(supportSource, /removeStylePropertyIfSet\(tabsRoot, '--accent-foreground'\)/);
 });
-
-test("bottom title bar receives and clears the same active theme as the tabs", async () => {
-  const { applyTopTabsChromeThemeVars, clearTopTabsChromeThemeVars } = await import('./topTabsChromeTheme.ts');
-  const { TERMINAL_THEMES } = await import('../../infrastructure/config/terminalThemes.ts');
-  const makeRoot = () => {
-    const values = new Map<string, string>();
-    return { style: {
-      getPropertyValue: (key: string) => values.get(key) ?? '',
-      setProperty: (key: string, value: string) => values.set(key, value),
-      removeProperty: (key: string) => values.delete(key),
-    }};
-  };
-  const tabs = makeRoot();
-  const titlebar = makeRoot();
-  const original = Object.getOwnPropertyDescriptor(globalThis, 'document');
-  Object.defineProperty(globalThis, 'document', { configurable: true, value: {
-    querySelector: (selector: string) => selector === '[data-top-tabs-root]' ? tabs : titlebar,
-  }});
-  try {
-    applyTopTabsChromeThemeVars(TERMINAL_THEMES[0]);
-    for (const property of ['--secondary', '--foreground', '--top-tabs-bg']) {
-      assert.notEqual(tabs.style.getPropertyValue(property), '');
-      assert.equal(titlebar.style.getPropertyValue(property), tabs.style.getPropertyValue(property));
-    }
-    clearTopTabsChromeThemeVars();
-    assert.equal(tabs.style.getPropertyValue('--secondary'), '');
-    assert.equal(titlebar.style.getPropertyValue('--secondary'), '');
-  } finally {
-    if (original) Object.defineProperty(globalThis, 'document', original);
-    else Reflect.deleteProperty(globalThis, 'document');
-  }
-});

application/app/topTabsChromeTheme.ts

@@ -70,31 +70,23 @@ const TOP_TABS_THEME_PROPERTIES = [
   '--muted-foreground',
 ] as const;
 
-export function getTopTabsChromeRoots(): HTMLElement[] {
-  if (typeof document === 'undefined') return [];
-  return [
-    document.querySelector<HTMLElement>('[data-top-tabs-root]'),
-    document.querySelector<HTMLElement>('[data-tab-window-titlebar]'),
-  ].filter((root): root is HTMLElement => root !== null);
-}
-
 let topTabsChromeThemeVarsApplied = false;
 
 export function clearTopTabsChromeThemeVars(): void {
   if (typeof document === 'undefined') return;
   if (!topTabsChromeThemeVarsApplied) return;
-  for (const root of getTopTabsChromeRoots()) {
-    for (const property of TOP_TABS_THEME_PROPERTIES) {
-      removeStylePropertyIfSet(root, property);
-    }
+  const tabsRoot = document.querySelector<HTMLElement>('[data-top-tabs-root]');
+  if (!tabsRoot) return;
+  for (const property of TOP_TABS_THEME_PROPERTIES) {
+    removeStylePropertyIfSet(tabsRoot, property);
   }
   topTabsChromeThemeVarsApplied = false;
 }
 
 export function applyTopTabsChromeThemeVars(theme: TerminalTheme): void {
   if (typeof document === 'undefined') return;
-  const roots = getTopTabsChromeRoots();
-  if (roots.length === 0) return;
+  const tabsRoot = document.querySelector<HTMLElement>('[data-top-tabs-root]');
+  if (!tabsRoot) return;
 
   const bg = hexToHslToken(theme.colors.background);
   const fg = hexToHslToken(theme.colors.foreground);
@@ -105,21 +97,19 @@ export function applyTopTabsChromeThemeVars(theme: TerminalTheme): void {
   const border = adjustLightnessToken(bg, isDark ? 12 : -10);
   const mutedFg = adjustSaturationToken(adjustLightnessToken(fg, isDark ? -20 : 20), 0.5);
 
-  for (const tabsRoot of roots) {
-    setStylePropertyIfChanged(tabsRoot, '--background', bg);
-    setStylePropertyIfChanged(tabsRoot, '--foreground', fg);
-    setStylePropertyIfChanged(tabsRoot, '--accent', accent);
-    setStylePropertyIfChanged(tabsRoot, '--accent-foreground', accentForeground);
-    setStylePropertyIfChanged(tabsRoot, '--primary', accent);
-    setStylePropertyIfChanged(tabsRoot, '--primary-foreground', accentForeground);
-    setStylePropertyIfChanged(tabsRoot, '--secondary', secondary);
-    setStylePropertyIfChanged(tabsRoot, '--border', border);
-    setStylePropertyIfChanged(tabsRoot, '--muted-foreground', mutedFg);
-    setStylePropertyIfChanged(tabsRoot, '--top-tabs-bg', 'hsl(var(--secondary))');
-    setStylePropertyIfChanged(tabsRoot, '--top-tabs-fg', 'hsl(var(--foreground))');
-    setStylePropertyIfChanged(tabsRoot, '--top-tabs-muted', 'hsl(var(--muted-foreground))');
-    setStylePropertyIfChanged(tabsRoot, '--top-tabs-active-bg', 'hsl(var(--background))');
-    setStylePropertyIfChanged(tabsRoot, '--top-tabs-accent', 'hsl(var(--accent))');
-  }
+  setStylePropertyIfChanged(tabsRoot, '--background', bg);
+  setStylePropertyIfChanged(tabsRoot, '--foreground', fg);
+  setStylePropertyIfChanged(tabsRoot, '--accent', accent);
+  setStylePropertyIfChanged(tabsRoot, '--accent-foreground', accentForeground);
+  setStylePropertyIfChanged(tabsRoot, '--primary', accent);
+  setStylePropertyIfChanged(tabsRoot, '--primary-foreground', accentForeground);
+  setStylePropertyIfChanged(tabsRoot, '--secondary', secondary);
+  setStylePropertyIfChanged(tabsRoot, '--border', border);
+  setStylePropertyIfChanged(tabsRoot, '--muted-foreground', mutedFg);
+  setStylePropertyIfChanged(tabsRoot, '--top-tabs-bg', 'hsl(var(--secondary))');
+  setStylePropertyIfChanged(tabsRoot, '--top-tabs-fg', 'hsl(var(--foreground))');
+  setStylePropertyIfChanged(tabsRoot, '--top-tabs-muted', 'hsl(var(--muted-foreground))');
+  setStylePropertyIfChanged(tabsRoot, '--top-tabs-active-bg', 'hsl(var(--background))');
+  setStylePropertyIfChanged(tabsRoot, '--top-tabs-accent', 'hsl(var(--accent))');
   topTabsChromeThemeVarsApplied = true;
 }

application/app/useAppStartupEffects.ts

@@ -181,11 +181,14 @@ export function useAppStartupEffects(ctx: StartupEffectsContext) {
           },
           {
             children,
-            onChildUpdate: (child) => {
+            onChildUpdate: (child, observation) => {
               if (acceptsResumeCallbacks) {
-                childUpdateBatcher.push({ ...child, ownerId: "dedicated-resume" });
+                childUpdateBatcher.push({ ...child, ownerId: "dedicated-resume" }, observation);
+                return true;
               }
             },
+            onChildSuperseded: (taskId) => childUpdateBatcher.discard(taskId),
+            flushChildUpdates: () => childUpdateBatcher.flush(),
             onDirectoryCheckpointUpdate: (checkpoint) => {
               if (acceptsResumeCallbacks) {
                 sftpTransferCenterStore.patchTask(task.id, {

application/i18n/locales/en/ai.ts

@@ -4,6 +4,7 @@ export const enAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Agent Settings',
   'ai.chat.preparing': 'Preparing…',
+  'ai.chat.modelCatalogWarning': 'Could not refresh the live model list. Showing the last available or built-in models.',
   'ai.chat.compactingContext': 'Compacting earlier context…',
   'ai.chat.compactingStep': 'Trimming context for next step…',
   'ai.chat.compactionRetry': 'Request was too large. Compacting context and retrying…',
@@ -364,21 +365,24 @@ export const enAiMessages: Messages = {
   'ai.externalMcp.client.claude': 'Claude Code',
   'ai.externalMcp.client.grok': 'Grok',
   'ai.externalMcp.client.cursor': 'Cursor',
+  'ai.externalMcp.client.other': 'Other',
   'ai.externalMcp.cliCommand': 'CLI command',
   'ai.externalMcp.configSnippet': 'Config snippet',
+  'ai.externalMcp.universalSetupPrompt': 'Universal setup prompt',
   'ai.externalMcp.addToCodex': 'Add to Codex',
   'ai.externalMcp.addToClaude': 'Add to Claude Code',
   'ai.externalMcp.addToGrok': 'Add to Grok',
-  'ai.externalMcp.codexAdded': 'Codex MCP entry added. Restart Codex or open a new Codex session.',
-  'ai.externalMcp.claudeAdded': 'Claude Code MCP entry added. Restart Claude Code or open a new Claude Code session.',
-  'ai.externalMcp.grokAdded': 'Grok MCP entry added. Restart Grok or open a new Grok session.',
+  'ai.externalMcp.codexAdded': 'Codex MCP entry and Netcatty skill added. Restart Codex or open a new Codex session.',
+  'ai.externalMcp.claudeAdded': 'Claude Code MCP entry and Netcatty skill added. Restart Claude Code or open a new Claude Code session.',
+  'ai.externalMcp.grokAdded': 'Grok MCP entry and Netcatty skill added. Restart Grok or open a new Grok session.',
   'ai.externalMcp.installCodex': 'Install Codex separately, then click Refresh.',
   'ai.externalMcp.installClaude': 'Install Claude Code separately, then click Refresh.',
   'ai.externalMcp.installGrok': 'Install the Grok CLI separately, then click Refresh.',
   'ai.externalMcp.conflict.description': 'A netcatty-external entry already exists and points elsewhere. Remove or edit it manually.',
   'ai.externalMcp.enableForLauncher': 'Enable External MCP to get a usable launcher path.',
-  'ai.externalMcp.cursor.title': 'Cursor / other clients',
-  'ai.externalMcp.cursor.description': 'Merge this into your MCP config (for example ~/.cursor/mcp.json). Do not replace the whole file if you already have other servers.',
+  'ai.externalMcp.cursor.title': 'Cursor',
+  'ai.externalMcp.cursor.description': 'Merge this into your Cursor MCP configuration without replacing existing servers.',
+  'ai.externalMcp.other.description': 'Copy the setup prompt into another terminal agent, or merge the MCP snippet into its client configuration.',
   'ai.externalMcp.status.unavailable': 'Unavailable',
   'ai.externalMcp.status.disabled': 'Disabled',
   'ai.externalMcp.status.running': 'Running',
@@ -597,8 +601,12 @@ export const enAiMessages: Messages = {
   'terminal.layer.aiChat': 'AI Chat',
   'terminal.layer.movePanelLeft': 'Move panel to left',
   'terminal.layer.movePanelRight': 'Move panel to right',
+  'terminal.layer.movePanelBottom': 'Move panel to bottom',
   'terminal.layer.closePanel': 'Close panel',
   'terminal.layer.closePane': 'Close split',
+  'terminal.layer.saveLayoutAsDefault': 'Save layout as default',
+  'terminal.layer.layoutSavedAsDefault': 'Layout saved as default',
+  'terminal.layer.layoutSaveFailed': 'Could not save layout',
   'terminal.layer.resizeSplit': 'Resize split',
   'terminal.layer.splitHorizontal': 'Split top and bottom',
   'terminal.layer.splitVertical': 'Split left and right',

application/i18n/locales/en/core.ts

@@ -359,9 +359,6 @@ export const enCoreMessages: Messages = {
   'settings.vault.selectBeforeConnectDesc': 'Click once to select a host (accent highlight in grid view), click again to connect. Groups work the same way. Default remains single-click connect.',
   'settings.vault.showOnlyUngroupedHostsInRoot': 'Only show ungrouped hosts at root',
   'settings.vault.showOnlyUngroupedHostsInRootDesc': 'When enabled, the root host list only shows hosts without a group. Open a group from the sidebar to see grouped hosts.',
-  'settings.appearance.tabBarPosition': 'Tab bar position',
-  'settings.appearance.tabBarPosition.top': 'Top',
-  'settings.appearance.tabBarPosition.bottom': 'Bottom',
   'settings.vault.showSftpTab': 'Show SFTP tab',
   'settings.vault.showSftpTabDesc': 'Display the standalone SFTP view in the top tab bar. When hidden, use the in-session SFTP side panel instead.',
   'settings.vault.showHostTreeSidebar': 'Show host list sidebar',
@@ -649,6 +646,12 @@ Highlight the focused split pane:
   'settings.terminal.sidePanel.pane.system': 'System',
   'settings.terminal.sidePanel.pane.notes': 'Notes',
   'settings.terminal.sidePanel.pane.ai': 'AI',
+  'settings.terminal.section.localShellSidePanel': 'Local Shell Side Panel',
+  'settings.terminal.localShellSidePanel.autoOpen': 'Open side panel with local shell',
+  'settings.terminal.localShellSidePanel.autoOpen.desc': 'Automatically open a side panel when opening a local shell.',
+  'settings.terminal.localShellSidePanel.autoOpenPane': 'Default side panel',
+  'settings.terminal.localShellSidePanel.autoOpenPane.desc': 'Choose which panel opens first.',
+  'settings.terminal.localShellSidePanel.pane.files': 'Files',
   'settings.terminal.accessibility.minimumContrastRatio.desc':
     'Adjust colors to meet contrast requirements (1 = disabled, 21 = max)',
   'settings.terminal.behavior.rightClick': 'Right-click behavior',
@@ -691,6 +694,12 @@ Highlight the focused split pane:
   'settings.terminal.behavior.autoUploadClipboardImage': 'Auto-upload clipboard images on paste',
   'settings.terminal.behavior.autoUploadClipboardImage.desc':
     'When the clipboard holds an image, pasting in a remote session uploads it via SFTP to .netcatty-paste-images/ under the remote working directory and inserts the remote path instead of pasting text.',
+  'settings.terminal.behavior.confirmMultilinePaste': 'Ask before pasting multiple lines',
+  'settings.terminal.behavior.confirmMultilinePaste.desc':
+    'Show a confirmation dialog before pasting multiple lines, with the line/character count, an editable preview, and Send / Send line by line / Cancel actions. Protects switch and firewall CLIs (Cisco IOS, Huawei VRP, H3C Comware) that do not support bracketed paste.',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines': 'Confirmation threshold (lines)',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines.desc':
+    'Ask for confirmation when a paste contains at least this many lines.',
   'settings.terminal.behavior.shiftEnterNewline': 'Shift+Enter text',
   'settings.terminal.behavior.shiftEnterNewline.desc':
     'Send configured text instead of normal Enter when pressing Shift+Enter in the terminal.',
@@ -1048,6 +1057,10 @@ Highlight the focused split pane:
   'vault.groups.deleteDialogTitle': 'Delete Group',
   'vault.groups.deleteDialog.desc': 'This will permanently delete the group and move all hosts to the root level.',
   'vault.groups.deleteDialog.managedDesc': 'This is a managed SSH config group. Deleting it will also delete all hosts and unlink from the source file.',
+  'vault.groups.deleteDialog.mixedDesc': 'This group contains hosts imported from a linked SSH config file. Every host under its managed subgroup will be deleted, even hosts not managed by that file. All other hosts will move to the root level unless you also delete them below.',
+  'vault.groups.deleteDialog.managedWarning': 'Deleting this group will also clear its entries from the linked SSH config file. Entries that came from that file may be lost for other apps that use it. Back up the file before continuing.',
+  'vault.groups.deleteDialog.sourcesChanged': 'The managed files affected by this deletion have changed. Review the files and confirm again.',
+  'vault.groups.deleteDialog.managedFile': 'Linked file: {file}',
   'vault.groups.deleteDialog.deleteHosts': 'Also delete all hosts in this group',
   'vault.groups.deleteDialog.bulkTitle': 'Delete Selected Groups',
   'vault.groups.deleteDialog.bulkDesc': 'This will permanently delete the selected groups and move their hosts to the root level.',
@@ -1106,6 +1119,7 @@ Highlight the focused split pane:
   'vault.hosts.export.toast.success': 'Exported {count} hosts to CSV',
   'vault.hosts.export.toast.successWithSkipped': 'Exported {count} hosts to CSV ({skipped} unsupported hosts skipped)',
   'vault.hosts.export.toast.passphrasesSkipped': '{count} saved key passphrases could not be read and were left blank',
+  'vault.hosts.export.toast.proxyCredentialsSkipped': '{count} saved proxy passwords could not be read and were left blank',
   'vault.hosts.export.toast.noHosts': 'No hosts to export',
   'vault.hosts.allHosts': 'All hosts',
   'vault.hosts.pinned': 'Pinned',

application/i18n/locales/en/terminal.ts

@@ -3,6 +3,13 @@ import type { Messages } from '../types';
 export const enTerminalMessages: Messages = {
   'terminal.menu.saveScreen': 'Save current screen',
   'terminal.saveScreen.failed': 'Failed to save terminal screen.',
+  // Multi-line paste confirmation dialog (#3398)
+  'terminal.pasteConfirm.title': 'Paste multiple lines?',
+  'terminal.pasteConfirm.summary': '{lines} lines ({chars} characters) will be sent to the session.',
+  'terminal.pasteConfirm.preview': 'Preview (editable)',
+  'terminal.pasteConfirm.send': 'Send',
+  'terminal.pasteConfirm.sendLineByLine': 'Send line by line',
+  'terminal.pasteConfirm.cancel': 'Cancel',
   'terminal.sudoHint.pressEnter': 'Press Enter to paste saved password',
   'terminal.passwordPicker.title': 'Saved passwords',
   'terminal.passwordPicker.empty': 'No saved passwords',
@@ -93,6 +100,7 @@ export const enTerminalMessages: Messages = {
   'terminal.statusbar.reconnect.tooltip': 'Reconnect this session',
   'terminal.serverStats.cpu': 'CPU Usage',
   'terminal.serverStats.cpuCores': 'CPU Core Usage',
+  'terminal.serverStats.gpu': 'GPU Usage',
   'terminal.serverStats.memory': 'Memory Usage',
   'terminal.serverStats.memoryDetails': 'Memory Details',
   'terminal.serverStats.memUsed': 'Used',
@@ -180,6 +188,7 @@ export const enTerminalMessages: Messages = {
   'terminal.auth.retryMessage': 'Authentication failed. Please check your credentials and try again.',
   'terminal.auth.retryLog': 'Authentication failed. Please try again.',
   'terminal.auth.noKeysHint': 'No keys available. Add keys in Keychain.',
+  'terminal.auth.selectIdentity': 'Use saved identity',
   'terminal.auth.continueSave': 'Continue & Save',
   'terminal.auth.credentialsUnavailable': 'Saved credentials cannot be decrypted on this device. Please re-enter and save them again.',
   'terminal.auth.jumpCredentialsUnavailable': 'A jump host has saved credentials that cannot be decrypted on this device. Open host settings and re-enter them.',
@@ -827,6 +836,10 @@ export const enTerminalMessages: Messages = {
   'serial.field.configLabelPlaceholder': 'e.g. Arduino Uno',
   'serial.connectAndSave': 'Connect & Save',
   'serial.edit.title': 'Serial Port Settings',
+  'serial.field.username': 'Username',
+  'serial.field.password': 'Password',
+  'serial.field.autoLoginDesc': 'When set, Login/Password prompts on the serial console are answered automatically with these saved credentials.',
+  'serial.field.clearPassword': 'Clear saved password',
 
   // Keyboard Interactive Authentication (2FA/MFA)
   'keyboard.interactive.title': 'Authentication Required',

application/i18n/locales/en/vault.ts

@@ -417,7 +417,6 @@ export const enVaultMessages: Messages = {
   'sftp.goUp': 'Go up',
   'sftp.goToTerminalCwd': 'Go to terminal directory',
   'sftp.locatePathInTerminal': 'Open path in terminal',
-  'sftp.refreshAfterCommand': 'Refresh after terminal commands',
   'sftp.followTerminalCwd': 'Follow terminal directory',
   'sftp.followTerminalCwd.enable': 'Enable follow terminal directory',
   'sftp.followTerminalCwd.disable': 'Disable follow terminal directory',

application/i18n/locales/es/ai.ts

@@ -4,6 +4,7 @@ export const esAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Configuración del agente',
   'ai.chat.preparing': 'Preparando…',
+  'ai.chat.modelCatalogWarning': 'No se pudo actualizar la lista de modelos. Se muestran los últimos modelos disponibles o los integrados.',
   'ai.chat.compactingContext': 'Compactando el contexto anterior…',
   'ai.chat.compactingStep': 'Recortando el contexto para el siguiente paso…',
   'ai.chat.compactionRetry': 'La petición era demasiado grande. Compactando el contexto y reintentando…',
@@ -355,21 +356,24 @@ export const esAiMessages: Messages = {
   'ai.externalMcp.client.claude': 'Claude Code',
   'ai.externalMcp.client.grok': 'Grok',
   'ai.externalMcp.client.cursor': 'Cursor',
+  'ai.externalMcp.client.other': 'Otros',
   'ai.externalMcp.cliCommand': 'Comando CLI',
   'ai.externalMcp.configSnippet': 'Fragmento de configuración',
+  'ai.externalMcp.universalSetupPrompt': 'Prompt de instalación universal',
   'ai.externalMcp.addToCodex': 'Agregar a Codex',
   'ai.externalMcp.addToClaude': 'Agregar a Claude Code',
   'ai.externalMcp.addToGrok': 'Agregar a Grok',
-  'ai.externalMcp.codexAdded': 'Entrada de MCP de Codex agregada. Reinicia Codex o abre una nueva sesión de Codex.',
-  'ai.externalMcp.claudeAdded': 'Entrada de MCP de Claude Code agregada. Reinicia Claude Code o abre una nueva sesión de Claude Code.',
-  'ai.externalMcp.grokAdded': 'Entrada de MCP de Grok agregada. Reinicia Grok o abre una nueva sesión de Grok.',
+  'ai.externalMcp.codexAdded': 'Entrada MCP de Codex y skill de Netcatty agregados. Reinicia Codex o abre una nueva sesión de Codex.',
+  'ai.externalMcp.claudeAdded': 'Entrada MCP de Claude Code y skill de Netcatty agregados. Reinicia Claude Code o abre una nueva sesión de Claude Code.',
+  'ai.externalMcp.grokAdded': 'Entrada MCP de Grok y skill de Netcatty agregados. Reinicia Grok o abre una nueva sesión de Grok.',
   'ai.externalMcp.installCodex': 'Instala Codex por separado y luego haz clic en Actualizar.',
   'ai.externalMcp.installClaude': 'Instala Claude Code por separado y luego haz clic en Actualizar.',
   'ai.externalMcp.installGrok': 'Instala la CLI de Grok por separado y luego haz clic en Actualizar.',
   'ai.externalMcp.conflict.description': 'Ya existe una entrada netcatty-external que apunta a otro lugar. Quítala o edítala manualmente.',
   'ai.externalMcp.enableForLauncher': 'Habilita el MCP externo para obtener una ruta de launcher utilizable.',
-  'ai.externalMcp.cursor.title': 'Cursor / otros clientes',
-  'ai.externalMcp.cursor.description': 'Combina esto en tu configuración de MCP (por ejemplo, ~/.cursor/mcp.json). No reemplaces todo el archivo si ya tienes otros servidores.',
+  'ai.externalMcp.cursor.title': 'Cursor',
+  'ai.externalMcp.cursor.description': 'Combina esto con la configuración MCP de Cursor sin reemplazar los servidores existentes.',
+  'ai.externalMcp.other.description': 'Copia el prompt de instalación en otro agente de terminal o combina el fragmento MCP con la configuración de su cliente.',
   'ai.externalMcp.status.unavailable': 'No disponible',
   'ai.externalMcp.status.disabled': 'Desactivado',
   'ai.externalMcp.status.running': 'En ejecución',
@@ -588,6 +592,7 @@ export const esAiMessages: Messages = {
   'terminal.layer.aiChat': 'Chat de IA',
   'terminal.layer.movePanelLeft': 'Mover panel a la izquierda',
   'terminal.layer.movePanelRight': 'Mover panel a la derecha',
+  'terminal.layer.movePanelBottom': 'Mover panel a la parte inferior',
   'terminal.layer.closePanel': 'Cerrar panel',
   'terminal.layer.closePane': 'Cerrar división',
   'terminal.layer.resizeSplit': 'Redimensionar división',

application/i18n/locales/es/core.ts

@@ -274,9 +274,6 @@ export const esCoreMessages: Messages = {
   'settings.vault.selectBeforeConnectDesc': 'Haz clic una vez para seleccionar un host (resaltado con el color de acento en la vista de cuadrícula), haz clic de nuevo para conectarte. Los grupos funcionan igual. El valor predeterminado sigue siendo conectarse con un solo clic.',
   'settings.vault.showOnlyUngroupedHostsInRoot': 'Mostrar solo hosts sin grupo en la raíz',
   'settings.vault.showOnlyUngroupedHostsInRootDesc': 'Cuando está activado, la lista de hosts de la raíz solo muestra hosts sin grupo. Abre un grupo desde la barra lateral para ver los hosts agrupados.',
-  'settings.appearance.tabBarPosition': 'Posición de la barra de pestañas',
-  'settings.appearance.tabBarPosition.top': 'Arriba',
-  'settings.appearance.tabBarPosition.bottom': 'Abajo',
   'settings.vault.showSftpTab': 'Mostrar pestaña SFTP',
   'settings.vault.showSftpTabDesc': 'Muestra la vista SFTP independiente en la barra de pestañas superior. Cuando está oculta, usa el panel lateral SFTP dentro de la sesión.',
   'settings.vault.showHostTreeSidebar': 'Mostrar barra lateral de lista de hosts',
@@ -564,6 +561,12 @@ Resalta el panel dividido enfocado:
   'settings.terminal.sidePanel.pane.system': 'Sistema',
   'settings.terminal.sidePanel.pane.notes': 'Notas',
   'settings.terminal.sidePanel.pane.ai': 'IA',
+  'settings.terminal.section.localShellSidePanel': 'Panel lateral de Shell local',
+  'settings.terminal.localShellSidePanel.autoOpen': 'Expandir panel lateral al abrir Shell local',
+  'settings.terminal.localShellSidePanel.autoOpen.desc': 'Abre automáticamente un panel lateral después de abrir el Shell local.',
+  'settings.terminal.localShellSidePanel.autoOpenPane': 'Panel lateral predeterminado',
+  'settings.terminal.localShellSidePanel.autoOpenPane.desc': 'Elige qué panel se abre primero.',
+  'settings.terminal.localShellSidePanel.pane.files': 'Archivos',
   'settings.terminal.accessibility.minimumContrastRatio.desc':
     'Ajusta los colores para cumplir con los requisitos de contraste (1 = desactivado, 21 = máximo)',
   'settings.terminal.behavior.rightClick': 'Comportamiento del clic derecho',
@@ -606,6 +609,12 @@ Resalta el panel dividido enfocado:
   'settings.terminal.behavior.autoUploadClipboardImage': 'Subir automáticamente imágenes del portapapeles al pegar',
   'settings.terminal.behavior.autoUploadClipboardImage.desc':
     'Cuando el portapapeles contiene una imagen, pegarla en una sesión remota la sube por SFTP a .netcatty-paste-images/ dentro del directorio de trabajo remoto e inserta la ruta remota en lugar de pegar texto.',
+  'settings.terminal.behavior.confirmMultilinePaste': 'Preguntar antes de pegar varias líneas',
+  'settings.terminal.behavior.confirmMultilinePaste.desc':
+    'Muestra un diálogo de confirmación antes de pegar varias líneas, con el número de líneas y caracteres, una vista previa editable y las acciones Enviar / Enviar línea por línea / Cancelar. Protege las CLI de dispositivos de red (Cisco IOS, Huawei VRP, H3C Comware) que no admiten bracketed paste.',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines': 'Umbral de confirmación (líneas)',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines.desc':
+    'Pedir confirmación cuando el texto pegado contenga al menos esta cantidad de líneas.',
   'settings.terminal.behavior.shiftEnterNewline': 'Texto de Shift+Enter',
   'settings.terminal.behavior.shiftEnterNewline.desc':
     'Envía el texto configurado en lugar del Enter normal al presionar Shift+Enter en la terminal.',
@@ -1006,6 +1015,10 @@ Resalta el panel dividido enfocado:
   'vault.groups.deleteDialogTitle': 'Eliminar grupo',
   'vault.groups.deleteDialog.desc': 'Esto eliminará permanentemente el grupo y moverá todos los hosts al nivel raíz.',
   'vault.groups.deleteDialog.managedDesc': 'Este es un grupo administrado de configuración SSH. Eliminarlo también eliminará todos los hosts y lo desvinculará del archivo de origen.',
+  'vault.groups.deleteDialog.mixedDesc': 'Este grupo contiene hosts importados de un archivo de configuración SSH vinculado. Todos los hosts bajo su subgrupo administrado se eliminarán, incluso los hosts no administrados por ese archivo. Los demás hosts se moverán al nivel raíz a menos que también los elimine abajo.',
+  'vault.groups.deleteDialog.managedWarning': 'Al eliminar este grupo también se borrarán sus entradas del archivo de configuración SSH vinculado. Las entradas provenientes de ese archivo pueden perderse y también afectará a otras aplicaciones que lo usen. Haz una copia de seguridad del archivo antes de continuar.',
+  'vault.groups.deleteDialog.sourcesChanged': 'Los archivos administrados afectados por esta eliminación han cambiado. Revisa los archivos y vuelve a confirmar.',
+  'vault.groups.deleteDialog.managedFile': 'Archivo vinculado: {file}',
   'vault.groups.deleteDialog.deleteHosts': 'También eliminar todos los hosts de este grupo',
   'vault.groups.deleteDialog.bulkTitle': 'Eliminar grupos seleccionados',
   'vault.groups.deleteDialog.bulkDesc': 'Esto eliminará permanentemente los grupos seleccionados y moverá sus hosts al nivel raíz.',
@@ -1064,6 +1077,7 @@ Resalta el panel dividido enfocado:
   'vault.hosts.export.toast.success': 'Se exportaron {count} hosts a CSV',
   'vault.hosts.export.toast.successWithSkipped': 'Se exportaron {count} hosts a CSV (se omitieron {skipped} hosts no compatibles)',
   'vault.hosts.export.toast.passphrasesSkipped': 'No se pudieron leer {count} frases de contraseña de claves guardadas y se dejaron en blanco',
+  'vault.hosts.export.toast.proxyCredentialsSkipped': 'No se pudieron leer {count} contraseñas de proxy guardadas y se dejaron en blanco',
   'vault.hosts.export.toast.noHosts': 'No hay hosts para exportar',
   'vault.hosts.allHosts': 'Todos los hosts',
   'vault.hosts.pinned': 'Fijados',

application/i18n/locales/es/terminal.ts

@@ -3,6 +3,13 @@ import type { Messages } from '../types';
 export const esTerminalMessages: Messages = {
   'terminal.menu.saveScreen': 'Guardar pantalla actual',
   'terminal.saveScreen.failed': 'No se pudo guardar la pantalla del terminal.',
+  // Diálogo de confirmación de pegado multilínea (#3398)
+  'terminal.pasteConfirm.title': '¿Pegar varias líneas?',
+  'terminal.pasteConfirm.summary': 'Se enviarán {lines} líneas ({chars} caracteres) a la sesión.',
+  'terminal.pasteConfirm.preview': 'Vista previa (editable)',
+  'terminal.pasteConfirm.send': 'Enviar',
+  'terminal.pasteConfirm.sendLineByLine': 'Enviar línea por línea',
+  'terminal.pasteConfirm.cancel': 'Cancelar',
   'terminal.sudoHint.pressEnter': 'Presiona Enter para pegar la contraseña guardada',
   'terminal.passwordPicker.title': 'Contraseñas guardadas',
   'terminal.passwordPicker.empty': 'No hay contraseñas guardadas',
@@ -93,6 +100,7 @@ export const esTerminalMessages: Messages = {
   'terminal.statusbar.reconnect.tooltip': 'Reconectar esta sesión',
   'terminal.serverStats.cpu': 'Uso de CPU',
   'terminal.serverStats.cpuCores': 'Uso de núcleos de CPU',
+  'terminal.serverStats.gpu': 'Uso de GPU',
   'terminal.serverStats.memory': 'Uso de memoria',
   'terminal.serverStats.memoryDetails': 'Detalles de memoria',
   'terminal.serverStats.memUsed': 'Usada',
@@ -180,6 +188,7 @@ export const esTerminalMessages: Messages = {
   'terminal.auth.retryMessage': 'Falló la autenticación. Verifica tus credenciales e inténtalo de nuevo.',
   'terminal.auth.retryLog': 'Falló la autenticación. Inténtalo de nuevo.',
   'terminal.auth.noKeysHint': 'No hay claves disponibles. Agrega claves en Keychain.',
+  'terminal.auth.selectIdentity': 'Usar identidad guardada',
   'terminal.auth.continueSave': 'Continuar y guardar',
   'terminal.auth.credentialsUnavailable': 'Las credenciales guardadas no se pueden descifrar en este dispositivo. Vuelve a ingresarlas y guárdalas de nuevo.',
   'terminal.auth.jumpCredentialsUnavailable': 'Un host de salto tiene credenciales guardadas que no se pueden descifrar en este dispositivo. Abre la configuración del host y vuelve a ingresarlas.',
@@ -827,6 +836,10 @@ export const esTerminalMessages: Messages = {
   'serial.field.configLabelPlaceholder': 'p. ej., Arduino Uno',
   'serial.connectAndSave': 'Conectar y guardar',
   'serial.edit.title': 'Configuración del puerto serial',
+  'serial.field.username': 'Usuario',
+  'serial.field.password': 'Contraseña',
+  'serial.field.autoLoginDesc': 'Si se establecen, los mensajes Login/Password de la consola serial se responden automáticamente con estas credenciales guardadas.',
+  'serial.field.clearPassword': 'Borrar la contraseña guardada',
 
   // Keyboard Interactive Authentication (2FA/MFA)
   'keyboard.interactive.title': 'Se requiere autenticación',

application/i18n/locales/ru/ai.ts

@@ -5,6 +5,7 @@ export const ruAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Настройки агента',
   'ai.chat.preparing': 'Подготовка…',
+  'ai.chat.modelCatalogWarning': 'Не удалось обновить список моделей. Показаны последние доступные или встроенные модели.',
   'ai.chat.contextCompacted': 'Контекст сжат',
   'ai.title': 'AI',
   'ai.description': 'Настройка AI-провайдеров, агентов и параметров безопасности',
@@ -323,21 +324,24 @@ export const ruAiMessages: Messages = {
   'ai.externalMcp.client.claude': 'Claude Code',
   'ai.externalMcp.client.grok': 'Grok',
   'ai.externalMcp.client.cursor': 'Cursor',
+  'ai.externalMcp.client.other': 'Другие',
   'ai.externalMcp.cliCommand': 'CLI-команда',
   'ai.externalMcp.configSnippet': 'Фрагмент конфига',
+  'ai.externalMcp.universalSetupPrompt': 'Универсальный запрос установки',
   'ai.externalMcp.addToCodex': 'Добавить в Codex',
   'ai.externalMcp.addToClaude': 'Добавить в Claude Code',
   'ai.externalMcp.addToGrok': 'Добавить в Grok',
-  'ai.externalMcp.codexAdded': 'Запись MCP для Codex добавлена. Перезапустите Codex или откройте новую сессию.',
-  'ai.externalMcp.claudeAdded': 'Запись MCP для Claude Code добавлена. Перезапустите Claude Code или откройте новую сессию.',
-  'ai.externalMcp.grokAdded': 'Запись MCP для Grok добавлена. Перезапустите Grok или откройте новую сессию.',
+  'ai.externalMcp.codexAdded': 'Запись MCP для Codex и навык Netcatty добавлены. Перезапустите Codex или откройте новую сессию.',
+  'ai.externalMcp.claudeAdded': 'Запись MCP для Claude Code и навык Netcatty добавлены. Перезапустите Claude Code или откройте новую сессию.',
+  'ai.externalMcp.grokAdded': 'Запись MCP для Grok и навык Netcatty добавлены. Перезапустите Grok или откройте новую сессию.',
   'ai.externalMcp.installCodex': 'Сначала установите Codex, затем нажмите Обновить.',
   'ai.externalMcp.installClaude': 'Сначала установите Claude Code, затем нажмите Обновить.',
   'ai.externalMcp.installGrok': 'Сначала установите Grok CLI, затем нажмите Обновить.',
   'ai.externalMcp.conflict.description': 'Запись netcatty-external уже существует и указывает в другое место. Удалите или измените её вручную.',
   'ai.externalMcp.enableForLauncher': 'Включите External MCP, чтобы получить путь launcher.',
-  'ai.externalMcp.cursor.title': 'Cursor / другие клиенты',
-  'ai.externalMcp.cursor.description': 'Объедините с MCP-конфигом (например ~/.cursor/mcp.json). Не заменяйте весь файл, если там уже есть другие серверы.',
+  'ai.externalMcp.cursor.title': 'Cursor',
+  'ai.externalMcp.cursor.description': 'Добавьте этот фрагмент в конфигурацию MCP Cursor, сохранив существующие серверы.',
+  'ai.externalMcp.other.description': 'Скопируйте запрос установки в другой терминальный агент или добавьте фрагмент MCP в конфигурацию его клиента.',
   'ai.externalMcp.status.unavailable': 'Недоступно',
   'ai.externalMcp.status.disabled': 'Выключено',
   'ai.externalMcp.status.running': 'Работает',
@@ -556,6 +560,7 @@ export const ruAiMessages: Messages = {
   'terminal.layer.aiChat': 'AI-чат',
   'terminal.layer.movePanelLeft': 'Переместить панель влево',
   'terminal.layer.movePanelRight': 'Переместить панель вправо',
+  'terminal.layer.movePanelBottom': 'Переместить панель вниз',
   'terminal.layer.closePanel': 'Закрыть панель',
   'terminal.layer.closePane': 'Закрыть область',
   'terminal.layer.resizeSplit': 'Изменить размер области',

application/i18n/locales/ru/core.ts

@@ -343,9 +343,6 @@ export const ruCoreMessages: Messages = {
   'settings.vault.selectBeforeConnectDesc': 'Один клик выбирает хост (акцентная рамка в сетке), повторный клик подключает. Группы работают так же. По умолчанию — подключение одним кликом.',
   'settings.vault.showOnlyUngroupedHostsInRoot': 'Показывать в корне только хосты без группы',
   'settings.vault.showOnlyUngroupedHostsInRootDesc': 'Если включено, в корневом списке хостов будут показаны только хосты без группы. Откройте группу на боковой панели, чтобы увидеть сгруппированные хосты.',
-  'settings.appearance.tabBarPosition': 'Расположение панели вкладок',
-  'settings.appearance.tabBarPosition.top': 'Сверху',
-  'settings.appearance.tabBarPosition.bottom': 'Снизу',
   'settings.vault.showSftpTab': 'Показывать вкладку SFTP',
   'settings.vault.showSftpTabDesc': 'Показывать отдельный SFTP-вид в верхней панели вкладок. Если скрыто, используйте боковую панель SFTP внутри сессии.',
   'settings.vault.showHostTreeSidebar': 'Показывать боковую панель хостов',
@@ -648,6 +645,12 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.behavior.autoUploadClipboardImage': 'Авто-загрузка изображений буфера обмена при вставке',
   'settings.terminal.behavior.autoUploadClipboardImage.desc':
     'Когда в буфере обмена есть изображение, вставка в удалённой сессии загружает его по SFTP в каталог .netcatty-paste-images/ в текущем удалённом каталоге и вводит удалённый путь вместо вставки текста.',
+  'settings.terminal.behavior.confirmMultilinePaste': 'Спрашивать перед вставкой нескольких строк',
+  'settings.terminal.behavior.confirmMultilinePaste.desc':
+    'Перед вставкой нескольких строк показывать диалог подтверждения с количеством строк и символов, редактируемым предпросмотром и действиями «Отправить» / «Отправить построчно» / «Отмена». Защищает CLI сетевых устройств (Cisco IOS, Huawei VRP, H3C Comware), не поддерживающих bracketed paste.',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines': 'Порог подтверждения (строк)',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines.desc':
+    'Запрашивать подтверждение, если вставка содержит не меньше этого числа строк.',
   'settings.terminal.behavior.shiftEnterNewline': 'Текст для Shift+Enter',
   'settings.terminal.behavior.shiftEnterNewline.desc':
     'Отправлять настроенный текст вместо обычного Enter при нажатии Shift+Enter в терминале.',
@@ -750,6 +753,12 @@ export const ruCoreMessages: Messages = {
   'settings.terminal.localShell.startDir.placeholder': 'Домашний каталог',
   'settings.terminal.localShell.startDir.notFound': 'Каталог не найден',
   'settings.terminal.localShell.startDir.isFile': 'Путь указывает на файл, а не на каталог',
+  'settings.terminal.section.localShellSidePanel': 'Боковая панель локальной оболочки',
+  'settings.terminal.localShellSidePanel.autoOpen': 'Развернуть боковую панель при открытии локальной оболочки',
+  'settings.terminal.localShellSidePanel.autoOpen.desc': 'Автоматически открывать боковую панель после открытия локальной оболочки.',
+  'settings.terminal.localShellSidePanel.autoOpenPane': 'Боковая панель по умолчанию',
+  'settings.terminal.localShellSidePanel.autoOpenPane.desc': 'Выберите, какую панель открывать в первую очередь.',
+  'settings.terminal.localShellSidePanel.pane.files': 'Файлы',
   'settings.terminal.section.connection': 'Подключение',
   'settings.terminal.connection.keepaliveInterval': 'Интервал keepalive',
   'settings.terminal.connection.keepaliveInterval.desc': 'Как часто (в секундах) отправлять keepalive-пакеты на уровне SSH. Установите 0, чтобы отключить глобально. Учтите, что отдельные хосты могут переопределять это значение в своих настройках.',
@@ -1030,6 +1039,10 @@ export const ruCoreMessages: Messages = {
   'vault.groups.deleteDialogTitle': 'Удалить группу',
   'vault.groups.deleteDialog.desc': 'Группа будет безвозвратно удалена, а все хосты будут перемещены в корень.',
   'vault.groups.deleteDialog.managedDesc': 'Это управляемая группа SSH-конфига. При её удалении также будут удалены все хосты и снята связь с исходным файлом.',
+  'vault.groups.deleteDialog.mixedDesc': 'Эта группа содержит хосты, импортированные из связанного SSH-конфига. Все хосты под управляемой подгруппой будут удалены, включая хосты, не управляемые этим файлом. Остальные хосты будут перемещены в корень, если вы также не удалите их ниже.',
+  'vault.groups.deleteDialog.managedWarning': 'При удалении этой группы её записи также будут удалены из связанного файла конфигурации SSH. Записи, импортированные из этого файла, могут быть утеряны, это затронет и другие приложения, использующие файл. Сделайте резервную копию файла перед продолжением.',
+  'vault.groups.deleteDialog.sourcesChanged': 'Управляемые файлы, затрагиваемые этим удалением, изменились. Проверьте файлы и подтвердите удаление снова.',
+  'vault.groups.deleteDialog.managedFile': 'Связанный файл: {file}',
   'vault.groups.deleteDialog.deleteHosts': 'Также удалить все хосты в этой группе',
   'vault.groups.deleteDialog.bulkTitle': 'Удалить выбранные группы',
   'vault.groups.deleteDialog.bulkDesc': 'Выбранные группы будут безвозвратно удалены, а их хосты перемещены в корень.',

application/i18n/locales/ru/terminal.ts

@@ -3,6 +3,13 @@ import type { Messages } from '../types';
 export const ruTerminalMessages: Messages = {
   'terminal.menu.saveScreen': 'Сохранить текущий экран',
   'terminal.saveScreen.failed': 'Не удалось сохранить экран терминала.',
+  // Диалог подтверждения многострочной вставки (#3398)
+  'terminal.pasteConfirm.title': 'Вставить несколько строк?',
+  'terminal.pasteConfirm.summary': 'В сессию будет отправлено строк: {lines} (символов: {chars}).',
+  'terminal.pasteConfirm.preview': 'Предпросмотр (можно изменить)',
+  'terminal.pasteConfirm.send': 'Отправить',
+  'terminal.pasteConfirm.sendLineByLine': 'Отправить построчно',
+  'terminal.pasteConfirm.cancel': 'Отмена',
   'terminal.sudoHint.pressEnter': 'Нажмите Enter, чтобы вставить сохранённый пароль',
   'terminal.passwordPicker.title': 'Сохранённые пароли',
   'terminal.passwordPicker.empty': 'Нет сохранённых паролей',
@@ -114,6 +121,7 @@ export const ruTerminalMessages: Messages = {
   'terminal.statusbar.reconnect.tooltip': 'Переподключить эту сессию',
   'terminal.serverStats.cpu': 'Использование CPU',
   'terminal.serverStats.cpuCores': 'Использование ядер CPU',
+  'terminal.serverStats.gpu': 'Использование GPU',
   'terminal.serverStats.memory': 'Использование памяти',
   'terminal.serverStats.memoryDetails': 'Сведения о памяти',
   'terminal.serverStats.memUsed': 'Использовано',
@@ -201,6 +209,7 @@ export const ruTerminalMessages: Messages = {
   'terminal.auth.retryMessage': 'Ошибка аутентификации. Проверьте учётные данные и повторите попытку.',
   'terminal.auth.retryLog': 'Ошибка аутентификации. Повторите попытку.',
   'terminal.auth.noKeysHint': 'Нет доступных ключей. Добавьте ключи в связке ключей.',
+  'terminal.auth.selectIdentity': 'Использовать сохранённый профиль',
   'terminal.auth.continueSave': 'Продолжить и сохранить',
   'terminal.auth.credentialsUnavailable': 'Сохранённые учётные данные не могут быть расшифрованы на этом устройстве. Пожалуйста, введите и сохраните их заново.',
   'terminal.auth.jumpCredentialsUnavailable': 'У jump-хоста сохранены учётные данные, которые нельзя расшифровать на этом устройстве. Откройте настройки хоста и введите их заново.',
@@ -834,6 +843,10 @@ export const ruTerminalMessages: Messages = {
   'serial.field.configLabelPlaceholder': 'например, Arduino Uno',
   'serial.connectAndSave': 'Подключить и сохранить',
   'serial.edit.title': 'Настройки последовательного порта',
+  'serial.field.username': 'Имя пользователя',
+  'serial.field.password': 'Пароль',
+  'serial.field.autoLoginDesc': 'Если задано, запросы Login/Password в последовательной консоли автоматически заполняются этими сохранёнными учётными данными.',
+  'serial.field.clearPassword': 'Очистить сохранённый пароль',
 
   // Keyboard Interactive Authentication (2FA/MFA)
   'keyboard.interactive.title': 'Требуется аутентификация',

application/i18n/locales/ru/vault.ts

@@ -108,6 +108,7 @@ export const ruVaultMessages: Messages = {
   'vault.hosts.export.toast.success': 'Экспортировано {count} хостов в CSV',
   'vault.hosts.export.toast.successWithSkipped': 'Экспортировано {count} хостов в CSV ({skipped} неподдерживаемых хостов пропущено)',
   'vault.hosts.export.toast.passphrasesSkipped': 'Не удалось прочитать {count} сохранённых парольных фраз ключей; они оставлены пустыми',
+  'vault.hosts.export.toast.proxyCredentialsSkipped': 'Не удалось прочитать {count} сохранённых паролей прокси; они оставлены пустыми',
   'vault.hosts.export.toast.noHosts': 'Нет хостов для экспорта',
   'vault.hosts.allHosts': 'Все хосты',
   'vault.hosts.pinned': 'Закреплённые',

application/i18n/locales/vaultGroupDeleteLocales.test.ts

@@ -0,0 +1,48 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import en from './en.ts';
+import ru from './ru.ts';
+import es from './es.ts';
+import zhCN from './zh-CN.ts';
+import zhTW from './zh-TW.ts';
+
+const KEYS = [
+  'vault.groups.deleteDialog.managedDesc',
+  'vault.groups.deleteDialog.mixedDesc',
+  'vault.groups.deleteDialog.managedWarning',
+  'vault.groups.deleteDialog.managedFile',
+] as const;
+
+test('managed group delete warning copy exists in every locale', () => {
+  for (const [locale, messages] of Object.entries({ en, ru, es, zhCN, zhTW })) {
+    const missing = KEYS.filter((key) => !messages[key]);
+    assert.deepEqual(missing, [], `${locale} is missing managed group delete copy`);
+  }
+});
+
+test('managed group delete warning mentions data loss in every locale', () => {
+  const MARKERS = ['备份', '備份', 'copia de seguridad', 'резервную копию', 'Back up'];
+  for (const [locale, messages] of Object.entries({ en, ru, es, zhCN, zhTW })) {
+    const text = messages['vault.groups.deleteDialog.managedWarning'];
+    assert.match(
+      text ?? '',
+      /SSH/,
+      `${locale} warning should reference the SSH config file`,
+    );
+    assert.ok(
+      MARKERS.some((marker) => text?.includes(marker)),
+      `${locale} warning should tell the user to back up the file`,
+    );
+  }
+});
+
+test('linked file line interpolates the file path', () => {
+  for (const messages of [en, ru, es, zhCN, zhTW]) {
+    assert.match(
+      messages['vault.groups.deleteDialog.managedFile'] ?? '',
+      /\{file\}/,
+      'managedFile copy should include the {file} placeholder',
+    );
+  }
+});

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

@@ -4,6 +4,7 @@ export const zhCNAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Agent 设置',
   'ai.chat.preparing': '准备中…',
+  'ai.chat.modelCatalogWarning': '暂时无法更新实时模型列表，当前显示上次可用或内置的模型。',
   'ai.chat.compactingContext': '正在压缩较早的上下文…',
   'ai.chat.compactingStep': '正在为下一步整理上下文…',
   'ai.chat.compactionRetry': '请求过大，正在压缩上下文并重试…',
@@ -364,21 +365,24 @@ export const zhCNAiMessages: Messages = {
   'ai.externalMcp.client.claude': 'Claude Code',
   'ai.externalMcp.client.grok': 'Grok',
   'ai.externalMcp.client.cursor': 'Cursor',
+  'ai.externalMcp.client.other': '其他',
   'ai.externalMcp.cliCommand': 'CLI 命令',
   'ai.externalMcp.configSnippet': '配置片段',
+  'ai.externalMcp.universalSetupPrompt': '通用安装提示词',
   'ai.externalMcp.addToCodex': '添加到 Codex',
   'ai.externalMcp.addToClaude': '添加到 Claude Code',
   'ai.externalMcp.addToGrok': '添加到 Grok',
-  'ai.externalMcp.codexAdded': '已添加 Codex MCP 条目。请重启 Codex 或打开新会话。',
-  'ai.externalMcp.claudeAdded': '已添加 Claude Code MCP 条目。请重启 Claude Code 或打开新会话。',
-  'ai.externalMcp.grokAdded': '已添加 Grok MCP 条目。请重启 Grok 或打开新会话。',
+  'ai.externalMcp.codexAdded': '已添加 Codex MCP 条目和 Netcatty Skill。请重启 Codex 或打开新会话。',
+  'ai.externalMcp.claudeAdded': '已添加 Claude Code MCP 条目和 Netcatty Skill。请重启 Claude Code 或打开新会话。',
+  'ai.externalMcp.grokAdded': '已添加 Grok MCP 条目和 Netcatty Skill。请重启 Grok 或打开新会话。',
   'ai.externalMcp.installCodex': '请先单独安装 Codex，然后点击刷新。',
   'ai.externalMcp.installClaude': '请先单独安装 Claude Code，然后点击刷新。',
   'ai.externalMcp.installGrok': '请先单独安装 Grok CLI，然后点击刷新。',
   'ai.externalMcp.conflict.description': '已存在指向其他位置的 netcatty-external 条目，请手动删除或修改。',
   'ai.externalMcp.enableForLauncher': '请先启用对外 MCP，以获取可用的 launcher 路径。',
-  'ai.externalMcp.cursor.title': 'Cursor / 其他客户端',
-  'ai.externalMcp.cursor.description': '合并到 MCP 配置文件（例如 ~/.cursor/mcp.json）。若已有其他服务器，请勿整文件覆盖。',
+  'ai.externalMcp.cursor.title': 'Cursor',
+  'ai.externalMcp.cursor.description': '将片段合并到 Cursor MCP 配置中，并保留已有服务器。',
+  'ai.externalMcp.other.description': '将安装提示词复制到其他终端 Agent，或把 MCP 片段合并到对应客户端配置。',
   'ai.externalMcp.status.unavailable': '不可用',
   'ai.externalMcp.status.disabled': '已关闭',
   'ai.externalMcp.status.running': '运行中',
@@ -597,8 +601,12 @@ export const zhCNAiMessages: Messages = {
   'terminal.layer.aiChat': 'AI 助手',
   'terminal.layer.movePanelLeft': '面板移至左侧',
   'terminal.layer.movePanelRight': '面板移至右侧',
+  'terminal.layer.movePanelBottom': '面板移至底部',
   'terminal.layer.closePanel': '关闭面板',
   'terminal.layer.closePane': '关闭分屏',
+  'terminal.layer.saveLayoutAsDefault': '将布局保存为默认',
+  'terminal.layer.layoutSavedAsDefault': '布局已保存为默认',
+  'terminal.layer.layoutSaveFailed': '布局保存失败',
   'terminal.layer.resizeSplit': '调整分屏大小',
   'terminal.layer.splitHorizontal': '上下分屏',
   'terminal.layer.splitVertical': '左右分屏',

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

@@ -120,6 +120,12 @@ export const zhCNCoreMessages: Messages = {
   'settings.terminal.sidePanel.pane.system': '系统',
   'settings.terminal.sidePanel.pane.notes': '笔记',
   'settings.terminal.sidePanel.pane.ai': 'AI',
+  'settings.terminal.section.localShellSidePanel': '本地 Shell 侧边栏',
+  'settings.terminal.localShellSidePanel.autoOpen': '打开本地 Shell 时展开侧边栏',
+  'settings.terminal.localShellSidePanel.autoOpen.desc': '打开本地 Shell 后自动打开一个侧边栏。',
+  'settings.terminal.localShellSidePanel.autoOpenPane': '默认侧边栏',
+  'settings.terminal.localShellSidePanel.autoOpenPane.desc': '选择优先打开哪个面板。',
+  'settings.terminal.localShellSidePanel.pane.files': '文件',
 
   // Settings > System
   'settings.system.title': '系统',
@@ -357,9 +363,6 @@ export const zhCNCoreMessages: Messages = {
   'settings.vault.selectBeforeConnectDesc': '单击选中主机（网格模式显示强调色边框），再次单击连接；分组同理。默认仍为单击直接连接。',
   'settings.vault.showOnlyUngroupedHostsInRoot': '根目录只显示未分组主机',
   'settings.vault.showOnlyUngroupedHostsInRootDesc': '开启后，主机库根目录的主机列表只显示没有分组的主机，已分组主机请从左侧分组进入查看。',
-  'settings.appearance.tabBarPosition': '标签栏位置',
-  'settings.appearance.tabBarPosition.top': '顶部',
-  'settings.appearance.tabBarPosition.bottom': '底部',
   'settings.vault.showSftpTab': '显示 SFTP 标签页',
   'settings.vault.showSftpTabDesc': '在顶部标签栏显示独立的 SFTP 视图。关闭后可改用会话内左侧的 SFTP 侧栏。',
   'settings.vault.showHostTreeSidebar': '显示主机列表侧栏',
@@ -678,6 +681,10 @@ export const zhCNCoreMessages: Messages = {
   'vault.groups.deleteDialogTitle': '删除分组',
   'vault.groups.deleteDialog.desc': '这将永久删除该分组并将所有主机移动到根级别。',
   'vault.groups.deleteDialog.managedDesc': '这是一个托管的 SSH config 分组。删除后将同时删除所有主机并断开与源文件的连接。',
+  'vault.groups.deleteDialog.mixedDesc': '该分组包含从关联 SSH config 文件导入的主机。其托管子分组下的所有主机都将被删除，包括不受该文件管理的主机；其余主机将移动到根级别，除非您在下方选择同时删除。',
+  'vault.groups.deleteDialog.managedWarning': '删除该分组会同时清空关联 SSH config 文件中的对应条目，从该文件导入的配置可能会丢失，其他使用该文件的应用也会受到影响。请先备份文件再继续。',
+  'vault.groups.deleteDialog.sourcesChanged': '此次删除涉及的托管文件已发生变化。请检查文件并重新确认。',
+  'vault.groups.deleteDialog.managedFile': '关联文件：{file}',
   'vault.groups.deleteDialog.deleteHosts': '同时删除该分组下的所有主机',
   'vault.groups.deleteDialog.bulkTitle': '删除所选分组',
   'vault.groups.deleteDialog.bulkDesc': '这将永久删除所选分组，并把其中的主机移动到根级别。',
@@ -736,6 +743,7 @@ export const zhCNCoreMessages: Messages = {
   'vault.hosts.export.toast.success': '已导出 {count} 个主机到 CSV',
   'vault.hosts.export.toast.successWithSkipped': '已导出 {count} 个主机到 CSV（跳过 {skipped} 个不支持的主机）',
   'vault.hosts.export.toast.passphrasesSkipped': '有 {count} 个已保存的密钥口令无法读取，导出时已留空',
+  'vault.hosts.export.toast.proxyCredentialsSkipped': '有 {count} 个已保存的代理密码无法读取，导出时已留空',
   'vault.hosts.export.toast.noHosts': '没有主机可导出',
   'vault.hosts.allHosts': '全部主机',
   'vault.hosts.pinned': '已置顶',
@@ -1050,7 +1058,6 @@ export const zhCNCoreMessages: Messages = {
   'sftp.goUp': '上一级',
   'sftp.goToTerminalCwd': '定位到终端当前目录',
   'sftp.locatePathInTerminal': '定位路径到终端',
-  'sftp.refreshAfterCommand': '终端命令完成后刷新',
   'sftp.followTerminalCwd': '追随终端目录',
   'sftp.followTerminalCwd.enable': '开启追随终端目录',
   'sftp.followTerminalCwd.disable': '关闭追随终端目录',

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

@@ -3,6 +3,13 @@ import type { Messages } from '../types';
 export const zhCNTerminalMessages: Messages = {
   'terminal.menu.saveScreen': '保存当前屏幕',
   'terminal.saveScreen.failed': '保存终端屏幕失败。',
+  // 多行粘贴确认对话框（#3398）
+  'terminal.pasteConfirm.title': '要粘贴多行文本吗？',
+  'terminal.pasteConfirm.summary': '将向会话发送 {lines} 行（{chars} 个字符）。',
+  'terminal.pasteConfirm.preview': '预览（可编辑）',
+  'terminal.pasteConfirm.send': '发送',
+  'terminal.pasteConfirm.sendLineByLine': '逐行发送',
+  'terminal.pasteConfirm.cancel': '取消',
   'terminal.sudoHint.pressEnter': '按 Enter 粘贴已保存的密码',
   'terminal.passwordPicker.title': '已保存的密码',
   'terminal.passwordPicker.empty': '没有已保存的密码',
@@ -326,6 +333,12 @@ export const zhCNTerminalMessages: Messages = {
   'settings.terminal.behavior.autoUploadClipboardImage': '粘贴时自动上传剪贴板图片',
   'settings.terminal.behavior.autoUploadClipboardImage.desc':
     '当剪贴板包含图片时，在远程会话中粘贴会通过 SFTP 将图片上传到远端当前目录的 .netcatty-paste-images/ 文件夹，并在终端输入远端路径，而不是粘贴文本。',
+  'settings.terminal.behavior.confirmMultilinePaste': '粘贴多行前先询问',
+  'settings.terminal.behavior.confirmMultilinePaste.desc':
+    '粘贴多行文本时先弹出确认对话框，显示行数和字符数、可编辑的预览，并提供发送 / 逐行发送 / 取消操作。可保护不支持括号粘贴的网络设备 CLI（Cisco IOS、华为 VRP、H3C Comware）。',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines': '确认阈值（行数）',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines.desc':
+    '粘贴内容达到该行数时才弹出确认对话框。',
   'settings.terminal.behavior.shiftEnterNewline': 'Shift+Enter 发送文本',
   'settings.terminal.behavior.shiftEnterNewline.desc':
     '在终端中按 Shift+Enter 时发送配置的文本，而不是普通回车。',
@@ -918,6 +931,10 @@ export const zhCNTerminalMessages: Messages = {
   'serial.field.configLabelPlaceholder': '例如 Arduino Uno',
   'serial.connectAndSave': '连接并保存',
   'serial.edit.title': '串口设置',
+  'serial.field.username': '用户名',
+  'serial.field.password': '密码',
+  'serial.field.autoLoginDesc': '设置后，串口终端出现 Login/Password 登录提示时，会自动填充此处保存的用户名和密码。',
+  'serial.field.clearPassword': '清除已保存的密码',
 
   // Keyboard Interactive Authentication (2FA/MFA)
   'keyboard.interactive.title': '需要验证',

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

@@ -503,6 +503,7 @@ export const zhCNVaultMessages: Messages = {
   'terminal.statusbar.reconnect.tooltip': '重新连接当前会话',
   'terminal.serverStats.cpu': 'CPU 使用率',
   'terminal.serverStats.cpuCores': 'CPU 核心使用率',
+  'terminal.serverStats.gpu': 'GPU 使用率',
   'terminal.serverStats.memory': '内存使用',
   'terminal.serverStats.memoryDetails': '内存详情',
   'terminal.serverStats.memUsed': '已用',
@@ -578,6 +579,7 @@ export const zhCNVaultMessages: Messages = {
   'terminal.auth.retryMessage': '身份验证失败。请检查凭据后重试。',
   'terminal.auth.retryLog': '身份验证失败，请重试。',
   'terminal.auth.noKeysHint': '暂无密钥，请先在钥匙串中添加。',
+  'terminal.auth.selectIdentity': '使用已保存的身份',
   'terminal.auth.continueSave': '继续并保存',
   'terminal.auth.credentialsUnavailable': '当前设备无法解密已保存凭据，请重新输入并再次保存。',
   'terminal.auth.jumpCredentialsUnavailable': '某个跳板机的已保存凭据无法在当前设备解密，请到主机设置中重新填写。',

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

@@ -4,6 +4,7 @@ export const zhTWAiMessages: Messages = {
   // AI Settings
   'ai.agentSettings': 'Agent 設定',
   'ai.chat.preparing': '準備中…',
+  'ai.chat.modelCatalogWarning': '暫時無法更新即時模型清單，目前顯示上次可用或內建的模型。',
   'ai.chat.compactingContext': '正在壓縮較早的上下文…',
   'ai.chat.compactingStep': '正在為下一步整理上下文…',
   'ai.chat.compactionRetry': '請求過大，正在壓縮上下文並重試…',
@@ -354,21 +355,24 @@ export const zhTWAiMessages: Messages = {
   'ai.externalMcp.client.claude': 'Claude Code',
   'ai.externalMcp.client.grok': 'Grok',
   'ai.externalMcp.client.cursor': 'Cursor',
+  'ai.externalMcp.client.other': '其他',
   'ai.externalMcp.cliCommand': 'CLI 命令',
   'ai.externalMcp.configSnippet': '設定片段',
+  'ai.externalMcp.universalSetupPrompt': '通用安裝提示詞',
   'ai.externalMcp.addToCodex': '新增到 Codex',
   'ai.externalMcp.addToClaude': '新增到 Claude Code',
   'ai.externalMcp.addToGrok': '新增到 Grok',
-  'ai.externalMcp.codexAdded': '已新增 Codex MCP 項目。請重新啟動 Codex 或開啟新工作階段。',
-  'ai.externalMcp.claudeAdded': '已新增 Claude Code MCP 項目。請重新啟動 Claude Code 或開啟新工作階段。',
-  'ai.externalMcp.grokAdded': '已新增 Grok MCP 項目。請重新啟動 Grok 或開啟新工作階段。',
+  'ai.externalMcp.codexAdded': '已新增 Codex MCP 項目和 Netcatty Skill。請重新啟動 Codex 或開啟新工作階段。',
+  'ai.externalMcp.claudeAdded': '已新增 Claude Code MCP 項目和 Netcatty Skill。請重新啟動 Claude Code 或開啟新工作階段。',
+  'ai.externalMcp.grokAdded': '已新增 Grok MCP 項目和 Netcatty Skill。請重新啟動 Grok 或開啟新工作階段。',
   'ai.externalMcp.installCodex': '請先另外安裝 Codex，然後按重新整理。',
   'ai.externalMcp.installClaude': '請先另外安裝 Claude Code，然後按重新整理。',
   'ai.externalMcp.installGrok': '請先另外安裝 Grok CLI，然後按重新整理。',
   'ai.externalMcp.conflict.description': '已存在指向其他位置的 netcatty-external 項目，請手動刪除或修改。',
   'ai.externalMcp.enableForLauncher': '請先啟用對外 MCP，以取得可用的 launcher 路徑。',
-  'ai.externalMcp.cursor.title': 'Cursor / 其他用戶端',
-  'ai.externalMcp.cursor.description': '合併到 MCP 設定檔（例如 ~/.cursor/mcp.json）。若已有其他伺服器，請勿整檔覆蓋。',
+  'ai.externalMcp.cursor.title': 'Cursor',
+  'ai.externalMcp.cursor.description': '將片段合併到 Cursor MCP 設定中，並保留已有伺服器。',
+  'ai.externalMcp.other.description': '將安裝提示詞複製到其他終端 Agent，或把 MCP 片段合併到對應用戶端設定。',
   'ai.externalMcp.status.unavailable': '無法使用',
   'ai.externalMcp.status.disabled': '已關閉',
   'ai.externalMcp.status.running': '執行中',
@@ -587,8 +591,12 @@ export const zhTWAiMessages: Messages = {
   'terminal.layer.aiChat': 'AI 助手',
   'terminal.layer.movePanelLeft': '面板移至左側',
   'terminal.layer.movePanelRight': '面板移至右側',
+  'terminal.layer.movePanelBottom': '面板移至底部',
   'terminal.layer.closePanel': '關閉面板',
   'terminal.layer.closePane': '關閉分割',
+  'terminal.layer.saveLayoutAsDefault': '將佈局儲存為預設',
+  'terminal.layer.layoutSavedAsDefault': '佈局已儲存為預設',
+  'terminal.layer.layoutSaveFailed': '佈局儲存失敗',
   'terminal.layer.resizeSplit': '調整分割大小',
   'terminal.layer.splitHorizontal': '上下分割',
   'terminal.layer.splitVertical': '左右分割',

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

@@ -122,6 +122,12 @@ export const zhTWCoreMessages: Messages = {
   'settings.terminal.sidePanel.pane.system': '系統',
   'settings.terminal.sidePanel.pane.notes': '筆記',
   'settings.terminal.sidePanel.pane.ai': 'AI',
+  'settings.terminal.section.localShellSidePanel': '本機 Shell 側邊欄',
+  'settings.terminal.localShellSidePanel.autoOpen': '開啟本機 Shell 時展開側邊欄',
+  'settings.terminal.localShellSidePanel.autoOpen.desc': '開啟本機 Shell 後自動開啟一個側邊欄。',
+  'settings.terminal.localShellSidePanel.autoOpenPane': '預設側邊欄',
+  'settings.terminal.localShellSidePanel.autoOpenPane.desc': '選擇優先開啟哪個面板。',
+  'settings.terminal.localShellSidePanel.pane.files': '檔案',
 
   // Settings > System
   'settings.system.title': '系統',
@@ -359,9 +365,6 @@ export const zhTWCoreMessages: Messages = {
   'settings.vault.selectBeforeConnectDesc': '點一下選取主機（網格模式會顯示強調色邊框），再點一下才連線；群組同理。預設仍是點一下直接連線。',
   'settings.vault.showOnlyUngroupedHostsInRoot': '根目錄只顯示未歸類主機',
   'settings.vault.showOnlyUngroupedHostsInRootDesc': '開啟後，主機庫根目錄的主機列表只顯示沒有群組的主機，已歸類的主機請從左側群組進入檢視。',
-  'settings.appearance.tabBarPosition': '分頁列位置',
-  'settings.appearance.tabBarPosition.top': '頂部',
-  'settings.appearance.tabBarPosition.bottom': '底部',
   'settings.vault.showSftpTab': '顯示 SFTP 分頁',
   'settings.vault.showSftpTabDesc': '在頂部分頁列顯示獨立的 SFTP 檢視。關閉後可改用工作階段內左側的 SFTP 側欄。',
   'settings.vault.showHostTreeSidebar': '顯示主機列表側欄',
@@ -680,6 +683,10 @@ export const zhTWCoreMessages: Messages = {
   'vault.groups.deleteDialogTitle': '刪除群組',
   'vault.groups.deleteDialog.desc': '這將永久刪除該群組並將所有主機移動到根層級。',
   'vault.groups.deleteDialog.managedDesc': '這是一個託管的 SSH config 群組。刪除後將同時刪除所有主機並斷開與原始檔的連線。',
+  'vault.groups.deleteDialog.mixedDesc': '該群組包含從關聯 SSH config 檔案匯入的主機。其受管理子群組下的所有主機都將被刪除，包括不受該檔案管理的主機；其餘主機將移動到根層級，除非您在下方選擇同時刪除。',
+  'vault.groups.deleteDialog.managedWarning': '刪除該群組會同時清空關聯 SSH config 檔案中的對應條目，從該檔案匯入的設定可能會遺失，其他使用該檔案的應用也會受到影響。請先備份檔案再繼續。',
+  'vault.groups.deleteDialog.sourcesChanged': '此次刪除涉及的受管理檔案已發生變化。請檢查檔案並重新確認。',
+  'vault.groups.deleteDialog.managedFile': '關聯檔案：{file}',
   'vault.groups.deleteDialog.deleteHosts': '同時刪除該群組下的所有主機',
   'vault.groups.deleteDialog.bulkTitle': '刪除所選群組',
   'vault.groups.deleteDialog.bulkDesc': '這將永久刪除所選群組，並把其中的主機移動到根層級。',
@@ -738,6 +745,7 @@ export const zhTWCoreMessages: Messages = {
   'vault.hosts.export.toast.success': '已匯出 {count} 個主機到 CSV',
   'vault.hosts.export.toast.successWithSkipped': '已匯出 {count} 個主機到 CSV（跳過 {skipped} 個不支援的主機）',
   'vault.hosts.export.toast.passphrasesSkipped': '有 {count} 個已儲存的金鑰密碼無法讀取，匯出時已留空',
+  'vault.hosts.export.toast.proxyCredentialsSkipped': '有 {count} 個已儲存的代理密碼無法讀取，匯出時已留空',
   'vault.hosts.export.toast.noHosts': '沒有主機可匯出',
   'vault.hosts.allHosts': '全部主機',
   'vault.hosts.pinned': '已置頂',
@@ -1052,7 +1060,6 @@ export const zhTWCoreMessages: Messages = {
   'sftp.goUp': '上一級',
   'sftp.goToTerminalCwd': '定位到終端目前目錄',
   'sftp.locatePathInTerminal': '定位路徑到終端',
-  'sftp.refreshAfterCommand': '終端命令完成後重新整理',
   'sftp.followTerminalCwd': '追隨終端目錄',
   'sftp.followTerminalCwd.enable': '開啟追隨終端目錄',
   'sftp.followTerminalCwd.disable': '關閉追隨終端目錄',

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

@@ -3,6 +3,13 @@ import type { Messages } from '../types';
 export const zhTWTerminalMessages: Messages = {
   'terminal.menu.saveScreen': '儲存目前畫面',
   'terminal.saveScreen.failed': '儲存終端畫面失敗。',
+  // 多行貼上確認對話框（#3398）
+  'terminal.pasteConfirm.title': '要貼上多行文字嗎？',
+  'terminal.pasteConfirm.summary': '將向工作階段傳送 {lines} 行（{chars} 個字元）。',
+  'terminal.pasteConfirm.preview': '預覽（可編輯）',
+  'terminal.pasteConfirm.send': '傳送',
+  'terminal.pasteConfirm.sendLineByLine': '逐行傳送',
+  'terminal.pasteConfirm.cancel': '取消',
   'terminal.sudoHint.pressEnter': '按 Enter 貼上已儲存的密碼',
   'terminal.passwordPicker.title': '已儲存的密碼',
   'terminal.passwordPicker.empty': '沒有已儲存的密碼',
@@ -326,6 +333,12 @@ export const zhTWTerminalMessages: Messages = {
   'settings.terminal.behavior.autoUploadClipboardImage': '貼上時自動上傳剪貼簿圖片',
   'settings.terminal.behavior.autoUploadClipboardImage.desc':
     '當剪貼簿包含圖片時，在遠端工作階段中貼上會透過 SFTP 將圖片上傳到遠端目前目錄的 .netcatty-paste-images/ 資料夾，並在終端輸入遠端路徑，而不是貼上文字。',
+  'settings.terminal.behavior.confirmMultilinePaste': '貼上多行前先詢問',
+  'settings.terminal.behavior.confirmMultilinePaste.desc':
+    '貼上多行文字時先彈出確認對話框，顯示行數和字元數、可編輯的預覽，並提供傳送 / 逐行傳送 / 取消操作。可保護不支援括號貼上的網路設備 CLI（Cisco IOS、華為 VRP、H3C Comware）。',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines': '確認門檻（行數）',
+  'settings.terminal.behavior.confirmMultilinePasteMinLines.desc':
+    '貼上內容達到該行數時才彈出確認對話框。',
   'settings.terminal.behavior.shiftEnterNewline': 'Shift+Enter 傳送文字',
   'settings.terminal.behavior.shiftEnterNewline.desc':
     '在終端中按 Shift+Enter 時傳送設定的文字，而不是一般 Enter。',
@@ -918,6 +931,10 @@ export const zhTWTerminalMessages: Messages = {
   'serial.field.configLabelPlaceholder': '例如 Arduino Uno',
   'serial.connectAndSave': '連線並儲存',
   'serial.edit.title': '序列埠設定',
+  'serial.field.username': '使用者名稱',
+  'serial.field.password': '密碼',
+  'serial.field.autoLoginDesc': '設定後，序列埠終端出現 Login/Password 登入提示時，會自動填入此處儲存的使用者名稱和密碼。',
+  'serial.field.clearPassword': '清除已儲存的密碼',
 
   // Keyboard Interactive Authentication (2FA/MFA)
   'keyboard.interactive.title': '需要驗證',

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

@@ -503,6 +503,7 @@ export const zhTWVaultMessages: Messages = {
   'terminal.statusbar.reconnect.tooltip': '重新連線目前工作階段',
   'terminal.serverStats.cpu': 'CPU 使用率',
   'terminal.serverStats.cpuCores': 'CPU 核心使用率',
+  'terminal.serverStats.gpu': 'GPU 使用率',
   'terminal.serverStats.memory': '記憶體使用',
   'terminal.serverStats.memoryDetails': '記憶體詳情',
   'terminal.serverStats.memUsed': '已用',
@@ -578,6 +579,7 @@ export const zhTWVaultMessages: Messages = {
   'terminal.auth.retryMessage': '驗證失敗。請檢查憑證後再試一次。',
   'terminal.auth.retryLog': '驗證失敗，請再試一次。',
   'terminal.auth.noKeysHint': '暫無金鑰，請先在鑰匙串中新增。',
+  'terminal.auth.selectIdentity': '使用已儲存的身分',
   'terminal.auth.continueSave': '繼續並儲存',
   'terminal.auth.credentialsUnavailable': '目前裝置無法解密已儲存憑證，請重新輸入並再次儲存。',
   'terminal.auth.jumpCredentialsUnavailable': '某個跳板機的已儲存憑證無法在目前裝置解密，請到主機設定中重新填寫。',

application/state/multilinePasteConfirmStore.test.ts

@@ -0,0 +1,62 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+
+import {
+  getPendingMultilinePasteConfirm,
+  requestMultilinePasteConfirm,
+  respondMultilinePasteConfirm,
+  subscribeMultilinePasteConfirm,
+} from "./multilinePasteConfirmStore";
+
+test("request stores the pending paste and respond resolves it", async () => {
+  const pending = requestMultilinePasteConfirm({
+    text: "line1\nline2",
+    lineCount: 2,
+    charCount: 12,
+  });
+  assert.equal(getPendingMultilinePasteConfirm()?.lineCount, 2);
+
+  respondMultilinePasteConfirm("line-by-line", "line1\nline2\nline3");
+  const response = await pending;
+  assert.deepEqual(response, { action: "line-by-line", text: "line1\nline2\nline3" });
+  assert.equal(getPendingMultilinePasteConfirm(), null);
+});
+
+test("respond without text falls back to the original request text", async () => {
+  const pending = requestMultilinePasteConfirm({
+    text: "line1\nline2",
+    lineCount: 2,
+    charCount: 12,
+  });
+  respondMultilinePasteConfirm("send");
+  const response = await pending;
+  assert.deepEqual(response, { action: "send", text: "line1\nline2" });
+});
+
+test("a newer paste request supersedes the pending one as cancelled", async () => {
+  const first = requestMultilinePasteConfirm({ text: "a\nb", lineCount: 2, charCount: 3 });
+  const second = requestMultilinePasteConfirm({ text: "c\nd", lineCount: 2, charCount: 3 });
+  assert.equal(getPendingMultilinePasteConfirm()?.text, "c\nd");
+
+  respondMultilinePasteConfirm("send", "c\nd");
+  assert.deepEqual(await first, { action: "cancel", text: "a\nb" });
+  assert.deepEqual(await second, { action: "send", text: "c\nd" });
+});
+
+test("respond without a pending request is a no-op and listeners are notified", async () => {
+  respondMultilinePasteConfirm("send");
+  assert.equal(getPendingMultilinePasteConfirm(), null);
+
+  const events: Array<string | null> = [];
+  const unsubscribe = subscribeMultilinePasteConfirm(() => {
+    events.push(getPendingMultilinePasteConfirm()?.id ?? "cleared");
+  });
+  const pending = requestMultilinePasteConfirm({ text: "x", lineCount: 1, charCount: 1 });
+  const pendingId = getPendingMultilinePasteConfirm()?.id ?? null;
+  respondMultilinePasteConfirm("cancel", "x");
+  await pending;
+  unsubscribe();
+
+  assert.ok(pendingId);
+  assert.deepEqual(events, [pendingId, "cleared"]);
+});

application/state/multilinePasteConfirmStore.ts

@@ -0,0 +1,81 @@
+/**
+ * App-level store for the "paste multiple lines" confirmation dialog (#3398).
+ *
+ * Terminal paste handlers call `requestMultilinePasteConfirm` from anywhere in
+ * the renderer and await the user's decision; `MultilinePasteConfirmHost`
+ * (mounted once in App) renders the dialog and resolves the pending request.
+ */
+
+export type MultilinePasteConfirmAction = "send" | "line-by-line" | "cancel";
+
+export interface MultilinePasteConfirmRequest {
+  id: string;
+  /** Clipboard text the dialog previews (editable by the user). */
+  text: string;
+  lineCount: number;
+  charCount: number;
+  /** Restore the originating terminal's focus after the modal releases it. */
+  onClose?: () => void;
+}
+
+export interface MultilinePasteConfirmResponse {
+  action: MultilinePasteConfirmAction;
+  /** Text to send: the preview content, possibly edited by the user. */
+  text: string;
+}
+
+interface PendingRequest {
+  request: MultilinePasteConfirmRequest;
+  resolve: (response: MultilinePasteConfirmResponse) => void;
+}
+
+let pending: PendingRequest | null = null;
+let nextRequestId = 0;
+const listeners = new Set<() => void>();
+
+const emit = (): void => {
+  for (const listener of listeners) listener();
+};
+
+export function requestMultilinePasteConfirm(
+  request: Omit<MultilinePasteConfirmRequest, "id">,
+): Promise<MultilinePasteConfirmResponse> {
+  // Only one confirmation dialog can be pending; a newer paste supersedes the
+  // older one (the stale promise resolves as "cancel" so its paste is dropped).
+  if (pending) {
+    const stale = pending;
+    pending = null;
+    stale.resolve({ action: "cancel", text: stale.request.text });
+  }
+  nextRequestId += 1;
+  const requestWithId: MultilinePasteConfirmRequest = {
+    ...request,
+    id: `multiline-paste-${nextRequestId}`,
+  };
+  return new Promise((resolve) => {
+    pending = { request: requestWithId, resolve };
+    emit();
+  });
+}
+
+export function respondMultilinePasteConfirm(
+  action: MultilinePasteConfirmAction,
+  text?: string,
+): void {
+  const current = pending;
+  if (!current) return;
+  pending = null;
+  current.resolve({ action, text: text ?? current.request.text });
+  emit();
+}
+
+/** Snapshot for `useSyncExternalStore`; stable reference while pending. */
+export const getPendingMultilinePasteConfirm =
+  (): MultilinePasteConfirmRequest | null => pending?.request ?? null;
+
+export function subscribeMultilinePasteConfirm(listener: () => void): () => void {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}

application/state/settingsChromeStore.ts

@@ -23,7 +23,6 @@ export type SettingsChromeSnapshot = {
   darkUiThemeId: string;
   uiLanguage: UILanguage;
   windowOpacity: number;
-  tabBarPosition: 'top' | 'bottom';
   showSftpTab: boolean;
   showHostTreeSidebar: boolean;
   showRecentHosts: boolean;
@@ -37,6 +36,8 @@ export type SettingsChromeSnapshot = {
   restoreTerminalCwd: boolean;
   terminalSidePanelAutoOpen: boolean;
   terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
+  localShellSidePanelAutoOpen: boolean;
+  localShellSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
 };
 
 /**
@@ -56,7 +57,6 @@ export const DEFAULT_SETTINGS_CHROME_SNAPSHOT: SettingsChromeSnapshot = Object.f
   darkUiThemeId: 'default',
   uiLanguage: 'en',
   windowOpacity: 1,
-  tabBarPosition: 'top',
   showSftpTab: true,
   showHostTreeSidebar: true,
   showRecentHosts: true,
@@ -70,6 +70,8 @@ export const DEFAULT_SETTINGS_CHROME_SNAPSHOT: SettingsChromeSnapshot = Object.f
   restoreTerminalCwd: true,
   terminalSidePanelAutoOpen: false,
   terminalSidePanelAutoOpenTab: 'ai',
+  localShellSidePanelAutoOpen: false,
+  localShellSidePanelAutoOpenTab: 'scripts',
 } satisfies SettingsChromeSnapshot);
 
 export function settingsChromeSnapshotsEqual(
@@ -82,7 +84,6 @@ export function settingsChromeSnapshotsEqual(
     && a.darkUiThemeId === b.darkUiThemeId
     && a.uiLanguage === b.uiLanguage
     && a.windowOpacity === b.windowOpacity
-    && a.tabBarPosition === b.tabBarPosition
     && a.showSftpTab === b.showSftpTab
     && a.showHostTreeSidebar === b.showHostTreeSidebar
     && a.showRecentHosts === b.showRecentHosts
@@ -95,7 +96,9 @@ export function settingsChromeSnapshotsEqual(
     && a.showTabNumberBadges === b.showTabNumberBadges
     && a.restoreTerminalCwd === b.restoreTerminalCwd
     && a.terminalSidePanelAutoOpen === b.terminalSidePanelAutoOpen
-    && a.terminalSidePanelAutoOpenTab === b.terminalSidePanelAutoOpenTab;
+    && a.terminalSidePanelAutoOpenTab === b.terminalSidePanelAutoOpenTab
+    && a.localShellSidePanelAutoOpen === b.localShellSidePanelAutoOpen
+    && a.localShellSidePanelAutoOpenTab === b.localShellSidePanelAutoOpenTab;
 }
 
 class SettingsChromeStore {

application/state/settingsIpcSync.localShell.test.ts

@@ -0,0 +1,79 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import React, { useState } from 'react';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import { useSettingsIpcSync } from './settingsIpcSync.ts';
+import { useSettingsStorageSync } from './settingsStorageSync.ts';
+import type { TerminalSidePanelAutoOpenTab } from '../../domain/terminalSidePanelAutoOpen.ts';
+import {
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN as enabledKey,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB as tabKey,
+} from '../../infrastructure/config/storageKeys.ts';
+
+for (const pathway of ['ipc', 'storage'] as const) {
+  test(`${pathway} receives local shell settings, rejects invalid tabs and cleans up`, async (t) => {
+    let receive: ((payload: { key: string; value: unknown }) => void) | undefined;
+    let unsubscribed = false;
+    const fakeWindow = Object.assign(new EventTarget(), {
+      netcatty: {
+        onSettingsChanged(callback: typeof receive) {
+          receive = callback;
+          return () => { unsubscribed = true; };
+        },
+      },
+    });
+    for (const [key, value] of Object.entries({ window: fakeWindow, IS_REACT_ACT_ENVIRONMENT: true })) {
+      const previous = Object.getOwnPropertyDescriptor(globalThis, key);
+      Object.defineProperty(globalThis, key, { value, configurable: true });
+      t.after(() => {
+        if (previous) Object.defineProperty(globalThis, key, previous);
+        else Reflect.deleteProperty(globalThis, key);
+      });
+    }
+    let current = { enabled: false, tab: 'scripts' };
+    let renderer: ReactTestRenderer | undefined;
+    function Harness() {
+      const [enabled, setEnabled] = useState(false);
+      const [tab, setTab] = useState<TerminalSidePanelAutoOpenTab>('scripts');
+      current = { enabled, tab };
+      const params = {
+        localShellSidePanelAutoOpen: enabled,
+        localShellSidePanelAutoOpenTab: tab,
+        setLocalShellSidePanelAutoOpenState: setEnabled,
+        setLocalShellSidePanelAutoOpenTabState: setTab,
+      };
+      // Only local-shell events are dispatched; unrelated settings are not used.
+      useSettingsIpcSync({ ...params, enabled: pathway === 'ipc' } as unknown as Parameters<typeof useSettingsIpcSync>[0]);
+      useSettingsStorageSync({ ...params, enabled: pathway === 'storage' } as Parameters<typeof useSettingsStorageSync>[0]);
+      return null;
+    }
+    async function send(key: string, value: unknown) {
+      await act(async () => {
+        if (pathway === 'ipc') receive!({ key, value });
+        else fakeWindow.dispatchEvent(Object.assign(new Event('storage'), { key, newValue: value === null ? null : String(value) }));
+      });
+    }
+    try {
+      await act(async () => { renderer = create(React.createElement(Harness)); });
+      await send(enabledKey, true);
+      await send(tabKey, 'notes');
+      assert.deepEqual(current, { enabled: true, tab: 'notes' });
+      await send(tabKey, 'invalid');
+      await send(tabKey, null);
+      await send(enabledKey, null);
+      assert.deepEqual(current, { enabled: true, tab: 'notes' });
+      if (pathway === 'ipc') {
+        await send(enabledKey, 'false');
+        assert.equal(current.enabled, true);
+      }
+      await send(enabledKey, false);
+      await send(tabKey, 'history');
+      assert.deepEqual(current, { enabled: false, tab: 'history' });
+      await act(async () => { renderer!.unmount(); });
+      renderer = undefined;
+      if (pathway === 'ipc') assert.equal(unsubscribed, true);
+    } finally {
+      await act(async () => { renderer?.unmount(); });
+    }
+  });
+}

application/state/settingsIpcSync.ts

@@ -1,4 +1,3 @@
-import { normalizeTabBarPosition, type TabBarPosition } from '../../domain/tabBarPosition';
 import { useEffect, type Dispatch, type SetStateAction } from 'react';
 import type { CustomKeyBindings, HotkeyScheme, SessionLogFormat, TerminalSettings, UILanguage } from '../../domain/models';
 import { parseCustomKeyBindingsStorageRecord } from '../../domain/customKeyBindings';
@@ -45,9 +44,10 @@ import {
   STORAGE_KEY_UI_THEME_LIGHT,
   STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
-  STORAGE_KEY_TAB_BAR_POSITION,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_WINDOW_OPACITY,
   STORAGE_KEY_APP_ICON_VARIANT,
   STORAGE_KEY_HTTP_NETWORK_PROXY,
@@ -102,10 +102,11 @@ interface UseSettingsIpcSyncParams {
   setSftpFollowTerminalCwd: Dispatch<SetStateAction<boolean>>;
   setSftpDefaultViewMode: Dispatch<SetStateAction<'list' | 'tree'>>;
   setWorkspaceFocusStyleState: Dispatch<SetStateAction<'dim' | 'border'>>;
-  setTabBarPositionState: Dispatch<SetStateAction<TabBarPosition>>;
   setShowHostTreeSidebarState: Dispatch<SetStateAction<boolean>>;
   setTerminalSidePanelAutoOpenState: Dispatch<SetStateAction<boolean>>;
   setTerminalSidePanelAutoOpenTabState: Dispatch<SetStateAction<TerminalSidePanelAutoOpenTab>>;
+  setLocalShellSidePanelAutoOpenState: Dispatch<SetStateAction<boolean>>;
+  setLocalShellSidePanelAutoOpenTabState: Dispatch<SetStateAction<TerminalSidePanelAutoOpenTab>>;
   setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
   setRestorePreviousSessionState: Dispatch<SetStateAction<boolean>>;
   setRestoreTerminalCwdState: Dispatch<SetStateAction<boolean>>;
@@ -149,10 +150,11 @@ export function useSettingsIpcSync({
   setSftpFollowTerminalCwd,
   setSftpDefaultViewMode,
   setWorkspaceFocusStyleState,
-  setTabBarPositionState,
   setShowHostTreeSidebarState,
   setTerminalSidePanelAutoOpenState,
   setTerminalSidePanelAutoOpenTabState,
+  setLocalShellSidePanelAutoOpenState,
+  setLocalShellSidePanelAutoOpenTabState,
   setDisableTerminalFontZoomState,
   setRestorePreviousSessionState,
   setRestoreTerminalCwdState,
@@ -304,9 +306,6 @@ export function useSettingsIpcSync({
       if (key === STORAGE_KEY_WORKSPACE_FOCUS_STYLE && (value === 'dim' || value === 'border')) {
         setWorkspaceFocusStyleState((prev) => (prev === value ? prev : value));
       }
-      if (key === STORAGE_KEY_TAB_BAR_POSITION) {
-        setTabBarPositionState(normalizeTabBarPosition(value));
-      }
       if (key === STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR && typeof value === 'boolean') {
         setShowHostTreeSidebarState((prev) => (prev === value ? prev : value));
       }
@@ -316,6 +315,12 @@ export function useSettingsIpcSync({
       if (key === STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB && isTerminalSidePanelAutoOpenTab(value)) {
         setTerminalSidePanelAutoOpenTabState((prev) => (prev === value ? prev : value));
       }
+      if (key === STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN && typeof value === 'boolean') {
+        setLocalShellSidePanelAutoOpenState((prev) => (prev === value ? prev : value));
+      }
+      if (key === STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB && isTerminalSidePanelAutoOpenTab(value)) {
+        setLocalShellSidePanelAutoOpenTabState((prev) => (prev === value ? prev : value));
+      }
       if (key === STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM && typeof value === 'boolean') {
         setDisableTerminalFontZoomState((prev) => (prev === value ? prev : value));
       }
@@ -367,10 +372,11 @@ export function useSettingsIpcSync({
     setSftpAutoOpenSidebar,
     setSftpFollowTerminalCwd,
     setSftpDefaultViewMode,
-    setTabBarPositionState,
     setShowHostTreeSidebarState,
     setTerminalSidePanelAutoOpenState,
     setTerminalSidePanelAutoOpenTabState,
+    setLocalShellSidePanelAutoOpenState,
+    setLocalShellSidePanelAutoOpenTabState,
     setDisableTerminalFontZoomState,
     setRestorePreviousSessionState,
     setRestoreTerminalCwdState,

application/state/settingsStorageSync.ts

@@ -1,4 +1,3 @@
-import { normalizeTabBarPosition, type TabBarPosition } from '../../domain/tabBarPosition';
 import { useEffect, useRef, type Dispatch, type SetStateAction } from 'react';
 import type { CustomKeyBindings, HotkeyScheme, SessionLogFormat, TerminalSettings, UILanguage } from '../../domain/models';
 import { parseCustomKeyBindingsStorageRecord } from '../../domain/customKeyBindings';
@@ -35,10 +34,11 @@ import {
   STORAGE_KEY_SHOW_RECENT_HOSTS,
   STORAGE_KEY_HOST_CLICK_BEHAVIOR,
   STORAGE_KEY_SHOW_SFTP_TAB,
-  STORAGE_KEY_TAB_BAR_POSITION,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
   STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
@@ -92,11 +92,12 @@ interface UseSettingsStorageSyncParams {
   showRecentHosts: boolean;
   hostClickBehavior: HostClickBehavior;
   showOnlyUngroupedHostsInRoot: boolean;
-  tabBarPosition: TabBarPosition;
   showSftpTab: boolean;
   showHostTreeSidebar: boolean;
   terminalSidePanelAutoOpen: boolean;
   terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
+  localShellSidePanelAutoOpen: boolean;
+  localShellSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
   shellOnlyTabNumberShortcuts: boolean;
   showTabNumberBadges: boolean;
   disableTerminalFontZoom: boolean;
@@ -142,11 +143,12 @@ interface UseSettingsStorageSyncParams {
   setShowRecentHostsState: Dispatch<SetStateAction<boolean>>;
   setHostClickBehaviorState: Dispatch<SetStateAction<HostClickBehavior>>;
   setShowOnlyUngroupedHostsInRootState: Dispatch<SetStateAction<boolean>>;
-  setTabBarPositionState: Dispatch<SetStateAction<TabBarPosition>>;
   setShowSftpTabState: Dispatch<SetStateAction<boolean>>;
   setShowHostTreeSidebarState: Dispatch<SetStateAction<boolean>>;
   setTerminalSidePanelAutoOpenState: Dispatch<SetStateAction<boolean>>;
   setTerminalSidePanelAutoOpenTabState: Dispatch<SetStateAction<TerminalSidePanelAutoOpenTab>>;
+  setLocalShellSidePanelAutoOpenState: Dispatch<SetStateAction<boolean>>;
+  setLocalShellSidePanelAutoOpenTabState: Dispatch<SetStateAction<TerminalSidePanelAutoOpenTab>>;
   setShellOnlyTabNumberShortcutsState: Dispatch<SetStateAction<boolean>>;
   setShowTabNumberBadgesState: Dispatch<SetStateAction<boolean>>;
   setDisableTerminalFontZoomState: Dispatch<SetStateAction<boolean>>;
@@ -180,7 +182,7 @@ export function useSettingsStorageSync({
   terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
   sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
   sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-  showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, tabBarPosition, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+  showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, localShellSidePanelAutoOpen, localShellSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
   editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
   globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode, applyIncomingCustomAccent,
@@ -189,7 +191,7 @@ export function useSettingsStorageSync({
   setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize,
   setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
   setSftpUseCompressedUpload, setSftpSkipUnchanged, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-  setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setTabBarPositionState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
+  setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setLocalShellSidePanelAutoOpenState, setLocalShellSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
   setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled, setSshDeepLinkEnabledState, setJmsDeepLinkEnabledState, setExplorerContextMenuEnabledState,
   setGlobalHotkeyEnabled, setWindowOpacity, setAppIconVariant, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
   setSftpTransferConcurrencyState, setSshTransportIdleTtlMsState,
@@ -204,7 +206,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, tabBarPosition, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, localShellSidePanelAutoOpen, localShellSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   });
@@ -214,7 +216,7 @@ export function useSettingsStorageSync({
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, tabBarPosition, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, localShellSidePanelAutoOpen, localShellSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
   };
@@ -435,9 +437,6 @@ export function useSettingsStorageSync({
           setShowOnlyUngroupedHostsInRootState(newValue);
         }
       }
-      if (e.key === STORAGE_KEY_TAB_BAR_POSITION) {
-        setTabBarPositionState(normalizeTabBarPosition(e.newValue));
-      }
       if (e.key === STORAGE_KEY_SHOW_SFTP_TAB && e.newValue !== null) {
         const newValue = e.newValue === 'true';
         if (newValue !== s.showSftpTab) {
@@ -461,6 +460,17 @@ export function useSettingsStorageSync({
           setTerminalSidePanelAutoOpenTabState(e.newValue);
         }
       }
+      if (e.key === STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN && e.newValue !== null) {
+        const newValue = e.newValue === 'true';
+        if (newValue !== s.localShellSidePanelAutoOpen) {
+          setLocalShellSidePanelAutoOpenState(newValue);
+        }
+      }
+      if (e.key === STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB && e.newValue !== null) {
+        if (isTerminalSidePanelAutoOpenTab(e.newValue) && e.newValue !== s.localShellSidePanelAutoOpenTab) {
+          setLocalShellSidePanelAutoOpenTabState(e.newValue);
+        }
+      }
       if (e.key === STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS && e.newValue !== null) {
         const newValue = e.newValue === 'true';
         if (newValue !== s.shellOnlyTabNumberShortcuts) {
@@ -581,8 +591,10 @@ export function useSettingsStorageSync({
     setShowHostTreeSidebarState,
     setTerminalSidePanelAutoOpenState,
     setTerminalSidePanelAutoOpenTabState,
+    setLocalShellSidePanelAutoOpenState,
+    setLocalShellSidePanelAutoOpenTabState,
     setShowRecentHostsState,
-    setTabBarPositionState, setShowSftpTabState,
+    setShowSftpTabState,
     setShellOnlyTabNumberShortcutsState,
     setShowTabNumberBadgesState,
     setDisableTerminalFontZoomState,

application/state/sftp/dedicatedTransferResume.test.ts

@@ -41,8 +41,12 @@ const host = (id: string, label: string, hostname = label): Host => ({
 
 for (const retainedStatus of [undefined, "interrupted", "failed", "paused"] as const) {
 for (const newerPause of retainedStatus === "paused" ? [false, true] : [false]) {
+for (const ownerChange of retainedStatus === "interrupted" || retainedStatus === undefined ? ["same", "active", "completed"] : ["same"]) {
+for (const completedBeforeReplacement of ownerChange === "active" ? [false, true] : [false]) {
+for (const flushBeforeReply of ownerChange === "same" || retainedStatus === undefined ? [false] : [false, true]) {
+for (const replyRejects of ownerChange !== "same" && !completedBeforeReplacement && !flushBeforeReply ? [false, true] : [false]) {
 const batchExistingIdentity = retainedStatus !== undefined;
-test(`superseded folder child settles when its completion was compacted into the parent: retained=${retainedStatus ?? "none"}, newerPause=${newerPause}`, async (t) => {
+test(`superseded folder child settles when its completion was compacted into the parent: retained=${retainedStatus ?? "none"}, newerPause=${newerPause}, owner=${ownerChange}, flush=${flushBeforeReply}, priorComplete=${completedBeforeReplacement}, reject=${replyRejects}`, async (t) => {
   const { sftpTransferCenterStore } = await import("../sftpTransferCenterStore");
   const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
   Object.defineProperty(globalThis, "localStorage", {
@@ -75,14 +79,19 @@ test(`superseded folder child settles when its completion was compacted into the
     ...parent, id: "retained-child", parentTaskId: parent.id, isDirectory: false,
     sourcePath: "/local/folder/a.bin", targetPath: "/remote/folder/a.bin",
     totalBytes: 10, sourceLastModified: 1, status: retainedStatus ?? "interrupted",
-    directoryEntryIndex: 0, directoryEntryIdentity: "a".repeat(64),
+    directoryEntryIndex: 0,
+    directoryEntryIdentity: newerPause ? createDirectoryEntryIdentity({
+      sourcePath: "/local/folder/a.bin", targetPath: "/remote/folder/a.bin", size: 10, lastModified: 1,
+    }) : "a".repeat(64),
   };
   const { createDedicatedResumeChildUpdateBatcher } = await import("../../app/dedicatedResumeProgress");
   // Exercise the real large-history batching branch with one relevant retained row.
   const childBatcher = createDedicatedResumeChildUpdateBatcher({
     getTaskCount: () => 4096,
-    hasTask: (id) => id === persisted.id,
-    upsertTasks: (updates) => sftpTransferCenterStore.upsertTasks(updates),
+    hasTask: (id) => id === persisted.id || id.startsWith("flush-peer-"),
+    // Peer rows only drive the real 512-entry flush; keep the relevant store
+    // fixture small so unrelated history maintenance cannot mask ownership.
+    upsertTasks: (updates) => sftpTransferCenterStore.upsertTasks(updates.filter((task) => !task.id.startsWith("flush-peer-"))),
   });
   sftpTransferCenterStore.publishOwner("compacted-owner", [parent, ...(batchExistingIdentity ? [persisted] : [])]);
   (netcattyBridge as { get: () => unknown }).get = () => ({
@@ -106,20 +115,50 @@ test(`superseded folder child settles when its completion was compacted into the
         directoryEntryIndex: options.directoryEntryIndex,
         directoryEntryIdentity: options.directoryEntryIdentity,
       });
-      // A newer same-id owner completes before this older invocation rejoins.
-      sftpTransferCenterStore.ingestBackgroundEvent({
-        type: "completed", transferId: childId, transferred: 10, totalBytes: 10, lifecycleEpoch: 0,
-      });
-      return { superseded: true };
+      if (ownerChange !== "same") {
+        const current = sftpTransferCenterStore.getTask(childId)!;
+        if (completedBeforeReplacement) {
+          sftpTransferCenterStore.ingestBackgroundEvent({
+            type: "completed", transferId: childId, transferred: 10, totalBytes: 10, lifecycleEpoch: 0,
+          });
+        }
+        sftpTransferCenterStore.upsertTasks([{
+          ...current, status: "transferring", directoryEntryIdentity: "e".repeat(64), lifecycleEpoch: 1,
+        }]);
+      }
+      if (ownerChange !== "active") {
+        // A newer same-id owner completes before this older invocation rejoins.
+        sftpTransferCenterStore.ingestBackgroundEvent({
+          type: "completed", transferId: childId, transferred: 10, totalBytes: 10, lifecycleEpoch: ownerChange === "same" ? 0 : 1,
+        });
+      }
+      if (flushBeforeReply) {
+        for (let index = 0; index < 512; index += 1) {
+          childBatcher.push({ ...persisted, id: `flush-peer-${index}`, status: "transferring" });
+        }
+        if (ownerChange === "active") {
+          assert.equal(sftpTransferCenterStore.getTask(childId)?.directoryEntryIdentity, "e".repeat(64),
+            "automatic flush before the displaced reply must preserve the new owner");
+        } else assert.equal(sftpTransferCenterStore.getTask(childId), undefined,
+          "automatic flush must not recreate the compacted new owner");
+      }
+      if (replyRejects) throw new Error("old invocation transport failed");
+      return completedBeforeReplacement ? {} : { superseded: true };
     },
   });
   running = resumeTransferWithDedicatedSession(parent, {
     hosts: [host("h1", "box", "1.2.3.4")], keys: [], identities: [],
   }, undefined, {
     children: batchExistingIdentity ? [persisted] : [], shouldAbort: () => abort,
-    onChildUpdate: (child) => batchExistingIdentity
-      ? childBatcher.push(child)
-      : sftpTransferCenterStore.publishOwner("compacted-owner", [parent, child]),
+    onChildSuperseded: (id) => childBatcher.discard(id),
+    flushChildUpdates: () => childBatcher.flush(),
+    onChildUpdate: (child, observation) => {
+      if (batchExistingIdentity) {
+        childBatcher.push(child, observation);
+        return true;
+      }
+      sftpTransferCenterStore.publishOwner("compacted-owner", [parent, child]);
+    },
   });
   const result = await Promise.race([
     running,
@@ -133,6 +172,15 @@ test(`superseded folder child settles when its completion was compacted into the
   }
   assert.notEqual(result, "still-waiting", "completed compacted child must not leave its folder waiting forever");
   assert.ok(childId);
+  if (ownerChange !== "same") {
+    childBatcher.flush();
+    assert.equal((result as { success: boolean }).success, false, "the displaced walk must not report success");
+    if (ownerChange === "active") {
+      assert.equal(sftpTransferCenterStore.getTask(childId)?.status, "transferring");
+      assert.equal(sftpTransferCenterStore.getTask(childId)?.directoryEntryIdentity, "e".repeat(64));
+    } else assert.equal(sftpTransferCenterStore.getTask(childId), undefined, "old waiter must not recreate a failed row");
+    return;
+  }
   assert.equal(sftpTransferCenterStore.getTask(childId), undefined, "completed row was compacted");
   assert.equal(sftpTransferCenterStore.getTask(parent.id)?.directoryResumeCheckpoint?.completedEntries, 1);
   assert.notEqual(result, "still-waiting", "completed compacted child must not leave its folder waiting forever");
@@ -140,6 +188,10 @@ test(`superseded folder child settles when its completion was compacted into the
 });
 }
 }
+}
+}
+}
+}
 
 test("resolveDirectoryResumeTargetRoot prefers staged replace path", () => {
   assert.equal(
@@ -696,6 +748,67 @@ test("single-file restart resume continues from checkpoint without page callback
   }
 });
 
+test("stat-less SCP download resume keeps saved progress instead of restarting", async (t) => {
+  resetDedicatedSessionOpenGateForTests();
+  const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
+  Object.defineProperty(globalThis, "localStorage", {
+    configurable: true,
+    value: { getItem: () => "2", setItem: () => {}, removeItem: () => {} },
+  });
+  t.after(() => {
+    if (previousLocalStorage) Object.defineProperty(globalThis, "localStorage", previousLocalStorage);
+    else Reflect.deleteProperty(globalThis, "localStorage");
+  });
+  const originalGet = netcattyBridge.get;
+  let startOptions: Record<string, unknown> | undefined;
+  (netcattyBridge as { get: () => unknown }).get = () => ({
+    openSftp: async () => "dedicated-sftp",
+    closeSftp: async () => {},
+    // Stat-less SCP host: size cannot be measured, so the bridge reports the
+    // placeholder 0 with sizeKnown false.
+    statSftp: async () => ({ type: "file", size: 0, lastModified: 5, sizeKnown: false }),
+    startStreamTransfer: async (options: Record<string, unknown>) => {
+      startOptions = options;
+      return { transferId: "scp-download-resume" };
+    },
+  });
+  try {
+    const result = await resumeTransferWithDedicatedSession({
+      id: "scp-download-resume",
+      fileName: "file.bin",
+      sourcePath: "/remote/file.bin",
+      targetPath: "/local/file.bin",
+      sourceConnectionId: "old-sftp",
+      sourceHostId: "h1",
+      sourceHostLabel: "box",
+      targetConnectionId: "local",
+      direction: "download",
+      status: "interrupted",
+      totalBytes: 100,
+      transferredBytes: 20,
+      checkpointBytes: 20,
+      sourceLastModified: 5,
+      speed: 0,
+      startTime: 1,
+      isDirectory: false,
+      reconnectRequired: true,
+    }, {
+      hosts: [host("h1", "box", "1.2.3.4")],
+      keys: [],
+      identities: [],
+    });
+
+    assert.equal(result.success, true, result.error);
+    // Unknown size must not misread the saved checkpoint as a shrunk source;
+    // the download resumes from byte 20 instead of silently restarting.
+    assert.equal(startOptions?.checkpointBytes, 20);
+    assert.equal(startOptions?.totalBytes, 100);
+  } finally {
+    (netcattyBridge as { get: typeof originalGet }).get = originalGet;
+    resetDedicatedSessionOpenGateForTests();
+  }
+});
+
 test("folder restart resume reports file-count progress without child page callbacks", async (t) => {
   resetDedicatedSessionOpenGateForTests();
   const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
@@ -2131,3 +2244,202 @@ for (const scenario of ["deleted-id", "ambiguous-legacy-label"] as const) {
     assert.equal(uploads, 0);
   });
 }
+
+for (const completeDuringSetup of [false, true]) {
+test(`large-history replace recovery retransfers retained completed children into its empty stage: late=${completeDuringSetup}`, async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { createDedicatedResumeChildUpdateBatcher } = await import("../../app/dedicatedResumeProgress");
+  const originalGet = netcattyBridge.get;
+  const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
+  Object.defineProperty(globalThis, "localStorage", {
+    configurable: true, value: { getItem: () => "2", setItem: () => {}, removeItem: () => {} },
+  });
+  const { createRequire } = await import("node:module");
+  const tempDirBridge = createRequire(import.meta.url)("../../../electron/bridges/tempDirBridge.cjs");
+  const root = await fs.promises.mkdtemp(`${tempDirBridge.getTempFilePath("folder-rebuild-test")}-`);
+  const finalPath = path.join(root, "final");
+  const stage = `${finalPath}.netcatty-retained-replace.part`;
+  await fs.promises.mkdir(stage);
+  await fs.promises.writeFile(path.join(stage, "b.txt"), "old contents");
+  const parent: TransferTask = {
+    id: "retained-replace", fileName: "folder", sourcePath: "/remote/folder", targetPath: finalPath,
+    stagedTargetPath: stage, replaceExistingTarget: true, sourceConnectionId: "old-sftp", targetConnectionId: "local",
+    sourceHostId: "h1", direction: "download", status: "transferring", totalBytes: 2,
+    transferredBytes: 1, speed: 0, startTime: 1, isDirectory: true, progressMode: "files", reconnectRequired: true,
+  };
+  const retained: TransferTask = {
+    ...parent, id: "retained-replace-b", parentTaskId: parent.id, isDirectory: false,
+    sourcePath: "/remote/folder/b.txt", targetPath: `${stage}/b.txt`, fileName: "b.txt",
+    status: completeDuringSetup ? "interrupted" : "completed", totalBytes: 10, transferredBytes: 10, checkpointBytes: 10,
+    sourceLastModified: 2, directoryEntryIndex: 1,
+    directoryEntryIdentity: createDirectoryEntryIdentity({
+      sourcePath: "/remote/folder/b.txt", targetPath: `${stage}/b.txt`, size: 10, lastModified: 2,
+    }),
+  };
+  store.upsertTasks([parent, retained]);
+  assert.ok(store.getTask(retained.id), "missing earlier manifest index retains the completed row");
+  const batcher = createDedicatedResumeChildUpdateBatcher({
+    getTaskCount: () => 4096,
+    hasTask: (id) => !!store.getTask(id),
+    upsertTasks: (updates) => store.upsertTasks(updates),
+  });
+  let releaseFirst!: () => void;
+  const secondDispatched = new Promise<void>((resolve) => { releaseFirst = resolve; });
+  t.after(async () => {
+    await fs.promises.rm(root, { recursive: true, force: true });
+    netcattyBridge.get = originalGet;
+    store.patchTask(parent.id, { status: "completed" });
+    store.dismiss(parent.id);
+    if (previousLocalStorage) Object.defineProperty(globalThis, "localStorage", previousLocalStorage);
+    else Reflect.deleteProperty(globalThis, "localStorage");
+    resetDedicatedSessionOpenGateForTests();
+  });
+  (netcattyBridge as { get: () => unknown }).get = () => ({
+    openSftp: async () => "dedicated-sftp", closeSftp: async () => {},
+    listSftp: async (_id: string, remotePath: string) => {
+      if (completeDuringSetup) store.patchTask(retained.id, { status: "completed", ownerId: "dedicated-resume" });
+      return remotePath === parent.sourcePath
+        ? ["a.txt", "b.txt"].map((name) => ({ name, type: "file", size: 10, lastModified: 2 })) : [];
+    },
+    mkdirLocal: async (target: string) => { await fs.promises.mkdir(target, { recursive: true }); },
+    statLocal: async (target: string) => {
+      try {
+        const stat = await fs.promises.stat(target);
+        return { type: stat.isDirectory() ? "directory" : "file", size: stat.size, lastModified: stat.mtimeMs };
+      } catch (error) {
+        if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
+        throw error;
+      }
+    },
+    statSftp: async (_id: string, source: string) => {
+      if (source.endsWith("a.txt")) await secondDispatched;
+      return { type: "file", size: 10, lastModified: 2 };
+    },
+    deleteLocalFile: async (target: string) => { await fs.promises.rm(target, { recursive: true }); },
+    renameLocalFile: async (source: string, target: string) => { await fs.promises.rename(source, target); },
+    startStreamTransfer: async (options: { targetPath: string; checkpointBytes: number }) => {
+      assert.equal(options.checkpointBytes, 0, "an empty replacement stage cannot reuse byte checkpoints");
+      await fs.promises.writeFile(options.targetPath, `new ${path.basename(options.targetPath)}`);
+      return {};
+    },
+  });
+  const result = await resumeTransferWithDedicatedSession(parent, {
+    hosts: [host("h1", "box")], keys: [], identities: [],
+  }, undefined, {
+    children: [retained],
+    flushChildUpdates: () => batcher.flush(),
+    onChildUpdate: (task, observation) => {
+      batcher.push(task, observation);
+      if (task.id === retained.id && task.status === "completed") releaseFirst();
+      return true;
+    },
+    onDirectoryCheckpointUpdate: (value) => store.patchTask(parent.id, { directoryResumeCheckpoint: value }),
+  });
+  batcher.flush();
+  assert.equal(result.success, true, result.error);
+  assert.deepEqual((await fs.promises.readdir(finalPath)).sort(), ["a.txt", "b.txt"],
+    "published replacement must include the previously completed file");
+  assert.equal(await fs.promises.readFile(path.join(finalPath, "b.txt"), "utf8"), "new b.txt");
+});
+}
+
+for (const boundary of ["before-admission", "source-missing", "source-modified", "after-completion", "after-commit"] as const) {
+  test(`dedicated recovery preserves replacement ownership ${boundary}`, async (t) => {
+    const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+    const { createDedicatedResumeChildUpdateBatcher } = await import("../../app/dedicatedResumeProgress");
+    const originalGet = netcattyBridge.get;
+    const originalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
+    Object.defineProperty(globalThis, "localStorage", { configurable: true, value: {
+      getItem: () => "2", setItem: () => {}, removeItem: () => {},
+    } });
+    const parent: TransferTask = {
+      id: `ownership-${boundary}`, fileName: "folder", sourcePath: "/local/folder", targetPath: "/remote/folder",
+      sourceConnectionId: "local", targetConnectionId: "old", targetHostId: "h1", direction: "upload",
+      status: "transferring", totalBytes: 2, transferredBytes: 0, speed: 0, startTime: 1,
+      isDirectory: true, progressMode: "files", reconnectRequired: true,
+    };
+    const child: TransferTask = {
+      ...parent, id: `${parent.id}-a`, parentTaskId: parent.id, isDirectory: false,
+      sourcePath: "/local/folder/a", targetPath: "/remote/folder/a", fileName: "a", totalBytes: 1,
+      status: "interrupted", directoryEntryIndex: 0, directoryEntryIdentity: "a".repeat(64), sourceLastModified: 1,
+    };
+    store.upsertTasks([parent, boundary === "before-admission"
+      ? { ...child, status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }
+      : child]);
+    const batch = createDedicatedResumeChildUpdateBatcher({
+      getTaskCount: () => 4096, hasTask: (id) => id === child.id || id.startsWith("peer-"),
+      upsertTasks: (rows) => store.upsertTasks(rows.filter((row) => !row.id.startsWith("peer-"))),
+    });
+    if (boundary === "before-admission") {
+      for (let n = 0; n < 511; n++) batch.push({ ...child, id: `peer-${n}` });
+    }
+    let releaseB!: () => void;
+    const bGate = new Promise<void>((resolve) => { releaseB = resolve; });
+    let timedOut = false;
+    const watchdog = setTimeout(() => { timedOut = true; releaseB(); }, 1000);
+    t.after(() => {
+      clearTimeout(watchdog);
+      releaseB();
+      batch.flush();
+      store.patchTask(parent.id, { status: "completed" });
+      store.dismiss(parent.id);
+      netcattyBridge.get = originalGet;
+      if (originalStorage) Object.defineProperty(globalThis, "localStorage", originalStorage);
+      else Reflect.deleteProperty(globalThis, "localStorage");
+      resetDedicatedSessionOpenGateForTests();
+    });
+    let starts = 0;
+    let displaced = 0;
+    let replaced = false;
+    (netcattyBridge as { get: () => unknown }).get = () => ({
+      openSftp: async () => "dedicated", closeSftp: async () => {
+        if (boundary === "after-commit") {
+          assert.equal(store.getTask(child.id), undefined, "completion must be committed before async cleanup");
+          store.upsertTasks([{ ...child, status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+        }
+      },
+      listLocalTree: async () => (boundary === "after-completion" ? ["a", "b"] : ["a"]).map((name) => ({
+        localPath: `/local/folder/${name}`, relativePath: name, type: "file", size: 1, lastModified: 1,
+      })),
+      mkdirSftp: async () => {}, statLocal: async () => {
+        if (boundary === "source-missing" || boundary === "source-modified") {
+          store.upsertTasks([{ ...child, status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+          if (boundary === "source-missing") return null;
+          return { type: "file", size: 1, lastModified: 2 };
+        }
+        return { type: "file", size: 1, lastModified: 1 };
+      },
+      startStreamTransfer: async (options: { sourcePath: string }) => {
+        starts++;
+        if (options.sourcePath.endsWith("/b")) await bGate;
+        return {};
+      },
+    });
+    const result = await resumeTransferWithDedicatedSession(parent, {
+      hosts: [host("h1", "box")], keys: [], identities: [],
+    }, undefined, {
+      children: [child],
+      onChildSuperseded: (id) => { displaced++; batch.discard(id); },
+      flushChildUpdates: () => batch.flush(),
+      onChildUpdate: (task, observation) => {
+        batch.push(task, observation);
+        if (boundary === "after-completion" && task.id === child.id && task.status === "completed" && !replaced) {
+          replaced = true;
+          queueMicrotask(() => {
+            try {
+              store.upsertTasks([{ ...task, status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+            } finally { releaseB(); }
+          });
+        }
+        return true;
+      },
+    });
+    batch.flush();
+    assert.equal(timedOut, false);
+    assert.equal(result.success, boundary === "after-commit", "only a committed success may precede a legitimate replacement");
+    assert.equal(store.getTask(child.id)?.directoryEntryIdentity, "b".repeat(64));
+    assert.equal(store.getTask(child.id)?.status, "transferring");
+    if (boundary !== "after-completion" && boundary !== "after-commit") assert.equal(starts, 0, "source validation and a full batch must not bypass ownership");
+    else assert.equal(displaced, boundary === "after-commit" ? 0 : 1);
+  });
+}

application/state/sftp/dedicatedTransferResume.ts

@@ -1,4 +1,4 @@
-import { runTransferAndWaitForOwner } from "./waitForTransferOwner";
+import { runTransferAndWaitForOwner, TransferOwnerChangedError, type TransferOwnerObservation } from "./waitForTransferOwner";
 import type { Host, Identity, KnownHost, SSHKey, TerminalSettings, TransferTask } from "../../../domain/models";
 import { validateTransferResumeSource } from "../../../domain/sftpTransferCenter";
 import { STORAGE_KEY_SFTP_TRANSFER_CONCURRENCY } from "../../../infrastructure/config/storageKeys";
@@ -62,7 +62,10 @@ export type DedicatedResumeResult = {
 
 export type DedicatedResumeOptions = {
   children?: readonly TransferTask[];
-  onChildUpdate?: (child: TransferTask) => void;
+  /** Return true only when the consumer takes responsibility for disposing the observation. */
+  onChildUpdate?: (child: TransferTask, observation?: TransferOwnerObservation) => unknown;
+  onChildSuperseded?: (taskId: string) => void;
+  flushChildUpdates?: () => void;
   onDirectoryCheckpointUpdate?: (checkpoint: TransferTask["directoryResumeCheckpoint"]) => void;
   shouldAbort?: () => boolean;
 };
@@ -671,6 +674,7 @@ async function resumeSingleFileWithDedicatedSession(
             const validationError = validateTransferResumeSource(task, {
               size: sourceStat.size,
               lastModified: sourceStat.lastModified,
+              sizeKnown: sourceStat.sizeKnown,
             }, { allowSourceGrowth });
             const classified = classifyResumeSourceValidationError(validationError);
             if (classified.kind === "modified") {
@@ -1090,6 +1094,12 @@ async function resumeDirectoryWithDedicatedSession(
           // the source since the interrupted attempt, so rebuild it from empty.
           await resetDirectoryReplaceStage(parent, endpoints, targetSftpId);
         }
+        // Session setup and traversal may finish more children. Capture only
+        // after resetting the stage/checkpoint: all these completions refer to
+        // the discarded destination, while later completions remain valid.
+        const completedAtRestart = new Map(sftpTransferCenterStore.getSnapshot().tasks
+          .filter((child) => child.parentTaskId === parent.id && child.status === "completed")
+          .map((child) => [child.id, child]));
         const destRoot = resolveDirectoryResumeTargetRoot(parent);
         if (endpoints.isDownload) await ensureLocalDir(destRoot);
         if (targetSftpId) await ensureRemoteDir(targetSftpId, destRoot);
@@ -1188,8 +1198,25 @@ async function resumeDirectoryWithDedicatedSession(
             }
             if (targetSftpId) await ensureRemoteDir(targetSftpId, getParentPath(file.targetPath));
 
+            let countedCompleted = false;
+            const onOwnerChanged = () => {
+              if (countedCompleted) {
+                countedCompleted = false;
+                completedCount -= 1;
+                failedCount += 1;
+              }
+              options?.onChildSuperseded?.(childId);
+            };
+            let childObservation: TransferOwnerObservation | undefined = sftpTransferCenterStore.observeTaskSettlement(
+              childBase, resetPersistedCheckpoint ? completedAtRestart.get(childId) : undefined, onOwnerChanged,
+            );
+            const publishChild = (child: TransferTask) => {
+              if (childObservation?.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed before child update");
+              if (options?.onChildUpdate?.(child, childObservation) === true) childObservation = undefined;
+            };
             try {
               if (options?.shouldAbort?.()) throw new Error("Transfer cancelled");
+              if (childObservation.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed before source validation");
 
               const sourceType = endpoints.isUpload ? "local" as const : "sftp" as const;
               const targetType = endpoints.isDownload ? "local" as const : "sftp" as const;
@@ -1206,6 +1233,7 @@ async function resumeDirectoryWithDedicatedSession(
               const validationError = validateTransferResumeSource(childBase, {
                 size: sourceStat.size,
                 lastModified: sourceStat.lastModified,
+                sizeKnown: sourceStat.sizeKnown,
               }, { allowSourceGrowth });
               const classified = classifyResumeSourceValidationError(validationError);
               if (classified.kind === "restart") {
@@ -1217,8 +1245,7 @@ async function resumeDirectoryWithDedicatedSession(
                   sourceLastModified: sourceStat.lastModified,
                 };
               } else if (classified.kind === "modified") {
-                attentionCount += 1;
-                options?.onChildUpdate?.({
+                publishChild({
                   ...childBase,
                   status: "attention",
                   error: classified.message || validationError || "Source was modified",
@@ -1227,6 +1254,7 @@ async function resumeDirectoryWithDedicatedSession(
                   phase: undefined,
                   retryable: true,
                 });
+                attentionCount += 1;
                 return;
               } else if (classified.kind === "fatal") {
                 throw new Error(classified.message || validationError || "Resume validation failed");
@@ -1236,56 +1264,71 @@ async function resumeDirectoryWithDedicatedSession(
                 // zero-byte plans (`||` would incorrectly promote to grown size).
                 const plannedBytes = Number(childBase.totalBytes);
                 const hasPlannedBytes = Number.isFinite(plannedBytes) && plannedBytes >= 0;
+                // Stat-less SCP sources report size as a placeholder 0; keep the
+                // planned size rather than re-planning to a fake zero.
+                const sourceSizeKnown = sourceStat.sizeKnown !== false && Number.isFinite(sourceStat.size);
                 childBase = {
                   ...childBase,
-                  totalBytes: allowSourceGrowth
-                    ? (hasPlannedBytes ? plannedBytes : sourceStat.size)
-                    : (sourceStat.size || childBase.totalBytes),
-                  sourceLastModified: allowSourceGrowth
-                    && hasPlannedBytes
-                    && sourceStat.size > plannedBytes
-                    ? (childBase.sourceLastModified ?? sourceStat.lastModified)
-                    : (sourceStat.lastModified ?? childBase.sourceLastModified),
+                  totalBytes: !sourceSizeKnown
+                    ? childBase.totalBytes
+                    : allowSourceGrowth
+                      ? (hasPlannedBytes ? plannedBytes : sourceStat.size)
+                      : (sourceStat.size || childBase.totalBytes),
+                  sourceLastModified: !sourceSizeKnown
+                    ? (sourceStat.lastModified ?? childBase.sourceLastModified)
+                    : allowSourceGrowth
+                      && hasPlannedBytes
+                      && sourceStat.size > plannedBytes
+                      ? (childBase.sourceLastModified ?? sourceStat.lastModified)
+                      : (sourceStat.lastModified ?? childBase.sourceLastModified),
                 };
               }
 
               // Re-check abort after async stat before inserting a transferring child.
               if (options?.shouldAbort?.()) throw new Error("Transfer cancelled");
-              options?.onChildUpdate?.(childBase);
+              const streamResult = await runTransferAndWaitForOwner(childBase, () => {
+                // Publish only after admission, while identity changes are observed.
+                options?.onChildUpdate?.(childBase);
+                return bridge.startStreamTransfer!({
+                  transferId: childId,
+                  // Lifecycle events must carry the current identity even while
+                  // large-history renderer child updates remain batched.
+                  parentTaskId: childBase.parentTaskId,
+                  directoryEntryIndex: childBase.directoryEntryIndex,
+                  directoryEntryIdentity: childBase.directoryEntryIdentity,
+                  sourcePath: file.sourcePath,
+                  targetPath: file.targetPath,
+                  sourceType,
+                  targetType,
+                  sourceSftpId,
+                  targetSftpId,
+                  sourceHostId: endpoints.sourceHost?.id,
+                  targetHostId: endpoints.targetHost?.id,
+                  totalBytes: Number.isFinite(childBase.totalBytes)
+                    ? childBase.totalBytes
+                    : (file.size || undefined),
+                  resumable: parent.resumable !== false,
+                  checkpointBytes: childBase.checkpointBytes ?? 0,
+                  resumeStage: childBase.resumeStage,
+                  downloadCheckpointBytes: childBase.downloadCheckpointBytes,
+                  uploadCheckpointBytes: childBase.uploadCheckpointBytes,
+                  sourceFingerprint: childBase.sourceFingerprint,
+                  skipAdmission: true,
+                });
+              }, () => options?.shouldAbort?.() === true, pausedAtResume.get(childId),
+                resetPersistedCheckpoint ? completedAtRestart.get(childId) : undefined,
+                // Drop queued UI updates at the ownership change itself: waiting
+                // for this invocation's reply may allow an intervening batch flush.
+                onOwnerChanged,
+                (observation) => { childObservation = observation; return true; }, childObservation);
 
-              const streamResult = await runTransferAndWaitForOwner(childBase, () => bridge.startStreamTransfer!({
-                transferId: childId,
-                // Lifecycle events must carry the current identity even while
-                // large-history renderer child updates remain batched.
-                parentTaskId: childBase.parentTaskId,
-                directoryEntryIndex: childBase.directoryEntryIndex,
-                directoryEntryIdentity: childBase.directoryEntryIdentity,
-                sourcePath: file.sourcePath,
-                targetPath: file.targetPath,
-                sourceType,
-                targetType,
-                sourceSftpId,
-                targetSftpId,
-                sourceHostId: endpoints.sourceHost?.id,
-                targetHostId: endpoints.targetHost?.id,
-                totalBytes: Number.isFinite(childBase.totalBytes)
-                  ? childBase.totalBytes
-                  : (file.size || undefined),
-                resumable: parent.resumable !== false,
-                checkpointBytes: childBase.checkpointBytes ?? 0,
-                resumeStage: childBase.resumeStage,
-                downloadCheckpointBytes: childBase.downloadCheckpointBytes,
-                uploadCheckpointBytes: childBase.uploadCheckpointBytes,
-                sourceFingerprint: childBase.sourceFingerprint,
-                skipAdmission: true,
-              }), () => options?.shouldAbort?.() === true, pausedAtResume.get(childId));
+              if (childObservation?.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed before child update");
 
               if (streamResult?.error || streamResult?.cancelled) {
                 throw new Error(streamResult.error || "Transfer cancelled");
               }
 
-              completedCount += 1;
-              options?.onChildUpdate?.({
+              publishChild({
                 ...childBase,
                 status: "completed",
                 transferredBytes: Number.isFinite(childBase.totalBytes)
@@ -1297,13 +1340,21 @@ async function resumeDirectoryWithDedicatedSession(
                 reconnectRequired: false,
                 phase: undefined,
               });
+              countedCompleted = true;
+              completedCount += 1;
               bumpParentProgress(0);
             } catch (error) {
               if (options?.shouldAbort?.() || /cancelled|canceled/i.test(error instanceof Error ? error.message : String(error))) {
                 throw error instanceof Error ? error : new Error(String(error));
               }
               failedCount += 1;
-              options?.onChildUpdate?.({
+              // Another invocation owns this ID now. Report this walk's failure
+              // without replacing the winner or recreating its compacted row.
+              if (error instanceof TransferOwnerChangedError || childObservation?.hasIdentityConflict()) {
+                options?.onChildSuperseded?.(childId);
+                return;
+              }
+              publishChild({
                 ...childBase,
                 status: "failed",
                 error: error instanceof Error ? error.message : String(error),
@@ -1312,6 +1363,8 @@ async function resumeDirectoryWithDedicatedSession(
                 reconnectRequired: false,
                 phase: undefined,
               });
+            } finally {
+              childObservation?.dispose();
             }
           },
         );
@@ -1322,6 +1375,10 @@ async function resumeDirectoryWithDedicatedSession(
 
     if (result?.error) throw new Error(result.error);
 
+    // Commit deferred child outcomes before deciding success or promoting a stage.
+    // Async connection cleanup must not outlive provisional completion evidence.
+    options?.flushChildUpdates?.();
+
     if (attentionCount > 0 && failedCount === 0 && completedCount + attentionCount >= totalFiles) {
       return {
         success: false,

application/state/sftp/downloadSourceSnapshot.test.ts

@@ -0,0 +1,108 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { resolveDownloadSourceSnapshot } from "./downloadSourceSnapshot.ts";
+
+const stat = (overrides: Partial<SftpStatResult> = {}): SftpStatResult => ({
+  name: "f",
+  size: 50_000,
+  type: "file",
+  lastModified: 0,
+  sizeKnown: true,
+  ...overrides,
+});
+
+for (const listedSize of [25_000, 100_000]) {
+  test(`recreated file uses the current 50k size rather than listed ${listedSize}`, async () => {
+    const snapshot = await resolveDownloadSourceSnapshot(
+      async (_id, path, encoding) => {
+        assert.equal(path, "/tmp/f");
+        assert.equal(encoding, "auto");
+        return stat();
+      },
+      "sftp-1", "/tmp/f", "auto",
+    );
+    assert.deepEqual(snapshot, { size: 50_000, isDirectory: false });
+    assert.notEqual(snapshot.size, listedSize);
+  });
+}
+
+test("a stale file entry replaced by a directory uses directory routing", async () => {
+  const snapshot = await resolveDownloadSourceSnapshot(
+    async () => stat({ size: 0, type: "directory" }),
+    "sftp-1", "/tmp/x", "auto",
+  );
+  assert.deepEqual(snapshot, { size: 0, isDirectory: true });
+});
+
+test("a stale directory entry replaced by a file uses file routing", async () => {
+  const snapshot = await resolveDownloadSourceSnapshot(
+    async () => stat({ size: 12, type: "file" }),
+    "sftp-1", "/tmp/x", "auto",
+  );
+  assert.deepEqual(snapshot, { size: 12, isDirectory: false });
+});
+
+test("missing, failed and unsupported stats reject instead of using a stale listing", async () => {
+  const rejected = [
+    undefined,
+    async () => null as unknown as SftpStatResult,
+    async () => { throw new Error("File not found"); },
+    async () => stat({ type: "symlink" }),
+    async () => stat({ size: Number.NaN }),
+    async () => stat({ size: -1 }),
+  ];
+  for (const candidate of rejected) {
+    await assert.rejects(
+      resolveDownloadSourceSnapshot(candidate, "sftp-1", "/tmp/f", "auto"),
+      /Cannot verify the current remote source before download/,
+    );
+  }
+});
+
+test("stat-less SCP file leaves sizing to the transfer instead of using listed bytes", async () => {
+  const snapshot = await resolveDownloadSourceSnapshot(
+    async () => stat({ size: 0, sizeKnown: false }),
+    "scp-1", "/tmp/f", "auto",
+  );
+  assert.deepEqual(snapshot, { size: undefined, isDirectory: false });
+});
+
+test("SCP links retain their resolved file or directory routing without using link size", async () => {
+  for (const target of ["file", "directory"] as const) {
+    const snapshot = await resolveDownloadSourceSnapshot(
+      async () => stat({ type: "symlink", size: 8 }),
+      "scp-1", "/tmp/link", "auto",
+      async (_id, parent, encoding) => {
+        assert.equal(parent, "/tmp");
+        assert.equal(encoding, "auto");
+        return [{ name: "link", type: "symlink", linkTarget: target, size: "8 bytes", lastModified: "" }];
+      },
+    );
+    assert.deepEqual(snapshot, { size: undefined, isDirectory: target === "directory" });
+  }
+});
+
+test("SCP link whose current target cannot be confirmed stops safely", async () => {
+  for (const entries of [
+    [],
+    [{ name: "link", type: "symlink" as const, linkTarget: null, size: "8 bytes", lastModified: "" }],
+    [{ name: "link", type: "file" as const, size: "8 bytes", lastModified: "" }],
+  ]) {
+    await assert.rejects(
+      resolveDownloadSourceSnapshot(
+        async () => stat({ type: "symlink" }),
+        "scp-1", "/tmp/link", "auto", async () => entries,
+      ),
+      /Cannot verify the current remote source before download/,
+    );
+  }
+});
+
+test("directory routing does not require a file byte count", async () => {
+  const snapshot = await resolveDownloadSourceSnapshot(
+    async () => stat({ size: Number.NaN, sizeKnown: false, type: "directory" }),
+    "sftp-1", "/tmp/d", "auto",
+  );
+  assert.deepEqual(snapshot, { size: 0, isDirectory: true });
+});

application/state/sftp/downloadSourceSnapshot.ts

@@ -0,0 +1,67 @@
+import type { SftpFilenameEncoding } from "../../../domain/models/sftp";
+import type { RemoteFile } from "../../../domain/models/workspace";
+import { getFileName, getParentPath } from "./utils";
+
+export type DownloadSourceSnapshot = {
+  /** Unknown for stat-less SCP files and links; the transfer reads its wire size. */
+  size: number | undefined;
+  isDirectory: boolean;
+};
+
+type StatSftp = (
+  sftpId: string,
+  path: string,
+  encoding?: SftpFilenameEncoding,
+) => Promise<SftpStatResult>;
+type ListSftp = (
+  sftpId: string,
+  path: string,
+  encoding?: SftpFilenameEncoding,
+) => Promise<RemoteFile[]>;
+
+const sourceUnavailable = () => new Error("Cannot verify the current remote source before download");
+
+/** A stale listing must never supply the size or type of a new download. */
+export const resolveDownloadSourceSnapshot = async (
+  statSftp: StatSftp | undefined,
+  sftpId: string,
+  sourcePath: string,
+  encoding: SftpFilenameEncoding | undefined,
+  listSftp?: ListSftp,
+): Promise<DownloadSourceSnapshot> => {
+  if (!statSftp) throw sourceUnavailable();
+
+  let stat: SftpStatResult | null;
+  try {
+    stat = await statSftp(sftpId, sourcePath, encoding);
+  } catch (cause) {
+    throw new Error("Cannot verify the current remote source before download", { cause });
+  }
+
+  if (!stat) {
+    throw sourceUnavailable();
+  }
+  if (stat.type === "directory") return { size: 0, isDirectory: true };
+  if (stat.type === "symlink") {
+    // SFTP STAT follows links; legacy SCP describes the link node. Re-list its
+    // parent to resolve the current target kind rather than trusting the pane.
+    if (!listSftp) throw sourceUnavailable();
+    let entries: RemoteFile[];
+    try {
+      entries = await listSftp(sftpId, getParentPath(sourcePath), encoding);
+    } catch (cause) {
+      throw new Error("Cannot verify the current remote source before download", { cause });
+    }
+    const current = entries.find((entry) => entry.name === getFileName(sourcePath));
+    if (current?.type !== "symlink"
+      || (current.linkTarget !== "file" && current.linkTarget !== "directory")) {
+      throw sourceUnavailable();
+    }
+    // The link's own size is never a valid file plan; SCP's wire header is.
+    return { size: undefined, isDirectory: current.linkTarget === "directory" };
+  }
+  if (stat.type !== "file") throw sourceUnavailable();
+  if (stat.sizeKnown === false) return { size: undefined, isDirectory: false };
+  if (!Number.isSafeInteger(stat.size) || stat.size < 0) throw sourceUnavailable();
+  return { size: stat.size, isDirectory: false };
+};

application/state/sftp/localFileDrag.test.ts

@@ -0,0 +1,174 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { netcattyBridge } from '../../../infrastructure/services/netcattyBridge';
+import { JSDOM } from 'jsdom';
+import {
+  startSftpFileDrag, takeLocalFileDragSources, getLocalFileDragSources,
+  clearLocalFileDrag, clearLocalFileDragForPane, localDragPathKey, localFileDragMoveEffect,
+} from './localFileDrag';
+
+function setup(t: test.TestContext) {
+  const dom = new JSDOM('<!doctype html><html><body></body></html>');
+  const previous = Object.getOwnPropertyDescriptor(globalThis, 'window');
+  Object.defineProperty(globalThis, 'window', { value: dom.window, configurable: true });
+  const calls: { requestId: string; paths: string[] }[] = [];
+  const cancels: string[] = [];
+  const errors: string[] = [];
+  const remote: unknown[] = [];
+  const bridge = {
+    startLocalFileDrag: async (payload) => { calls.push(payload); return { started: true }; },
+    cancelLocalFileDrag: (id) => cancels.push(id),
+    getPathForFile: (file) => (file as unknown as { path: string }).path,
+  } as unknown as NetcattyBridge;
+  Object.defineProperty(window, "netcatty", { value: bridge, configurable: true });
+  t.after(() => {
+    clearLocalFileDrag();
+    dom.window.close();
+    if (previous) Object.defineProperty(globalThis, 'window', previous);
+    else Reflect.deleteProperty(globalThis, 'window');
+  });
+  const transfer = (paths: string[] = []) => ({
+    types: ['Files'], files: paths.map((path) => ({ path })),
+    effectAllowed: '', setData: (...args: string[]) => remote.push(args),
+  }) as unknown as DataTransfer;
+  const sources = [
+    { name: 'certificate.txt', sourcePath: '/local', sourceConnectionId: 'local', isDirectory: false },
+    { name: 'folder', sourcePath: '/another path', sourceConnectionId: 'local', isDirectory: true },
+  ];
+  let prevented = 0;
+  const start = (isLocal: boolean | undefined = true, selection = sources) => startSftpFileDrag({
+    event: { dataTransfer: transfer(), preventDefault: () => { prevented++; } },
+    paneId: 'pane', connection: { id: 'local', isLocal }, sources: selection, side: 'left',
+    onRemoteDrag: (...args) => remote.push(args), onError: (error) => errors.push(error),
+  });
+  return { calls, cancels, errors, remote, transfer, sources, start, prevented: () => prevented, dom };
+}
+
+test('local multi-selection retains individual tree paths and never exports plain text', async (t) => {
+  const h = setup(t);
+  h.start();
+  assert.equal(h.prevented(), 1);
+  assert.equal(h.remote.length, 0);
+  assert.deepEqual(h.calls[0].paths, ['/local/certificate.txt', '/another path/folder']);
+  const payload = h.transfer([...h.calls[0].paths].reverse());
+  assert.equal(getLocalFileDragSources(payload)?.length, 2);
+  assert.deepEqual(takeLocalFileDragSources(payload), h.sources.map((source) => ({ ...source, side: 'left' })));
+  assert.equal(takeLocalFileDragSources(payload), null, 'a native gesture is consumed exactly once');
+  assert.equal(getLocalFileDragSources(payload), null);
+});
+
+test('native paths retain symlink-parent segments and match the returning internal drop', (t) => {
+  const h = setup(t);
+  const sources = [{ ...h.sources[0], sourcePath: '/local/link/.././folder' }];
+  h.start(true, sources);
+  assert.deepEqual(h.calls[0].paths, ['/local/link/.././folder/certificate.txt']);
+  const payload = h.transfer(h.calls[0].paths);
+  assert.deepEqual(takeLocalFileDragSources(payload), sources.map(source => ({ ...source, side: 'left' })));
+  assert.equal(takeLocalFileDragSources(payload), null);
+});
+
+test('remote origin preserves HTML payload and callbacks, including absent isLocal', (t) => {
+  const h = setup(t);
+  h.start(false);
+  assert.equal(h.prevented(), 0);
+  assert.equal(h.calls.length, 0);
+  assert.deepEqual(h.remote, [['text/plain', 'certificate.txt\nfolder'], [h.sources, 'left']]);
+  startSftpFileDrag({ event: { dataTransfer: h.transfer(), preventDefault: () => assert.fail('remote drag canceled') },
+    paneId: 'remote', connection: { id: 'remote' }, sources: h.sources, side: 'right',
+    onRemoteDrag: () => {}, onError: assert.fail });
+  assert.equal(h.calls.length, 0);
+});
+
+test('unrelated external files cannot reuse a previous local gesture', (t) => {
+  const h = setup(t);
+  h.start();
+  assert.equal(takeLocalFileDragSources(h.transfer(['/different/certificate.txt'])), null);
+  assert.equal(getLocalFileDragSources(h.transfer()), null);
+  h.start();
+  assert.equal(takeLocalFileDragSources(h.transfer(['/local/certificate.txt'])), null, 'partial selection is not an internal transfer');
+});
+
+test('local failure cancels without text fallback and stale async errors cannot clear a newer gesture', async (t) => {
+  const h = setup(t);
+  let reject!: (error: Error) => void;
+  netcattyBridge.require().startLocalFileDrag = () => new Promise((_resolve, rejectPromise) => { reject = rejectPromise; });
+  h.start();
+  const oldReject = reject;
+  h.start();
+  oldReject(new Error('obsolete'));
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.equal(h.errors.length, 0);
+  assert.ok(getLocalFileDragSources(h.transfer()));
+  reject(new Error('file disappeared'));
+  await new Promise((resolve) => setImmediate(resolve));
+  assert.deepEqual(h.errors, ['file disappeared']);
+  assert.equal(getLocalFileDragSources(h.transfer()), null);
+  assert.equal(h.remote.length, 0);
+});
+
+test('native state is cleared on physical cancellation, external completion, connection disposal and new gestures', async (t) => {
+  const h = setup(t);
+  for (const event of [new h.dom.window.KeyboardEvent('keydown', { key: 'Escape' }),
+    new h.dom.window.MouseEvent('mousemove', { buttons: 0 }), new h.dom.window.MouseEvent('mousedown'),
+    new h.dom.window.Event('blur'), new h.dom.window.Event('pagehide')]) {
+    h.start();
+    await Promise.resolve();
+    window.dispatchEvent(event);
+    assert.equal(getLocalFileDragSources(h.transfer()), null, event.type);
+  }
+  h.start();
+  clearLocalFileDragForPane('another-pane');
+  assert.ok(getLocalFileDragSources(h.transfer()));
+  clearLocalFileDragForPane('pane');
+  assert.equal(getLocalFileDragSources(h.transfer()), null);
+  h.start();
+  h.start(false);
+  assert.equal(getLocalFileDragSources(h.transfer()), null);
+});
+
+test('invalid local selections and missing bridge are rejected; parent entry is excluded', (t) => {
+  const h = setup(t);
+  h.start(true, [{ ...h.sources[0], name: '..' }]);
+  assert.equal(h.calls.length, 0);
+  h.start(true, [{ ...h.sources[0], sourceConnectionId: 'remote' }]);
+  assert.equal(h.calls.length, 0);
+  h.start(true, [h.sources[0], { ...h.sources[0], name: '..' }]);
+  assert.deepEqual(h.calls[0].paths, ['/local/certificate.txt']);
+  netcattyBridge.require().startLocalFileDrag = undefined;
+  h.start();
+  assert.equal(h.errors.length, 3);
+  assert.equal(h.remote.length, 0);
+});
+
+test('path matching preserves POSIX whitespace, Unicode and backslashes, and accepts Windows separators', () => {
+  assert.equal(localDragPathKey('C:\\Users\\david\\certificate.pem'), 'C:/Users/david/certificate.pem');
+  assert.equal(localDragPathKey('\\\\server\\share\\folder'), '//server/share/folder');
+  assert.equal(localDragPathKey('/local/é \\name '), '/local/é \\name ');
+  assert.notEqual(localDragPathKey('/local/A'), localDragPathKey('/local/a'));
+});
+
+
+test('local move accepts the copy-only native transport on Windows/Linux without changing the operation', () => {
+  assert.equal(localFileDragMoveEffect({ effectAllowed: 'copyLink' }), 'copy');
+  assert.equal(localFileDragMoveEffect({ effectAllowed: 'copy' }), 'copy');
+  assert.equal(localFileDragMoveEffect({ effectAllowed: 'all' }), 'move');
+  assert.equal(localFileDragMoveEffect({ effectAllowed: 'copyMove' }), 'move');
+});
+
+test('native drop cleanup survives the browser microtask checkpoint before React receives the drop', async (t) => {
+  const h = setup(t);
+  h.start();
+  window.dispatchEvent(new h.dom.window.Event('drop'));
+  // Unlike dispatchEvent in jsdom, native browser events can drain microtasks
+  // after the window capture callback, before the React root bubble callback.
+  await Promise.resolve();
+  assert.ok(getLocalFileDragSources(h.transfer()), 'capture must not erase native identity before React handles drop');
+  assert.deepEqual(takeLocalFileDragSources(h.transfer(h.calls[0].paths)), h.sources.map(source => ({ ...source, side: 'left' })));
+  await new Promise(resolve => setTimeout(resolve, 5));
+  assert.equal(getLocalFileDragSources(h.transfer()), null);
+
+  h.start();
+  window.dispatchEvent(new h.dom.window.Event('drop'));
+  await new Promise(resolve => setTimeout(resolve, 5));
+  assert.equal(getLocalFileDragSources(h.transfer()), null, 'unhandled drops also release the gesture');
+});

application/state/sftp/localFileDrag.ts

@@ -0,0 +1,177 @@
+import { netcattyBridge } from "../../../infrastructure/services/netcattyBridge";
+import { joinPath } from "./utils";
+
+export interface LocalDragSource {
+  name: string;
+  isDirectory: boolean;
+  sourcePath?: string;
+  sourceConnectionId?: string;
+  targetPath?: string;
+  side: "left" | "right";
+}
+
+interface DragSession {
+  requestId: string;
+  paneId: string;
+  connectionId: string;
+  paths: string[];
+  sources: LocalDragSource[];
+  started?: boolean;
+}
+
+// Windows separators can differ between the SFTP UI and Electron webUtils.
+// POSIX backslashes, whitespace, and case must remain significant.
+export function localDragPathKey(value: string): string {
+  if (/^[A-Za-z]:[\\/]/.test(value) || /^\\\\/.test(value)) {
+    return value.replace(/\\/g, "/").replace(/\/$/, "");
+  }
+  return value.length > 1 ? value.replace(/\/$/, "") : value;
+}
+
+class LocalFileDragState {
+  session: DragSession | null = null;
+
+  clear(requestId?: string) {
+    if (!requestId || this.session?.requestId === requestId) this.session = null;
+  }
+
+  take(paths: string[]): LocalDragSource[] | null {
+    const session = this.session;
+    this.clear();
+    if (!session || paths.length === 0 || paths.some((path) => !path)) return null;
+    const expected = new Set(session.paths.map(localDragPathKey));
+    const actual = new Set(paths.map(localDragPathKey));
+    if (expected.size !== actual.size || [...expected].some((path) => !actual.has(path))) return null;
+    return session.sources;
+  }
+}
+
+const state = new LocalFileDragState();
+let detach: (() => void) | undefined;
+
+export function clearLocalFileDrag(requestId?: string) {
+  if (requestId && state.session?.requestId !== requestId) return;
+  const previous = state.session;
+  state.clear();
+  detach?.();
+  detach = undefined;
+  if (previous) netcattyBridge.get()?.cancelLocalFileDrag?.(previous.requestId);
+}
+
+export function clearLocalFileDragForPane(paneId: string) {
+  if (state.session?.paneId === paneId) clearLocalFileDrag();
+}
+
+function observeGestureEnd() {
+  let dropCleanupTimer: ReturnType<typeof setTimeout> | undefined;
+  // Electron has no cross-platform native-drag completion callback. A canceled
+  // HTML drag's dragend is not a native completion signal. Clear on drop and
+  // on the next physical input/focus transition, including Escape and returning
+  // after a drop outside the window. Never retain state into a new gesture.
+  const clear = () => clearLocalFileDrag();
+  const key = (event: KeyboardEvent) => { if (event.key === "Escape") clear(); };
+  const move = (event: MouseEvent) => { if (state.session?.started && event.buttons === 0) clear(); };
+  const drop = () => {
+    const requestId = state.session?.requestId;
+    // Native event dispatch can run microtasks BETWEEN capture and React's
+    // bubble listener. Use a macrotask so the row/pane can consume the gesture.
+    dropCleanupTimer = setTimeout(() => { if (requestId) clearLocalFileDrag(requestId); }, 0);
+  };
+  // preventDefault() on dragstart produces a synthetic mouseup in Chromium.
+  // It must not cancel the native handoff. Observe later input instead.
+  window.addEventListener("mousedown", clear, true);
+  window.addEventListener("mousemove", move, true);
+  window.addEventListener("keydown", key, true);
+  window.addEventListener("blur", clear);
+  window.addEventListener("pagehide", clear);
+  window.addEventListener("drop", drop, true);
+  detach = () => {
+    if (dropCleanupTimer !== undefined) clearTimeout(dropCleanupTimer);
+    window.removeEventListener("mousedown", clear, true);
+    window.removeEventListener("mousemove", move, true);
+    window.removeEventListener("keydown", key, true);
+    window.removeEventListener("blur", clear);
+    window.removeEventListener("pagehide", clear);
+    window.removeEventListener("drop", drop, true);
+  };
+}
+
+type DragEventLike = Pick<DragEvent, "dataTransfer" | "preventDefault">;
+
+export function startSftpFileDrag({ event, paneId, connection, sources, side, onRemoteDrag, onError }: {
+  event: DragEventLike;
+  paneId: string;
+  connection?: { id: string; isLocal?: boolean } | null;
+  sources: Omit<LocalDragSource, "side">[];
+  side: "left" | "right";
+  onRemoteDrag: (sources: Omit<LocalDragSource, "side">[], side: "left" | "right") => void;
+  onError: (message: string) => void;
+}) {
+  clearLocalFileDrag();
+  if (connection?.isLocal !== true) {
+    event.dataTransfer!.effectAllowed = "copyMove";
+    event.dataTransfer!.setData("text/plain", sources.map((file) => file.name).join("\n"));
+    onRemoteDrag(sources, side);
+    return;
+  }
+  event.preventDefault();
+  const bridge = netcattyBridge.get();
+  if (!bridge?.startLocalFileDrag) {
+    onError("Native file drag is unavailable. Restart Netcatty after updating.");
+    return;
+  }
+  const files = sources.filter((source) => source.name !== "..");
+  if (!files.length || files.some((file) => !file.sourcePath || file.sourceConnectionId !== connection.id)) {
+    onError("The local file selection is no longer available.");
+    return;
+  }
+  const requestId = crypto.randomUUID();
+  const paths = [...new Set(files.map((file) => joinPath(file.sourcePath!, file.name)))];
+  state.session = { requestId, paneId, connectionId: connection.id, paths, sources: files.map((file) => ({ ...file, side })) };
+  observeGestureEnd();
+  // Send during dragstart, without awaiting in the renderer. Do not interpret
+  // the reply as a completed transfer or use it to clear an active gesture.
+  try {
+    void bridge.startLocalFileDrag({ requestId, paths }).then((result) => {
+      if (result.started && state.session?.requestId === requestId) state.session.started = true;
+      if (!result.started && state.session?.requestId === requestId) {
+        clearLocalFileDrag(requestId);
+        if (result.error) onError(result.error);
+      }
+    }).catch((error: unknown) => {
+      if (state.session?.requestId !== requestId) return;
+      clearLocalFileDrag(requestId);
+      onError(error instanceof Error ? error.message : "Unable to drag local files");
+    });
+  } catch (error) {
+    clearLocalFileDrag(requestId);
+    onError(error instanceof Error ? error.message : "Unable to drag local files");
+  }
+}
+
+export function getLocalFileDragSources(dataTransfer: DataTransfer): LocalDragSource[] | null {
+  return dataTransfer.types.includes("Files") ? state.session?.sources ?? null : null;
+}
+
+export function localFileDragMoveEffect(dataTransfer: Pick<DataTransfer, "effectAllowed">): "copy" | "move" {
+  // Electron's Windows/Linux native source advertises COPY | LINK, not MOVE.
+  // Negotiate an allowed transport effect; our existing same-pane callback is
+  // responsible for the actual local move (the OS must not delete originals).
+  return ["all", "copyMove", "linkMove", "move"].includes(dataTransfer.effectAllowed) ? "move" : "copy";
+}
+
+export function takeLocalFileDragSources(dataTransfer: DataTransfer): LocalDragSource[] | null {
+  if (!state.session) return null;
+  const bridge = netcattyBridge.get();
+  const session = state.session;
+  try {
+    return state.take(Array.from(dataTransfer.files).map((file) => bridge?.getPathForFile?.(file) ?? ""));
+  } catch {
+    state.clear();
+    return null;
+  } finally {
+    detach?.();
+    detach = undefined;
+    bridge?.cancelLocalFileDrag?.(session.requestId);
+  }
+}

application/state/sftp/transferDirectoryOps.discovery.test.tsx

@@ -334,7 +334,8 @@ test("live directory download rejects a Windows backslash traversal entry", asyn
   }
 });
 
-test("live folder settles a superseded child whose completed row was compacted", async () => {
+for (const ownerChange of ["same", "changed-active", "changed-completed"] as const) {
+test(`live folder settles superseded ownership without clobbering its replacement: ${ownerChange}`, async () => {
   const { sftpTransferCenterStore } = await import("../sftpTransferCenterStore");
   const previousWindow = (globalThis as { window?: unknown }).window;
   const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, "localStorage");
@@ -355,10 +356,18 @@ test("live folder settles a superseded child whose completed row was compacted",
     startStreamTransfer: async (options: { transferId: string }) => {
       childId = options.transferId;
       sftpTransferCenterStore.publishOwner("live-compacted-owner", tasks);
-      // The winning invocation has already completed; history compaction drops its row.
-      sftpTransferCenterStore.ingestBackgroundEvent({
-        type: "completed", transferId: childId, transferred: 1, totalBytes: 1, lifecycleEpoch: 0,
-      });
+      if (ownerChange !== "same") {
+        const current = sftpTransferCenterStore.getTask(childId)!;
+        sftpTransferCenterStore.admitTaskRun({ ...current, directoryEntryIdentity: "b".repeat(64) });
+      }
+      if (ownerChange !== "changed-active") {
+        // The winning invocation completed; history compaction drops its row.
+        sftpTransferCenterStore.ingestBackgroundEvent({
+          type: "completed", transferId: childId, transferred: 1, totalBytes: 1, lifecycleEpoch: 0,
+        });
+      }
+      tasks = [...sftpTransferCenterStore.getSnapshot().tasks];
+      transfersRef.current = tasks;
       return { superseded: true };
     },
   } };
@@ -387,10 +396,15 @@ test("live folder settles a superseded child whose completed row was compacted",
       new Promise<"still-waiting">((resolve) => setTimeout(() => resolve("still-waiting"), 450)),
     ]);
     assert.ok(childId);
-    assert.equal(sftpTransferCenterStore.getTask(childId), undefined);
-    assert.equal(sftpTransferCenterStore.getTask(root.id)?.directoryResumeCheckpoint?.completedEntries, 1);
+    if (ownerChange === "changed-active") {
+      assert.equal(tasks.find((task) => task.id === childId)?.status, "transferring");
+      assert.equal(tasks.find((task) => task.id === childId)?.directoryEntryIdentity, "b".repeat(64));
+    } else {
+      assert.equal(tasks.find((task) => task.id === childId), undefined, "old waiter must not reinsert a compacted child");
+      assert.equal(sftpTransferCenterStore.getTask(root.id)?.directoryResumeCheckpoint?.completedEntries, 1);
+    }
     assert.notEqual(result, "still-waiting", "compacted completion must settle the live folder");
-    assert.equal(result, 0);
+    assert.equal(result, ownerChange === "same" ? 0 : 1);
   } finally {
     cancelledTasksRef.current.add(root.id);
     await running?.catch(() => {});
@@ -404,3 +418,4 @@ test("live folder settles a superseded child whose completed row was compacted",
   }
 });
 
+}

application/state/sftp/transferDirectoryOps.ts

@@ -1,5 +1,5 @@
 import { reconcileSupersededControls } from "./globalSftpTransferControl";
-import { runTransferAndWaitForOwner } from "./waitForTransferOwner";
+import { runTransferAndWaitForOwner, TransferOwnerChangedError } from "./waitForTransferOwner";
 import { useCallback, type Dispatch, type MutableRefObject, type SetStateAction } from "react";
 import type { Host, SftpFileEntry, SftpFilenameEncoding, TransferStatus, TransferTask } from "../../../domain/models";
 import {
@@ -118,6 +118,10 @@ async function tryStatTransferPath(
     if (!sftpId) return null;
     const stat = await netcattyBridge.get()?.statSftp?.(sftpId, filePath, encoding);
     if (!stat || stat.type === "directory") return null;
+    // Stat-less SCP endpoints report size as a placeholder 0 (sizeKnown false).
+    // Treat that as missing metadata so skip-unchanged is disabled rather than
+    // comparing a fake zero against the other endpoint (Codex P1).
+    if (stat.sizeKnown === false) return null;
     return { size: Number(stat.size) || 0, lastModified: Number(stat.lastModified) || 0, type: stat.type };
   } catch {
     return null;
@@ -978,6 +982,10 @@ export function useSftpDirectoryTransferOps({
               errors.push(err instanceof Error ? err : new Error(message));
               return;
             }
+            if (err instanceof TransferOwnerChangedError) {
+              errors.push(err);
+              return;
+            }
             // Mark child as failed
             setTransfers((prev) =>
               prev.map((t) =>

application/state/sftp/transferSettlementObservation.test.ts

@@ -169,3 +169,284 @@ test("fresh directory recovery authorizes only an unchanged retained pause under
   store.patchTask("root", { status: "paused", lifecycleEpoch: 6 });
   assert.equal(store.admitTaskRun(task, currentPause), "paused", "parent pause still wins");
 });
+
+for (const compactNewOwner of [false, true]) {
+  test(`superseded waiter rejects a changed identity even after new owner compaction: ${compactNewOwner}`, async (t) => {
+    const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+    const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+    const task = { ...child(), id: `changed-owner-${compactNewOwner}`, parentTaskId: `changed-root-${compactNewOwner}` };
+    store.upsertTasks([{ ...task, id: task.parentTaskId, parentTaskId: undefined, isDirectory: true }, task]);
+    let abort = false;
+    const running = runTransferAndWaitForOwner(task, async () => {
+      const changed = { ...task, directoryEntryIdentity: "b".repeat(64) };
+      assert.equal(store.admitTaskRun(changed), "ready");
+      if (compactNewOwner) {
+        store.patchTask(changed.id, { status: "completed" });
+        assert.equal(store.getTask(changed.id), undefined);
+      }
+      return { superseded: true };
+    }, () => abort);
+    const settled = running.then(() => "completed", (error: Error) => error.message);
+    t.after(async () => {
+      abort = true;
+      await settled;
+      store.patchTask(task.parentTaskId, { status: "completed" });
+      store.dismiss(task.parentTaskId);
+    });
+    assert.match(String(await Promise.race([
+      settled, new Promise((resolve) => setTimeout(() => resolve("still-waiting"), 450)),
+    ])), /identity changed/i);
+  });
+}
+
+test("destination rebuild restarts only the captured completion and preserves newer controls", async (t) => {
+  const { latchTransferPause, resetTransferPauseLatchesForTests } = await import("./transferPauseLatch");
+  const store = createSftpTransferCenterStore();
+  const task = { ...child(), parentTaskId: undefined, status: "completed" as const, checkpointBytes: 10 };
+  store.upsertTasks([task]);
+  const captured = store.getTask(task.id)!;
+  const restart = { ...task, status: "transferring" as const, checkpointBytes: 0, transferredBytes: 0 };
+  latchTransferPause(task.id);
+  t.after(resetTransferPauseLatchesForTests);
+  assert.equal(store.admitTaskRun(restart, undefined, captured), "paused");
+  resetTransferPauseLatchesForTests();
+  assert.equal(store.admitTaskRun(restart, undefined, captured), "ready");
+  assert.equal(store.getTask(task.id)?.checkpointBytes, 0);
+  store.patchTask(task.id, { status: "completed" });
+  assert.equal(store.admitTaskRun(restart, undefined, captured), "completed", "new completion must not be restarted");
+  store.patchTask(task.id, { status: "cancelled" });
+  assert.equal(store.admitTaskRun(restart, undefined, captured), "cancelled");
+});
+
+test("destination rebuild waiting on pause reuses a newer compacted completion", async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const { latchTransferPause, resetTransferPauseLatchesForTests } = await import("./transferPauseLatch");
+  const task = { ...child(), id: "restart-wait-child", parentTaskId: "restart-wait-root", directoryEntryIndex: 1 };
+  const root = { ...task, id: task.parentTaskId, parentTaskId: undefined, isDirectory: true };
+  store.upsertTasks([root, { ...task, status: "completed" }]);
+  const captured = store.getTask(task.id)!;
+  latchTransferPause(task.id);
+  let starts = 0;
+  let abort = false;
+  const running = runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => abort, undefined, captured);
+  const settled = running.then(() => "completed", (error: Error) => error.message);
+  t.after(async () => {
+    abort = true;
+    resetTransferPauseLatchesForTests();
+    await settled;
+    store.patchTask(root.id, { status: "completed" });
+    store.dismiss(root.id);
+  });
+  // An unrelated lifecycle emit must not pin the old completion in the observation.
+  store.patchTask(root.id, { reconnectRequired: true });
+  assert.equal(await Promise.race([
+    settled, new Promise((resolve) => setTimeout(() => resolve("still-waiting"), 230)),
+  ]), "still-waiting", "old completion cannot finish recovery while a new transfer is still needed");
+  assert.equal(starts, 0);
+  resetTransferPauseLatchesForTests();
+  store.patchTask(task.id, { status: "transferring", lifecycleEpoch: 1 });
+  store.upsertTasks([{ ...task, id: "restart-wait-first", directoryEntryIndex: 0, status: "completed" }]);
+  store.patchTask(task.id, { status: "completed", lifecycleEpoch: 2 });
+  assert.equal(store.getTask(task.id), undefined);
+  assert.equal(await settled, "completed");
+  assert.equal(starts, 0, "new completion after stage rebuild must be reused even when its row was compacted");
+});
+
+test("paused admission cannot reclaim an identity replaced while it waited", async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const task = { ...child(), id: "paused-displaced", parentTaskId: undefined };
+  store.upsertTasks([{ ...task, status: "paused" }]);
+  let starts = 0;
+  let abort = false;
+  const running = runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => abort);
+  const settled = running.then(() => "completed", (error: Error) => error.message);
+  t.after(async () => {
+    abort = true;
+    await settled;
+    store.patchTask(task.id, { status: "completed" });
+    store.dismiss(task.id);
+  });
+  store.upsertTasks([{ ...task, status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+  assert.match(await settled, /identity changed/i);
+  assert.equal(starts, 0);
+  assert.equal(store.getTask(task.id)?.directoryEntryIdentity, "b".repeat(64));
+});
+
+for (const identityChangesDuringWait of [false, true]) {
+  test(`paused recovery distinguishes initial stale identity from later ownership: changed=${identityChangesDuringWait}`, async (t) => {
+    const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+    const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+    const { latchTransferPause, resetTransferPauseLatchesForTests } = await import("./transferPauseLatch");
+    const task = { ...child(), id: `paused-origin-${identityChangesDuringWait}`, parentTaskId: `paused-origin-root-${identityChangesDuringWait}` };
+    const root = { ...task, id: task.parentTaskId, parentTaskId: undefined, isDirectory: true };
+    store.upsertTasks([root, {
+      ...task, status: identityChangesDuringWait ? "failed" : "paused",
+      directoryEntryIdentity: identityChangesDuringWait ? task.directoryEntryIdentity : "b".repeat(64),
+    }]);
+    const initialPause = store.getTask(task.id)!;
+    latchTransferPause(task.id);
+    let starts = 0;
+    let abort = false;
+    let conflicts = 0;
+    const running = runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => abort,
+      identityChangesDuringWait ? undefined : initialPause, undefined, () => { conflicts += 1; });
+    const settled = running.then(() => "completed", (error: Error) => error.message);
+    t.after(async () => {
+      abort = true;
+      resetTransferPauseLatchesForTests();
+      await settled;
+      store.patchTask(root.id, { status: "completed" });
+      store.dismiss(root.id);
+    });
+    // This captures the prior failed result, or republishes the unchanged
+    // initial old identity. Neither is evidence of a replacement by itself.
+    store.patchTask(root.id, { reconnectRequired: true });
+    resetTransferPauseLatchesForTests();
+    if (identityChangesDuringWait) {
+      store.patchTask(task.id, { status: "transferring", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 });
+    }
+    const outcome = await settled;
+    if (identityChangesDuringWait) {
+      assert.match(outcome, /identity changed/i);
+      assert.equal(starts, 0);
+      assert.equal(conflicts, 1);
+      assert.equal(store.getTask(task.id)?.directoryEntryIdentity, "b".repeat(64));
+    } else {
+      assert.equal(outcome, "completed");
+      assert.equal(starts, 1);
+      assert.equal(conflicts, 0);
+    }
+  });
+}
+
+test("paused retry observes newer same-identity completion after an old failure", async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const { latchTransferPause, resetTransferPauseLatchesForTests } = await import("./transferPauseLatch");
+  const task = { ...child(), id: "failed-then-completed", parentTaskId: "failed-then-completed-root" };
+  const root = { ...task, id: task.parentTaskId, parentTaskId: undefined, isDirectory: true };
+  store.upsertTasks([root, { ...task, status: "failed" }]);
+  latchTransferPause(task.id);
+  let starts = 0;
+  let abort = false;
+  const running = runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => abort);
+  const settled = running.then(() => "completed", (error: Error) => error.message);
+  t.after(async () => {
+    abort = true;
+    resetTransferPauseLatchesForTests();
+    await settled;
+    store.patchTask(root.id, { status: "completed" });
+    store.dismiss(root.id);
+  });
+  store.patchTask(root.id, { reconnectRequired: true });
+  resetTransferPauseLatchesForTests();
+  store.patchTask(task.id, { status: "transferring", lifecycleEpoch: 1 });
+  store.patchTask(task.id, { status: "completed", lifecycleEpoch: 2 });
+  assert.equal(store.getTask(task.id), undefined);
+  assert.equal(await settled, "completed");
+  assert.equal(starts, 0, "a newer completed attempt must replace the captured old failure");
+});
+
+test("an unchanged owner retains its original transport rejection", async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const task = { ...child(), id: "unchanged-rejected-owner", parentTaskId: undefined };
+  store.upsertTasks([task]);
+  t.after(() => { store.patchTask(task.id, { status: "completed" }); store.dismiss(task.id); });
+  const error = new Error("original transport failure");
+  await assert.rejects(runTransferAndWaitForOwner(task, async () => { throw error; }, () => false),
+    (actual) => actual === error);
+});
+
+for (const activation of ["patch", "progress", "owner"] as const) {
+test(`initial stale identity exemption ends when another owner activates that row: ${activation}`, async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const { latchTransferPause, resetTransferPauseLatchesForTests } = await import("./transferPauseLatch");
+  const task = { ...child(), id: "activated-initial-identity", parentTaskId: undefined };
+  store.upsertTasks([{ ...task, status: "paused", directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+  const initial = store.getTask(task.id)!;
+  latchTransferPause(task.id);
+  let starts = 0;
+  let abort = false;
+  const running = runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => abort, initial);
+  const settled = running.then(() => "completed", (error: Error) => error.message);
+  t.after(async () => {
+    abort = true;
+    resetTransferPauseLatchesForTests();
+    await settled;
+    store.patchTask(task.id, { status: "completed" });
+    store.dismiss(task.id);
+  });
+  resetTransferPauseLatchesForTests();
+  if (activation === "progress") {
+    store.ingestBackgroundEvent({ type: "progress", transferId: task.id,
+      transferred: 1, lifecycleEpoch: 2, lifecycleState: "transferring" });
+  } else if (activation === "owner") store.patchTask(task.id, { ownerId: "replacement-owner" });
+  else store.patchTask(task.id, { status: "transferring", lifecycleEpoch: 2 });
+  assert.match(String(await Promise.race([
+    settled, new Promise((resolve) => setTimeout(() => resolve("still-waiting"), 450)),
+  ])), /identity changed/i);
+  assert.equal(starts, 0);
+  assert.equal(store.getTask(task.id)?.directoryEntryIdentity, "b".repeat(64));
+});
+
+}
+
+test("already active different identity is rejected before first admission", async (t) => {
+  const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+  const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+  const task = { ...child(), id: "already-active-identity", parentTaskId: undefined };
+  store.upsertTasks([{ ...task, directoryEntryIdentity: "b".repeat(64), lifecycleEpoch: 1 }]);
+  t.after(() => { store.patchTask(task.id, { status: "completed" }); store.dismiss(task.id); });
+  let starts = 0;
+  let conflicts = 0;
+  await assert.rejects(runTransferAndWaitForOwner(task, async () => { starts += 1; return {}; }, () => false,
+    undefined, undefined, () => { conflicts += 1; }), /identity changed/i);
+  assert.equal(starts, 0);
+  assert.equal(conflicts, 1);
+  assert.equal(store.getTask(task.id)?.directoryEntryIdentity, "b".repeat(64));
+});
+
+for (const replacementStatus of ["transferring", "completed"] as const) {
+  for (const oldStatus of ["completed", "failed"] as const) {
+    test(`deferred ${oldStatus} cannot overwrite a ${replacementStatus} replacement after waiter exit`, async () => {
+      const { sftpTransferCenterStore: store } = await import("../sftpTransferCenterStore");
+      const { runTransferAndWaitForOwner } = await import("./waitForTransferOwner");
+      const { createDedicatedResumeChildUpdateBatcher } = await import("../../app/dedicatedResumeProgress");
+      const task = child();
+      const root = { ...task, id: task.parentTaskId!, parentTaskId: undefined, isDirectory: true };
+      const batcher = createDedicatedResumeChildUpdateBatcher({
+        getTaskCount: () => 4096, hasTask: () => true,
+        upsertTasks: (updates) => store.upsertTasks(updates),
+      });
+      store.upsertTasks([root, task]);
+      let observation: ReturnType<typeof store.observeTaskSettlement> | undefined;
+      try {
+        await runTransferAndWaitForOwner(task, async () => {
+          store.patchTask(task.id, { status: oldStatus });
+          return {};
+        }, () => false, undefined, undefined, () => batcher.discard(task.id), (value) => {
+          observation = value;
+          return true;
+        });
+        assert.ok(observation);
+        batcher.push({ ...task, status: oldStatus }, observation);
+        store.upsertTasks([{ ...task, directoryEntryIdentity: "b".repeat(64), status: replacementStatus }]);
+        const replacement = store.getTask(task.id);
+        batcher.flush();
+        assert.equal(store.getTask(task.id), replacement);
+        if (replacementStatus === "transferring") assert.equal(replacement?.directoryEntryIdentity, "b".repeat(64));
+        else assert.equal(replacement, undefined, "the replacement remains compacted");
+        assert.equal(observation.read(), undefined, "the retained observation is disposed");
+      } finally {
+        batcher.flush();
+        observation?.dispose();
+        store.patchTask(root.id, { status: "completed" });
+        store.dismiss(root.id);
+      }
+    });
+  }
+}

application/state/sftp/useSftpCommandRefresh.test.ts

@@ -1,60 +0,0 @@
-import assert from 'node:assert/strict';
-import test, { after } from 'node:test';
-import React from 'react';
-import { act, create, type ReactTestRenderer } from 'react-test-renderer';
-import { publishTerminalCommandCompletion } from '../terminalCommandCompletion';
-import { useSftpCommandRefresh } from './useSftpCommandRefresh';
-
-const environment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
-const previous = environment.IS_REACT_ACT_ENVIRONMENT;
-environment.IS_REACT_ACT_ENVIRONMENT = true;
-after(() => { environment.IS_REACT_ACT_ENVIRONMENT = previous; });
-
-test('completion refresh is coalesced, visible, idle and bound to its original pane', async (t) => {
-  t.mock.timers.enable({ apis: ['setTimeout'] });
-  let count = 0;
-  let options = {
-    sessionId: 'terminal-1', enabled: true, visible: true, busy: false,
-    matchesTerminal: true, paneId: 'pane-1', connectionId: 'connection-1',
-    path: '/browsed', connected: true, refresh: async () => { count += 1; },
-  };
-  function Probe() { useSftpCommandRefresh(options); return null; }
-  let renderer: ReactTestRenderer;
-  await act(async () => { renderer = create(React.createElement(Probe)); });
-  const update = async (patch: Partial<typeof options>) => {
-    options = { ...options, ...patch };
-    await act(async () => { renderer.update(React.createElement(Probe)); });
-  };
-  const finish = async () => { await act(async () => { t.mock.timers.tick(250); }); };
-  publishTerminalCommandCompletion('another-terminal');
-  await finish();
-  assert.equal(count, 0);
-  publishTerminalCommandCompletion('terminal-1');
-  publishTerminalCommandCompletion('terminal-1');
-  await finish();
-  assert.equal(count, 1);
-  for (const patch of [{ enabled: false }, { visible: false }, { connected: false }, { matchesTerminal: false }]) {
-    await update(patch);
-    publishTerminalCommandCompletion('terminal-1');
-    await finish();
-    assert.equal(count, 1);
-    await update({ enabled: true, visible: true, busy: false, connected: true, matchesTerminal: true });
-  }
-  await update({ busy: true });
-  publishTerminalCommandCompletion('terminal-1');
-  await finish();
-  assert.equal(count, 1);
-  await update({ busy: false });
-  await finish();
-  assert.equal(count, 2);
-  for (const patch of [{ path: '/new' }, { paneId: 'pane-2' }, { connectionId: 'connection-2' }, { sessionId: 'terminal-2' }]) {
-    publishTerminalCommandCompletion(options.sessionId);
-    await update(patch);
-    await finish();
-    assert.equal(count, 2);
-  }
-  publishTerminalCommandCompletion(options.sessionId);
-  await act(async () => { renderer.unmount(); });
-  await finish();
-  assert.equal(count, 2);
-});

application/state/sftp/useSftpCommandRefresh.ts

@@ -1,56 +0,0 @@
-import { useEffect, useRef } from 'react';
-import { subscribeTerminalCommandCompletion } from '../terminalCommandCompletion';
-
-interface Options {
-  sessionId: string | null;
-  enabled: boolean;
-  visible: boolean;
-  busy: boolean;
-  matchesTerminal: boolean;
-  paneId: string;
-  connectionId: string | null;
-  path: string | null;
-  connected: boolean;
-  refresh: () => Promise<void>;
-}
-
-/** Coalesce completion bursts; never poll or carry refreshes across pane changes. */
-export function useSftpCommandRefresh(options: Options): void {
-  const latest = useRef(options);
-  latest.current = options;
-  const drain = useRef(() => {});
-  useEffect(() => {
-    if (!options.enabled || !options.visible || !options.sessionId) return;
-    let timer: ReturnType<typeof setTimeout> | undefined;
-    let pending = false;
-    let refreshing = false;
-    let disposed = false;
-    const eligible = () => {
-      const live = latest.current;
-      return !disposed && live.enabled && live.visible && live.connected && live.matchesTerminal
-        && live.sessionId === options.sessionId && live.paneId === options.paneId
-        && live.connectionId === options.connectionId && live.path === options.path;
-    };
-    const schedule = () => {
-      if (!pending || refreshing || latest.current.busy || !eligible()) return;
-      clearTimeout(timer);
-      timer = setTimeout(() => {
-        if (!eligible() || latest.current.busy) return;
-        pending = false;
-        refreshing = true;
-        void latest.current.refresh().catch(() => {}).finally(() => {
-          refreshing = false;
-          schedule();
-        });
-      }, 250);
-    };
-    drain.current = schedule;
-    const unsubscribe = subscribeTerminalCommandCompletion((sessionId) => {
-      if (sessionId !== options.sessionId || !eligible()) return;
-      pending = true;
-      schedule();
-    });
-    return () => { disposed = true; clearTimeout(timer); unsubscribe(); drain.current = () => {}; };
-  }, [options.enabled, options.visible, options.sessionId, options.paneId, options.connectionId, options.path]);
-  useEffect(() => { drain.current(); }, [options.busy]);
-}

application/state/sftp/useSftpHostCredentials.test.ts

@@ -5,6 +5,7 @@ import {
   buildSftpHostCredentials,
 } from "./useSftpHostCredentials.ts";
 import type { Host, Identity, KnownHost, SSHKey } from "../../../domain/models.ts";
+import { resolvePasswordAuthSftpHost } from "../../../domain/authIdentityPicker.ts";
 
 const host = (overrides: Partial<Host> = {}): Host => ({
   id: "host-1",
@@ -16,6 +17,22 @@ const host = (overrides: Partial<Host> = {}): Host => ({
   ...overrides,
 });
 
+test("SFTP credentials follow the temporary deploy identity on a root profile", () => {
+  const identities = [
+    { id: "root-id", label: "root", username: "root", authMethod: "password", password: "bad-root", created: 0 },
+    { id: "deploy-id", label: "deploy", username: "deploy", authMethod: "password", password: "good-deploy", created: 0 },
+  ] as Identity[];
+  const savedHost = host({ identityId: "root-id" });
+  const sftpHost = resolvePasswordAuthSftpHost(savedHost, identities, {
+    authMethod: "password", username: "deploy", password: "good-deploy", savedToHost: false,
+  });
+  const credentials = buildSftpHostCredentials({ host: sftpHost, hosts: [savedHost], keys: [], identities });
+  assert.equal(credentials.username, "deploy");
+  assert.equal(credentials.password, "good-deploy");
+  assert.equal(credentials.hostId, savedHost.id);
+  assert.equal(savedHost.identityId, "root-id");
+});
+
 test("buildSftpHostCredentials forwards system agent settings for target and jump hosts", () => {
   const jump = host({
     id: "jump-1",

application/state/sftp/useSftpPaneActions.refresh.test.ts

@@ -1,51 +0,0 @@
-import assert from 'node:assert/strict';
-import test, { after } from 'node:test';
-import React from 'react';
-import { act, create, type ReactTestRenderer } from 'react-test-renderer';
-import { useSftpPaneActions } from './useSftpPaneActions';
-import { createEmptyPane, type SftpPane } from './types';
-import type { SftpFileEntry } from '../../../types';
-
-const environment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
-const previous = environment.IS_REACT_ACT_ENVIRONMENT;
-environment.IS_REACT_ACT_ENVIRONMENT = true;
-after(() => { environment.IS_REACT_ACT_ENVIRONMENT = previous; });
-
-test('command refresh keeps current directory/filter/selection and drops deleted selections', async () => {
-  const file = (name: string): SftpFileEntry => ({ name, type: 'file', size: 1, sizeFormatted: '1 B', lastModified: 0, lastModifiedFormatted: '1970-01-01' });
-  let result = [file('kept'), file('new')];
-  const selection = new Set(['kept']);
-  const pane: SftpPane = { ...createEmptyPane('pane'), connection: { id: 'conn', hostId: 'host', hostLabel: 'Host', status: 'connected', currentPath: '/browsed', homeDir: '/', isLocal: true }, files: [file('kept')], selectedFiles: selection, filter: 'ke' };
-  const left = { current: { tabs: [pane], activeTabId: pane.id } };
-  const calls: string[] = [];
-  let actions: ReturnType<typeof useSftpPaneActions>;
-  const update: Parameters<typeof useSftpPaneActions>[0]['updateTab'] = (_side, id, updater) => {
-    left.current.tabs = left.current.tabs.map((p) => p.id === id ? updater(p) : p);
-  };
-  function Probe() {
-    actions = useSftpPaneActions({
-      hosts: [], getActivePane: () => left.current.tabs[0], updateTab: update,
-      updateActiveTab: (side, updater) => update(side, pane.id, updater),
-      leftTabsRef: left, rightTabsRef: { current: { tabs: [], activeTabId: null } },
-      navSeqRef: { current: { left: 0, right: 0 } }, dirCacheRef: { current: new Map() },
-      sftpSessionsRef: { current: new Map() }, lastConnectedHostRef: { current: { left: null, right: null } },
-      connectionCacheKeyMapRef: { current: new Map() }, makeCacheKey: (id, path) => id + path,
-      clearCacheForConnection() {}, listLocalFiles: async (path) => { calls.push(path); return result; },
-      listRemoteFiles: async () => [], handleSessionError() {}, releaseConnection: async () => {},
-      isSessionError: () => false, clearSelectionsExcept() {}, dirCacheTtlMs: 1000,
-    });
-    return null;
-  }
-  let renderer: ReactTestRenderer;
-  await act(async () => { renderer = create(React.createElement(Probe)); });
-  await actions!.refresh('left', { tabId: pane.id, preserveSelection: true });
-  assert.deepEqual(calls, ['/browsed']);
-  assert.equal(left.current.tabs[0].selectedFiles, selection);
-  assert.equal(left.current.tabs[0].filter, 'ke');
-  assert.deepEqual(left.current.tabs[0].files.map((f) => f.name), ['kept', 'new']);
-  result = [file('new')];
-  await actions!.refresh('left', { preserveSelection: true });
-  assert.equal(left.current.tabs[0].selectedFiles.size, 0);
-  assert.equal(left.current.tabs[0].connection?.currentPath, '/browsed');
-  await act(async () => { renderer.unmount(); });
-});

application/state/sftp/useSftpPaneActions.ts

@@ -27,13 +27,6 @@ import {
 /** Shared empty set for navigation resets — never mutate this. */
 const EMPTY_SET = new Set<string>();
 
-/** Retain selection identity when no selected entry disappeared. */
-export function retainSftpSelection(selected: Set<string>, files: SftpFileEntry[]): Set<string> {
-  const names = new Set(files.map((file) => file.name));
-  const retained = new Set([...selected].filter((name) => names.has(name)));
-  return retained.size === selected.size ? selected : retained;
-}
-
 interface UseSftpPaneActionsParams {
   hosts: Host[];
   getActivePane: (side: "left" | "right") => SftpPane | null;
@@ -60,14 +53,13 @@ interface UseSftpPaneActionsParams {
 export type SftpNavigateResult = "reached" | "failed" | "aborted" | "superseded";
 export type SftpNavigateOptions = {
   force?: boolean;
-  preserveSelection?: boolean;
   tabId?: string;
   shouldApply?: () => boolean;
 };
 
 interface UseSftpPaneActionsResult {
   navigateTo: (side: "left" | "right", path: string, options?: SftpNavigateOptions) => Promise<SftpNavigateResult>;
-  refresh: (side: "left" | "right", options?: { tabId?: string; preserveSelection?: boolean }) => Promise<void>;
+  refresh: (side: "left" | "right", options?: { tabId?: string }) => Promise<void>;
   navigateUp: (side: "left" | "right") => Promise<void>;
   openEntry: (side: "left" | "right", entry: SftpFileEntry) => Promise<void>;
   toggleSelection: (side: "left" | "right", fileName: string, multiSelect: boolean) => void;
@@ -187,7 +179,6 @@ export const useSftpPaneActions = ({
         pane.connection.homeDir,
       );
 
-      const preserveSelection = options?.preserveSelection && normalizedPath === pane.connection.currentPath;
       const connectionId = pane.connection.id;
       const requestId = ++navSeqRef.current[side];
       const cacheKey = makeCacheKey(connectionId, normalizedPath, pane.filenameEncoding);
@@ -290,7 +281,7 @@ export const useSftpPaneActions = ({
         connection: prev.connection
           ? { ...prev.connection, currentPath: normalizedPath }
           : null,
-        selectedFiles: preserveSelection ? prev.selectedFiles : EMPTY_SET,
+        selectedFiles: EMPTY_SET,
         filter: clearFilterForPathChange ? "" : prev.filter,
         loading: true,
         error: null,
@@ -378,7 +369,7 @@ export const useSftpPaneActions = ({
           connectionId,
           path: normalizedPath,
           files,
-          selectedFiles: preserveSelection ? retainSftpSelection(getTargetPane()?.selectedFiles ?? EMPTY_SET, files) : EMPTY_SET,
+          selectedFiles: EMPTY_SET,
           filter: nextConfirmedFilter,
         });
 
@@ -389,7 +380,7 @@ export const useSftpPaneActions = ({
             : null,
           files,
           loading: false,
-          selectedFiles: preserveSelection ? retainSftpSelection(prev.selectedFiles, files) : EMPTY_SET,
+          selectedFiles: EMPTY_SET,
           filter: clearFilterForPathChange ? "" : prev.filter,
         }));
         if (!pane.connection.isLocal) {
@@ -454,7 +445,7 @@ export const useSftpPaneActions = ({
   );
 
   const refresh = useCallback(
-    async (side: "left" | "right", options?: { tabId?: string; preserveSelection?: boolean }) => {
+    async (side: "left" | "right", options?: { tabId?: string }) => {
       const sideTabs = side === "left" ? leftTabsRef.current : rightTabsRef.current;
       const pane = options?.tabId
         ? sideTabs.tabs.find((t) => t.id === options.tabId) ?? null
@@ -485,7 +476,7 @@ export const useSftpPaneActions = ({
           }
           return;
         }
-        await navigateTo(side, pane.connection.currentPath, { force: true, tabId: options?.tabId, preserveSelection: options?.preserveSelection });
+        await navigateTo(side, pane.connection.currentPath, { force: true, tabId: options?.tabId });
       } else if (!pane?.connection && pane?.error) {
         // For background tabs, don't trigger reconnection (it operates on
         // the active tab). Just leave the error state for the user to see

application/state/sftp/waitForTransferOwner.ts

@@ -1,6 +1,11 @@
 import type { TransferTask } from "../../../domain/models";
 import { sftpTransferCenterStore } from "../sftpTransferCenterStore";
 
+/** The displaced invocation may fail its walk, but no longer owns the child row. */
+export class TransferOwnerChangedError extends Error {}
+
+export type TransferOwnerObservation = ReturnType<typeof sftpTransferCenterStore.observeTaskSettlement>;
+
 type StreamResult = { error?: string; cancelled?: boolean; superseded?: boolean } | undefined;
 
 /** A live waiter owns bounded settlement evidence; persisted history stays compact. */
@@ -9,33 +14,47 @@ export async function runTransferAndWaitForOwner(
   start: () => Promise<StreamResult>,
   shouldAbort: () => boolean,
   pausedAtResume?: TransferTask,
+  completedAtRestart?: TransferTask,
+  onOwnerChanged?: () => void,
+  retainObservation?: (observation: TransferOwnerObservation) => boolean,
+  existingObservation?: TransferOwnerObservation,
 ): Promise<StreamResult> {
   // Register before admission/start: an owner may finish while dispatch waits for resume.
-  let observation = sftpTransferCenterStore.observeTaskSettlement(task);
+  let observation = existingObservation ?? sftpTransferCenterStore.observeTaskSettlement(task, completedAtRestart, onOwnerChanged);
   try {
     for (;;) {
       if (shouldAbort()) throw new Error("Transfer cancelled");
-      const admission = sftpTransferCenterStore.admitTaskRun(task, pausedAtResume);
+      if (observation.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed before dispatch");
+      const admission = sftpTransferCenterStore.admitTaskRun(task, pausedAtResume, completedAtRestart);
       if (admission === "cancelled") throw new Error("Transfer cancelled");
       if (admission === "completed" || observation.read()?.status === "completed") return {};
-      if (admission === "conflict") throw new Error("Transfer identity changed before dispatch");
+      if (admission === "conflict") throw new TransferOwnerChangedError("Transfer identity changed before dispatch");
       if (admission === "ready") break;
       await new Promise((resolve) => setTimeout(resolve, 200));
     }
     // Admission begins a new attempt; discard any previous failed settlement.
     observation.dispose();
-    observation = sftpTransferCenterStore.observeTaskSettlement(task);
+    observation = sftpTransferCenterStore.observeTaskSettlement(task, undefined, onOwnerChanged);
     const result = await start();
+    if (observation.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed while waiting for its owner");
     if (!result?.superseded) return result;
     for (;;) {
       if (shouldAbort()) throw new Error("Transfer cancelled");
+      if (observation.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed while waiting for its owner");
       const latest = observation.read();
       if (latest?.status === "completed") return { ...result, superseded: false };
       if (latest?.status === "failed") throw new Error(latest.error || "Transfer failed");
       if (latest?.status === "cancelled") throw new Error("Transfer cancelled");
       await new Promise((resolve) => setTimeout(resolve, 200));
     }
+  } catch (error) {
+    // A displaced invocation can reject instead of returning superseded. Its
+    // transport error must not regain permission to write the winning row.
+    if (observation.hasIdentityConflict()) throw new TransferOwnerChangedError("Transfer identity changed while waiting for its owner");
+    throw error;
   } finally {
-    observation.dispose();
+    // A deferred child update may outlive the invocation. Its caller must either
+    // retain this evidence through the write or release it after handling exit.
+    if (!retainObservation?.(observation)) observation.dispose();
   }
 }

application/state/sftpTransferCenterStore.ts

@@ -42,6 +42,14 @@ import { restoreSftpTransferHistoryCooperatively } from "./sftp/transferHistoryR
 import { cancelExternalUploadRuntime } from "./sftp/externalUploadRuntime";
 
 type Listener = () => void;
+type TaskSettlementObserver = {
+  expected: TransferTask;
+  initialInactiveRow?: TransferTask;
+  settled?: TransferTask;
+  conflicted?: boolean;
+  ignoredCompletion?: TransferTask;
+  onIdentityConflict?: () => void;
+};
 
 // Ordinary bounded history restores synchronously so existing callers receive
 // it immediately. Legacy directory snapshots can contain tens of thousands of
@@ -98,9 +106,9 @@ export interface SftpTransferCenterStore {
   /** Single task row — same object identity until that row is patched. */
   getTask(taskId: string): TransferTask | undefined;
   /** Observe exact task settlement before completed child rows are compacted. */
-  observeTaskSettlement(task: TransferTask): { read(): TransferTask | undefined; dispose(): void };
+  observeTaskSettlement(task: TransferTask, ignoredCompletion?: TransferTask, onIdentityConflict?: () => void): { read(): TransferTask | undefined; hasIdentityConflict(): boolean; dispose(): void };
   /** Publish an explicit dispatch identity without flushing large child-history batches. */
-  admitTaskRun(task: TransferTask, pausedAtResume?: TransferTask): "ready" | "paused" | "completed" | "cancelled" | "conflict";
+  admitTaskRun(task: TransferTask, pausedAtResume?: TransferTask, completedAtRestart?: TransferTask): "ready" | "paused" | "completed" | "cancelled" | "conflict";
   getOwnerTasks(ownerId: string): TransferTask[];
   publishOwner(ownerId: string, tasks: readonly TransferTask[]): void;
   registerOwner(ownerId: string, controls: SftpTransferOwnerControls): () => void;
@@ -405,7 +413,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
   let snapshotDirty = false;
   const listeners = new Set<Listener>();
   const progressListeners = new Set<Listener>();
-  const settlementObservers = new Map<string, Set<{ expected: TransferTask; settled?: TransferTask }>>();
+  const settlementObservers = new Map<string, Set<TaskSettlementObserver>>();
   const matchesObservedTask = (expected: TransferTask, candidate: TransferTask) => (
     expected.id === candidate.id
     && expected.sourcePath === candidate.sourcePath
@@ -414,6 +422,29 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
     && expected.directoryEntryIndex === candidate.directoryEntryIndex
     && expected.directoryEntryIdentity === candidate.directoryEntryIdentity
   );
+  const captureObservedTask = (task: TransferTask) => {
+    for (const observer of settlementObservers.get(task.id) ?? []) {
+      if (observer.conflicted || task === observer.ignoredCompletion) continue;
+      const matchesExpected = matchesObservedTask(observer.expected, task);
+      // A retry may plan a new source identity while its initial stale row is
+      // still paused. Only the unchanged initial attempt is exempt: activating
+      // it or replacing its owner/epoch must not let the stale plan reclaim it.
+      if (!matchesExpected && observer.initialInactiveRow
+        && matchesObservedTask(observer.initialInactiveRow, task)
+        && observer.initialInactiveRow.status === task.status
+        && observer.initialInactiveRow.lifecycleEpoch === task.lifecycleEpoch
+        && observer.initialInactiveRow.ownerId === task.ownerId) continue;
+      observer.initialInactiveRow = undefined;
+      if (!matchesExpected) {
+        observer.conflicted = true;
+        observer.onIdentityConflict?.();
+      } else if (observer.settled?.status !== "completed") {
+        // Failed/cancelled evidence belongs to the latest observed attempt. A
+        // resumed owner can supersede it; exact successful completion stays final.
+        observer.settled = TERMINAL_OWNER_STATUSES.has(task.status) ? task : undefined;
+      }
+    }
+  };
   const refreshBadgeSnapshot = () => {
     const next = buildBadgeSnapshot(tasks);
     if (
@@ -633,12 +664,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
     // settles; everything else can release its whole tree here.
     settleFinishedTransferControlState(tasks, tasks);
     if (settlementObservers.size > 0) {
-      for (const task of tasks) {
-        if (!TERMINAL_OWNER_STATUSES.has(task.status)) continue;
-        for (const observer of settlementObservers.get(task.id) ?? []) {
-          if (!observer.settled && matchesObservedTask(observer.expected, task)) observer.settled = task;
-        }
-      }
+      for (const task of tasks) captureObservedTask(task);
     }
     const beforePrune = tasks;
     tasks = pruneSftpTransferHistory(tasks);
@@ -1338,7 +1364,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
     },
     getSnapshot: () => ensureSnapshot(),
     getBadgeSnapshot: () => badgeSnapshot,
-    admitTaskRun(incoming, pausedAtResume) {
+    admitTaskRun(incoming, pausedAtResume, completedAtRestart) {
       const rootId = incoming.parentTaskId ?? incoming.id;
       if (isTransferOrRootCancelled(rootId, incoming.id)) return "cancelled";
       const parent = incoming.parentTaskId ? tasks.find((task) => task.id === rootId) : undefined;
@@ -1348,7 +1374,10 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
       if (existing && (existing.sourcePath !== incoming.sourcePath || existing.targetPath !== incoming.targetPath
         || existing.parentTaskId !== incoming.parentTaskId)) return "conflict";
       if (existing?.status === "cancelled") return "cancelled";
-      if (existing?.status === "completed") {
+      // Only the exact completion captured at the destination reset is
+      // stale. A newer completion or user control must keep its authority.
+      const restartsCompletion = existing?.status === "completed" && existing === completedAtRestart;
+      if (existing?.status === "completed" && !restartsCompletion) {
         return matchesObservedTask(incoming, existing) ? "completed" : "conflict";
       }
       const resumesUnchangedPause = existing === pausedAtResume
@@ -1369,6 +1398,14 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
         ...existing,
         directoryEntryIndex: incoming.directoryEntryIndex,
         directoryEntryIdentity: incoming.directoryEntryIdentity,
+        ...(restartsCompletion ? {
+          checkpointBytes: incoming.checkpointBytes,
+          transferredBytes: incoming.transferredBytes,
+          resumeStage: incoming.resumeStage,
+          downloadCheckpointBytes: incoming.downloadCheckpointBytes,
+          uploadCheckpointBytes: incoming.uploadCheckpointBytes,
+          sourceFingerprint: incoming.sourceFingerprint,
+        } : {}),
         ...(existing.status === "transferring" ? {} : {
           status: "transferring" as const,
           lifecycleEpoch: undefined,
@@ -1378,25 +1415,36 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
         }),
       };
       tasks = next;
+      captureObservedTask(next[index]);
       emitProgress(false);
       return "ready";
     },
-    observeTaskSettlement(expected) {
-      const observer: { expected: TransferTask; settled?: TransferTask } = { expected: { ...expected } };
+    observeTaskSettlement(expected, ignoredCompletion, onIdentityConflict) {
+      const initial = tasks.find((task) => task.id === expected.id);
+      const observer: TaskSettlementObserver = {
+        expected: { ...expected }, ignoredCompletion, onIdentityConflict,
+        initialInactiveRow: initial && ["paused", "failed", "interrupted", "attention"].includes(initial.status)
+          && !matchesObservedTask(expected, initial) ? { ...initial } : undefined,
+      };
       const observers = settlementObservers.get(expected.id) ?? new Set();
       observers.add(observer);
       settlementObservers.set(expected.id, observers);
+      // A different active owner may predate registration. Detect it now,
+      // before admission can publish the stale caller's identity over it.
+      if (initial) captureObservedTask(initial);
       let disposed = false;
       return {
         read() {
           if (disposed) return undefined;
           if (observer.settled) return observer.settled;
           const current = tasks.find((task) => task.id === expected.id);
-          return current && matchesObservedTask(observer.expected, current) ? current : undefined;
+          return current && current !== ignoredCompletion && matchesObservedTask(observer.expected, current) ? current : undefined;
         },
+        hasIdentityConflict: () => !disposed && observer.conflicted === true,
         dispose() {
           disposed = true;
           observer.settled = undefined;
+          observer.conflicted = undefined;
           observers.delete(observer);
           if (observers.size === 0) settlementObservers.delete(expected.id);
         },
@@ -1662,6 +1710,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
       const next = tasks.slice();
       next[index] = nextTask;
       tasks = next;
+      captureObservedTask(nextTask);
       if (changed) {
         const lifecycleChanged = (
           (updates.status !== undefined && updates.status !== task.status)
@@ -2023,7 +2072,8 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
         backgroundEventsDuringRestore.set(event.transferId, pending);
         return;
       }
-      let existing = tasks.find((task) => task.id === event.transferId);
+      let existingIndex = tasks.findIndex((task) => task.id === event.transferId);
+      let existing = tasks[existingIndex];
       const eventParent = event.parentTaskId
         ? tasks.find((task) => task.id === event.parentTaskId)
         : undefined;
@@ -2039,7 +2089,8 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
           directoryEntryIdentity: event.directoryEntryIdentity ?? task.directoryEntryIdentity,
           background: false,
         } : task);
-        existing = tasks.find((task) => task.id === event.transferId);
+        existing = tasks[existingIndex];
+        captureObservedTask(existing);
       }
       // A delayed child progress event can arrive after the renderer compacted
       // that completed child into its parent checkpoint. Never resurrect it as
@@ -2119,6 +2170,7 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
       if ((event.type === "queued" || event.type === "started" || event.type === "progress") && !existing) {
         const sourcePath = event.sourcePath ?? "";
         const targetPath = event.targetPath ?? "";
+        existingIndex = tasks.length;
         tasks.push({
           id: event.transferId,
           ownerId: eventParent?.ownerId
@@ -2352,6 +2404,9 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
           phase: undefined,
         } : task);
       }
+      // Ownership changes must be observed synchronously even when a progress
+      // event takes the lightweight UI path. Reuse the located row, not a scan.
+      if (existingIndex >= 0) captureObservedTask(tasks[existingIndex]);
       // Progress-only ticks skip prune + coalesce listener paints; lifecycle
       // events still take the full emit path so UI never lags on pause/cancel.
       if (event.type === "progress" && !persistImmediately) {

application/state/terminalCommandCompletion.ts

@@ -1,12 +0,0 @@
-type Listener = (sessionId: string) => void;
-const listeners = new Set<Listener>();
-
-/** Renderer-local fan-out of the terminal's existing completion detection. */
-export function publishTerminalCommandCompletion(sessionId: string): void {
-  for (const listener of listeners) listener(sessionId);
-}
-
-export function subscribeTerminalCommandCompletion(listener: Listener): () => void {
-  listeners.add(listener);
-  return () => { listeners.delete(listener); };
-}

application/state/terminalSidePanelWidth.test.ts

@@ -2,10 +2,15 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 
 import {
+  clampTerminalSidePanelHeight,
   clampTerminalSidePanelWidth,
   getTerminalSidePanelAvailableWidth,
   getTerminalSidePanelMaxShownTools,
   getTerminalSidePanelMaxWidth,
+  getTerminalSidePanelAvailableHeight,
+  getTerminalSidePanelMaxHeight,
+  TERMINAL_SIDE_PANEL_MAX_HEIGHT,
+  TERMINAL_SIDE_PANEL_MIN_HEIGHT,
   TERMINAL_SIDE_PANEL_MAX_WIDTH,
   TERMINAL_SIDE_PANEL_MIN_WIDTH,
 } from './terminalSidePanelWidth.ts';
@@ -34,3 +39,17 @@ test('terminal side panel keeps usable terminal space in smaller windows', () =>
   assert.equal(clampTerminalSidePanelWidth(280, 1000, 401), 401);
   assert.equal(clampTerminalSidePanelWidth(280, 600, 401), TERMINAL_SIDE_PANEL_MIN_WIDTH);
 });
+
+test('terminal side panel bottom dock clamps height against surface height', () => {
+  assert.equal(getTerminalSidePanelAvailableHeight(1000, 200), 800);
+  assert.equal(getTerminalSidePanelMaxHeight(1000), 760);
+  assert.equal(clampTerminalSidePanelHeight(900, 1000), 760);
+  assert.equal(clampTerminalSidePanelHeight(100, 1000), TERMINAL_SIDE_PANEL_MIN_HEIGHT);
+  assert.equal(clampTerminalSidePanelHeight(300, 1000, 500), 500);
+  assert.equal(clampTerminalSidePanelHeight(5000, 4000), TERMINAL_SIDE_PANEL_MAX_HEIGHT);
+  // A tall compose bar in the smallest window leaves less than the nominal
+  // panel minimum; the terminal's 240px reserve must still win.
+  assert.equal(getTerminalSidePanelMaxHeight(244), 4);
+  assert.equal(clampTerminalSidePanelHeight(560, 244), 4);
+  assert.equal(clampTerminalSidePanelHeight(560, 220), 0);
+});

application/state/terminalSidePanelWidth.ts

@@ -41,3 +41,37 @@ export function getTerminalSidePanelMaxShownTools(panelWidth: number): number {
     ),
   );
 }
+
+export const TERMINAL_SIDE_PANEL_MIN_HEIGHT = 200;
+export const TERMINAL_SIDE_PANEL_MAX_HEIGHT = 1200;
+export const TERMINAL_SIDE_PANEL_MIN_TERMINAL_HEIGHT = 240;
+// Shared tab toolbar rendered above the pane tree (`h-9`).
+export const TERMINAL_SIDE_PANEL_TOOLBAR_HEIGHT = 36;
+
+export function getTerminalSidePanelAvailableHeight(
+  terminalLayerHeight: number,
+  occupiedSiblingHeight: number,
+): number {
+  return Math.max(0, terminalLayerHeight - occupiedSiblingHeight);
+}
+
+export function getTerminalSidePanelMaxHeight(availableSurfaceHeight: number): number {
+  const availableHeight = availableSurfaceHeight - TERMINAL_SIDE_PANEL_MIN_TERMINAL_HEIGHT;
+  return Math.max(
+    0,
+    Math.min(TERMINAL_SIDE_PANEL_MAX_HEIGHT, availableHeight),
+  );
+}
+
+export function clampTerminalSidePanelHeight(
+  height: number,
+  availableSurfaceHeight: number,
+  contentMinimumHeight = TERMINAL_SIDE_PANEL_MIN_HEIGHT,
+): number {
+  const maximumHeight = getTerminalSidePanelMaxHeight(availableSurfaceHeight);
+  const minimumHeight = Math.min(
+    maximumHeight,
+    Math.max(TERMINAL_SIDE_PANEL_MIN_HEIGHT, contentMinimumHeight),
+  );
+  return Math.max(minimumHeight, Math.min(maximumHeight, height));
+}

application/state/useCodexConfigModel.test.ts

@@ -29,6 +29,9 @@ for (const codexRuntime of ['sdk', 'app-server'] as const) {
       const config = { ...agent, codexRuntime };
       await act(async () => { root = TestRenderer.create(React.createElement(Harness, { config })); });
       assert.equal(result.model, null);
+      // The unresolved probe must be distinguishable from "no locked model"
+      // so consumers can hide manual entry until it resolves (#3535).
+      assert.equal(result.isPending, true);
       let sent = false;
       const sending = result.loadModel().then(model => { sent = true; return model; });
       await Promise.resolve();
@@ -38,9 +41,11 @@ for (const codexRuntime of ['sdk', 'app-server'] as const) {
       await act(async () => { resolve({ customConfig: { model: 'glm-5' } }); await sending; });
       assert.equal(await sending, 'glm-5');
       assert.equal(result.model, 'glm-5');
+      assert.equal(result.isPending, false);
       // A different agent must not inherit the previous home/model or promise.
       await act(async () => { root.update(React.createElement(Harness, { config: { ...config, env: { CODEX_HOME: '/fixture/other' } } })); });
       assert.equal(result.model, null);
+      assert.equal(result.isPending, true);
       assert.equal(calls.length, 2);
       await act(async () => { resolve({ customConfig: null }); await result.loadModel(); });
       assert.equal(result.model, null);

application/state/useCodexConfigModel.ts

@@ -29,5 +29,11 @@ export function useCodexConfigModel(agent: ExternalAgentConfig | undefined, isVi
     });
     return () => { cancelled = true; };
   }, [isVisible, loadModel]);
-  return { model: result?.loadModel === loadModel ? result.model : null, loadModel };
+  return {
+    model: result?.loadModel === loadModel ? result.model : null,
+    loadModel,
+    // `model` is null both while the probe is pending and when no locked model
+    // exists; this flag lets consumers distinguish the unresolved state.
+    isPending: result?.loadModel !== loadModel,
+  };
 }

application/state/useManagedSourceSync.test.ts

@@ -201,3 +201,96 @@ test("managed sync writes the latest persisted hosts, not the pre-edit snapshot"
     });
   }
 });
+
+test("managed source deletion preserves the file when its contents cannot be read", async () => {
+  const dom = new JSDOM("<!doctype html><html><body></body></html>", {
+    url: "http://localhost",
+  });
+  const globalAny = globalThis as Record<string, unknown>;
+  const saved = {
+    window: globalAny.window,
+    document: globalAny.document,
+    localStorage: globalAny.localStorage,
+    navigator: Object.getOwnPropertyDescriptor(globalThis, "navigator"),
+    actEnv: (globalAny as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT,
+  };
+  Object.defineProperty(globalThis, "window", { configurable: true, value: dom.window });
+  Object.defineProperty(globalThis, "document", { configurable: true, value: dom.window.document });
+  Object.defineProperty(globalThis, "localStorage", { configurable: true, value: dom.window.localStorage });
+  Object.defineProperty(globalThis, "navigator", {
+    configurable: true,
+    value: { locks: createFakeLockManager() },
+  });
+  Object.defineProperty(globalAny, "IS_REACT_ACT_ENVIRONMENT", { configurable: true, value: true });
+
+  const container = dom.window.document.createElement("div");
+  dom.window.document.body.appendChild(container);
+  const original = "# Keep this comment\nHost outside\n    HostName outside.example.com\n"
+    + "# BEGIN NETCATTY MANAGED - DO NOT EDIT THIS BLOCK\n"
+    + "Host managed\n    HostName managed.example.com\n"
+    + "# END NETCATTY MANAGED\n";
+  let fileContent = original;
+  let writes = 0;
+  let failRead = true;
+  (dom.window as unknown as Record<string, unknown>).netcatty = {
+    readLocalFile: async () => {
+      if (failRead) throw new Error("EIO: simulated read failure");
+      return new TextEncoder().encode(fileContent).buffer;
+    },
+    writeLocalFile: async (_filePath: string, buffer: ArrayBuffer) => {
+      writes += 1;
+      fileContent = new TextDecoder().decode(buffer);
+    },
+  };
+
+  let clearAndRemoveSource!: ReturnType<typeof useManagedSourceSync>["clearAndRemoveSource"];
+  function Harness() {
+    ({ clearAndRemoveSource } = useManagedSourceSync({
+      hosts: [],
+      managedSources: [],
+      onUpdateManagedSources: () => {},
+      onReadPersistedHosts: async () => [],
+    }));
+    return null;
+  }
+
+  const root = createRoot(container);
+  try {
+    await act(async () => root.render(React.createElement(Harness)));
+
+    await assert.rejects(clearAndRemoveSource(managedSource), /Could not clear managed SSH config source/);
+    assert.equal(writes, 0);
+    assert.equal(fileContent, original);
+
+    failRead = false;
+    await clearAndRemoveSource(managedSource);
+    assert.equal(writes, 1);
+    assert.match(fileContent, /Host outside/);
+    assert.doesNotMatch(fileContent, /Host managed/);
+  } finally {
+    await act(async () => root.unmount());
+    container.remove();
+    dom.window.close();
+    for (const key of ["window", "document", "localStorage"] as const) {
+      if (key in globalAny) {
+        Object.defineProperty(globalThis, key, {
+          configurable: true,
+          enumerable: true,
+          writable: true,
+          value: saved[key],
+        });
+      } else {
+        delete globalAny[key];
+      }
+    }
+    if (saved.navigator) {
+      Object.defineProperty(globalThis, "navigator", saved.navigator);
+    } else {
+      delete (globalThis as { navigator?: unknown }).navigator;
+    }
+    Object.defineProperty(globalAny, "IS_REACT_ACT_ENVIRONMENT", {
+      configurable: true,
+      value: saved.actEnv,
+    });
+  }
+});

application/state/useManagedSourceSync.ts

@@ -55,26 +55,20 @@ export const useManagedSourceSync = ({
   );
 
   const readExistingFileContent = useCallback(
-    async (filePath: string): Promise<string | null> => {
+    async (filePath: string): Promise<string> => {
       const bridge = netcattyBridge.get();
       if (!bridge?.readLocalFile) {
-        return null;
-      }
-      try {
-        const buffer = await bridge.readLocalFile(filePath);
-        const decoder = new TextDecoder();
-        return decoder.decode(buffer);
-      } catch {
-        // File might not exist yet
-        return null;
+        throw new Error("readLocalFile not available");
       }
+      const buffer = await bridge.readLocalFile(filePath);
+      return new TextDecoder().decode(buffer);
     },
     [],
   );
 
   const mergeWithExistingContent = useCallback(
     (
-      existingContent: string | null,
+      existingContent: string,
       managedHosts: Host[],
       allHosts: Host[],
     ): string => {
@@ -82,7 +76,7 @@ export const useManagedSourceSync = ({
       const managedContent = serializeHostsToSshConfig(managedHosts, allHosts);
 
       if (!existingContent) {
-        // No existing file, just wrap the managed content
+        // The existing file is empty; wrap the managed content.
         return `${MANAGED_BLOCK_BEGIN}\n${managedContent}${MANAGED_BLOCK_END}\n`;
       }
 

application/state/useScriptRecorder.test.ts

@@ -352,3 +352,158 @@ test("manual stop still returns its recording and permits a clean restart", asyn
   assert.equal(recorder!.isRecording, true);
   await act(async () => renderer!.unmount());
 });
+
+test("confirmed line-by-line recording awaits each send and prompt step in order", async (t) => {
+  const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
+  let appendGate: Promise<void> | undefined;
+  let stopCalls = 0;
+  const steps: Array<{ type: string; value?: unknown; sensitive?: boolean }> = [];
+  const eventTarget = new EventTarget();
+  Object.assign(eventTarget, {
+    netcatty: {
+      scriptRecordingStart: async () => ({ ok: true }),
+      scriptRecordingStop: async () => { stopCalls++; return { steps: [...steps], code: "" }; },
+      scriptRecordingAppendStep: async (_id: string, step: typeof steps[number]) => {
+        await appendGate;
+        await new Promise(resolve => setImmediate(resolve));
+        steps.push(step);
+        return { stopped: false };
+      },
+    },
+    setInterval, clearInterval,
+  });
+  Object.defineProperty(globalThis, "window", { configurable: true, value: eventTarget });
+  t.after(() => {
+    if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);
+    else Reflect.deleteProperty(globalThis, "window");
+  });
+  let recorder!: Recorder;
+  let renderer!: ReactTestRenderer;
+  function Probe() { recorder = useScriptRecorder("session-1"); return null; }
+  await act(async () => { renderer = create(React.createElement(Probe)); });
+  try {
+    await act(async () => { await recorder.startRecording(); });
+    await act(async () => {
+      recorder.recordInput("echo ");
+      const recordLine = recorder.captureSubmittedLineRecorder()!;
+      recorder.recordInput("new input");
+      await Promise.all([recordLine("echo first"), recordLine("cd /tmp")]);
+    });
+    assert.deepEqual(steps.map(step => [step.type, step.value]), [
+      ["send", "echo first"], ["waitForPrompt", undefined],
+      ["send", "cd /tmp"], ["waitForPrompt", undefined],
+    ]);
+    steps.length = 0;
+    await act(async () => {
+      await recorder.recordEnter();
+      assert.equal(steps[0].value, "new input");
+      steps.length = 0;
+      const recordLine = recorder.captureSubmittedLineRecorder()!;
+      await Promise.all([recordLine("secret", { sensitive: true }), recordLine("second secret", { sensitive: true })]);
+    });
+    assert.deepEqual(steps.filter(step => step.type === "send").map(step => step.sensitive), [true, true]);
+    const staleRecorder = recorder.captureSubmittedLineRecorder()!;
+    await act(async () => { await recorder.stopRecording(); await recorder.startRecording(); });
+    steps.length = 0;
+    await act(async () => { await staleRecorder("never sent in this recording"); });
+    assert.deepEqual(steps, []);
+    const pauseGate = deferred<void>();
+    appendGate = pauseGate.promise;
+    const beforePause = recorder.captureSubmittedLineRecorder()!;
+    const pausedFirst = beforePause("sent before pause 1");
+    const pausedSecond = beforePause("sent before pause 2");
+    await flushReact();
+    act(() => recorder.pauseRecording());
+    await beforePause("ignored while paused");
+    pauseGate.resolve();
+    await act(async () => { await Promise.all([pausedFirst, pausedSecond]); });
+    assert.deepEqual(steps.map(step => [step.type, step.value]), [
+      ["send", "sent before pause 1"], ["waitForPrompt", undefined],
+      ["send", "sent before pause 2"], ["waitForPrompt", undefined],
+    ]);
+    act(() => recorder.resumeRecording());
+    steps.length = 0;
+    const gate = deferred<void>();
+    appendGate = gate.promise;
+    const recordLine = recorder.captureSubmittedLineRecorder()!;
+    const first = recordLine("sent first");
+    const second = recordLine("sent second");
+    await flushReact();
+    let stopped!: ReturnType<Recorder["stopRecording"]>;
+    act(() => { stopped = recorder.stopRecording(); });
+    assert.equal(stopCalls, 1);
+    await recordLine("arrived after stop");
+    gate.resolve();
+    await act(async () => { await Promise.all([first, second, stopped]); });
+    assert.equal(stopCalls, 2);
+    assert.deepEqual(steps.map(step => [step.type, step.value]), [
+      ["send", "sent first"], ["waitForPrompt", undefined],
+      ["send", "sent second"], ["waitForPrompt", undefined],
+    ]);
+  } finally {
+    await act(async () => renderer.unmount());
+  }
+});
+
+test("paced recording uses its captured prefix and never imports text typed while paused", async (t) => {
+  const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
+  const steps: Array<{ type: string; value?: unknown }> = [];
+  const target = new EventTarget();
+  Object.assign(target, {
+    netcatty: {
+      scriptRecordingStart: async () => ({ ok: true }),
+      scriptRecordingAppendStep: async (_id: string, step: typeof steps[number]) => {
+        steps.push(step);
+        return { stopped: false };
+      },
+    }, setInterval, clearInterval,
+  });
+  Object.defineProperty(globalThis, "window", { configurable: true, value: target });
+  t.after(() => {
+    if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);
+    else Reflect.deleteProperty(globalThis, "window");
+  });
+  let recorder!: Recorder;
+  let renderer!: ReactTestRenderer;
+  function Probe() { recorder = useScriptRecorder("s"); return null; }
+  await act(async () => { renderer = create(React.createElement(Probe)); });
+  try {
+    await act(async () => {
+      await recorder.startRecording();
+      recorder.recordInput("echo ");
+      recorder.pauseRecording();
+      recorder.recordInput("PAUSED_");
+      recorder.resumeRecording();
+      const lineRecorder = recorder.captureSubmittedLineRecorder()!;
+      recorder.recordInput("next input");
+      await lineRecorder("first", { includePendingInput: true });
+      await lineRecorder("second");
+      await recorder.recordEnter();
+    });
+    assert.deepEqual(steps.filter(step => step.type === "send").map(step => step.value), ["echo first", "second", "next input"]);
+    steps.length = 0;
+    await act(async () => {
+      recorder.recordInput("preserved ");
+      recorder.captureSubmittedLineRecorder(); // No write receipt: rejected batch.
+      recorder.recordInput("draft");
+      await recorder.recordEnter();
+      assert.equal(steps.find(step => step.type === "send")?.value, "preserved draft");
+      steps.length = 0;
+      recorder.recordInput("old ");
+      const lateReceipt = recorder.captureSubmittedLineRecorder()!;
+      recorder.recordClearLine();
+      recorder.recordInput("old new draft");
+      await lateReceipt("sent", { includePendingInput: true });
+      await recorder.recordEnter();
+      assert.deepEqual(steps.filter(step => step.type === "send").map(step => step.value), ["old sent", "old new draft"]);
+      steps.length = 0;
+      recorder.recordInput("prefix for a dropped first line");
+      const lineRecorder = recorder.captureSubmittedLineRecorder()!;
+      await lineRecorder("second was sent", { consumePendingInput: false });
+      await recorder.recordEnter();
+    });
+    assert.deepEqual(steps.filter(step => step.type === "send").map(step => step.value), ["second was sent", "prefix for a dropped first line"]);
+  } finally {
+    await act(async () => renderer.unmount());
+  }
+});

application/state/useScriptRecorder.ts

@@ -27,12 +27,16 @@ export function useScriptRecorder(sessionId: string | undefined) {
   const [elapsedMs, setElapsedMs] = useState(0);
   const startedAtRef = useRef<number | null>(null);
   const inputBufferRef = useRef('');
+  const inputRevisionRef = useRef(0);
   const lastStepAtRef = useRef<number>(Date.now());
   const isRecordingRef = useRef(false);
   const isPausedRef = useRef(false);
   const isStoppingRef = useRef(false);
   const stopPromiseRef = useRef<Promise<ScriptRecordingResult> | null>(null);
   const sessionIdRef = useRef(sessionId);
+  const recordingGenerationRef = useRef(0);
+  const pendingRecordStepsRef = useRef(Promise.resolve());
+  const isDrainingRecordingRef = useRef(false);
 
   sessionIdRef.current = sessionId;
 
@@ -60,8 +64,10 @@ export function useScriptRecorder(sessionId: string | undefined) {
     const bridge = netcattyBridge.get();
     if (!sid || !bridge?.scriptRecordingStart) return;
     await bridge.scriptRecordingStart(sid);
+    recordingGenerationRef.current += 1;
     startedAtRef.current = Date.now();
     lastStepAtRef.current = Date.now();
+    inputRevisionRef.current += 1;
     inputBufferRef.current = '';
     setElapsedMs(0);
     setIsPaused(false);
@@ -76,27 +82,26 @@ export function useScriptRecorder(sessionId: string | undefined) {
     const sid = sessionIdRef.current;
     const bridge = netcattyBridge.get();
     isStoppingRef.current = true;
+    isDrainingRecordingRef.current = true;
     isRecordingRef.current = false;
     isPausedRef.current = false;
     setIsRecording(false);
     setIsPaused(false);
+    inputRevisionRef.current += 1;
     inputBufferRef.current = '';
     startedAtRef.current = null;
     if (!sid || !bridge?.scriptRecordingStop) {
       isStoppingRef.current = false;
+      isDrainingRecordingRef.current = false;
       return emptyScriptRecordingResult();
     }
-    let stopRequest: Promise<ScriptRecordingResult>;
-    try {
-      stopRequest = Promise.resolve(bridge.scriptRecordingStop(sid));
-    } catch (error) {
-      stopRequest = Promise.reject(error);
-    }
+    const stopRequest = pendingRecordStepsRef.current.catch(() => {}).then(() => bridge.scriptRecordingStop!(sid));
     let stopPromise: Promise<ScriptRecordingResult>;
     stopPromise = stopRequest.finally(() => {
       if (stopPromiseRef.current === stopPromise) {
         stopPromiseRef.current = null;
         isStoppingRef.current = false;
+        isDrainingRecordingRef.current = false;
       }
     });
     stopPromiseRef.current = stopPromise;
@@ -104,8 +109,10 @@ export function useScriptRecorder(sessionId: string | undefined) {
   }, []);
 
   const finishAutomaticStop = useCallback((detail: ScriptRecordingLimitDetail) => {
+    isDrainingRecordingRef.current = false;
     isRecordingRef.current = false;
     isPausedRef.current = false;
+    inputRevisionRef.current += 1;
     inputBufferRef.current = '';
     startedAtRef.current = null;
     setIsRecording(false);
@@ -126,10 +133,13 @@ export function useScriptRecorder(sessionId: string | undefined) {
     setIsPaused(false);
   }, []);
 
-  const appendStep = useCallback(async (step: ScriptRecordingStep) => {
+  const appendStep = useCallback(async (step: ScriptRecordingStep, accepted = false) => {
     const sid = sessionIdRef.current;
-    if (!sid || !isRecordingRef.current || isPausedRef.current || isStoppingRef.current) return;
+    if (!sid || (!(accepted && isDrainingRecordingRef.current)
+      && (!isRecordingRef.current || (!accepted && isPausedRef.current) || isStoppingRef.current))) return;
+    const generation = recordingGenerationRef.current;
     const result = await netcattyBridge.get()?.scriptRecordingAppendStep?.(sid, step);
+    if (generation !== recordingGenerationRef.current || sid !== sessionIdRef.current) return;
     if (result?.stopped) {
       finishAutomaticStop({
         sessionId: sid,
@@ -154,6 +164,7 @@ export function useScriptRecorder(sessionId: string | undefined) {
     isStoppingRef.current = true;
     isRecordingRef.current = false;
     isPausedRef.current = false;
+    inputRevisionRef.current += 1;
     inputBufferRef.current = '';
     startedAtRef.current = null;
     setIsRecording(false);
@@ -188,33 +199,68 @@ export function useScriptRecorder(sessionId: string | undefined) {
 
   const recordBackspace = useCallback(() => {
     if (!isRecordingRef.current || isPausedRef.current || isStoppingRef.current) return;
+    inputRevisionRef.current += 1;
     inputBufferRef.current = inputBufferRef.current.slice(0, -1);
   }, []);
 
   const recordClearLine = useCallback(() => {
     if (!isRecordingRef.current || isPausedRef.current || isStoppingRef.current) return;
+    inputRevisionRef.current += 1;
     inputBufferRef.current = '';
   }, []);
 
-  const recordEnter = useCallback(async (options?: { sensitive?: boolean }) => {
+  const recordEnter = useCallback(async (options?: { sensitive?: boolean; submittedLine?: string }) => {
     const sid = sessionIdRef.current;
     if (!isRecordingRef.current || isPausedRef.current || isStoppingRef.current || !sid) return;
-    const line = inputBufferRef.current;
-    inputBufferRef.current = '';
+    const line = options?.submittedLine ?? inputBufferRef.current;
+    if (options?.submittedLine === undefined) {
+      inputRevisionRef.current += 1;
+      inputBufferRef.current = '';
+    }
     const now = Date.now();
     const gap = now - lastStepAtRef.current;
-    if (gap > 1000) {
-      await appendStep({ type: 'sleep', value: gap });
-    }
-    await appendStep({
-      type: 'send',
-      value: line,
-      sensitive: options?.sensitive,
-    });
-    await appendStep({ type: 'waitForPrompt', timeoutMs: DEFAULT_RECORDING_PROMPT_TIMEOUT_MS });
     lastStepAtRef.current = now;
+    const generation = recordingGenerationRef.current;
+    const pending = pendingRecordStepsRef.current.catch(() => {}).then(async () => {
+      const isCurrent = () => generation === recordingGenerationRef.current && sid === sessionIdRef.current
+        && (isRecordingRef.current || isDrainingRecordingRef.current);
+      if (!isCurrent()) return;
+      if (gap > 1000) await appendStep({ type: 'sleep', value: gap }, true);
+      if (!isCurrent()) return;
+      await appendStep({ type: 'send', value: line, sensitive: options?.sensitive }, true);
+      if (!isCurrent()) return;
+      await appendStep({ type: 'waitForPrompt', timeoutMs: DEFAULT_RECORDING_PROMPT_TIMEOUT_MS }, true);
+    });
+    pendingRecordStepsRef.current = pending;
+    await pending;
   }, [appendStep]);
 
+  // Delayed paste receipts must not consume newly typed input or leak into a
+  // recording started after the paste. Each receipt records one actual write.
+  const captureSubmittedLineRecorder = useCallback(() => {
+    if (!isRecordingRef.current || isPausedRef.current || isStoppingRef.current) return undefined;
+    const generation = recordingGenerationRef.current;
+    const sid = sessionIdRef.current;
+    const pendingInput = inputBufferRef.current;
+    const revision = inputRevisionRef.current;
+    let consumed = false;
+    const isCurrent = () => generation === recordingGenerationRef.current
+      && sid === sessionIdRef.current && isRecordingRef.current
+      && !isPausedRef.current && !isStoppingRef.current;
+    return (line: string, options?: { sensitive?: boolean; includePendingInput?: boolean; consumePendingInput?: boolean }): Promise<void> => {
+      // Capturing a batch is not a write. Retain its prefix if no receipt
+      // arrives; only its prefixed first line can consume the still-owned draft.
+      if (options?.consumePendingInput !== false && !consumed && generation === recordingGenerationRef.current && sid === sessionIdRef.current
+        && revision === inputRevisionRef.current && inputBufferRef.current.startsWith(pendingInput)) {
+        inputBufferRef.current = inputBufferRef.current.slice(pendingInput.length);
+        inputRevisionRef.current += 1;
+      }
+      if (options?.consumePendingInput !== false) consumed = true;
+      if (!isCurrent()) return Promise.resolve();
+      return recordEnter({ sensitive: options?.sensitive, submittedLine: options?.includePendingInput ? `${pendingInput}${line}` : line });
+    };
+  }, [recordEnter]);
+
   return {
     isRecording,
     isPaused,
@@ -227,5 +273,6 @@ export function useScriptRecorder(sessionId: string | undefined) {
     recordBackspace,
     recordClearLine,
     recordEnter,
+    captureSubmittedLineRecorder,
   };
 }

application/state/useServerStats.ts

@@ -33,6 +33,10 @@ export interface ServerStats {
   cpu: number | null;           // CPU usage percentage (0-100)
   cpuCores: number | null;      // Number of CPU cores
   cpuPerCore: number[];         // Per-core CPU usage array
+  gpu: number | null;           // NVIDIA GPU utilization percentage (0-100), null when no GPU data
+  gpuName: string | null;       // First GPU name (tooltip)
+  gpuMemUsed: number | null;    // Summed VRAM used in MB
+  gpuMemTotal: number | null;   // Summed VRAM total in MB
   memTotal: number | null;      // Total memory in MB
   memUsed: number | null;       // Used memory in MB (excluding buffers/cache)
   memFree: number | null;       // Free memory in MB
@@ -107,6 +111,10 @@ function createEmptyServerStats(): ServerStats {
     cpu: null,
     cpuCores: null,
     cpuPerCore: [],
+    gpu: null,
+    gpuName: null,
+    gpuMemUsed: null,
+    gpuMemTotal: null,
     memTotal: null,
     memUsed: null,
     memFree: null,
@@ -200,6 +208,10 @@ function normalizeServerStats(stats: Partial<ServerStats>): ServerStats {
     cpu: stats.cpu ?? null,
     cpuCores: stats.cpuCores ?? null,
     cpuPerCore: stats.cpuPerCore || [],
+    gpu: stats.gpu ?? null,
+    gpuName: stats.gpuName ?? null,
+    gpuMemUsed: stats.gpuMemUsed ?? null,
+    gpuMemTotal: stats.gpuMemTotal ?? null,
     memTotal: stats.memTotal ?? null,
     memUsed: stats.memUsed ?? null,
     memFree: stats.memFree ?? null,

application/state/useSettingsState.ts

@@ -1,4 +1,3 @@
-import { normalizeTabBarPosition, type TabBarPosition } from '../../domain/tabBarPosition';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type SetStateAction } from 'react';
 
 import { runThemeTransition, type ThemeTransitionMode } from './themeTransition';
@@ -79,10 +78,11 @@ import {
   STORAGE_KEY_HOST_CLICK_BEHAVIOR,
   STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT,
   STORAGE_KEY_SHOW_SFTP_TAB,
-  STORAGE_KEY_TAB_BAR_POSITION,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
   STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_DISABLE_TERMINAL_FONT_ZOOM,
@@ -415,9 +415,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT);
     return stored ?? DEFAULT_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT;
   });
-  const [tabBarPosition, setTabBarPositionState] = useState<TabBarPosition>(() =>
-    normalizeTabBarPosition(readStoredString(STORAGE_KEY_TAB_BAR_POSITION)),
-  );
   const [showSftpTab, setShowSftpTabState] = useState<boolean>(() => {
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_SFTP_TAB);
     return stored ?? DEFAULT_SHOW_SFTP_TAB;
@@ -434,6 +431,14 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     const stored = readStoredString(STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB);
     return isTerminalSidePanelAutoOpenTab(stored) ? stored : DEFAULT_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB;
   });
+  const [localShellSidePanelAutoOpen, setLocalShellSidePanelAutoOpenState] = useState<boolean>(() => {
+    const stored = localStorageAdapter.readBoolean(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN);
+    return stored ?? false;
+  });
+  const [localShellSidePanelAutoOpenTab, setLocalShellSidePanelAutoOpenTabState] = useState<TerminalSidePanelAutoOpenTab>(() => {
+    const stored = readStoredString(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB);
+    return isTerminalSidePanelAutoOpenTab(stored) ? stored : 'scripts';
+  });
   const [shellOnlyTabNumberShortcuts, setShellOnlyTabNumberShortcutsState] = useState<boolean>(() => {
     const stored = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
     return stored ?? DEFAULT_SHELL_ONLY_TAB_NUMBER_SHORTCUTS;
@@ -1017,7 +1022,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     );
     const storedShowOnlyUngroupedHostsInRoot = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT);
     setShowOnlyUngroupedHostsInRootState(storedShowOnlyUngroupedHostsInRoot ?? DEFAULT_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT);
-    setTabBarPositionState(normalizeTabBarPosition(readStoredString(STORAGE_KEY_TAB_BAR_POSITION)));
     const storedShowSftpTab = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_SFTP_TAB);
     setShowSftpTabState(storedShowSftpTab ?? DEFAULT_SHOW_SFTP_TAB);
     const storedShowHostTreeSidebar = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR);
@@ -1030,6 +1034,14 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
         ? storedTerminalSidePanelAutoOpenTab
         : DEFAULT_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
     );
+    const storedLocalShellSidePanelAutoOpen = localStorageAdapter.readBoolean(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN);
+    setLocalShellSidePanelAutoOpenState(storedLocalShellSidePanelAutoOpen ?? false);
+    const storedLocalShellSidePanelAutoOpenTab = readStoredString(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB);
+    setLocalShellSidePanelAutoOpenTabState(
+      isTerminalSidePanelAutoOpenTab(storedLocalShellSidePanelAutoOpenTab)
+        ? storedLocalShellSidePanelAutoOpenTab
+        : 'scripts',
+    );
     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);
@@ -1204,10 +1216,11 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setSftpFollowTerminalCwd,
     setSftpDefaultViewMode,
     setWorkspaceFocusStyleState,
-    setTabBarPositionState,
     setShowHostTreeSidebarState,
     setTerminalSidePanelAutoOpenState,
     setTerminalSidePanelAutoOpenTabState,
+    setLocalShellSidePanelAutoOpenState,
+    setLocalShellSidePanelAutoOpenTabState,
     setDisableTerminalFontZoomState,
     setRestorePreviousSessionState,
     setRestoreTerminalCwdState,
@@ -1261,7 +1274,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     terminalThemeId, followAppTerminalTheme, terminalFontFamilyId, terminalFontSize,
     sftpDoubleClickBehavior, sftpAutoSync, sftpShowHiddenFiles,
     sftpUseCompressedUpload, sftpSkipUnchanged, sftpAutoOpenSidebar, sftpFollowTerminalCwd, sftpDefaultViewMode,
-    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, tabBarPosition, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
+    showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, localShellSidePanelAutoOpen, localShellSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom, restorePreviousSession, restoreTerminalCwd, startupLanding,
     editorWordWrap, sessionLogsEnabled, sessionLogsDir, sessionLogsFormat, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     globalHotkeyEnabled, autoUpdateEnabled, windowOpacity, appIconVariant,
     setTheme, setLightUiThemeId, setDarkUiThemeId, setAccentMode,
@@ -1271,7 +1284,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setFollowAppTerminalThemeState, setTerminalFontFamilyId, setTerminalFontSize: applyIncomingTerminalFontSize,
     setSftpDoubleClickBehavior, setSftpAutoSync, setSftpShowHiddenFiles,
     setSftpUseCompressedUpload, setSftpSkipUnchanged, setSftpAutoOpenSidebar, setSftpFollowTerminalCwd, setSftpDefaultViewMode,
-    setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setTabBarPositionState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
+    setShowRecentHostsState, setHostClickBehaviorState, setShowOnlyUngroupedHostsInRootState, setShowSftpTabState, setShowHostTreeSidebarState, setTerminalSidePanelAutoOpenState, setTerminalSidePanelAutoOpenTabState, setLocalShellSidePanelAutoOpenState, setLocalShellSidePanelAutoOpenTabState, setShellOnlyTabNumberShortcutsState, setShowTabNumberBadgesState, setDisableTerminalFontZoomState, setRestorePreviousSessionState, setRestoreTerminalCwdState, setStartupLandingState,
     setEditorWordWrapState, setSessionLogsEnabled, setSessionLogsDir, setSessionLogsFormat, setSessionLogsTimestampsEnabled, setSshDebugLogsEnabled, setSshDeepLinkEnabledState: applyIncomingSshDeepLinkEnabled, setJmsDeepLinkEnabledState: applyIncomingJmsDeepLinkEnabled, setExplorerContextMenuEnabledState: applyIncomingExplorerContextMenuEnabled,
     setGlobalHotkeyEnabled, setWindowOpacity: applyIncomingWindowOpacity, setAppIconVariant, setAutoUpdateEnabled, setWorkspaceFocusStyleState,
     setSftpTransferConcurrencyState, setSshTransportIdleTtlMsState,
@@ -1401,14 +1414,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     notifySettingsChanged(STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT, enabled);
   }, [notifySettingsChanged]);
 
-  const setTabBarPosition = useCallback((value: TabBarPosition) => {
-    const next = normalizeTabBarPosition(value);
-    setTabBarPositionState(next);
-    localStorageAdapter.writeString(STORAGE_KEY_TAB_BAR_POSITION, next);
-    if (!persistMountedRef.current) return;
-    notifySettingsChanged(STORAGE_KEY_TAB_BAR_POSITION, next);
-  }, [notifySettingsChanged]);
-
   const setShowSftpTab = useCallback((enabled: boolean) => {
     setShowSftpTabState(enabled);
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_SFTP_TAB, enabled);
@@ -1438,6 +1443,21 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     notifySettingsChanged(STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB, next);
   }, [notifySettingsChanged]);
 
+  const setLocalShellSidePanelAutoOpen = useCallback((enabled: boolean) => {
+    setLocalShellSidePanelAutoOpenState(enabled);
+    localStorageAdapter.writeBoolean(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, enabled);
+    if (!persistMountedRef.current) return;
+    notifySettingsChanged(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, enabled);
+  }, [notifySettingsChanged]);
+
+  const setLocalShellSidePanelAutoOpenTab = useCallback((tab: TerminalSidePanelAutoOpenTab) => {
+    const next = isTerminalSidePanelAutoOpenTab(tab) ? tab : 'scripts';
+    setLocalShellSidePanelAutoOpenTabState(next);
+    localStorageAdapter.writeString(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, next);
+    if (!persistMountedRef.current) return;
+    notifySettingsChanged(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, next);
+  }, [notifySettingsChanged]);
+
   const setShellOnlyTabNumberShortcuts = useCallback((enabled: boolean) => {
     setShellOnlyTabNumberShortcutsState(enabled);
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS, enabled);
@@ -1880,7 +1900,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
       darkUiThemeId,
       uiLanguage,
       windowOpacity,
-      tabBarPosition,
       showSftpTab,
       showHostTreeSidebar,
       showRecentHosts,
@@ -1894,6 +1913,8 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
       restoreTerminalCwd,
       terminalSidePanelAutoOpen,
       terminalSidePanelAutoOpenTab,
+      localShellSidePanelAutoOpen,
+      localShellSidePanelAutoOpenTab,
     });
   }, [
     darkUiThemeId,
@@ -1907,7 +1928,6 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     showHostTreeSidebar,
     showOnlyUngroupedHostsInRoot,
     showRecentHosts,
-    tabBarPosition,
     showSftpTab,
     showTabNumberBadges,
     terminalSettings.dynamicTabTitleMode,
@@ -1916,6 +1936,8 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     theme,
     uiLanguage,
     windowOpacity,
+    localShellSidePanelAutoOpen,
+    localShellSidePanelAutoOpenTab,
   ]);
 
   useLayoutEffect(() => {
@@ -2080,9 +2102,7 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setHostClickBehavior,
     showOnlyUngroupedHostsInRoot,
     setShowOnlyUngroupedHostsInRoot,
-    tabBarPosition,
     showSftpTab,
-    setTabBarPosition,
     setShowSftpTab,
     showHostTreeSidebar,
     setShowHostTreeSidebar,
@@ -2090,6 +2110,10 @@ export const useSettingsState = (options: { enableSettingsSync?: boolean; enable
     setTerminalSidePanelAutoOpen,
     terminalSidePanelAutoOpenTab,
     setTerminalSidePanelAutoOpenTab,
+    localShellSidePanelAutoOpen,
+    setLocalShellSidePanelAutoOpen,
+    localShellSidePanelAutoOpenTab,
+    setLocalShellSidePanelAutoOpenTab,
     shellOnlyTabNumberShortcuts,
     setShellOnlyTabNumberShortcuts,
     showTabNumberBadges,
@@ -2158,7 +2182,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, tabBarPosition, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom,
+      showRecentHosts, hostClickBehavior, showOnlyUngroupedHostsInRoot, showSftpTab, showHostTreeSidebar, terminalSidePanelAutoOpen, terminalSidePanelAutoOpenTab, localShellSidePanelAutoOpen, localShellSidePanelAutoOpenTab, shellOnlyTabNumberShortcuts, showTabNumberBadges, disableTerminalFontZoom,
       customThemes, workspaceFocusStyle, sessionLogsTimestampsEnabled, sshDebugLogsEnabled, sshDeepLinkEnabled, jmsDeepLinkEnabled, explorerContextMenuEnabled,
     ]),
   };

application/state/useTerminalBackend.ts

@@ -202,13 +202,19 @@ export const useTerminalBackend = () => {
     bridge?.writeToSession?.(sessionId, data, options);
   }, []);
 
-  const interruptSession = useCallback((sessionId: string, trace?: NetcattyTerminalInterruptTrace) => {
+  const notifyUserInput = useCallback((sessionId: string) => {
+    const bridge = netcattyBridge.get();
+    bridge?.notifySessionUserInput?.(sessionId);
+  }, []);
+
+  const interruptSession = useCallback((...args: Parameters<NonNullable<NetcattyBridge["interruptSession"]>>) => {
+    const [sessionId, , options] = args;
     const bridge = netcattyBridge.get();
     if (bridge?.interruptSession) {
-      bridge.interruptSession(sessionId, trace);
+      bridge.interruptSession(...args);
       return;
     }
-    bridge?.writeToSession?.(sessionId, "\x03");
+    if (!options?.cancelPendingWritesOnly) bridge?.writeToSession?.(sessionId, "\x03");
   }, []);
 
   const resizeSession = useCallback((sessionId: string, cols: number, rows: number) => {
@@ -593,6 +599,7 @@ export const useTerminalBackend = () => {
         getSessionDistroInfo,
         getServerStats,
         writeToSession,
+        notifyUserInput,
         interruptSession,
         resizeSession,
         clearSessionPtyBuffer,
@@ -675,6 +682,7 @@ export const useTerminalBackend = () => {
       getSessionDistroInfo,
       getServerStats,
       writeToSession,
+      notifyUserInput,
       interruptSession,
       resizeSession,
       clearSessionPtyBuffer,

application/state/useVaultGroupDeletion.test.tsx

@@ -4,7 +4,7 @@ import React from "react";
 import { act, create, type ReactTestRenderer } from "react-test-renderer";
 
 import type { GroupConfig, ManagedSource } from "../../domain/models.ts";
-import { useVaultGroupDeletion } from "./useVaultGroupDeletion.ts";
+import { useVaultGroupDeletion, VaultGroupDeletionConfirmationChangedError } from "./useVaultGroupDeletion.ts";
 
 test("group deletion removes saved settings in the same Vault transaction", async () => {
   const actEnvironment = globalThis as typeof globalThis & {
@@ -132,7 +132,7 @@ test("group deletion restores managed files when the persisted Vault cannot be r
   assert.equal(commitCount, 0);
 });
 
-test("group deletion retries file clearing when another managed source enters the group", async () => {
+test("group deletion rejects retry when another managed source enters the group", async () => {
   const actEnvironment = globalThis as typeof globalThis & {
     IS_REACT_ACT_ENVIRONMENT?: boolean;
   };
@@ -198,7 +198,7 @@ test("group deletion retries file clearing when another managed source enters th
       renderer = create(React.createElement(Probe));
     });
     await act(async () => {
-      await deleteGroups?.(["Production"]);
+      await assert.rejects(deleteGroups!(["Production"]), VaultGroupDeletionConfirmationChangedError);
     });
   } finally {
     await act(async () => {
@@ -209,10 +209,9 @@ test("group deletion retries file clearing when another managed source enters th
 
   assert.deepEqual(clearedSourceIds, [
     ["managed-first"],
-    ["managed-concurrent", "managed-first"],
   ]);
   assert.equal(restoreCount, 1);
-  assert.equal(commitCount, 1);
+  assert.equal(commitCount, 0);
 });
 
 test("group deletion restores managed files and does not report success when commit fails", async () => {
@@ -278,3 +277,209 @@ test("group deletion restores managed files and does not report success when com
   assert.equal(restoreCount, 1);
   assert.equal(reportedCount, 0);
 });
+
+const confirmedSource: ManagedSource = {
+  id: "managed-production",
+  type: "ssh_config",
+  filePath: "/tmp/managed-production.conf",
+  groupName: "Production",
+  lastSyncedAt: 1,
+};
+
+async function withDeletionProbe(
+  options: Partial<Parameters<typeof useVaultGroupDeletion>[0]>,
+  run: (getDelete: () => ReturnType<typeof useVaultGroupDeletion>, rerender: (sources: ManagedSource[]) => Promise<void>) => Promise<void>,
+) {
+  const environment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
+  const previous = environment.IS_REACT_ACT_ENVIRONMENT;
+  environment.IS_REACT_ACT_ENVIRONMENT = true;
+  let renderer: ReactTestRenderer | undefined;
+  let deleteGroups!: ReturnType<typeof useVaultGroupDeletion>;
+  const defaults: Parameters<typeof useVaultGroupDeletion>[0] = {
+    customGroups: ["Production"], hosts: [], groupConfigs: [],
+    managedSources: [confirmedSource],
+    onReadPersistedHosts: async () => [],
+    onReadPersistedManagedSources: () => [confirmedSource],
+    onCommitVaultGroupMutation: async (mutate) => mutate({
+      groups: ["Production"], configs: [], hosts: [],
+      managedSources: [confirmedSource], snippets: [],
+    }),
+    ...options,
+  };
+  const Probe = ({ sources }: { sources: ManagedSource[] }) => {
+    deleteGroups = useVaultGroupDeletion({ ...defaults, managedSources: sources });
+    return null;
+  };
+  try {
+    await act(async () => {
+      renderer = create(<Probe sources={defaults.managedSources} />);
+    });
+    await run(() => deleteGroups, async (sources) => {
+      await act(async () => { renderer!.update(<Probe sources={sources} />); });
+    });
+  } finally {
+    await act(async () => { renderer?.unmount(); });
+    environment.IS_REACT_ACT_ENVIRONMENT = previous;
+  }
+}
+
+for (const [name, rendered, persisted] of [
+  ["changed file path", [confirmedSource], [{ ...confirmedSource, filePath: "/tmp/other.conf" }]],
+  ["changed source id", [confirmedSource], [{ ...confirmedSource, id: "replacement" }]],
+  ["added source", [confirmedSource], [confirmedSource, { ...confirmedSource, id: "added", filePath: "/tmp/added.conf" }]],
+  ["first source", [], [confirmedSource]],
+  ["source moved up within selection", [{ ...confirmedSource, groupName: "Production/Sub" }], [confirmedSource]],
+  ["source moved into selection", [{ ...confirmedSource, groupName: "Staging" }], [confirmedSource]],
+] as const) {
+  test(`group deletion rejects initially persisted ${name} before clearing files`, async () => {
+    let clearCount = 0;
+    let commitCount = 0;
+    let reportedCount = 0;
+    await withDeletionProbe({
+      managedSources: [...rendered],
+      onReadPersistedManagedSources: () => [...persisted],
+      onClearAndRemoveManagedSources: async () => {
+        clearCount += 1;
+        return async () => {};
+      },
+      onCommitVaultGroupMutation: async () => {
+        commitCount += 1;
+        throw new Error("unexpected commit");
+      },
+      onDeletedPaths: () => { reportedCount += 1; },
+    }, async (getDelete) => {
+      // A failed attempt refreshes latestRef without refreshing the warning.
+      for (let attempt = 0; attempt < 2; attempt += 1) {
+        await assert.rejects(getDelete()(["Production"]), VaultGroupDeletionConfirmationChangedError);
+      }
+    });
+    assert.equal(clearCount, 0);
+    assert.equal(commitCount, 0);
+    assert.equal(reportedCount, 0);
+  });
+}
+
+test("group deletion keeps old callbacks bound to their rendered confirmation", async () => {
+  const changed = { ...confirmedSource, filePath: "/tmp/changed.conf" };
+  const cleared: string[] = [];
+  await withDeletionProbe({
+    onReadPersistedManagedSources: () => [changed],
+    onClearAndRemoveManagedSources: async (sources) => {
+      cleared.push(...sources.map((source) => source.filePath));
+      return async () => {};
+    },
+    onCommitVaultGroupMutation: async (mutate) => mutate({
+      groups: ["Production"], configs: [], hosts: [], managedSources: [changed], snippets: [],
+    }),
+  }, async (getDelete, rerender) => {
+    const staleDelete = getDelete();
+    await rerender([changed]);
+    assert.notEqual(getDelete(), staleDelete);
+    await assert.rejects(staleDelete(["Production"]), VaultGroupDeletionConfirmationChangedError);
+    assert.deepEqual(cleared, []);
+    await getDelete()(["Production"]);
+  });
+  assert.deepEqual(cleared, [changed.filePath]);
+});
+
+for (const retry of ["snapshot", "commit", "superseded"] as const) {
+  test(`group deletion retains safe ${retry} retries for the same confirmed file`, async () => {
+    const updated = { ...confirmedSource, lastSyncedAt: 2 };
+    let reads = 0;
+    let commits = 0;
+    let restores = 0;
+    let reported = 0;
+    const cleared: string[] = [];
+    await withDeletionProbe({
+      onReadPersistedManagedSources: () => {
+        reads += 1;
+        return [retry === "snapshot" && reads > 1 ? updated : confirmedSource];
+      },
+      onClearAndRemoveManagedSources: async (sources) => {
+        cleared.push(...sources.map((source) => source.filePath));
+        return async () => { restores += 1; };
+      },
+      onCommitVaultGroupMutation: async (mutate) => {
+        commits += 1;
+        if (retry === "superseded" && commits === 1) return { ok: false, superseded: true };
+        return mutate({
+          groups: ["Production"], configs: [], hosts: [], snippets: [],
+          managedSources: [retry === "snapshot" || (retry === "commit" && commits === 1) ? updated : confirmedSource],
+        });
+      },
+      onDeletedPaths: () => { reported += 1; },
+    }, async (getDelete) => { await getDelete()(["Production"]); });
+    assert.deepEqual(cleared, [confirmedSource.filePath, confirmedSource.filePath]);
+    assert.equal(restores, 1);
+    assert.equal(commits, retry === "snapshot" ? 1 : 2);
+    assert.equal(reported, 1);
+  });
+}
+
+for (const retry of ["commit", "superseded"] as const) {
+  test(`group deletion rejects new files after a ${retry} retry`, async () => {
+    const added = { ...confirmedSource, id: "added", filePath: "/tmp/added.conf" };
+    let persisted = [confirmedSource];
+    let commits = 0;
+    let restores = 0;
+    let reported = 0;
+    const cleared: string[] = [];
+    await withDeletionProbe({
+      onReadPersistedManagedSources: () => persisted,
+      onClearAndRemoveManagedSources: async (sources) => {
+        cleared.push(...sources.map((source) => source.filePath));
+        return async () => { restores += 1; };
+      },
+      onCommitVaultGroupMutation: async (mutate) => {
+        commits += 1;
+        persisted = [confirmedSource, added];
+        if (retry === "superseded") return { ok: false, superseded: true };
+        return mutate({
+          groups: ["Production"], configs: [], hosts: [], snippets: [], managedSources: persisted,
+        });
+      },
+      onDeletedPaths: () => { reported += 1; },
+    }, async (getDelete) => {
+      await assert.rejects(getDelete()(["Production"]), VaultGroupDeletionConfirmationChangedError);
+    });
+    assert.deepEqual(cleared, [confirmedSource.filePath]);
+    assert.equal(restores, 1);
+    assert.equal(commits, 1);
+    assert.equal(reported, 0);
+  });
+}
+
+for (const phase of ["snapshot", "commit"] as const) {
+  test(`group deletion rejects a managed subgroup moved to its parent during ${phase}`, async () => {
+    const subgroup = { ...confirmedSource, groupName: "Production/Sub" };
+    let persisted = [subgroup];
+    let reads = 0;
+    let restores = 0;
+    let commits = 0;
+    const cleared: string[] = [];
+    await withDeletionProbe({
+      managedSources: [subgroup],
+      onReadPersistedManagedSources: () => {
+        if (phase === "snapshot" && ++reads > 1) persisted = [confirmedSource];
+        return persisted;
+      },
+      onClearAndRemoveManagedSources: async (sources) => {
+        cleared.push(...sources.map((source) => source.groupName));
+        return async () => { restores += 1; };
+      },
+      onCommitVaultGroupMutation: async (mutate) => {
+        commits += 1;
+        persisted = [confirmedSource];
+        return mutate({
+          groups: ["Production", "Production/Sub"], configs: [], hosts: [],
+          managedSources: persisted, snippets: [],
+        });
+      },
+    }, async (getDelete) => {
+      await assert.rejects(getDelete()(["Production"]), VaultGroupDeletionConfirmationChangedError);
+    });
+    assert.deepEqual(cleared, ["Production/Sub"]);
+    assert.equal(restores, 1);
+    assert.equal(commits, phase === "snapshot" ? 0 : 1);
+  });
+}

application/state/useVaultGroupDeletion.ts

@@ -14,6 +14,17 @@ import {
 
 const RETRY_VAULT_GROUP_DELETION = Symbol("retry-vault-group-deletion");
 
+export class VaultGroupDeletionConfirmationChangedError extends Error {
+  constructor() {
+    super("The managed files affected by this deletion have changed. Review the files and confirm again.");
+    this.name = "VaultGroupDeletionConfirmationChangedError";
+  }
+}
+
+const managedSourceDeletionIdentity = (source: ManagedSource): string => (
+  JSON.stringify([source.id, source.type, source.filePath, source.groupName])
+);
+
 const managedSourceSnapshotsMatch = (
   left: ManagedSource[],
   right: ManagedSource[],
@@ -59,6 +70,14 @@ export function useVaultGroupDeletion({
     additionallyDeletedHostIds: ReadonlySet<string> = new Set(),
   ) => {
     const selectedPaths = [...paths];
+    // Bind confirmation to the sources rendered with this callback, not the
+    // latest persisted snapshot (which reads and retries update independently).
+    const confirmedFiles = new Set(buildVaultGroupDeletion({
+      ...latestRef.current,
+      selectedPaths,
+      deleteHosts,
+      managedSources,
+    }).sourcesToRemove.map(managedSourceDeletionIdentity));
     let deletedRoots: string[] = [];
     while (true) {
       let restoreManagedFiles: (() => Promise<void>) | undefined;
@@ -82,6 +101,12 @@ export function useVaultGroupDeletion({
             return { status: "empty" as const };
           }
 
+          if (deletion.sourcesToRemove.some((source) => (
+            !confirmedFiles.has(managedSourceDeletionIdentity(source))
+          ))) {
+            throw new VaultGroupDeletionConfirmationChangedError();
+          }
+
           if (deletion.sourcesToRemove.length > 0) {
             if (onClearAndRemoveManagedSources) {
               restoreManagedFiles = await onClearAndRemoveManagedSources(deletion.sourcesToRemove);
@@ -194,6 +219,7 @@ export function useVaultGroupDeletion({
     }
     onDeletedPaths?.(deletedRoots);
   }, [
+    managedSources,
     onClearAndRemoveManagedSource,
     onClearAndRemoveManagedSources,
     onCommitVaultGroupMutation,

application/state/useVaultState.ts

@@ -186,6 +186,7 @@ const migrateKey = (key: Partial<SSHKey>): SSHKey => {
     id,
     label,
     type: key.type || "ED25519",
+    keySize: key.keySize,
     privateKey: key.privateKey || "",
     publicKey: key.publicKey,
     certificate: key.certificate,

application/state/useWorkspaceLayoutPresetState.test.tsx

@@ -0,0 +1,145 @@
+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 {
+  collectSidePanelPanes,
+  createSidePanelLayout,
+  splitSidePanelPane,
+  type SidePanelLayout,
+} from '../../domain/sidePanelLayout.ts';
+import { STORAGE_KEY_WORKSPACE_LAYOUT_PRESET } from '../../infrastructure/config/storageKeys.ts';
+import { useWorkspaceLayoutPresetState } from './useWorkspaceLayoutPresetState.ts';
+
+function buildSplitLayout(): SidePanelLayout {
+  let layout = createSidePanelLayout('scripts', 'pane-scripts');
+  layout = splitSidePanelPane(layout, 'pane-scripts', 'sftp', 'horizontal', {
+    paneId: 'pane-sftp',
+    splitId: 'split-root',
+  }, 400);
+  return layout;
+}
+
+test('saved default resolves per session with fresh ids and protocol-aware pruning', async () => {
+  const values = new Map<string, string>();
+  const fakeStorage = {
+    getItem: (key: string) => values.get(key) ?? null,
+    setItem: (key: string, value: string) => { values.set(key, value); },
+    removeItem: (key: string) => { values.delete(key); },
+  };
+  const globals = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+    localStorage?: typeof fakeStorage;
+  };
+  const previousActEnvironment = globals.IS_REACT_ACT_ENVIRONMENT;
+  const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, 'localStorage');
+  globals.IS_REACT_ACT_ENVIRONMENT = true;
+  Object.defineProperty(globalThis, 'localStorage', {
+    value: fakeStorage,
+    configurable: true,
+  });
+
+  let state: ReturnType<typeof useWorkspaceLayoutPresetState> | null = null;
+  const Probe = () => {
+    state = useWorkspaceLayoutPresetState();
+    return null;
+  };
+
+  try {
+    await act(async () => {
+      create(React.createElement(Probe));
+    });
+    assert.ok(state);
+
+    // Nothing saved yet: no preset to apply.
+    assert.equal(state.resolveDefaultLayoutForSession({ protocol: 'ssh' }), null);
+
+    let saved = false;
+    await act(async () => {
+      saved = state?.saveWorkspaceLayoutAsDefault(buildSplitLayout()) ?? false;
+    });
+    assert.equal(saved, true);
+    assert.ok(values.has(STORAGE_KEY_WORKSPACE_LAYOUT_PRESET));
+
+    // SSH sessions keep their SFTP pane; ids are rekeyed per application.
+    const sshResolved = state.resolveDefaultLayoutForSession({ protocol: 'ssh' });
+    assert.ok(sshResolved);
+    assert.equal(sshResolved.protocol, 'ssh');
+    assert.deepEqual(
+      collectSidePanelPanes(sshResolved.layout.root).map((pane) => pane.tool),
+      ['scripts', 'sftp'],
+    );
+    assert.notEqual(sshResolved.layout.root.id, buildSplitLayout().root.id);
+    assert.equal(sshResolved.focusedTool, 'sftp');
+
+    // Protocols that cannot serve SFTP lose that pane.
+    const telnetResolved = state.resolveDefaultLayoutForSession({ protocol: 'telnet' });
+    assert.ok(telnetResolved);
+    assert.deepEqual(
+      collectSidePanelPanes(telnetResolved.layout.root).map((pane) => pane.tool),
+      ['scripts'],
+    );
+    assert.equal(telnetResolved.focusedTool, 'scripts');
+
+    // A second resolve rekeys again so parallel workspaces share no node ids.
+    const again = state.resolveDefaultLayoutForSession({ protocol: 'ssh' });
+    assert.ok(again);
+    assert.notEqual(again.layout.root.id, sshResolved.layout.root.id);
+  } finally {
+    if (previousLocalStorage) {
+      Object.defineProperty(globalThis, 'localStorage', previousLocalStorage);
+    } else {
+      delete (globalThis as { localStorage?: unknown }).localStorage;
+    }
+    globals.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
+  }
+});
+
+test('saving falls back to false when persistence rejects the write', async () => {
+  const fakeStorage = {
+    getItem: () => null,
+    setItem: () => {
+      const quotaError = new DOMException('full', 'QuotaExceededError');
+      throw quotaError;
+    },
+    removeItem: () => undefined,
+  };
+  const globals = globalThis as typeof globalThis & {
+    IS_REACT_ACT_ENVIRONMENT?: boolean;
+    localStorage?: typeof fakeStorage;
+  };
+  const previousActEnvironment = globals.IS_REACT_ACT_ENVIRONMENT;
+  const previousLocalStorage = Object.getOwnPropertyDescriptor(globalThis, 'localStorage');
+  globals.IS_REACT_ACT_ENVIRONMENT = true;
+  Object.defineProperty(globalThis, 'localStorage', {
+    value: fakeStorage,
+    configurable: true,
+  });
+
+  let state: ReturnType<typeof useWorkspaceLayoutPresetState> | null = null;
+  const Probe = () => {
+    state = useWorkspaceLayoutPresetState();
+    return null;
+  };
+
+  try {
+    await act(async () => {
+      create(React.createElement(Probe));
+    });
+    assert.ok(state);
+
+    let saved = true;
+    await act(async () => {
+      saved = state?.saveWorkspaceLayoutAsDefault(buildSplitLayout()) ?? true;
+    });
+    assert.equal(saved, false);
+  } finally {
+    if (previousLocalStorage) {
+      Object.defineProperty(globalThis, 'localStorage', previousLocalStorage);
+    } else {
+      delete (globalThis as { localStorage?: unknown }).localStorage;
+    }
+    globals.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
+  }
+});

application/state/useWorkspaceLayoutPresetState.ts

@@ -0,0 +1,69 @@
+import { useCallback } from 'react';
+
+import {
+  getFocusedSidePanelPane,
+  type SidePanelLayout,
+  type SidePanelTool,
+} from '../../domain/sidePanelLayout';
+import {
+  createWorkspaceLayoutPreset,
+  rekeySidePanelLayout,
+  withoutUnavailableSidePanelTools,
+} from '../../domain/workspaceLayoutPreset';
+import {
+  readWorkspaceLayoutPreset,
+  writeWorkspaceLayoutPreset,
+} from './workspaceLayoutPresetStore';
+
+/** Protocols whose sessions can actually serve an SFTP pane. */
+function canServeSftp(protocol: string): boolean {
+  return protocol === 'local' || protocol === 'ssh' || protocol === 'mosh';
+}
+
+export type ResolvedWorkspaceLayoutPreset = {
+  layout: SidePanelLayout;
+  focusedTool: SidePanelTool;
+  /** Connection protocol used for availability filtering (`session.protocol ?? 'ssh'`). */
+  protocol: string;
+};
+
+/**
+ * Application boundary for the saved default workspace side panel layout.
+ * Owns the preset persistence lifecycle (read, validate, write) so UI
+ * components consume handlers instead of touching the store directly.
+ */
+export function useWorkspaceLayoutPresetState() {
+  /**
+   * Resolve the saved default preset into a fresh layout for a newly
+   * connected session. Panes the session cannot serve (SFTP on non-file
+   * protocols) are pruned, and ids are rekeyed so several workspaces can
+   * run the same preset in parallel. Returns null when there is no preset
+   * or nothing survives availability filtering.
+   */
+  const resolveDefaultLayoutForSession = useCallback(
+    (session: { protocol?: string | null }): ResolvedWorkspaceLayoutPreset | null => {
+      const preset = readWorkspaceLayoutPreset();
+      if (!preset) return null;
+
+      const proto = session.protocol ?? 'ssh';
+      const usable = withoutUnavailableSidePanelTools(
+        preset.layout,
+        (tool) => tool !== 'sftp' || canServeSftp(proto),
+      );
+      if (!usable) return null;
+
+      const layout = rekeySidePanelLayout(usable, () => crypto.randomUUID());
+      return { layout, focusedTool: getFocusedSidePanelPane(layout).tool, protocol: proto };
+    },
+    [],
+  );
+
+  /** Validate and persist a live layout as the default. False when invalid or the write failed. */
+  const saveWorkspaceLayoutAsDefault = useCallback((layout: SidePanelLayout): boolean => {
+    const preset = createWorkspaceLayoutPreset(layout);
+    if (!preset) return false;
+    return writeWorkspaceLayoutPreset(preset);
+  }, []);
+
+  return { resolveDefaultLayoutForSession, saveWorkspaceLayoutAsDefault };
+}

application/state/vaultImportFile.test.ts

@@ -48,6 +48,51 @@ test("MobaXterm import keeps valid UTF-8 labels when GB18030 would produce Chine
   assert.equal(result.hosts[0]?.label, "¡prod");
 });
 
+test("CSV import decodes legacy GB18030 Chinese group names", async () => {
+  const header = new TextEncoder().encode("Groups,Label,Hostname/IP,Port,Username\n");
+  const encodedGroup = new Uint8Array([
+    0xd6, 0xd0, 0xce, 0xc4, 0xd7, 0xe9, // 中文组 in GB18030
+  ]);
+  const row = new TextEncoder().encode(",web,192.168.1.10,22,root\n");
+  const bytes = new Uint8Array(header.length + encodedGroup.length + row.length);
+  bytes.set(header);
+  bytes.set(encodedGroup, header.length);
+  bytes.set(row, header.length + encodedGroup.length);
+
+  const text = await readVaultImportFile(
+    "csv",
+    new File([bytes], "hosts.csv", { type: "text/csv" }),
+  );
+  const result = importVaultHostsFromText("csv", text);
+
+  assert.equal(result.hosts[0]?.group, "中文组");
+});
+
+test("CSV import keeps valid UTF-8 Chinese group names", async () => {
+  const text = "Groups,Label,Hostname/IP,Port,Username\n中文组,web,192.168.1.10,22,root\n";
+  const decoded = await readVaultImportFile(
+    "csv",
+    new File([text], "hosts.csv", { type: "text/csv" }),
+  );
+  const result = importVaultHostsFromText("csv", decoded);
+
+  assert.equal(result.hosts[0]?.group, "中文组");
+});
+
+test("ssh_config import keeps UTF-8 host names when a comment has invalid bytes", async () => {
+  const file = new File([
+    new TextEncoder().encode("# legacy comment "),
+    new Uint8Array([0xff]),
+    new TextEncoder().encode("\nHost 中文组\n  HostName example.com\n"),
+  ], "config", { type: "text/plain" });
+
+  const text = await readVaultImportFile("ssh_config", file);
+  const result = importVaultHostsFromText("ssh_config", text);
+
+  assert.equal(result.hosts[0]?.label, "中文组");
+  assert.equal(result.hosts[0]?.hostname, "example.com");
+});
+
 test("MobaXterm import can force GB18030 for ambiguous legacy Chinese text", async () => {
   const prefix = new TextEncoder().encode("[Bookmarks]\nSubRep=\nImgNum=42\n");
   const suffix = new TextEncoder().encode(`prod=${sessionValue}`);

application/state/workspaceLayoutPresetStore.ts

@@ -0,0 +1,18 @@
+import { STORAGE_KEY_WORKSPACE_LAYOUT_PRESET } from '../../infrastructure/config/storageKeys';
+import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
+import {
+  sanitizeWorkspaceLayoutPreset,
+  type WorkspaceLayoutPreset,
+} from '../../domain/workspaceLayoutPreset';
+
+/**
+ * Saved default workspace side panel layout. Device-local only: it is not
+ * part of the sync payload because pane arrangements are client-side chrome.
+ */
+export function readWorkspaceLayoutPreset(): WorkspaceLayoutPreset | null {
+  return sanitizeWorkspaceLayoutPreset(localStorageAdapter.read(STORAGE_KEY_WORKSPACE_LAYOUT_PRESET));
+}
+
+export function writeWorkspaceLayoutPreset(preset: WorkspaceLayoutPreset): boolean {
+  return localStorageAdapter.write(STORAGE_KEY_WORKSPACE_LAYOUT_PRESET, preset);
+}

application/syncPayload.test.ts

@@ -1964,22 +1964,54 @@ test("applySyncPayload applies pluginSidecars through the production applier hoo
   assert.equal((applied as SyncPayload["pluginSidecars"])?.entries[0].value.clock, 3);
 });
 
-test("tab bar position survives settings export and import, with a safe fallback", async () => {
-  localStorage.clear();
-  localStorage.setItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION, "bottom");
-  const payload = buildSyncPayload(vault([]));
-  assert.equal(payload.settings?.tabBarPosition, "bottom");
-  localStorage.removeItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION);
+test("local shell side panel settings round-trip independently and trigger auto-sync", async () => {
+  for (const key of [storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB]) {
+    assert.ok((SYNCABLE_SETTING_STORAGE_KEYS as readonly string[]).includes(key));
+  }
+  for (const enabled of [true, false]) {
+    localStorage.clear();
+    localStorage.setItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, String(enabled));
+    localStorage.setItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, "notes");
+    localStorage.setItem(storageKeys.STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN, String(!enabled));
+    localStorage.setItem(storageKeys.STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB, "scripts");
+    const payload = await buildSyncPayload(vault());
+    assert.equal(payload.settings?.localShellSidePanelAutoOpen, enabled);
+    assert.equal(payload.settings?.localShellSidePanelAutoOpenTab, "notes");
+    localStorage.clear();
+    await applySyncPayload(payload, { importVaultData: () => {} });
+    assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN), String(enabled));
+    assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB), "notes");
+    assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN), String(!enabled));
+    assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB), "scripts");
+  }
+});
+
+test("missing local shell settings and invalid tabs preserve existing settings", async () => {
+  const payload = await buildSyncPayload(vault());
+  assert.equal(payload.settings?.localShellSidePanelAutoOpen, undefined);
+  assert.equal(payload.settings?.localShellSidePanelAutoOpenTab, undefined);
+  localStorage.setItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, "true");
+  localStorage.setItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, "notes");
   await applySyncPayload(payload, { importVaultData: () => {} });
-  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION), "bottom");
+  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN), "true");
+  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB), "notes");
+  await applySyncPayload({ ...payload, settings: { localShellSidePanelAutoOpenTab: "invalid" } } as unknown as SyncPayload, { importVaultData: () => {} });
+  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB), "notes");
+  localStorage.setItem(storageKeys.STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, "invalid");
+  assert.equal((await buildSyncPayload(vault())).settings?.localShellSidePanelAutoOpenTab, undefined);
+});
 
-  const invalid = { ...payload, settings: { tabBarPosition: "left" } } as unknown as SyncPayload;
-  await applySyncPayload(invalid, { importVaultData: () => {} });
-  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION), "top");
-
-  localStorage.setItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION, "bottom");
-  await applySyncPayload({ ...payload, settings: {} }, { importVaultData: () => {} });
-  assert.equal(localStorage.getItem(storageKeys.STORAGE_KEY_TAB_BAR_POSITION), "bottom");
+test("old bottom tab preference is ignored by settings export and import", async () => {
+  localStorage.clear();
+  const legacyKey = "netcatty_tab_bar_position_v1";
+  localStorage.setItem(legacyKey, "bottom");
+  const payload = buildSyncPayload(vault([]));
+  assert.equal(Object.hasOwn(payload.settings ?? {}, "tabBarPosition"), false);
+  await applySyncPayload({ ...payload, settings: { tabBarPosition: "bottom" } } as unknown as SyncPayload, { importVaultData: () => {} });
+  assert.equal(localStorage.getItem(legacyKey), "bottom");
+  localStorage.removeItem(legacyKey);
+  await applySyncPayload({ ...payload, settings: { tabBarPosition: "bottom" } } as unknown as SyncPayload, { importVaultData: () => {} });
+  assert.equal(localStorage.getItem(legacyKey), null);
 });
 for (const enabled of [true, false]) {
   test(`right-click long press preference survives sync (${enabled})`, async () => {

application/syncPayload.ts

@@ -1,4 +1,3 @@
-import { normalizeTabBarPosition } from '../domain/tabBarPosition';
 import { decryptProviderHeaders, encryptProviderHeaders } from '../infrastructure/ai/providerHeaderCredentials';
 /**
  * Sync Payload Builders - Single source of truth for constructing and applying
@@ -78,6 +77,8 @@ import {
   STORAGE_KEY_TERM_SETTINGS,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_CUSTOM_KEY_BINDINGS,
   STORAGE_KEY_EDITOR_WORD_WRAP,
   STORAGE_KEY_SFTP_DOUBLE_CLICK_BEHAVIOR,
@@ -94,7 +95,6 @@ import {
   STORAGE_KEY_HOST_CLICK_BEHAVIOR,
   STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT,
   STORAGE_KEY_SHOW_SFTP_TAB,
-  STORAGE_KEY_TAB_BAR_POSITION,
   STORAGE_KEY_SHOW_HOST_TREE_SIDEBAR,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
   STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
@@ -266,6 +266,7 @@ const SYNCABLE_TERMINAL_KEYS = [
   'linkModifier', 'keywordHighlightEnabled', 'keywordHighlightRules',
   'keepaliveInterval', 'keepaliveCountMax', 'disableBracketedPaste', 'clearWipesScrollback',
   'autoUploadClipboardImageOnPaste',
+  'confirmBeforeMultilinePaste', 'multilinePasteConfirmMinLines',
   'preserveSelectionOnInput', 'forcePromptNewLine', 'osc52Clipboard', 'oscNotifications', 'dynamicTabTitleMode', 'tabDoubleClickBehavior',
   'autoCloseOnExit', 'disconnectedNoticeMode',
   'showHostInfoBar', 'hostInfoBarTitleMode', 'showServerStats',
@@ -302,6 +303,8 @@ export const SYNCABLE_SETTING_STORAGE_KEYS = [
   STORAGE_KEY_TERM_SETTINGS,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN,
   STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN,
+  STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB,
   STORAGE_KEY_CUSTOM_THEMES,
   STORAGE_KEY_CUSTOM_KEY_BINDINGS,
   STORAGE_KEY_EDITOR_WORD_WRAP,
@@ -318,7 +321,6 @@ export const SYNCABLE_SETTING_STORAGE_KEYS = [
   STORAGE_KEY_HOST_CLICK_BEHAVIOR,
   STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT,
   STORAGE_KEY_SHOW_SFTP_TAB,
-  STORAGE_KEY_TAB_BAR_POSITION,
   STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS,
   STORAGE_KEY_SHOW_TAB_NUMBER_BADGES,
   STORAGE_KEY_WORKSPACE_FOCUS_STYLE,
@@ -481,6 +483,12 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
   if (isTerminalSidePanelAutoOpenTab(terminalSidePanelAutoOpenTab)) {
     settings.terminalSidePanelAutoOpenTab = terminalSidePanelAutoOpenTab;
   }
+  const localShellSidePanelAutoOpen = localStorageAdapter.readBoolean(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN);
+  if (localShellSidePanelAutoOpen != null) settings.localShellSidePanelAutoOpen = localShellSidePanelAutoOpen;
+  const localShellSidePanelAutoOpenTab = localStorageAdapter.readString(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB);
+  if (isTerminalSidePanelAutoOpenTab(localShellSidePanelAutoOpenTab)) {
+    settings.localShellSidePanelAutoOpenTab = localShellSidePanelAutoOpenTab;
+  }
 
   // Terminal settings (syncable subset only)
   const termSettingsRaw = localStorageAdapter.readString(STORAGE_KEY_TERM_SETTINGS);
@@ -546,8 +554,6 @@ export function collectSyncableSettings(): SyncPayload['settings'] {
   }
   const showOnlyUngroupedHostsInRoot = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_ONLY_UNGROUPED_HOSTS_IN_ROOT);
   if (showOnlyUngroupedHostsInRoot != null) settings.showOnlyUngroupedHostsInRoot = showOnlyUngroupedHostsInRoot;
-  const tabBarPosition = localStorageAdapter.readString(STORAGE_KEY_TAB_BAR_POSITION);
-  if (tabBarPosition != null) settings.tabBarPosition = normalizeTabBarPosition(tabBarPosition);
   const showSftpTab = localStorageAdapter.readBoolean(STORAGE_KEY_SHOW_SFTP_TAB);
   if (showSftpTab != null) settings.showSftpTab = showSftpTab;
   const shellOnlyTabNumberShortcuts = localStorageAdapter.readBoolean(STORAGE_KEY_SHELL_ONLY_TAB_NUMBER_SHORTCUTS);
@@ -732,6 +738,12 @@ async function applySyncableSettings(
   if (isTerminalSidePanelAutoOpenTab(settings.terminalSidePanelAutoOpenTab)) {
     localStorageAdapter.writeString(STORAGE_KEY_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB, settings.terminalSidePanelAutoOpenTab);
   }
+  if (settings.localShellSidePanelAutoOpen != null) {
+    localStorageAdapter.writeBoolean(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN, settings.localShellSidePanelAutoOpen);
+  }
+  if (isTerminalSidePanelAutoOpenTab(settings.localShellSidePanelAutoOpenTab)) {
+    localStorageAdapter.writeString(STORAGE_KEY_LOCAL_SHELL_SIDE_PANEL_AUTO_OPEN_TAB, settings.localShellSidePanelAutoOpenTab);
+  }
 
   // Terminal settings - merge with existing to preserve platform-specific keys
   if (settings.terminalSettings) {
@@ -813,9 +825,6 @@ async function applySyncableSettings(
       settings.showOnlyUngroupedHostsInRoot,
     );
   }
-  if (settings.tabBarPosition != null) {
-    localStorageAdapter.writeString(STORAGE_KEY_TAB_BAR_POSITION, normalizeTabBarPosition(settings.tabBarPosition));
-  }
   if (settings.showSftpTab != null) {
     localStorageAdapter.writeBoolean(STORAGE_KEY_SHOW_SFTP_TAB, settings.showSftpTab);
   }

components/AIChatPanelContent.tsx

@@ -67,6 +67,8 @@ interface AIChatPanelContentProps {
   modelDisplayName?: string;
   modelCatalogWarning?: string;
   agentModelPresets: AgentModelPreset[];
+  /** Suppress the composer picker's "use custom model" action (locked model). */
+  allowCustomModelEntry?: boolean;
   selectedAgentModel: string;
   handleAgentModelSelect: (modelId: string) => void;
   cattyConfiguredProviders: ProviderConfig[];
@@ -138,6 +140,7 @@ export const AIChatPanelContent: React.FC<AIChatPanelContentProps> = ({
   modelDisplayName,
   modelCatalogWarning,
   agentModelPresets,
+  allowCustomModelEntry = true,
   selectedAgentModel,
   handleAgentModelSelect,
   cattyConfiguredProviders,
@@ -354,6 +357,7 @@ export const AIChatPanelContent: React.FC<AIChatPanelContentProps> = ({
                   modelName={modelDisplayName}
                   agentName={currentAgentId === 'catty' ? 'Catty Agent' : externalAgents.find(a => a.id === currentAgentId)?.name}
                   modelPresets={agentModelPresets}
+                  allowCustomModelEntry={allowCustomModelEntry}
                   selectedModelId={selectedAgentModel}
                   onModelSelect={handleAgentModelSelect}
                   providerSwitcher={providerSwitcher}

components/AIChatSidePanel.tsx

@@ -22,6 +22,14 @@ import {
   resolveAgentModelSelection,
 } from '../infrastructure/ai/types';
 import { getExternalAgentSdkBackend, getManualAgentCommand, matchesManagedAgentConfig } from '../infrastructure/ai/managedAgents';
+import {
+  appendComposerCustomModelPresets,
+  resolveComposerCustomModelIds,
+} from '../infrastructure/ai/composerPicker';
+import {
+  readComposerModelPrefs,
+  subscribeComposerModelPrefs,
+} from '../infrastructure/ai/composerModelPrefs';
 import { toast } from './ui/toast';
 import { useAgentDiscovery } from '../application/state/useAgentDiscovery';
 import {
@@ -311,8 +319,8 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
 
   const [showHistory, setShowHistory] = useState(false);
   const [isSending, setIsSending] = useState(false);
-  const [runtimeAgentModelPresets, setRuntimeAgentModelPresets] = useState<Record<string, AgentModelPreset[]>>({});
-  const [runtimeModelWarnings, setRuntimeModelWarnings] = useState<Record<string, string>>({});
+  const [runtimeAgentModelPresets, setRuntimeAgentModelPresets] = useState<Record<string, { cacheKey: string; models: AgentModelPreset[] }>>({});
+  const [runtimeModelWarnings, setRuntimeModelWarnings] = useState<Record<string, { cacheKey: string; message: string }>>({});
   const [steerWarnings, setSteerWarnings] = useState<Record<string, SteerWarning>>({});
   const [steeringSessionId, setSteeringSessionId] = useState<string | null>(null);
   const [userSkillOptions, setUserSkillOptions] = useState<UserSkillOption[]>([]);
@@ -843,13 +851,34 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     [currentAgentConfig],
   );
 
-  const { model: codexConfigModel, loadModel: loadCodexConfigModel } = useCodexConfigModel(
+  const {
+    model: codexConfigModel,
+    loadModel: loadCodexConfigModel,
+    isPending: isCodexConfigModelPending,
+  } = useCodexConfigModel(
     currentAgentConfig, isVisible,
   );
 
   const agentModelMapRef = useRef(agentModelMap);
   agentModelMapRef.current = agentModelMap;
 
+  // Manual model ids typed in the composer picker are recorded in composer
+  // prefs (per agent scope). Re-render when they change so custom picks stay
+  // visible and accepted as stored selections (#3534).
+  const [composerCustomModelsVersion, setComposerCustomModelsVersion] = useState(0);
+  useEffect(() => subscribeComposerModelPrefs(() => {
+    setComposerCustomModelsVersion((version) => version + 1);
+  }), []);
+  const collectCustomModelIds = useCallback((agentId: string, presets: AgentModelPreset[]) => {
+    // Touch the version so pref writes recreate this callback and invalidate
+    // memos that read custom ids.
+    void composerCustomModelsVersion;
+    return resolveComposerCustomModelIds({
+      prefs: readComposerModelPrefs(agentId),
+      presets,
+    });
+  }, [composerCustomModelsVersion]);
+
   const buildExternalAgentRuntimeModelTarget = useCallback((agent: ExternalAgentConfig | undefined): SdkRuntimeModelTarget | null => {
     if (!agent) return null;
     const sdkBackend = getExternalAgentSdkBackend(agent);
@@ -874,15 +903,21 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   externalAgentsRef.current = externalAgents;
 
   const applySdkRuntimeModelCatalog = useCallback((
-    agentId: string,
+    target: SdkRuntimeModelTarget,
     catalog: SdkRuntimeModelCatalog,
     options: { adoptCurrentModel?: boolean } = {},
   ) => {
-    const agent = externalAgentsRef.current.find((item) => item.id === agentId);
-    const runtimePresets = mergeFallbackThinkingLevels(
+    const agent = externalAgentsRef.current.find((item) => item.id === target.agentId);
+    if (buildExternalAgentRuntimeModelTarget(agent)?.cacheKey !== target.cacheKey) return;
+    const agentId = target.agentId;
+    const catalogPresets = mergeFallbackThinkingLevels(
       normalizeSdkRuntimeModelPresets(catalog.models, catalog.currentModelId),
       getAgentModelPresets(agent?.command, getExternalAgentSdkBackend(agent)),
     );
+    const runtimePresets = appendComposerCustomModelPresets(
+      catalogPresets,
+      collectCustomModelIds(agentId, catalogPresets),
+    );
     const storedModelId = agentModelMapRef.current[agentId];
     if (runtimePresets.length === 0) {
       setRuntimeAgentModelPresets((prev) => {
@@ -892,9 +927,10 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
       });
     } else {
       setRuntimeAgentModelPresets((prev) => (
-        agentModelPresetsShallowEqual(prev[agentId], runtimePresets)
+        prev[agentId]?.cacheKey === target.cacheKey
+          && agentModelPresetsShallowEqual(prev[agentId].models, runtimePresets)
           ? prev
-          : { ...prev, [agentId]: runtimePresets }
+          : { ...prev, [agentId]: { cacheKey: target.cacheKey, models: runtimePresets } }
       ));
     }
 
@@ -914,7 +950,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     ) {
       setAgentModel(agentId, catalog.currentModelId);
     }
-  }, [setAgentModel]);
+  }, [setAgentModel, buildExternalAgentRuntimeModelTarget, collectCustomModelIds]);
 
   const loadSdkRuntimeModelCatalog = useCallback((
     target: SdkRuntimeModelTarget,
@@ -939,10 +975,15 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
           throw new Error(result?.error || 'Failed to load SDK agent models');
         }
         setRuntimeModelWarnings((current) => {
+          const agent = externalAgentsRef.current.find((item) => item.id === target.agentId);
+          if (buildExternalAgentRuntimeModelTarget(agent)?.cacheKey !== target.cacheKey) return current;
           const next = { ...current };
-          if (result.warning && target.codexRuntime === 'app-server') {
-            next[target.agentId] = t('ai.codex.appServer.modelCatalogWarning');
-            console.warn('[AIChatSidePanel] Codex App Server model catalog unavailable:', result.warning);
+          if (result.warning) {
+            next[target.agentId] = {
+              cacheKey: target.cacheKey,
+              message: t('ai.chat.modelCatalogWarning'),
+            };
+            console.warn('[AIChatSidePanel] SDK model catalog unavailable:', result.warning);
           } else {
             delete next[target.agentId];
           }
@@ -955,18 +996,20 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
       },
       { force: options.force },
     ).catch((err) => {
-      if (target.codexRuntime === 'app-server') {
-        setRuntimeModelWarnings((current) => ({
+      setRuntimeModelWarnings((current) => {
+        const agent = externalAgentsRef.current.find((item) => item.id === target.agentId);
+        if (buildExternalAgentRuntimeModelTarget(agent)?.cacheKey !== target.cacheKey) return current;
+        return {
           ...current,
-          [target.agentId]: t('ai.codex.appServer.modelCatalogWarning'),
-        }));
-      }
+          [target.agentId]: { cacheKey: target.cacheKey, message: t('ai.chat.modelCatalogWarning') },
+        };
+      });
       if (options.logErrors !== false) {
         console.warn('[AIChatSidePanel] Failed to load SDK agent models:', err);
       }
       return null;
     });
-  }, [t]);
+  }, [t, buildExternalAgentRuntimeModelTarget]);
 
   useEffect(() => {
     if (!isVisible) return;
@@ -978,7 +1021,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
 
     const cached = sdkRuntimeModelCache.read(target.cacheKey);
     if (cached) {
-      applySdkRuntimeModelCatalog(target.agentId, cached);
+      applySdkRuntimeModelCatalog(target, cached);
     }
 
     // Respect renderer TTL / in-flight coalescing for all SDK agents including
@@ -990,7 +1033,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     const cancelIdle = scheduleWhenAiComposerIdle(() => {
       void loadSdkRuntimeModelCatalog(target).then((catalog) => {
         if (cancelled || !catalog) return;
-        applySdkRuntimeModelCatalog(target.agentId, catalog, { adoptCurrentModel: true });
+        applySdkRuntimeModelCatalog(target, catalog, { adoptCurrentModel: true });
       });
     });
 
@@ -1010,27 +1053,50 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
   const isCodexAppServer = isCodexManagedAgent && currentAgentConfig?.codexRuntime === 'app-server';
   const canSteerCurrentTurn = Boolean(activeSessionId && isStreaming && isCodexAppServer);
   const hasCodexCustomConfig = Boolean(codexConfigModel) && isCodexManagedAgent;
+  // `codexConfigModel` is null both while the config probe is pending and when
+  // the managed Codex config has no locked model. Keep the manual-entry action
+  // hidden until the probe resolves so a pick made in the interim can't be
+  // silently overridden by the config model on send (#3535).
+  const allowCustomModelEntry = !isCodexManagedAgent
+    || (!isCodexConfigModelPending && !hasCodexCustomConfig);
 
   const agentModelPresets = useMemo(() => {
-    const runtimePresets = runtimeAgentModelPresets[currentAgentId];
+    const target = buildExternalAgentRuntimeModelTarget(currentAgentConfig);
+    const runtimeEntry = runtimeAgentModelPresets[currentAgentId];
+    const runtimePresets = runtimeEntry && target && runtimeEntry.cacheKey === target.cacheKey
+      ? runtimeEntry.models
+      : undefined;
     if (hasCodexCustomConfig && codexConfigModel) {
       return [{ id: codexConfigModel, name: codexConfigModel }];
     }
-    if (runtimePresets) return runtimePresets;
+    if (runtimePresets) {
+      return appendComposerCustomModelPresets(
+        runtimePresets,
+        collectCustomModelIds(currentAgentId, runtimePresets),
+      );
+    }
     const presets = getAgentModelPresets(
       currentAgentConfig?.command,
       getExternalAgentSdkBackend(currentAgentConfig),
     );
     // BYO Codex CLI: hide GPT-5.6 when CLI < 0.144.0 (stored probe or discovery).
     const cliVersion = resolveAgentCliVersion(currentAgentConfig, discoveredAgents);
-    return filterAgentModelPresetsForCliVersion(presets, cliVersion);
+    const filteredPresets = filterAgentModelPresetsForCliVersion(presets, cliVersion);
+    // Manual model ids typed in the composer (#3534) stay selectable even when
+    // the CLI catalog does not list them yet.
+    return appendComposerCustomModelPresets(
+      filteredPresets,
+      collectCustomModelIds(currentAgentId, filteredPresets),
+    );
   }, [
     currentAgentConfig,
     currentAgentId,
     runtimeAgentModelPresets,
+    buildExternalAgentRuntimeModelTarget,
     hasCodexCustomConfig,
     codexConfigModel,
     discoveredAgents,
+    collectCustomModelIds,
   ]);
 
   const selectedAgentModel = useMemo(() => {
@@ -1213,14 +1279,18 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
         if (runtimeTarget) {
           const catalog = await loadSdkRuntimeModelCatalog(runtimeTarget);
           if (catalog) {
-            applySdkRuntimeModelCatalog(runtimeTarget.agentId, catalog, { adoptCurrentModel: true });
-            const runtimePresets = mergeFallbackThinkingLevels(
+            applySdkRuntimeModelCatalog(runtimeTarget, catalog, { adoptCurrentModel: true });
+            const catalogPresets = mergeFallbackThinkingLevels(
               normalizeSdkRuntimeModelPresets(catalog.models, catalog.currentModelId),
               getAgentModelPresets(
                 currentAgentConfig.command,
                 getExternalAgentSdkBackend(currentAgentConfig),
               ),
             );
+            const runtimePresets = appendComposerCustomModelPresets(
+              catalogPresets,
+              collectCustomModelIds(sendAgentId, catalogPresets),
+            );
             const storedModelId = agentModelMapRef.current[sendAgentId];
             if (
               catalog.currentModelId
@@ -1403,7 +1473,7 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
     toolIntegrationMode,
     clearScopeDraft, showScopeSessionView, setActiveSessionId,
     flushDraftText, currentAgentConfig, buildExternalAgentRuntimeModelTarget,
-    loadSdkRuntimeModelCatalog, applySdkRuntimeModelCatalog,
+    loadSdkRuntimeModelCatalog, applySdkRuntimeModelCatalog, collectCustomModelIds,
   ]);
 
   const handleCompact = useCallback(async () => {
@@ -1720,8 +1790,14 @@ const AIChatSidePanelActive: React.FC<AIChatSidePanelProps> = ({
         canSendCurrentAgent={canSendCurrentAgent}
         providerDisplayName={providerDisplayName}
         modelDisplayName={modelDisplayName}
-        modelCatalogWarning={runtimeModelWarnings[currentAgentId]}
+        modelCatalogWarning={runtimeModelWarnings[currentAgentId]
+          && runtimeModelWarnings[currentAgentId].cacheKey === buildExternalAgentRuntimeModelTarget(currentAgentConfig)?.cacheKey
+          ? runtimeModelWarnings[currentAgentId].message
+          : undefined}
         agentModelPresets={agentModelPresets}
+        // A managed Codex config's `model` field overrides every selection on
+        // send, so the manual-entry action would be a silent no-op.
+        allowCustomModelEntry={allowCustomModelEntry}
         selectedAgentModel={selectedAgentModel}
         handleAgentModelSelect={handleAgentModelSelect}
         cattyConfiguredProviders={cattyConfiguredProviders}

components/AIChatSidePanelHelpers.test.tsx

@@ -89,6 +89,11 @@ test('mergeFallbackThinkingLevels fills missing runtime effort catalogs', () =>
     [{ id: 'gpt-5.5', name: 'GPT-5.5', thinkingLevels: ['low', 'medium', 'high'], defaultThinkingLevel: 'medium' }],
   );
   assert.deepEqual(partial[0]?.thinkingLevels, ['low']);
+  const unsupported = mergeFallbackThinkingLevels(
+    [{ id: 'gpt-5.5', name: 'GPT-5.5', thinkingLevels: [] }],
+    [{ id: 'gpt-5.5', name: 'GPT-5.5', thinkingLevels: ['low', 'high'] }],
+  );
+  assert.deepEqual(unsupported[0]?.thinkingLevels, []);
   assert.deepEqual(mergeFallbackThinkingLevels([], [{ id: 'gpt-5.5', name: 'GPT-5.5' }]), []);
   const alreadyFilled = [{ id: 'gpt-5.5', name: 'GPT-5.5', thinkingLevels: ['low'] }];
   assert.equal(
@@ -137,7 +142,7 @@ test('shouldLoadSdkRuntimeModels includes SDK agents with model catalogs', () =>
   assert.equal(shouldLoadSdkRuntimeModels(agent('codebuddy')), true);
   assert.equal(shouldLoadSdkRuntimeModels(agent('opencode')), true);
   assert.equal(shouldLoadSdkRuntimeModels(agent('grok')), true);
-  assert.equal(shouldLoadSdkRuntimeModels(agent('codex')), false);
+  assert.equal(shouldLoadSdkRuntimeModels(agent('codex')), true);
   assert.equal(shouldLoadSdkRuntimeModels({ ...agent('codex'), codexRuntime: 'app-server' }), true);
   assert.equal(shouldLoadSdkRuntimeModels(undefined), false);
 });
@@ -156,6 +161,28 @@ test('Codex App Server model discovery uses a separate cache identity', () => {
     codexRuntime: 'app-server',
   });
   assert.notEqual(sdk, appServer);
+  assert.notEqual(
+    buildSdkRuntimeModelCacheKey({ id: 'discovered_codex', sdkBackend: 'codex', command: '/bin/codex', env: { HOME: '/shared', CODEX_HOME: '/profiles/a' } }),
+    buildSdkRuntimeModelCacheKey({ id: 'discovered_codex', sdkBackend: 'codex', command: '/bin/codex', env: { HOME: '/shared', CODEX_HOME: '/profiles/b' } }),
+  );
+});
+
+test('Claude model cache keys isolate configuration directories under one home', () => {
+  const agent = { id: 'discovered_claude', sdkBackend: 'claude', command: '/bin/claude' };
+  assert.notEqual(
+    buildSdkRuntimeModelCacheKey({ ...agent, env: { HOME: '/shared', CLAUDE_CONFIG_DIR: '/profiles/a' } }),
+    buildSdkRuntimeModelCacheKey({ ...agent, env: { HOME: '/shared', CLAUDE_CONFIG_DIR: '/profiles/b' } }),
+  );
+});
+
+test('Claude model cache keys isolate credentials without exposing them', () => {
+  const agent = { id: 'discovered_claude', sdkBackend: 'claude', command: '/bin/claude' };
+  for (const name of ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'CLAUDE_CODE_OAUTH_TOKEN']) {
+    const first = buildSdkRuntimeModelCacheKey({ ...agent, env: { [name]: 'secret-one' } });
+    const second = buildSdkRuntimeModelCacheKey({ ...agent, env: { [name]: 'secret-two' } });
+    assert.notEqual(first, second, `${name} must separate cache entries`);
+    assert.doesNotMatch(first, /secret-one/);
+  }
 });
 
 test('shouldAdoptSdkCurrentModel keeps SDK defaults when no runtime list is returned', () => {

components/AIChatSidePanelHelpers.ts

@@ -4,9 +4,19 @@ import {
   type ExternalAgentConfig,
 } from '../infrastructure/ai/types';
 import { getExternalAgentSdkBackend } from '../infrastructure/ai/managedAgents';
-import { canonicalizeEffortEncodedModelId } from '../infrastructure/ai/composerPicker';
+import {
+  canonicalizeEffortEncodedModelId,
+  modelPresetMatchesId,
+  modelPresetsContainId,
+} from '../infrastructure/ai/composerPicker';
+import { sha256 } from '@noble/hashes/sha2.js';
+import { bytesToHex } from '@noble/hashes/utils.js';
 
-export { canonicalizeEffortEncodedModelId };
+export {
+  canonicalizeEffortEncodedModelId,
+  modelPresetMatchesId,
+  modelPresetsContainId,
+};
 
 export type SdkRuntimeModelCatalog = {
   currentModelId: string | null;
@@ -35,6 +45,11 @@ const MODEL_CACHE_ENV_HINTS = [
   'HOME',
   'USERPROFILE',
   'XDG_CONFIG_HOME',
+  'CODEX_HOME',
+  'CLAUDE_CONFIG_DIR',
+  'ANTHROPIC_API_KEY',
+  'ANTHROPIC_AUTH_TOKEN',
+  'CLAUDE_CODE_OAUTH_TOKEN',
   'OPENCODE_BIN',
   'OPENCODE_CONFIG',
   'OPENCODE_CONFIG_DIR',
@@ -103,7 +118,9 @@ export function buildSdkRuntimeModelCacheKey(agent: {
   const grokRuntime = sdkBackend === 'grok'
     ? (agent.grokRuntime === 'streaming-json' ? 'streaming-json' : 'acp')
     : '';
-  return [agent.id, sdkBackend, agent.command ?? '', agent.codexRuntime ?? 'sdk', grokRuntime, cursorAuth, ...envHints].join('\u0000');
+  // Keep authentication values out of the in-memory cache key itself.
+  const envHash = bytesToHex(sha256(new TextEncoder().encode(envHints.join('\u0000'))));
+  return [agent.id, sdkBackend, agent.command ?? '', agent.codexRuntime ?? 'sdk', grokRuntime, cursorAuth, envHash].join('\u0000');
 }
 
 export function createSdkRuntimeModelCache(options: SdkRuntimeModelCacheOptions = {}) {
@@ -190,7 +207,7 @@ export function mergeFallbackThinkingLevels(
   const byId = new Map(fallbacks.map((preset) => [preset.id, preset]));
   let changed = false;
   const next = runtime.map((preset) => {
-    if (preset.thinkingLevels?.length) return preset;
+    if (preset.thinkingLevels !== undefined) return preset;
     const fallback = byId.get(preset.id);
     if (!fallback?.thinkingLevels?.length) return preset;
     changed = true;
@@ -225,19 +242,6 @@ export function agentModelPresetsShallowEqual(
   });
 }
 
-export function modelPresetMatchesId(preset: AgentModelPreset, modelId: string): boolean {
-  const canonical = canonicalizeEffortEncodedModelId(modelId);
-  if (preset.thinkingLevels?.length) {
-    return preset.id === canonical
-      || preset.thinkingLevels.some((level) => `${preset.id}/${level}` === canonical);
-  }
-  return preset.id === canonical;
-}
-
-export function modelPresetsContainId(presets: AgentModelPreset[], modelId: string): boolean {
-  return presets.some((preset) => modelPresetMatchesId(preset, modelId));
-}
-
 export function normalizeStoredAgentModelSelection(
   storedModelId: string | null | undefined,
   presets: AgentModelPreset[],
@@ -253,7 +257,10 @@ export function normalizeStoredAgentModelSelection(
 
 export function shouldLoadSdkRuntimeModels(agent?: ExternalAgentConfig): boolean {
   const sdkBackend = getExternalAgentSdkBackend(agent);
-  return (sdkBackend === 'codex' && agent?.codexRuntime === 'app-server')
+  // Codex on the default `sdk` runtime also serves a live catalog: its driver
+  // falls back to the App Server runtime's model/list in main (#3496), so
+  // quick sends must await it instead of running with build-time presets.
+  return sdkBackend === 'codex'
     || sdkBackend === 'claude'
     || sdkBackend === 'copilot'
     || sdkBackend === 'cursor'

components/KeychainManager.tsx

@@ -17,6 +17,7 @@ import React, { useCallback, useMemo, useRef, useState } from "react";
 import { useI18n } from "../application/i18n/I18nProvider";
 import { useStoredViewMode } from "../application/state/useStoredViewMode";
 import type { GroupConfig } from "../domain/models";
+import { detectSshKeyType } from "../domain/keyTypeDetect";
 import { reorderVaultItems, sortByVaultOrder } from "../domain/vaultOrder";
 import { STORAGE_KEY_VAULT_KEYS_VIEW_MODE } from "../infrastructure/config/storageKeys";
 import { logger } from "../lib/logger";
@@ -422,16 +423,16 @@ echo $3 >> "$FILE"`);
     }
 
     // Detect key type from private key content
-    let detectedType: KeyType = "ED25519";
-    const pk = draftKey.privateKey.toLowerCase();
-    if (pk.includes("rsa")) detectedType = "RSA";
-    else if (pk.includes("ecdsa") || pk.includes("ec ")) detectedType = "ECDSA";
-    else if (pk.includes("ed25519")) detectedType = "ED25519";
+    const detected = detectSshKeyType(
+      draftKey.privateKey,
+      draftKey.publicKey,
+    );
 
     const newKey: SSHKey = {
       id: crypto.randomUUID(),
       label: draftKey.label.trim(),
-      type: (draftKey.type as KeyType) || detectedType,
+      type: detected.type,
+      keySize: detected.keySize,
       privateKey: draftKey.privateKey.trim(),
       publicKey: draftKey.publicKey?.trim() || undefined,
       certificate: draftKey.certificate?.trim() || undefined,
@@ -541,12 +542,7 @@ echo $3 >> "$FILE"`);
         const content = e.target?.result as string;
         if (content) {
           // Try to detect key type from content
-          let detectedType: KeyType = "ED25519";
-          const lc = content.toLowerCase();
-          if (lc.includes("rsa")) detectedType = "RSA";
-          else if (lc.includes("ecdsa") || lc.includes("ec private"))
-            detectedType = "ECDSA";
-          else if (lc.includes("ed25519")) detectedType = "ED25519";
+          const detected = detectSshKeyType(content);
 
           // Extract label from filename (remove extension)
           const label = file.name.replace(/\.(pem|key|pub|ppk)$/i, "");
@@ -555,7 +551,8 @@ echo $3 >> "$FILE"`);
             ...prev,
             privateKey: content,
             label: prev.label || label,
-            type: detectedType,
+            type: detected.type,
+            keySize: detected.keySize,
           }));
         }
       };

components/QuickConnectWizard.tsx

@@ -16,6 +16,7 @@ import { formatHostPort } from "../domain/host";
 import {
   buildQuickConnectHost,
   getQuickConnectDefaultPort,
+  isQuickConnectIdentityCompatible,
   isQuickConnectIdentityUsable,
   type QuickConnectAuthMethod,
   type QuickConnectProtocol,
@@ -104,13 +105,13 @@ const QuickConnectWizard: React.FC<QuickConnectWizardProps> = ({
     [keys, protocol, selectedIdentity],
   );
   const identityOptions = useMemo(
-    () => identities.map((identity) => ({
+    () => identities.filter((identity) => isQuickConnectIdentityCompatible(identity, target)).map((identity) => ({
       value: identity.id,
       label: identity.label,
       sublabel: identity.username,
       icon: <User size={14} />,
     })),
-    [identities],
+    [identities, target],
   );
 
   const detachSelectedIdentity = () => {
@@ -131,7 +132,7 @@ const QuickConnectWizard: React.FC<QuickConnectWizardProps> = ({
       return;
     }
     const identity = identities.find((candidate) => candidate.id === identityId);
-    if (!identity) return;
+    if (!identity || !isQuickConnectIdentityCompatible(identity, target)) return;
     setSelectedIdentityId(identity.id);
     setUsername(identity.username);
     setAuthMethod(identity.authMethod);
@@ -431,7 +432,7 @@ const QuickConnectWizard: React.FC<QuickConnectWizardProps> = ({
       </div>
       </div>
 
-      {protocol !== "telnet" && identities.length > 0 && (
+      {protocol !== "telnet" && identityOptions.length > 0 && (
         <div className="flex flex-col gap-4">
           <div className="flex flex-col gap-3">
             <Label className="text-sm font-medium">{t("quickConnect.identity.label")}</Label>

components/SerialHostDetailsPanel.tsx

@@ -2,7 +2,7 @@
  * Serial Host Details Panel
  * A dedicated editor for serial port hosts (distinct from SSH HostDetailsPanel)
  */
-import { ChevronDown, ChevronUp, Save, Tag, Usb } from 'lucide-react';
+import { ChevronDown, ChevronUp, Eye, EyeOff, Save, Tag, Usb, X } from 'lucide-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useI18n } from '../application/i18n/I18nProvider';
 import { useTerminalBackend } from '../application/state/useTerminalBackend';
@@ -75,9 +75,22 @@ export const SerialHostDetailsPanel: React.FC<SerialHostDetailsPanelPropsWithRes
   const [ports, setPorts] = useState<SerialPort[]>([]);
   const [isLoadingPorts, setIsLoadingPorts] = useState(false);
   const [showAdvanced, setShowAdvanced] = useState(false);
+  const [showPassword, setShowPassword] = useState(false);
 
   // Form state
   const [label, setLabel] = useState(initialData.label);
+  const [username, setUsername] = useState(initialData.username || '');
+  const [password, setPassword] = useState(initialData.password || '');
+  // Tracks whether the user edited the password field this session. An empty
+  // password is a meaningful serial credential (the auto-login detector
+  // submits a blank line at a Password prompt), so an explicit edit to blank
+  // must be saved as '' while an untouched field preserves the stored value.
+  const [passwordChanged, setPasswordChanged] = useState(false);
+  // Explicit "remove the saved credential" flag. An empty password field is a
+  // meaningful serial credential (a present blank password), so blanking the
+  // input alone cannot restore `password` to undefined — the user needs a
+  // dedicated control to delete the credential entirely.
+  const [passwordCleared, setPasswordCleared] = useState(false);
   const [selectedPort, setSelectedPort] = useState(initialData.hostname || initialData.serialConfig?.path || '');
   const [baudRate, setBaudRate] = useState(initialData.serialConfig?.baudRate || initialData.port || 115200);
   const [dataBits, setDataBits] = useState<5 | 6 | 7 | 8>(initialData.serialConfig?.dataBits || 8);
@@ -140,6 +153,16 @@ export const SerialHostDetailsPanel: React.FC<SerialHostDetailsPanelPropsWithRes
       label: label.trim() || `Serial: ${portName}`,
       hostname: selectedPort,
       port: baudRate,
+      username: username.trim() || undefined,
+      // An empty password is meaningful for serial auto-login: the detector
+      // distinguishes an absent password from a present empty string and
+      // submits the required blank line at a Password prompt. An explicit edit
+      // saves exactly what the user typed (including a blank line); the
+      // dedicated clear control removes the credential entirely (undefined);
+      // an untouched field preserves the stored credential as-is.
+      password: passwordChanged
+        ? (passwordCleared ? undefined : password)
+        : (initialData.password ?? undefined),
       tags,
       group,
       charset,
@@ -276,6 +299,62 @@ export const SerialHostDetailsPanel: React.FC<SerialHostDetailsPanelPropsWithRes
           )}
         </div>
 
+        {/* Login credentials (auto-login) */}
+        <div className="space-y-2">
+          <Label htmlFor="serial-username">{t('serial.field.username')}</Label>
+          <Input
+            id="serial-username"
+            value={username}
+            onChange={(e) => setUsername(e.target.value)}
+            placeholder={t('serial.field.username')}
+            autoComplete="off"
+          />
+          <div className="relative">
+            <Input
+              id="serial-password"
+              value={password}
+              type={showPassword ? 'text' : 'password'}
+              onChange={(e) => {
+                setPassword(e.target.value);
+                setPasswordChanged(true);
+                if (e.target.value !== '') {
+                  setPasswordCleared(false);
+                }
+              }}
+              placeholder={t('serial.field.password')}
+              autoComplete="off"
+              className="pr-16"
+            />
+            <div className="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-0.5">
+              {(initialData.password !== undefined || password !== '') && (
+                <button
+                  type="button"
+                  onClick={() => {
+                    setPassword('');
+                    setPasswordChanged(true);
+                    setPasswordCleared(true);
+                  }}
+                  title={t('serial.field.clearPassword')}
+                  aria-label={t('serial.field.clearPassword')}
+                  className="p-1 text-muted-foreground hover:text-foreground transition-colors"
+                >
+                  <X size={14} />
+                </button>
+              )}
+              <button
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="p-1 text-muted-foreground hover:text-foreground transition-colors"
+              >
+                {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
+              </button>
+            </div>
+          </div>
+          <p className="text-xs text-muted-foreground">
+            {t('serial.field.autoLoginDesc')}
+          </p>
+        </div>
+
         {/* Tags */}
         <div className="space-y-2">
           <Label className="flex items-center gap-2">

components/SettingsPage.tsx

@@ -135,6 +135,10 @@ type TerminalTabSettingsProps = Pick<
     | 'setTerminalSidePanelAutoOpen'
     | 'terminalSidePanelAutoOpenTab'
     | 'setTerminalSidePanelAutoOpenTab'
+    | 'localShellSidePanelAutoOpen'
+    | 'setLocalShellSidePanelAutoOpen'
+    | 'localShellSidePanelAutoOpenTab'
+    | 'setLocalShellSidePanelAutoOpenTab'
     | 'workspaceFocusStyle'
     | 'setWorkspaceFocusStyle'
 >;
@@ -161,6 +165,10 @@ const SettingsTerminalTabContainer = React.memo<TerminalTabSettingsProps>(functi
     setTerminalSidePanelAutoOpen,
     terminalSidePanelAutoOpenTab,
     setTerminalSidePanelAutoOpenTab,
+    localShellSidePanelAutoOpen,
+    setLocalShellSidePanelAutoOpen,
+    localShellSidePanelAutoOpenTab,
+    setLocalShellSidePanelAutoOpenTab,
     workspaceFocusStyle,
     setWorkspaceFocusStyle,
 }) {
@@ -189,6 +197,10 @@ const SettingsTerminalTabContainer = React.memo<TerminalTabSettingsProps>(functi
             setTerminalSidePanelAutoOpen={setTerminalSidePanelAutoOpen}
             terminalSidePanelAutoOpenTab={terminalSidePanelAutoOpenTab}
             setTerminalSidePanelAutoOpenTab={setTerminalSidePanelAutoOpenTab}
+            localShellSidePanelAutoOpen={localShellSidePanelAutoOpen}
+            setLocalShellSidePanelAutoOpen={setLocalShellSidePanelAutoOpen}
+            localShellSidePanelAutoOpenTab={localShellSidePanelAutoOpenTab}
+            setLocalShellSidePanelAutoOpenTab={setLocalShellSidePanelAutoOpenTab}
             availableFonts={availableFonts}
             workspaceFocusStyle={workspaceFocusStyle}
             setWorkspaceFocusStyle={setWorkspaceFocusStyle}
@@ -545,8 +557,6 @@ const SettingsPageContent: React.FC<{ settings: SettingsState; appLock?: AppLock
                                 setHostClickBehavior={settings.setHostClickBehavior}
                                 showOnlyUngroupedHostsInRoot={settings.showOnlyUngroupedHostsInRoot}
                                 setShowOnlyUngroupedHostsInRoot={settings.setShowOnlyUngroupedHostsInRoot}
-                                tabBarPosition={settings.tabBarPosition}
-                                setTabBarPosition={settings.setTabBarPosition}
                                 showSftpTab={settings.showSftpTab}
                                 setShowSftpTab={settings.setShowSftpTab}
                                 showHostTreeSidebar={settings.showHostTreeSidebar}
@@ -583,6 +593,10 @@ const SettingsPageContent: React.FC<{ settings: SettingsState; appLock?: AppLock
                                 setTerminalSidePanelAutoOpen={settings.setTerminalSidePanelAutoOpen}
                                 terminalSidePanelAutoOpenTab={settings.terminalSidePanelAutoOpenTab}
                                 setTerminalSidePanelAutoOpenTab={settings.setTerminalSidePanelAutoOpenTab}
+                                localShellSidePanelAutoOpen={settings.localShellSidePanelAutoOpen}
+                                setLocalShellSidePanelAutoOpen={settings.setLocalShellSidePanelAutoOpen}
+                                localShellSidePanelAutoOpenTab={settings.localShellSidePanelAutoOpenTab}
+                                setLocalShellSidePanelAutoOpenTab={settings.setLocalShellSidePanelAutoOpenTab}
                                 workspaceFocusStyle={settings.workspaceFocusStyle}
                                 setWorkspaceFocusStyle={settings.setWorkspaceFocusStyle}
                             />

components/SftpSidePanel.tsx

@@ -1,4 +1,3 @@
-import { useSftpCommandRefresh } from "../application/state/sftp/useSftpCommandRefresh";
 /**
  * SftpSidePanel - SFTP file browser rendered as a resizable side panel
  *
@@ -347,6 +346,7 @@ const SftpSidePanelInner: React.FC<SftpSidePanelProps> = ({
     listLocalDir,
     listDrives,
     openPath,
+    statSftp,
   } = useSftpBackend();
 
   const sftpRef = useRef(sftp);
@@ -1337,6 +1337,7 @@ const SftpSidePanelInner: React.FC<SftpSidePanelProps> = ({
         selectDirectory={selectDirectory}
         listLocalDir={listLocalDir}
         listDrives={listDrives}
+        statSftp={statSftp}
         openPath={openPath}
         t={t}
       />
@@ -1389,6 +1390,7 @@ type SftpSidePanelInteractiveBodyProps = {
   selectDirectory: ReturnType<typeof useSftpBackend>["selectDirectory"];
   listLocalDir: ReturnType<typeof useSftpBackend>["listLocalDir"];
   listDrives: ReturnType<typeof useSftpBackend>["listDrives"];
+  statSftp: ReturnType<typeof useSftpBackend>["statSftp"];
   openPath: ReturnType<typeof useSftpBackend>["openPath"];
   t: ReturnType<typeof useI18n>["t"];
 };
@@ -1431,6 +1433,7 @@ const SftpSidePanelInteractiveBody: React.FC<SftpSidePanelInteractiveBodyProps>
   selectDirectory,
   listLocalDir,
   listDrives,
+  statSftp,
   openPath,
   t,
 }) => {
@@ -1540,6 +1543,7 @@ const SftpSidePanelInteractiveBody: React.FC<SftpSidePanelInteractiveBodyProps>
     showSaveDialog,
     selectDirectory,
     getSftpIdForConnection: sftp.getSftpIdForConnection,
+    statSftp,
     listLocalFiles: listLocalDir,
     listDrives,
   });
@@ -1620,22 +1624,6 @@ const SftpSidePanelInteractiveBody: React.FC<SftpSidePanelInteractiveBodyProps>
     || (sftp.activeExternalEditCount ?? 0) > 0;
   const connectionId = sftp.leftPane.connection?.id ?? null;
   const connectionPath = sftp.leftPane.connection?.currentPath ?? null;
-  const [autoRefresh, setAutoRefresh] = useState(true);
-  useSftpCommandRefresh({
-    sessionId: focusedSessionId ?? activeSessionId,
-    enabled: autoRefresh,
-    visible: isVisible && ownerPanelOpen,
-    busy: hasActiveWork || sftp.leftPane.loading,
-    matchesTerminal: !!activeHost && !!connectedHostObjRef.current
-      && sftpHostEndpointsEqual(activeHost, connectedHostObjRef.current)
-      && sftp.leftPane.connection?.hostId === activeHost.id,
-    paneId: sftp.leftPane.id,
-    connectionId,
-    path: connectionPath,
-    connected: sftp.leftPane.connection?.status === "connected",
-    refresh: () => sftpRef.current.refresh("left", { tabId: sftp.leftPane.id, preserveSelection: true }),
-  });
-
 
   const {
     handleGoToTerminalCwd,
@@ -1877,10 +1865,6 @@ const SftpSidePanelInteractiveBody: React.FC<SftpSidePanelInteractiveBodyProps>
         data-section="terminal-sftp-panel"
         onClick={handlePaneFocus}
       >
-        <label className="flex shrink-0 items-center gap-2 border-b border-border/50 px-3 py-1 text-xs text-muted-foreground">
-          <input type="checkbox" checked={autoRefresh} onChange={(event) => setAutoRefresh(event.target.checked)} />
-          {t("sftp.refreshAfterCommand")}
-        </label>
         {showWorkspaceHostHeader && displayHost && (
           <div
             className={`${TERMINAL_SIDE_PANEL_INNER_HEADER_CLASS} border-b border-border/50 bg-muted/20 px-3 flex items-center`}

components/SftpView.tsx

@@ -193,6 +193,7 @@ const SftpViewInner: React.FC<SftpViewProps> = ({
     listLocalDir,
     listDrives,
     openPath,
+    statSftp,
   } = useSftpBackend();
 
   // Store sftp in a ref so callbacks can access the latest instance
@@ -424,6 +425,7 @@ const SftpViewInner: React.FC<SftpViewProps> = ({
     showSaveDialog,
     selectDirectory,
     getSftpIdForConnection: sftp.getSftpIdForConnection,
+    statSftp,
     listLocalFiles: listLocalDir,
     listDrives,
   });

components/Terminal.tsx

@@ -1,4 +1,4 @@
-import { publishTerminalCommandCompletion } from "../application/state/terminalCommandCompletion";
+import { clearTerminalBroadcastUserInput, markTerminalBroadcastUserInput } from "./terminal/runtime/terminalPacedBroadcast";
 import { createTerminalReflowReadingPosition } from "./terminal/terminalReflowReadingPosition";
 import { resolveHostOs } from '../domain/host';
 import { Terminal as XTerm } from "@xterm/xterm";
@@ -52,6 +52,7 @@ import { CONNECTION_PROGRESS_START } from "./terminal/connectionProgress";
 import { supportsZmodemTerminalDragDrop } from "../lib/zmodemDragDrop";
 import { resolveHostAuth, resolveHostAutofillPassword } from "../domain/sshAuth";
 import { resolveEffectiveTerminalProtocol } from "../domain/terminalProtocol";
+import { MULTILINE_PASTE_CONFIRM_MIN_LINES_DEFAULT } from "../domain/terminalPasteConfirm";
 import { isPluginHostProtocol } from "../domain/pluginConnection";
 import { clearTerminalBootEpoch, setTerminalBootEpoch } from "../domain/terminalBootEpoch";
 import {
@@ -80,6 +81,7 @@ import { usePluginTerminalProviders } from "../application/state/usePluginTermin
 import type { PluginTerminalDecorationRule } from "../domain/pluginTerminalProviders";
 import { terminalReconnectRegistry } from "../application/state/terminalReconnectRegistry";
 import { resolveSftpReuseSourceSessionId } from "../application/state/terminalConnectionReuse";
+import { resolvePasswordAuthSftpHost } from "../domain/authIdentityPicker";
 // SFTPModal removed - SFTP is now handled by SftpSidePanel in TerminalLayer
 import { Button } from "./ui/button";
 import { HoverCard, HoverCardContent, HoverCardTrigger } from "./ui/hover-card";
@@ -434,6 +436,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     sessionId,
     () => passwordPromptActiveRef.current,
   ), [sessionId]);
+  useEffect(() => () => clearTerminalBroadcastUserInput(sessionId), [sessionId]);
   const sensitivePromptOutputTailRef = useRef("");
   const [activeScriptRun, setActiveScriptRun] = useState<import('@/types/global/netcatty-bridge-script.d.ts').ScriptRun | undefined>(undefined);
   const dismissedScriptRunIdsRef = useRef(new Set<string>());
@@ -998,6 +1001,10 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   autocompleteAcceptTextRef.current = (text: string) => {
     const id = sessionRef.current;
     if (id && text) {
+      markTerminalBroadcastUserInput(sessionId);
+      if (["\r", "\n", "\b", "\x7f", "\x15"].some(control => text.includes(control))) {
+        xtermRuntimeRef.current?.invalidatePendingPasteDraft();
+      }
       const sensitive = passwordPromptActiveRef.current;
       let textToWrite = text;
       let handledSubmittedInput = false;
@@ -1231,6 +1238,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   }
   const auth = useTerminalAuthState({
     host,
+    identities,
     pendingAuthRef,
     termRef,
     onUpdateHost: handleUpdateHostFromTerminal,
@@ -1431,8 +1439,11 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       hasEverConnectedRef.current = true;
       clearAutoReconnect();
     }
-    onStatusChange?.(sessionId, next);
-  }, [clearAutoReconnect, onStatusChange, sessionId]);
+    const sftpHost = next === "connected"
+      ? resolvePasswordAuthSftpHost(host, identities, pendingAuthRef.current)
+      : host;
+    onStatusChange?.(sessionId, next, sftpHost === host ? undefined : sftpHost);
+  }, [clearAutoReconnect, host, identities, onStatusChange, sessionId]);
   const updateStatusRef = useRef(updateStatus);
   updateStatusRef.current = updateStatus;
 
@@ -1953,7 +1964,12 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       sensitivePromptOutputTailRef.current,
       chunk,
     );
-    const promptSecurityOptions = { allowHostStyleGreaterThan: isNetworkDevice };
+    const promptSecurityOptions = {
+      allowHostStyleGreaterThan: isNetworkDevice,
+      alternateScreen: termRef.current
+        ? isTerminalAlternateScreenActive(termRef.current)
+        : false,
+    };
     if (typeof meta?.pluginPipelineSensitiveInput === "boolean") {
       passwordPromptActiveRef.current = meta.pluginPipelineSensitiveInput;
       if (meta.pluginPipelineSensitiveInput) {
@@ -2368,10 +2384,9 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     onCommandSubmitted?.(...args);
   }, [onCommandSubmitted, onTerminalCwdChange, sessionId, terminalCwdTracker]);
   const pluginAwareOnCommandCompleted = useCallback(() => {
-    publishTerminalCommandCompletion(sessionId);
     pluginTerminalLifecycle.onCommandCompleted();
     void xtermRuntimeRef.current?.pluginProviderHost?.commandCompleted();
-  }, [pluginTerminalLifecycle, sessionId]);
+  }, [pluginTerminalLifecycle]);
   const pluginAwareOnTerminalCwdChange = useCallback((
     changedSessionId: string,
     cwd: string | null,
@@ -3216,6 +3231,14 @@ const TerminalComponent: React.FC<TerminalProps> = ({
   normalizeTextOnCopyRef.current = terminalSettings?.normalizeTextOnCopy ?? true;
   const autoUploadClipboardImageOnPasteRef = useRef(terminalSettings?.autoUploadClipboardImageOnPaste ?? false);
   autoUploadClipboardImageOnPasteRef.current = terminalSettings?.autoUploadClipboardImageOnPaste ?? false;
+  const multilinePasteConfirmRef = useRef({
+    enabled: terminalSettings?.confirmBeforeMultilinePaste ?? false,
+    minLines: terminalSettings?.multilinePasteConfirmMinLines ?? MULTILINE_PASTE_CONFIRM_MIN_LINES_DEFAULT,
+  });
+  multilinePasteConfirmRef.current = {
+    enabled: terminalSettings?.confirmBeforeMultilinePaste ?? false,
+    minLines: terminalSettings?.multilinePasteConfirmMinLines ?? MULTILINE_PASTE_CONFIRM_MIN_LINES_DEFAULT,
+  };
 
   const scrollToBottomAfterProgrammaticInput = useCallback((data: string) => {
     if (!termRef.current) return;
@@ -3240,14 +3263,17 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     termRef.current?.scrollToBottom();
   }, [activeScriptRun]);
 
-  const broadcastUserPasteData = useCallback((data: string) => {
+  const broadcastUserPasteData = useCallback((
+    data: string,
+    options?: { lineDelayMs?: number },
+  ) => {
     if (
       !passwordPromptActiveRef.current
       && sessionRef.current
       && isBroadcastEnabledRef.current
       && onBroadcastInputRef.current
     ) {
-      onBroadcastInputRef.current(data, sessionId);
+      onBroadcastInputRef.current(data, sessionId, options);
       return true;
     }
     return false;
@@ -3299,6 +3325,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       ? AUTO_RUN_SNIPPET_LINE_DELAY_MS
       : undefined;
     const isMultiLine = data.includes('\n');
+    if (lineDelayMs) markTerminalBroadcastUserInput(sessionId);
     // Wrap in bracketed paste BEFORE appending \r so the Enter is sent
     // outside the paste markers — otherwise shells treat it as pasted text
     // instead of a submit action.
@@ -3317,6 +3344,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     const sensitive = passwordPromptActiveRef.current;
     if (!sensitive && options?.broadcast !== false && isBroadcastEnabledRef.current && onBroadcastInputRef.current) {
       onBroadcastInputRef.current(data, sessionId, {
+        automated: true,
         noAutoRun,
         ...(lineDelayMs ? { lineDelayMs } : {}),
       });
@@ -3391,6 +3419,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     isLocalConnection,
     supportsRemoteImagePaste,
     autoUploadClipboardImageOnPasteRef,
+    multilinePasteConfirmRef,
     terminalBackend,
     getRemoteCwd: () => resolveSftpInitialPath({ preferFreshBackend: true }),
     scrollToBottomAfterProgrammaticInput,
@@ -3441,8 +3470,11 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     if (onOpenSftp) {
       // Delegate to parent (TerminalLayer) for shared SFTP side panel
       const initialPath = await resolveSftpInitialPath();
+      const sftpHost = statusRef.current === 'connected'
+        ? resolvePasswordAuthSftpHost(host, identities, pendingAuthRef.current)
+        : host;
       onOpenSftp(
-        host,
+        sftpHost,
         initialPath,
         undefined,
         sessionId,
@@ -3457,7 +3489,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
       return;
     }
     setShowSFTP(true);
-  }, [host, onOpenSftp, resolveSftpInitialPath, sessionId, showSFTP]);
+  }, [host, identities, onOpenSftp, resolveSftpInitialPath, sessionId, showSFTP]);
 
   const handleSendYmodem = useCallback(async () => {
     if (!isSerialConnection || statusRef.current !== "connected") return;
@@ -3935,6 +3967,13 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     requiresUserInput: auth.needsAuth || needsHostKeyVerification || isConnectionAwaitingUserInput,
   });
 
+  const dragDropSftpHost = status === 'connected'
+    ? resolvePasswordAuthSftpHost(host, identities, pendingAuthRef.current)
+    : host;
+  const dragDropSudoPassword = dragDropSftpHost === host
+    ? resolvedSudoAutofillPassword
+    : identities.find(identity => identity.id === dragDropSftpHost.identityId)?.password;
+
   const {
     handleDragEnter,
     handleDragLeave,
@@ -3942,9 +3981,9 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     handleDrop,
     isDraggingOver,
   } = useTerminalDragDrop({
-    host,
-    resolvedLoginUsername,
-    resolvedSudoPassword: resolvedSudoAutofillPassword,
+    host: dragDropSftpHost,
+    resolvedLoginUsername: dragDropSftpHost === host ? resolvedLoginUsername : dragDropSftpHost.username,
+    resolvedSudoPassword: dragDropSudoPassword,
     isLocalConnection,
     isNetworkDevice,
     onOpenSftp,
@@ -3972,6 +4011,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
     containerRef,
     autoUploadClipboardImage:
       supportsRemoteImagePaste && terminalSettings?.autoUploadClipboardImageOnPaste === true,
+    multilinePasteConfirmRef,
     getRemoteCwd: () => resolveSftpInitialPath({ preferFreshBackend: true }),
     onClipboardImageUploadResult: handleClipboardImageUploadResult,
   });
@@ -4518,7 +4558,7 @@ const TerminalComponent: React.FC<TerminalProps> = ({
 
   return (
     <>
-      <TerminalView ctx={{ Activity, ArrowDownToLine, ArrowUpFromLine, Button, Clock3, Copy, Cpu, HardDrive, HoverCard, HoverCardContent, HoverCardTrigger, Maximize2, MemoryStick, Radio, RefreshCcw, Sparkles, SquareArrowOutUpRight, Unplug, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost: !!onUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI: onAddSelectionToAI ? handleAddSelectionToAI : undefined, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect: (attachExistingSession || compactToolbar) ? undefined : handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, isCancelling, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, knownCwdRef, needsHostKeyVerification, onAddSelectionToAI, onBroadcastInput, onCloseSession, onDetach, onDetachDragEnd, onDetachDragStart, onDetachPointerDown, onEndSessionDrag, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onStartSessionDrag, onToggleBroadcast, onUpdateHost: handleUpdateHostFromTerminal, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scrollToBottomAfterProgrammaticInput, searchMatchCount, searchFocusToken, scriptExecutionOverlay: activeScriptRun ? (
+      <TerminalView ctx={{ Activity, ArrowDownToLine, ArrowUpFromLine, Button, Clock3, Copy, Cpu, HardDrive, HoverCard, HoverCardContent, HoverCardTrigger, Maximize2, MemoryStick, Radio, RefreshCcw, Sparkles, SquareArrowOutUpRight, Unplug, TerminalAutocomplete, TerminalComposeBar, TerminalConnectionDialog, TerminalContextMenu, TerminalSearchBar, Tooltip, TooltipContent, TooltipTrigger, ZmodemOverwriteDialog, ZmodemProgressIndicator, auth, autocompleteAcceptTextRef, autocompleteCloseRef, autocompleteHostOs, autocompleteInputRef, autocompleteKeyEventRef, autocompleteRepositionRef, autocompleteSettings, canUpdateHost: !!onUpdateHost, chainProgress, cn, compactToolbar, lineTimestampsAvailable, containerRef, effectiveFontSize, effectiveFontWeight, effectiveTheme, error, executeSnippet, executeSnippetCommand, handleAddSelectionToAI: onAddSelectionToAI ? handleAddSelectionToAI : undefined, handleCancelConnect, handleCloseDisconnectedSession, handleCloseSearch, handleDisconnect: (attachExistingSession || compactToolbar) ? undefined : handleDisconnect, handleDismissDisconnectedDialog, handleDragEnter, handleDragLeave, handleDragOver, handleDrop, handleFindNext, handleFindPrevious, handleHostKeyAddAndContinue, handleHostKeyClose, handleHostKeyContinue, handleOsc52ReadResponse, handleOsc7SetupConfirm, handleOsc7SetupOpenChange, handleReceiveYmodem, handleRetry, handleSearch, handleSendYmodem, handleTopOverlayMouseDownCapture, hasMouseTracking, host, hotkeyScheme, inWorkspace, isBroadcastEnabled, isCancelling, isComposeBarOpen: effectiveComposeBarOpen, isConnectionAwaitingUserInput, isDraggingOver, isFocusMode, isFocusedPane, isLocalConnection, remoteDragDropUsesZmodem, isPluginTerminalProviderAvailable, isReconnectActive, isSerialConnection, isSearchOpen, isSupportedOs, isSystemSidebarEligible, isVisible, keyBindings, keys, identities, knownCwdRef, needsHostKeyVerification, onAddSelectionToAI, onBroadcastInput, onCloseSession, onDetach, onDetachDragEnd, onDetachDragStart, onDetachPointerDown, onEndSessionDrag, onExpandToFocus, onTogglePaneMagnification, onOpenSystem, onRename, onSplitHorizontal, onSplitVertical, onStartSessionDrag, onToggleBroadcast, onUpdateHost: handleUpdateHostFromTerminal, osc52ReadPromptVisible, osc7SetupOpen, osc7SetupRunning, passwordPromptActiveRef, pendingHostKeyInfo, progressLogs, progressValue, renderControls, resolvedFontFamily, restoreState, scrollToBottomAfterProgrammaticInput, searchMatchCount, searchFocusToken, scriptExecutionOverlay: activeScriptRun ? (
         <ScriptExecutionOverlay
           run={activeScriptRun}
           onPause={() => { void pauseScriptRun(activeScriptRun.runId); }}

components/TerminalLayer.memo.test.tsx

@@ -306,3 +306,8 @@ test("TerminalLayer re-renders when terminalFontFamilyId changes", () => {
     false,
   );
 });
+
+test("local shell auto-open preferences invalidate terminal layer memo", () => {
+  assert.equal(terminalLayerAreEqual(baseProps as never, { ...baseProps, localShellSidePanelAutoOpen: true } as never), false);
+  assert.equal(terminalLayerAreEqual(baseProps as never, { ...baseProps, localShellSidePanelAutoOpenTab: "sftp" } as never), false);
+});

components/TerminalLayer.tsx

@@ -1,3 +1,4 @@
+import { captureTerminalBroadcastInput, isTerminalBroadcastInputCurrent, markTerminalBroadcastUserInput } from "./terminal/runtime/terminalPacedBroadcast";
 import { pruneComposeBarHistory } from '../application/state/composeBarHistoryStore';
 import { FolderTree, History, MessageSquare, PanelLeft, PanelRight, Palette, X, Zap } from 'lucide-react';
 import React, { memo, startTransition, useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -19,6 +20,7 @@ import {
 } from '../application/state/codingCliSessionSignalController';
 import { collectSessionIds } from '../domain/workspace';
 import { isPluginHostProtocol } from '../domain/pluginConnection';
+import { isSameSftpHostSelection } from '../domain/sftpTerminalIdentity';
 
 import { cn, normalizeLineEndings } from '../lib/utils';
 import { detectLocalOs } from '../lib/localShell';
@@ -26,6 +28,7 @@ import { useStoredString } from '../application/state/useStoredString';
 import { useStoredNumber } from '../application/state/useStoredNumber';
 import { useStoredBoolean } from '../application/state/useStoredBoolean';
 import {
+  STORAGE_KEY_SIDE_PANEL_HEIGHT,
   STORAGE_KEY_SIDE_PANEL_WIDTH,
   STORAGE_KEY_TERMINAL_COMPOSE_BAR_OPEN,
 } from '../infrastructure/config/storageKeys';
@@ -105,7 +108,7 @@ import {
 } from './terminalLayer/terminalLayerSessionRouting';
 import {
   DEFAULT_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
-  resolveTerminalSidePanelAutoOpen,
+  resolveSessionSidePanelAutoOpen,
 } from '../domain/terminalSidePanelAutoOpen';
 import { shouldProbeCommandCwd } from './terminalLayer/commandCwdProbe';
 import {
@@ -118,8 +121,10 @@ import { classifyDistroId, shouldProbeSessionCwd } from '../domain/host';
 import {
   collectSidePanelPanes,
   sidePanelLayoutHasTool,
+  type SidePanelLayout,
   type SidePanelSplitDirection,
 } from '../domain/sidePanelLayout';
+import { useWorkspaceLayoutPresetState } from '../application/state/useWorkspaceLayoutPresetState';
 import {
   isPaneMagnificationSelectionValid,
   resolvePaneMagnificationCandidate,
@@ -128,9 +133,12 @@ import {
 } from '../domain/paneMagnification';
 import { useTerminalSidePanelLayoutState } from '../application/state/useTerminalSidePanelLayoutState';
 import {
+  TERMINAL_SIDE_PANEL_MAX_HEIGHT,
   TERMINAL_SIDE_PANEL_MAX_WIDTH,
+  TERMINAL_SIDE_PANEL_MIN_HEIGHT,
   TERMINAL_SIDE_PANEL_MIN_WIDTH,
 } from '../application/state/terminalSidePanelWidth';
+import { isSidePanelDockPosition } from '../domain/sidePanelLayout';
 
 import {
   AIChatPanelsHost,
@@ -262,6 +270,8 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
   sftpAutoOpenSidebar,
   terminalSidePanelAutoOpen = false,
   terminalSidePanelAutoOpenTab = DEFAULT_TERMINAL_SIDE_PANEL_AUTO_OPEN_TAB,
+  localShellSidePanelAutoOpen = false,
+  localShellSidePanelAutoOpenTab = 'scripts',
   sftpFollowTerminalCwd,
   setSftpFollowTerminalCwd,
   editorWordWrap,
@@ -445,56 +455,195 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
   terminalSidePanelAutoOpenRef.current = terminalSidePanelAutoOpen;
   const terminalSidePanelAutoOpenTabRef = useRef(terminalSidePanelAutoOpenTab);
   terminalSidePanelAutoOpenTabRef.current = terminalSidePanelAutoOpenTab;
+  const localShellSidePanelAutoOpenRef = useRef(localShellSidePanelAutoOpen);
+  localShellSidePanelAutoOpenRef.current = localShellSidePanelAutoOpen;
+  const localShellSidePanelAutoOpenTabRef = useRef(localShellSidePanelAutoOpenTab);
+  localShellSidePanelAutoOpenTabRef.current = localShellSidePanelAutoOpenTab;
   const sftpFollowTerminalCwdRef = useRef(sftpFollowTerminalCwd);
   sftpFollowTerminalCwdRef.current = sftpFollowTerminalCwd;
 
-  const handleStatusChange = useCallback((sessionId: string, status: TerminalSession['status']) => {
+  // Destructure the stable hook callbacks: the hook returns a fresh object
+  // each render, and depending on that object would recreate the preset
+  // callbacks (and in turn handleStatusChange) on unrelated state updates,
+  // defeating the terminal pane memoization.
+  const { resolveDefaultLayoutForSession, saveWorkspaceLayoutAsDefault: persistWorkspaceLayoutAsDefault } =
+    useWorkspaceLayoutPresetState();
+
+  const applyWorkspaceLayoutPresetForSession = useCallback((session: TerminalSession, tabId: string, sftpHostOverride?: Host) => {
+    // Preset persistence and resolution live in the application layer; the
+    // component only mounts the resolved panes into its UI state.
+    const resolved = resolveDefaultLayoutForSession(session);
+    if (!resolved) return false;
+    const { layout, focusedTool, protocol: proto } = resolved;
+
+    for (const pane of collectSidePanelPanes(layout.root)) {
+      if (pane.tool === 'ai') {
+        setAiMountedTabIds((prev) => addMountedSidePanelTabId(prev, tabId));
+      } else if (pane.tool === 'scripts') {
+        setScriptsMountedTabIds((prev) => addMountedSidePanelTabId(prev, tabId));
+      } else if (pane.tool === 'theme') {
+        setThemeMountedTabIds((prev) => addMountedSidePanelTabId(prev, tabId));
+      } else if (pane.tool === 'system') {
+        setSystemMountedTabIds((prev) => addMountedSidePanelTabId(prev, tabId));
+      } else if (pane.tool === 'notes') {
+        setNotesMountedTabIds((prev) => addMountedSidePanelTabId(prev, tabId));
+      } else if (pane.tool === 'sftp') {
+        // Mirror the normal SFTP open path: a previously retained panel (kept
+        // mounted while transfers or external edits finished after close) must
+        // not keep suppressing command-triggered refreshes once the preset
+        // reopens SFTP for this tab. Mark the tab as opening first so an
+        // activity callback firing before React commits the open state still
+        // sees the panel as open instead of pruning the retained host state.
+        const cleanupTimer = sftpRetainedCleanupTimersRef.current.get(tabId);
+        if (cleanupTimer !== undefined) {
+          window.clearTimeout(cleanupTimer);
+          sftpRetainedCleanupTimersRef.current.delete(tabId);
+        }
+        sftpOpeningTabIdsRef.current.add(tabId);
+        sftpRetainedAfterCloseTabIdsRef.current.delete(tabId);
+        sftpPaneClosedTabIdsRef.current.delete(tabId);
+        setSftpHostSourceSessionForTab(prev => new Map(prev).set(tabId, session.id));
+        const host = hostsRef.current.find(h => h.id === session.hostId);
+        const hostWithOverrides: Host = host
+          ? {
+            ...host,
+            protocol: session.protocol ?? host.protocol,
+            port: session.port ?? host.port,
+            moshEnabled: session.moshEnabled ?? host.moshEnabled,
+            etEnabled: session.etEnabled ?? host.etEnabled,
+          }
+          : {
+            id: session.hostId || session.id,
+            hostname: session.hostname,
+            username: session.username,
+            port: session.port ?? 22,
+            protocol: proto,
+            label: session.customName || session.hostLabel || session.hostname,
+          } as Host;
+        setSftpHostForTab(prev => {
+          const next = new Map(prev);
+          next.set(tabId, sftpHostOverride ?? hostWithOverrides);
+          return next;
+        });
+      }
+    }
+
+    setSidePanelLayouts((prev) => {
+      const next = new Map(prev);
+      next.set(tabId, layout);
+      return next;
+    });
+    lastSidePanelTabRef.current.set(tabId, focusedTool);
+    setSidePanelOpenTabs(prev => {
+      const next = new Map(prev);
+      next.set(tabId, focusedTool);
+      return next;
+    });
+    return true;
+  }, [resolveDefaultLayoutForSession, setSidePanelLayouts, setSidePanelOpenTabs]);
+
+  const handleSaveWorkspaceLayoutAsDefault = useCallback((layout: SidePanelLayout): boolean => {
+    if (!persistWorkspaceLayoutAsDefault(layout)) {
+      toast.error(t('terminal.layer.layoutSaveFailed'));
+      return false;
+    }
+    toast.success(t('terminal.layer.layoutSavedAsDefault'));
+    return true;
+  }, [persistWorkspaceLayoutAsDefault, t]);
+
+  const handleStatusChange = useCallback((sessionId: string, status: TerminalSession['status'], sftpHostOverride?: Host) => {
     onUpdateSessionStatus(sessionId, status);
 
     if (status !== 'connected') return;
 
+    setSftpAuthHostBySessionId(prev => {
+      const next = new Map(prev);
+      if (sftpHostOverride) next.set(sessionId, sftpHostOverride);
+      else next.delete(sessionId);
+      return next;
+    });
+
     const session = sessionsRef.current.find(s => s.id === sessionId);
     if (!session) return;
-    const proto = session.protocol;
-    const sftpAvailable = proto === 'ssh' || proto === 'mosh';
-    const tabId = session.workspaceId || sessionId;
+    const workspaceId = session.workspaceId;
+    const tabId = workspaceId || sessionId;
+
+    // Within a workspace every member session maps to the same tab id, so the
+    // preset (and any auto-open host binding) must come from the workspace's
+    // focused session; otherwise whichever pane connects first would decide
+    // SFTP pruning and host selection regardless of focus.
+    let presetSession = session;
+    if (workspaceId) {
+      const focusedSessionId = workspacesRef.current.find(ws => ws.id === workspaceId)?.focusedSessionId;
+      const focusedSession = focusedSessionId
+        ? sessionsRef.current.find(s => s.id === focusedSessionId)
+        : undefined;
+      if (focusedSession) presetSession = focusedSession;
+    }
+    const proto = presetSession.protocol ?? 'ssh';
+
+    if (presetSession.id === sessionId && (sftpHostOverride || sftpHostSourceSessionForTabRef.current.get(tabId) === sessionId)) {
+      const connectedHost = sftpHostOverride ?? sessionHostsMapRef.current.get(sessionId);
+      if (connectedHost) {
+        setSftpHostForTab(prev => new Map(prev).set(tabId, connectedHost));
+      }
+      setSftpHostSourceSessionForTab(prev => {
+        if (!sftpHostOverride) return prev;
+        const next = new Map(prev);
+        next.set(tabId, sessionId);
+        return next;
+      });
+    }
 
     if (sidePanelOpenTabsRef.current.has(tabId)) return;
 
-    const sessionAutoOpenTarget = session.autoOpenSidePanel === 'sftp' && sftpAvailable ? 'sftp' : null;
-    const autoOpenTarget = sessionAutoOpenTarget ?? resolveTerminalSidePanelAutoOpen({
-      enabled: terminalSidePanelAutoOpenRef.current,
-      selectedTab: terminalSidePanelAutoOpenTabRef.current,
-      sftpAvailable,
+    const targetPanel = resolveSessionSidePanelAutoOpen({
+      session: presetSession,
+      terminalEnabled: terminalSidePanelAutoOpenRef.current,
+      terminalTab: terminalSidePanelAutoOpenTabRef.current,
+      localEnabled: localShellSidePanelAutoOpenRef.current,
+      localTab: localShellSidePanelAutoOpenTabRef.current,
+      legacySftpEnabled: sftpAutoOpenSidebarRef.current,
     });
-    const targetPanel = autoOpenTarget ?? (sftpAutoOpenSidebarRef.current && sftpAvailable ? 'sftp' : null);
-    if (!targetPanel) return;
+
+    // Explicit SFTP (JumpServer deep link / host.autoOpenSftpPanel) wins over a
+    // saved default that may omit file transfer — only when SFTP is actually
+    // available. Ordinary auto-open still yields to the saved default.
+    if (targetPanel !== "sftp") {
+      if (applyWorkspaceLayoutPresetForSession(
+        presetSession,
+        tabId,
+        presetSession.id === sessionId ? sftpHostOverride : undefined,
+      )) return;
+      if (!targetPanel) return;
+    }
 
     lastSidePanelTabRef.current.set(tabId, targetPanel);
 
     if (targetPanel === 'sftp') {
       sftpPaneClosedTabIdsRef.current.delete(tabId);
-      const host = hostsRef.current.find(h => h.id === session.hostId);
+      setSftpHostSourceSessionForTab(prev => new Map(prev).set(tabId, presetSession.id));
+      const host = hostsRef.current.find(h => h.id === presetSession.hostId);
       const hostWithOverrides: Host = host
         ? {
           ...host,
-          protocol: session.protocol ?? host.protocol,
-          port: session.port ?? host.port,
-          moshEnabled: session.moshEnabled ?? host.moshEnabled,
-          etEnabled: session.etEnabled ?? host.etEnabled,
+          protocol: presetSession.protocol ?? host.protocol,
+          port: presetSession.port ?? host.port,
+          moshEnabled: presetSession.moshEnabled ?? host.moshEnabled,
+          etEnabled: presetSession.etEnabled ?? host.etEnabled,
         }
         : {
-          id: session.hostId || sessionId,
-          hostname: session.hostname,
-          username: session.username,
-          port: session.port ?? 22,
+          id: presetSession.hostId || presetSession.id,
+          hostname: presetSession.hostname,
+          username: presetSession.username,
+          port: presetSession.port ?? 22,
           protocol: proto,
-          label: session.label || session.hostname,
+          label: presetSession.customName || presetSession.hostLabel || presetSession.hostname,
         } as Host;
 
       setSftpHostForTab(prev => {
         const next = new Map(prev);
-        next.set(tabId, hostWithOverrides);
+        next.set(tabId, presetSession.id === sessionId && sftpHostOverride ? sftpHostOverride : hostWithOverrides);
         return next;
       });
     } else if (targetPanel === 'ai') {
@@ -514,7 +663,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       next.set(tabId, targetPanel);
       return next;
     });
-  }, [onUpdateSessionStatus, setSidePanelOpenTabs, sidePanelOpenTabsRef]);
+  }, [applyWorkspaceLayoutPresetForSession, onUpdateSessionStatus, setSidePanelOpenTabs, sidePanelOpenTabsRef]);
 
   const handleSessionExit = useCallback((sessionId: string, evt: TerminalSessionExitEvent) => {
     const intent = resolveTerminalSessionExitIntent(
@@ -614,10 +763,15 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     420,
     { min: TERMINAL_SIDE_PANEL_MIN_WIDTH, max: TERMINAL_SIDE_PANEL_MAX_WIDTH },
   );
-  const [sidePanelPosition, setSidePanelPosition] = useStoredString<'left' | 'right'>(
+  const [sidePanelPosition, setSidePanelPosition] = useStoredString<'left' | 'right' | 'bottom'>(
     'netcatty_side_panel_position',
     'left',
-    (v): v is 'left' | 'right' => v === 'left' || v === 'right',
+    isSidePanelDockPosition,
+  );
+  const [sidePanelHeight, setSidePanelHeight, persistSidePanelHeight] = useStoredNumber(
+    STORAGE_KEY_SIDE_PANEL_HEIGHT,
+    360,
+    { min: TERMINAL_SIDE_PANEL_MIN_HEIGHT, max: TERMINAL_SIDE_PANEL_MAX_HEIGHT },
   );
   // Remember the last sub-panel shown per tab so the toggle shortcut can
   // restore it after a close. Overwritten on open, never cleared on close.
@@ -626,6 +780,15 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
 
   // The host to pass to the SFTP panel - stored when the user opens SFTP
   const [sftpHostForTab, setSftpHostForTab] = useState<Map<string, Host>>(new Map());
+  const [sftpHostSourceSessionForTab, setSftpHostSourceSessionForTab] = useState<Map<string, string>>(new Map());
+  const [sftpAuthHostBySessionId, setSftpAuthHostBySessionId] = useState<Map<string, Host>>(new Map());
+  useEffect(() => {
+    setSftpAuthHostBySessionId(prev => {
+      const liveIds = new Set(sessions.map(session => session.id));
+      const next = new Map([...prev].filter(([id]) => liveIds.has(id)));
+      return next.size === prev.size ? prev : next;
+    });
+  }, [sessions]);
   const [sftpInitialLocationForTab, setSftpInitialLocationForTab] = useState<
     Map<string, { hostId: string; path: string }>
   >(new Map());
@@ -638,6 +801,8 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
   const notesOpenRequestIdRef = useRef(0);
   const sftpHostForTabRef = useRef(sftpHostForTab);
   sftpHostForTabRef.current = sftpHostForTab;
+  const sftpHostSourceSessionForTabRef = useRef(sftpHostSourceSessionForTab);
+  sftpHostSourceSessionForTabRef.current = sftpHostSourceSessionForTab;
   const sftpActiveTransfersByTabRef = useRef<Map<string, number>>(new Map());
   const sftpActiveExternalEditsByTabRef = useRef<Map<string, number>>(new Map());
   const sftpRetainedAfterCloseTabIdsRef = useRef<Set<string>>(new Set());
@@ -685,6 +850,12 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       next.delete(tabId);
       return next;
     });
+    setSftpHostSourceSessionForTab(prev => {
+      if (!prev.has(tabId)) return prev;
+      const next = new Map(prev);
+      next.delete(tabId);
+      return next;
+    });
     setSftpPendingUploadsForTab(prev => {
       if (!prev.has(tabId)) return prev;
       const next = new Map(prev);
@@ -870,14 +1041,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     // Compare full endpoint identity so that session-time overrides
     // (different port/protocol for the same host ID) trigger a switch
     // instead of toggling the panel closed.
-    const isSameEndpoint = currentHost
-      && currentHost.id === host.id
-      && currentHost.hostname === host.hostname
-      && currentHost.port === host.port
-      && currentHost.protocol === host.protocol
-      && currentHost.username === host.username
-      && currentHost.sftpSudo === host.sftpSudo
-      && (currentHost.sftpFileProtocol || "auto") === (host.sftpFileProtocol || "auto");
+    const isSameEndpoint = isSameSftpHostSelection(currentHost, host);
 
     const currentLayout = sidePanelLayoutsRef.current.get(tabId);
     const paneCount = currentLayout
@@ -914,6 +1078,18 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       next.set(tabId, host);
       return next;
     });
+    setSftpHostSourceSessionForTab(prev => {
+      const next = new Map(prev);
+      if (originSessionId) next.set(tabId, originSessionId);
+      else next.delete(tabId);
+      return next;
+    });
+    if (originSessionId) {
+      const sessionHost = sessionHostsMapRef.current.get(originSessionId);
+      if (sessionHost && (host.username !== sessionHost.username || host.identityId !== sessionHost.identityId)) {
+        setSftpAuthHostBySessionId(prev => new Map(prev).set(originSessionId, host));
+      }
+    }
 
     const { connectionKey, effectiveInitialPath } = resolveSftpOpenTarget({
       tabId,
@@ -1064,12 +1240,26 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     sourceSessionId: string,
     options?: TerminalBroadcastInputOptions,
   ) => {
+    const paced = options?.pacedBroadcast;
+    if (paced && !options?.preparePacedBroadcast) {
+      if (!paced.targets || isTerminalSensitiveInputActive(sourceSessionId)) return [];
+      paced.targets = paced.targets.filter(target => isTerminalBroadcastInputCurrent(target)
+        && !isTerminalSensitiveInputActive(target.sessionId));
+    }
     const targetSessionIds = resolveTerminalBroadcastTargetIds({
       sessions: sessionsRef.current,
       sourceSessionId,
       globalBroadcastEnabled: isGlobalBroadcastEnabled,
       directTargetSessionIds: options?.kittyKeyboardTargetSessionIds,
-    });
+    }).filter(id => !paced?.targets || paced.targets.some(target => target.sessionId === id));
+    if (options?.preparePacedBroadcast && paced) {
+      paced.targets = targetSessionIds.filter(id => !isTerminalSensitiveInputActive(id)).map(id => {
+        markTerminalBroadcastUserInput(id);
+        terminalBackend.interruptSession(id, undefined, { cancelPendingWritesOnly: true });
+        return captureTerminalBroadcastInput(id);
+      });
+      return paced.targets.map(target => target.sessionId);
+    }
     if (targetSessionIds.length === 0) return [];
 
     const targetSessionIdSet = new Set(targetSessionIds);
@@ -1078,6 +1268,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     for (const session of sessionsRef.current) {
       if (!targetSessionIdSet.has(session.id)) continue;
       if (!canUseDirectSessionWriteFallback(session)) continue;
+      if (!paced && (options?.automated !== true || options.lineDelayMs)) markTerminalBroadcastUserInput(session.id);
 
       if (options?.kittyKeyboardInput) {
         dispatchKittyKeyboardBroadcastInput(session.id, options.kittyKeyboardInput, {
@@ -1094,6 +1285,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
         && isPluginHostProtocol(session.protocol)
         && terminalBackend.signalPluginConnection) {
         broadcastInterruptPrioritizersRef.current.get(session.id)?.();
+        terminalBackend.interruptSession(session.id, undefined, { cancelPendingWritesOnly: true });
         void terminalBackend.signalPluginConnection(session.id, "interrupt").catch(() => {
           terminalBackend.interruptSession(session.id);
         });
@@ -1107,7 +1299,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       }
       if (isTerminalSensitiveInputActive(session.id)) continue;
       terminalBackend.writeToSession(session.id, data, {
-        automated: true,
+        automated: options?.automated === true,
         sensitive: false,
         ...(lineDelayMs ? { lineDelayMs } : {}),
       });
@@ -1432,16 +1624,35 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
       sftpPaneClosedTabIdsRef.current.delete(tabId);
     }
 
+    if (tab === 'sftp') {
+      const sourceSessionId = getActiveTerminalSessionId();
+      const sessionHost = sourceSessionId ? sessionHostsMapRef.current.get(sourceSessionId) : undefined;
+      const authHost = sourceSessionId ? sftpAuthHostBySessionId.get(sourceSessionId) : undefined;
+      const storedHost = sftpHostForTabRef.current.get(tabId);
+      if (sourceSessionId && sessionHost && authHost
+        && (!storedHost || sftpHostSourceSessionForTabRef.current.has(tabId)
+          || (storedHost.id === sessionHost.id
+            && storedHost.hostname === sessionHost.hostname
+            && (storedHost.port || 22) === (sessionHost.port || 22)))) {
+        setSftpHostForTab(prev => new Map(prev).set(tabId, authHost));
+        setSftpHostSourceSessionForTab(prev => new Map(prev).set(tabId, sourceSessionId));
+      }
+    }
+
     // If switching to SFTP and no host is stored yet, resolve it
     if (tab === 'sftp' && !sftpHostForTabRef.current.has(tabId)) {
-      const host = resolveSftpHostForTab(tabId);
+      const sourceSessionId = getActiveTerminalSessionId();
+      const host = (sourceSessionId && sftpAuthHostBySessionId.get(sourceSessionId))
+        ?? resolveSftpHostForTab(tabId);
       if (!host) return;
+      if (sourceSessionId) {
+        setSftpHostSourceSessionForTab(prev => new Map(prev).set(tabId, sourceSessionId));
+      }
       setSftpHostForTab(prev => {
         const next = new Map(prev);
         next.set(tabId, host);
         return next;
       });
-      const sourceSessionId = getActiveTerminalSessionId();
       const { effectiveInitialPath } = resolveSftpOpenTarget({
         tabId,
         host,
@@ -1463,7 +1674,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     // explicitly closes the now-idle panel, preserving the completed history.
     markSidePanelSubTabOpened(tabId, tab);
     return true;
-  }, [getActiveTerminalSessionId, markSidePanelSubTabOpened, resolveSftpHostForTab, resolveSftpOpenTarget]);
+  }, [getActiveTerminalSessionId, markSidePanelSubTabOpened, resolveSftpHostForTab, resolveSftpOpenTarget, sftpAuthHostBySessionId]);
 
   // Switch only the focused pane. If the tool is already open elsewhere in
   // the tree, the domain helper focuses that pane instead of duplicating it.
@@ -2284,6 +2495,7 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     handleSftpActiveExternalEditsChange,
     handleSftpInitialLocationApplied,
     persistSidePanelWidth,
+    persistSidePanelHeight,
     handleSnippetClickForFocusedSession,
     handleSnippetFromPanel,
     handleRunScriptFromPanel,
@@ -2397,20 +2609,26 @@ const TerminalLayerInner: React.FC<TerminalLayerProps> = ({
     setSidePanelOpenTabs,
     setSidePanelLayouts,
     setSidePanelWidth,
+    setSidePanelHeight,
     setSftpFollowTerminalCwd,
     setSftpHostForTab,
+    setSftpHostSourceSessionForTab,
     setSftpInitialLocationForTab,
+    onSaveWorkspaceLayoutAsDefault: handleSaveWorkspaceLayoutAsDefault,
     setSftpPendingUploadsForTab,
     showHostTreeSidebar,
     sidePanelOpenTabs,
     sidePanelLayouts,
     sidePanelPosition,
     sidePanelWidth,
+    sidePanelHeight,
     sftpAutoSync,
     sftpDefaultViewMode,
     sftpDoubleClickBehavior,
     sftpFollowTerminalCwd,
     sftpHostForTab,
+    sftpHostSourceSessionForTab,
+    sftpAuthHostBySessionId,
     sftpInitialLocationForTab,
     sftpPendingUploadsForTab,
     sftpPaneClosedTabIdsRef,

components/TerminalPopupPage.test.ts

@@ -145,11 +145,11 @@ test('popup terminals use their window-local vault readiness', () => {
   assert.match(source, /vaultInitializedOverride=\{vaultInitialized\}/);
 });
 
-test('popup provider tree mounts the plugin authentication host', () => {
+test('popup provider tree mounts authentication and paste confirmation hosts', () => {
   assert.match(source, /import \{ PluginAuthenticationHost \} from '\.\/plugins\/PluginAuthenticationHost';/);
   assert.match(
     source,
-    /<I18nProvider locale=\{settings\.uiLanguage\}>\s+<TerminalPopupPageInner\s+settings=\{settings\}\s+allowTerminalStart=\{allowTerminalStart\}\s+\/>\s+<PluginAuthenticationHost \/>\s+<\/I18nProvider>/,
+    /<I18nProvider locale=\{settings\.uiLanguage\}>\s+<TerminalPopupPageInner\s+settings=\{settings\}\s+allowTerminalStart=\{allowTerminalStart\}\s+\/>\s+<PluginAuthenticationHost \/>\s+<MultilinePasteConfirmHost \/>\s+<\/I18nProvider>/,
   );
 });
 

components/TerminalPopupPage.tsx

@@ -2,6 +2,7 @@ import { setupVaultAgentBridge } from "../infrastructure/ai/vaultAgentBridgeClie
 import { Copy, Minus, Square, Unplug, X } from 'lucide-react';
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useState } from 'react';
 import { I18nProvider, useI18n } from '../application/i18n/I18nProvider';
+import { MultilinePasteConfirmHost } from './terminal/MultilinePasteConfirmDialog';
 import { useTerminalPopupWindow } from '../application/state/useTerminalPopupWindow';
 import { useVaultState } from '../application/state/useVaultState';
 import { useWindowControls } from '../application/state/useWindowControls';
@@ -547,6 +548,7 @@ export default function TerminalPopupPage({
         allowTerminalStart={allowTerminalStart}
       />
       <PluginAuthenticationHost />
+      <MultilinePasteConfirmHost />
     </I18nProvider>
   );
 }

components/TopTabs.tsx

@@ -228,7 +228,6 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
   const { t } = useI18n();
   const { maximize, isFullscreen, onFullscreenChanged } = useWindowControls();
   const {
-    tabBarPosition,
     hotkeyScheme,
     showTabNumberBadges,
     shellOnlyTabNumberShortcuts,
@@ -270,8 +269,7 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
   const [hostTreeChromeReady, setHostTreeChromeReady] = useState(false);
   const [hostTreeGutterExiting, setHostTreeGutterExiting] = useState(false);
   const [rootTabsCompact, setRootTabsCompact] = useState(false);
-  const tabsAtBottom = tabBarPosition === 'bottom';
-  const showWindowControls = !isMacClient && !tabsAtBottom;
+  const showWindowControls = !isMacClient;
 
   // Tab reorder drag state
   const [dropIndicator, setDropIndicator] = useState<{ tabId: string; position: 'before' | 'after' } | null>(null);
@@ -999,24 +997,12 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
   }, [isMacClient, maximize]);
 
   return (
-    <>
-        <div
-          data-tab-window-titlebar
-          data-section="top-tabs"
-          className={cn("h-9 shrink-0 items-end justify-end bg-secondary app-drag", tabsAtBottom ? "flex" : "hidden")}
-          style={dragRegionNoSelect}
-          onDoubleClick={handleTitleBarDoubleClick}
-        >
-          {!isMacClient && <WindowControls />}
-        </div>
     <div
       data-top-tabs-root
-      data-position={tabBarPosition}
       data-section="top-tabs"
-      className="relative w-full shrink-0 bg-secondary app-drag"
+      className="relative w-full bg-secondary app-drag"
       style={{
         ...dragRegionNoSelect,
-        order: tabsAtBottom ? 2 : undefined,
         backgroundColor: 'var(--top-tabs-bg, hsl(var(--secondary)))',
         color: 'var(--top-tabs-fg, hsl(var(--foreground)))',
       }}
@@ -1027,12 +1013,12 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
         updateScrollState={updateScrollState}
       />
       {/* Always-on drag stripe so the window can be moved even when tabs fill the bar */}
-      <div className={cn("absolute inset-x-0 h-1 app-drag pointer-events-auto z-10", tabsAtBottom ? "bottom-0" : "top-0")} style={dragRegionStyle} aria-hidden />
+      <div className="absolute inset-x-0 top-0 h-1 app-drag pointer-events-auto z-10" style={dragRegionStyle} aria-hidden />
       <div
-        className={cn("h-9 flex gap-0 app-drag overflow-visible", tabsAtBottom ? "items-start" : "items-end")}
+        className="h-9 flex items-end gap-0 app-drag overflow-visible"
         style={{
           ...dragRegionStyle,
-          paddingLeft: isMacClient && !isWindowFullscreen && !tabsAtBottom ? 76 : 12,
+          paddingLeft: isMacClient && !isWindowFullscreen ? 76 : 12,
           paddingRight: showWindowControls ? 0 : 12,
         }}
       >
@@ -1080,7 +1066,7 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
           {hasHostTreeToggleSurface && (
             <div
               ref={hostTreeToggleSlotRef}
-              className={cn("top-tab-host-tree-toggle-slot mb-0 flex-shrink-0 app-no-drag", tabsAtBottom ? "self-start" : "self-end")}
+              className="top-tab-host-tree-toggle-slot mb-0 flex-shrink-0 self-end app-no-drag"
               data-section="top-tabs-host-tree-toggle"
               data-visible={effectiveShowHostTreeToggle ? 'true' : 'false'}
               style={noDragRegionStyle}
@@ -1190,7 +1176,7 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
                 <Button
                   variant="ghost"
                   size="icon"
-                  className={cn("h-7 w-7 flex-shrink-0 app-no-drag rounded-none", tabsAtBottom ? "self-start" : "self-end")}
+                  className="h-7 w-7 flex-shrink-0 app-no-drag self-end rounded-none"
                   style={{ color: 'var(--top-tabs-muted, hsl(var(--muted-foreground)))' }}
                   onClick={onOpenQuickSwitcher}
                 >
@@ -1202,9 +1188,12 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
           </div>
         )}
 
-        {/* Fixed right controls — utility icons + window controls share one h-7 row */}
+        {/* Keep window controls above the top drag stripe so their full height remains clickable. */}
         <div
-          className={cn("flex-shrink-0 flex items-center gap-0.5 app-drag h-7 overflow-visible", tabsAtBottom ? "self-start" : "self-end")}
+          className={cn(
+            "flex-shrink-0 flex items-center gap-0.5 app-drag overflow-visible self-end",
+            showWindowControls ? "relative z-20 h-9" : "h-7",
+          )}
           style={dragRegionStyle}
           data-section="top-tabs-toolbar-actions"
         >
@@ -1279,7 +1268,6 @@ const TopTabsInner: React.FC<TopTabsProps> = ({
         )}
       </div>
     </div>
-    </>
   );
 };
 

components/VaultView.tsx

@@ -77,6 +77,7 @@ import {
   remapSnippetTargetGroupPaths,
 } from "../domain/hostGroupPathMutations";
 import {
+  canReorderVaultHosts,
   reorderVaultItems,
   reorderVaultStrings,
   type VaultOrderPosition,
@@ -697,12 +698,15 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
       keyPassphrases,
       unreadablePassphraseCount,
     } = await buildVaultCsvCredentialOptions(hosts, keys);
-    const { csv, exportedCount, skippedCount } = exportHostsToCsvWithStats(
+    const { csv, exportedCount, skippedCount, unreadableProxyCredentialCount } = exportHostsToCsvWithStats(
       hosts,
       {
         keyPassphrases,
         keyPassphrasesById,
         keyPathsById,
+        proxyProfiles,
+        identities,
+        groupConfigs,
       },
     );
 
@@ -728,6 +732,13 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
         }),
       );
     }
+    if (unreadableProxyCredentialCount > 0) {
+      toast.warning(
+        t("vault.hosts.export.toast.proxyCredentialsSkipped", {
+          count: unreadableProxyCredentialCount,
+        }),
+      );
+    }
     if (skippedCount > 0) {
       toast.warning(
         t("vault.hosts.export.toast.successWithSkipped", {
@@ -740,7 +751,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
         t("vault.hosts.export.toast.success", { count: exportedCount }),
       );
     }
-  }, [hosts, keys, t]);
+  }, [hosts, keys, proxyProfiles, identities, groupConfigs, t]);
 
   // Copy hostname/IP for cross-host paste without opening the editor
   const handleCopyHostname = useCallback(
@@ -1181,34 +1192,13 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
       const source = hostsRef.current.find((host) => host.id === sourceHostId);
       const target = hostsRef.current.find((host) => host.id === targetHostId);
       if (!source || !target) return;
-      const targetGroup = target.group || "";
-      const targetManagedSource = managedSources
-        .filter(
-          (sourceInfo) =>
-            targetGroup === sourceInfo.groupName ||
-            targetGroup.startsWith(`${sourceInfo.groupName}/`),
-        )
-        .sort((a, b) => b.groupName.length - a.groupName.length)[0];
-      const updatedHosts = hostsRef.current.map((host) =>
-        host.id === sourceHostId
-          ? {
-              ...host,
-              label:
-                targetManagedSource &&
-                (!host.protocol || host.protocol === "ssh")
-                  ? host.label.replace(/\s/g, "")
-                  : host.label,
-              group: targetGroup,
-              managedSourceId:
-                targetManagedSource &&
-                (!host.protocol || host.protocol === "ssh")
-                  ? targetManagedSource.id
-                  : undefined,
-            }
-          : host,
-      );
+      // Card-to-card drags only reorder hosts within the same group; moving a
+      // host into a different group must go through the group folder drop
+      // (moveHostToGroup), otherwise dragging two grouped cards past each
+      // other silently swaps their group membership.
+      if (!canReorderVaultHosts(source.group, target.group)) return;
       const reorderedHosts = reorderVaultItems<Host>(
-        updatedHosts,
+        hostsRef.current,
         sourceHostId,
         targetHostId,
         position,
@@ -1217,7 +1207,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
       onUpdateHosts(reorderedHosts);
       setSortMode("manual");
     },
-    [managedSources, onUpdateHosts, setSortMode],
+    [onUpdateHosts, setSortMode],
   );
 
   const reorderGroup = useCallback(
@@ -1289,6 +1279,21 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
     t,
   });
 
+  const managedFilesByGroupPath = useMemo(() => {
+    const map = new Map<string, string[]>();
+    for (const source of managedSources) {
+      if (source.filePath) {
+        const files = map.get(source.groupName);
+        if (files) {
+          files.push(source.filePath);
+        } else {
+          map.set(source.groupName, [source.filePath]);
+        }
+      }
+    }
+    return map;
+  }, [managedSources]);
+
   const {
     startInlineNewGroup,
     startInlineRenameGroup,
@@ -1380,6 +1385,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
     <>
       <HostTreeGroupDeleteDialog
         managedGroupPaths={managedGroupPaths}
+        managedFilesByGroupPath={managedFilesByGroupPath}
         onConfirmDelete={deleteGroupPath}
       />
       <VaultViewLayout

components/ai/ChatInput.tsx

@@ -206,6 +206,12 @@ interface ChatInputProps {
   placeholder?: string;
   /** Available model presets for the current agent */
   modelPresets?: AgentModelPreset[];
+  /**
+   * Offer the picker's "use custom model" action. Disable when the current
+   * agent locks the model (e.g. managed Codex `model` config overrides the
+   * selection on every send).
+   */
+  allowCustomModelEntry?: boolean;
   /** Currently selected model ID */
   selectedModelId?: string;
   /** Callback when user selects a model */
@@ -271,6 +277,7 @@ const ChatInput: React.FC<ChatInputProps> = ({
   agentName,
   placeholder,
   modelPresets = [],
+  allowCustomModelEntry = true,
   selectedModelId,
   onModelSelect,
   files = [],
@@ -1526,7 +1533,7 @@ const ChatInput: React.FC<ChatInputProps> = ({
               ) : (
                 <Cpu size={11} className="text-muted-foreground/64" />
               )}
-              <span className={`truncate min-w-0 ${modelChipMaxWidth}`}>{modelLabel}</span>
+              <span className={`truncate min-w-0 ${modelChipMaxWidth}`} title={modelLabel}>{modelLabel}</span>
               {hasModelPicker && <ChevronDown size={9} className="text-muted-foreground/50" />}
             </button>
             {contextUsage && (
@@ -1585,19 +1592,22 @@ const ChatInput: React.FC<ChatInputProps> = ({
                     selectedProviderId={providerSwitcher?.selectedProviderId}
                     selectedModelId={hasProviderSwitcher ? providerSwitcher?.selectedModelId : selectedBaseModelId}
                     modelPresets={hasProviderSwitcher ? undefined : modelPresets}
+                    allowCustomEntry={allowCustomModelEntry}
                     prefs={modelPrefs}
                     onSelectProviderModel={(providerId, modelId, contextWindow) => {
                       providerSwitcher?.onSelect(providerId, modelId, contextWindow);
                       setModelPrefs(rememberComposerRecentModel(pickerScope, { providerId, modelId }));
                       closeAllMenus();
                     }}
-                    onSelectModel={(modelId) => {
+                    onSelectModel={(modelId, options) => {
                       const preset = modelPresets.find((item) => item.id === modelId);
                       const nextId = preset
                         ? resolveModelSelectionWithThinking(preset, selectedPresetThinking)
                         : modelId;
                       onModelSelect?.(nextId);
-                      setModelPrefs(rememberComposerRecentModel(pickerScope, { modelId }));
+                      setModelPrefs(rememberComposerRecentModel(pickerScope, options?.custom
+                        ? { modelId, custom: true }
+                        : { modelId }));
                       closeAllMenus();
                     }}
                     onTogglePinned={(entry) => {
@@ -1795,6 +1805,7 @@ function chatInputPropsAreEqual(prev: ChatInputProps, next: ChatInputProps): boo
     && prev.agentName === next.agentName
     && prev.placeholder === next.placeholder
     && prev.modelPresets === next.modelPresets
+    && prev.allowCustomModelEntry === next.allowCustomModelEntry
     && prev.selectedModelId === next.selectedModelId
     && prev.onModelSelect === next.onModelSelect
     && prev.files === next.files

components/ai/ComposerModelPicker.test.tsx

@@ -61,8 +61,51 @@ test('external agent picker lists presets without a provider column', () => {
   assert.doesNotMatch(html, /ai\.chat\.providers/);
 });
 
-test('custom model action is only offered in Catty provider-switcher mode', () => {
+test('custom model action is offered in provider-switcher and preset modes', () => {
   const source = readFileSync(new URL('./ComposerModelPicker.tsx', import.meta.url), 'utf8');
-  assert.match(source, /const showCustom = Boolean\(\s*hasProviders/s);
+  // Custom ids are accepted regardless of mode (provider catalog or CLI
+  // presets) — #3534 wants manual model entry for external agents too.
+  assert.match(source, /const showCustom = Boolean\(\s*allowCustomEntry\s*&&\s*trimmedQuery/s);
   assert.match(source, /resolveComposerEnterModelId/);
 });
+
+test('custom model action can be suppressed when the host locks the model', () => {
+  const source = readFileSync(new URL('./ComposerModelPicker.tsx', import.meta.url), 'utf8');
+  // Codex config-locked models override every selection on send; the host
+  // turns the action off so it never becomes a silent no-op.
+  assert.match(source, /allowCustomEntry = true/);
+  const html = renderToStaticMarkup(
+    <ComposerModelPicker
+      modelPresets={[{ id: 'gpt-5.5', name: 'GPT-5.5' }]}
+      selectedModelId="gpt-5.5"
+      prefs={{ recent: [], pinned: [] }}
+      allowCustomEntry={false}
+      onSelectModel={() => {}}
+      onTogglePinned={() => {}}
+    />,
+  );
+  assert.doesNotMatch(html, /ai\.chat\.useCustomModel/);
+});
+
+test('reselecting a saved custom model preserves its custom provenance', () => {
+  const source = readFileSync(new URL('./ComposerModelPicker.tsx', import.meta.url), 'utf8');
+  // A saved custom id is appended to the preset list, so picking it from
+  // Recent has showCustom === false. The callback must keep the custom flag
+  // anyway, or the host overwrites the pref entry without it and
+  // resolveComposerCustomModelIds drops the model from the presets.
+  assert.match(source, /customPrefIds\.has\(modelId\.toLowerCase\(\)\)/);
+});
+
+test('external agent picker keeps preset rows truncation-friendly with a full-name tooltip', () => {
+  const html = renderToStaticMarkup(
+    <ComposerModelPicker
+      modelPresets={[{ id: 'gpt-5.6-sol-very-long-preview-id', name: 'GPT-5.6 Sol (preview)' }]}
+      selectedModelId="gpt-5.6-sol-very-long-preview-id"
+      prefs={{ recent: [], pinned: [] }}
+      onSelectModel={() => {}}
+      onTogglePinned={() => {}}
+    />,
+  );
+
+  assert.match(html, /title="GPT-5\.6 Sol \(preview\)"/);
+});

components/ai/ComposerModelPicker.tsx

@@ -2,6 +2,7 @@ import { Check, ChevronLeft, ChevronRight, Loader2, Pin, Search, Star } from 'lu
 import React, { useEffect, useMemo, useState } from 'react';
 import { useI18n } from '../../application/i18n/I18nProvider';
 import {
+  canonicalizeEffortEncodedModelId,
   filterComposerModels,
   resolveComposerEnterModelId,
   resolvePinnedAndRecentModels,
@@ -22,8 +23,14 @@ export interface ComposerModelPickerProps {
   selectedModelId?: string;
   modelPresets?: AgentModelPreset[];
   prefs: ComposerModelPrefs;
+  /**
+   * Offer the "use custom model" action. Disable when the host locks the
+   * model (e.g. a managed Codex config's `model` field overrides every
+   * selection), so the action never becomes a silent no-op.
+   */
+  allowCustomEntry?: boolean;
   onSelectProviderModel?: (providerId: string, modelId: string, contextWindow?: number) => void;
-  onSelectModel?: (modelId: string) => void;
+  onSelectModel?: (modelId: string, options?: { custom?: boolean }) => void;
   onTogglePinned: (entry: ComposerModelPrefEntry) => void;
 }
 
@@ -56,7 +63,7 @@ const ModelRow: React.FC<{
       {selected
         ? <Check size={11} className="text-primary shrink-0" />
         : <span className="w-[11px] shrink-0" />}
-      <span className="min-w-0 flex-1 truncate text-foreground/88">{model.name}</span>
+      <span className="min-w-0 flex-1 truncate text-foreground/88" title={model.name}>{model.name}</span>
     </button>
     <button
       type="button"
@@ -83,6 +90,7 @@ export const ComposerModelPicker: React.FC<ComposerModelPickerProps> = ({
   selectedModelId,
   modelPresets = [],
   prefs,
+  allowCustomEntry = true,
   onSelectProviderModel,
   onSelectModel,
   onTogglePinned,
@@ -133,23 +141,51 @@ export const ComposerModelPicker: React.FC<ComposerModelPickerProps> = ({
   );
 
   const trimmedQuery = query.trim();
+  // Manual model ids are accepted in both modes: provider-bound catalogs and
+  // preset lists from external CLI agents whose catalogs lag new models.
   const showCustom = Boolean(
-    hasProviders
+    allowCustomEntry
     && trimmedQuery
     && !models.some((model) => model.id.toLowerCase() === trimmedQuery.toLowerCase()),
   );
 
+  // Ids the prefs already mark as custom. A saved custom model that was
+  // appended to the preset list is selectable from Recent/Pinned while
+  // showCustom is false (query empty, id present in the list); the callback
+  // must keep the custom provenance or the host overwrites the pref entry
+  // without it and resolveComposerCustomModelIds drops the model (#3534).
+  const customPrefIds = useMemo(() => {
+    const ids = new Set<string>();
+    for (const entry of [...prefs.pinned, ...prefs.recent]) {
+      if (entry.providerId || entry.custom !== true) continue;
+      ids.add(canonicalizeEffortEncodedModelId(entry.modelId).trim().toLowerCase());
+    }
+    return ids;
+  }, [prefs]);
+
   const selectModel = (modelId: string) => {
     const contextWindow = models.find((model) => model.id === modelId)?.contextWindow;
     if (hasProviders && previewProvider) {
       onSelectProviderModel?.(previewProvider.id, modelId, contextWindow);
       return;
     }
-    onSelectModel?.(modelId);
+    // showCustom is only true when no catalog id matches the query, so a
+    // matching pick here came from the manual-entry action (row or Enter).
+    // Otherwise preserve provenance already recorded in the prefs.
+    const custom = Boolean(
+      (showCustom && modelId.toLowerCase() === trimmedQuery.toLowerCase())
+      || customPrefIds.has(modelId.toLowerCase()),
+    );
+    onSelectModel?.(modelId, custom ? { custom: true } : undefined);
   };
 
   const prefEntryFor = (modelId: string): ComposerModelPrefEntry => (
-    previewProvider ? { providerId: previewProvider.id, modelId } : { modelId }
+    previewProvider
+      ? { providerId: previewProvider.id, modelId }
+      // Preserve custom provenance on pin/unpin: a manual model pinned while
+      // other selections evict its unmarked recent twin would otherwise lose
+      // the custom marker and fall back to a catalog model (#3534).
+      : { modelId, ...(customPrefIds.has(modelId.toLowerCase()) ? { custom: true as const } : {}) }
   );
 
   if (hasProviders && view === 'providers') {

components/host/HostTreeGroupDeleteDialog.tsx

@@ -5,6 +5,8 @@ import {
   hostTreeInlineGroupDeleteStore,
   useHostTreeInlineGroupDeleteTarget,
 } from '../../application/state/hostTreeInlineGroupDeleteStore';
+import { VaultGroupDeletionConfirmationChangedError } from '../../application/state/useVaultGroupDeletion';
+import { toast } from '../ui/toast';
 import { Button } from '../ui/button';
 import {
   Dialog,
@@ -17,11 +19,13 @@ import {
 
 type HostTreeGroupDeleteDialogProps = {
   managedGroupPaths?: Set<string>;
+  managedFilesByGroupPath?: Map<string, string[]>;
   onConfirmDelete: (groupPath: string, deleteHosts: boolean) => void | Promise<void>;
 };
 
 export const HostTreeGroupDeleteDialog: React.FC<HostTreeGroupDeleteDialogProps> = ({
   managedGroupPaths,
+  managedFilesByGroupPath,
   onConfirmDelete,
 }) => {
   const { t } = useI18n();
@@ -29,6 +33,23 @@ export const HostTreeGroupDeleteDialog: React.FC<HostTreeGroupDeleteDialogProps>
   const [deleteHosts, setDeleteHosts] = useState(false);
   const isOpen = Boolean(targetPath);
   const isManaged = Boolean(targetPath && managedGroupPaths?.has(targetPath));
+  const descendantManagedFiles: string[] = [];
+  if (targetPath && managedFilesByGroupPath) {
+    for (const [groupPath, files] of managedFilesByGroupPath) {
+      if (
+        (groupPath === targetPath || groupPath.startsWith(`${targetPath}/`))
+      ) {
+        for (const filePath of files) {
+          if (
+            filePath
+            && !descendantManagedFiles.includes(filePath)
+          ) {
+            descendantManagedFiles.push(filePath);
+          }
+        }
+      }
+    }
+  }
 
   useEffect(() => {
     if (!isOpen) {
@@ -49,7 +70,9 @@ export const HostTreeGroupDeleteDialog: React.FC<HostTreeGroupDeleteDialogProps>
           <DialogDescription className="break-words [overflow-wrap:anywhere]">
             {isManaged
               ? t('vault.groups.deleteDialog.managedDesc')
-              : t('vault.groups.deleteDialog.desc')}
+              : descendantManagedFiles.length > 0
+                ? t('vault.groups.deleteDialog.mixedDesc')
+                : t('vault.groups.deleteDialog.desc')}
           </DialogDescription>
         </DialogHeader>
         <div className="min-w-0 space-y-4 py-4">
@@ -59,6 +82,25 @@ export const HostTreeGroupDeleteDialog: React.FC<HostTreeGroupDeleteDialogProps>
                 {t('vault.groups.pathLabel')}:{' '}
                 <span className="font-mono">{targetPath}</span>
               </p>
+              {descendantManagedFiles.length > 0 && (
+                <div className="space-y-1 rounded-md border border-destructive/40 bg-destructive/10 p-3">
+                  <p className="text-sm text-destructive">
+                    {t('vault.groups.deleteDialog.managedWarning')}
+                  </p>
+                  {descendantManagedFiles.length > 0 && (
+                    <div className="max-h-40 space-y-1 overflow-y-auto">
+                      {descendantManagedFiles.map((filePath) => (
+                        <p
+                          key={filePath}
+                          className="break-all font-mono text-xs text-muted-foreground"
+                        >
+                          {t('vault.groups.deleteDialog.managedFile', { file: filePath })}
+                        </p>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
               {!isManaged && (
                 <label className="flex items-center gap-2 text-sm cursor-pointer">
                   <input
@@ -79,12 +121,18 @@ export const HostTreeGroupDeleteDialog: React.FC<HostTreeGroupDeleteDialogProps>
           </Button>
           <Button
             variant="destructive"
-            onClick={() => {
+            onClick={async () => {
               if (!targetPath) return;
-              void Promise.resolve(onConfirmDelete(targetPath, isManaged || deleteHosts)).finally(() => {
-                hostTreeInlineGroupDeleteStore.close();
-                setDeleteHosts(false);
-              });
+              try {
+                await onConfirmDelete(targetPath, isManaged || deleteHosts);
+              } catch (error) {
+                toast.error(error instanceof VaultGroupDeletionConfirmationChangedError
+                  ? t('vault.groups.deleteDialog.sourcesChanged')
+                  : error instanceof Error ? error.message : t('common.error'));
+                return;
+              }
+              hostTreeInlineGroupDeleteStore.close();
+              setDeleteHosts(false);
             }}
           >
             {t('common.delete')}

components/keychain/ImportKeyPanel.tsx

@@ -10,7 +10,7 @@ import { Button } from '../ui/button';
 import { Input } from '../ui/input';
 import { Label } from '../ui/label';
 import { Textarea } from '../ui/textarea';
-import { detectKeyType } from './utils';
+import { detectSshKeyType } from '../../domain/keyTypeDetect';
 
 interface ImportKeyPanelProps {
     draftKey: Partial<SSHKey>;
@@ -38,14 +38,15 @@ export const ImportKeyPanel: React.FC<ImportKeyPanelProps> = ({
         reader.onload = (e) => {
             const content = e.target?.result as string;
             if (content) {
-                const detectedType = detectKeyType(content);
+                const detected = detectSshKeyType(content);
                 const label = file.name.replace(/\.(pem|key|pub|ppk)$/i, '');
 
                 setDraftKey({
                     ...draftKey,
                     privateKey: content,
                     label: draftKey.label || label,
-                    type: detectedType,
+                    type: detected.type,
+                    keySize: detected.keySize,
                 });
             }
         };
@@ -64,14 +65,15 @@ export const ImportKeyPanel: React.FC<ImportKeyPanelProps> = ({
         reader.onload = (e) => {
             const content = e.target?.result as string;
             if (content) {
-                const detectedType = detectKeyType(content);
+                const detected = detectSshKeyType(content);
                 const label = file.name.replace(/\.(pem|key|pub|ppk)$/i, '');
 
                 setDraftKey({
                     ...draftKey,
                     privateKey: content,
                     label: draftKey.label || label,
-                    type: detectedType,
+                    type: detected.type,
+                    keySize: detected.keySize,
                 });
             }
         };

components/keychain/utils.ts

@@ -5,6 +5,7 @@
 import { BadgeCheck, Key } from 'lucide-react';
 import React from 'react';
 import { logger } from '../../lib/logger';
+import { detectSshKeyType } from '../../domain/keyTypeDetect';
 import { KeyType, SSHKey } from '../../types';
 
 /**
@@ -27,10 +28,7 @@ export const getKeyTypeDisplay = (key: SSHKey, isMac: boolean): string => {
  * Detect key type from private key content
  */
 export const detectKeyType = (privateKey: string): KeyType => {
-    const pk = privateKey.toLowerCase();
-    if (pk.includes('rsa')) return 'RSA';
-    if (pk.includes('ecdsa') || pk.includes('ec ')) return 'ECDSA';
-    return 'ED25519';
+    return detectSshKeyType(privateKey).type;
 };
 
 /**

components/settings/tabs/SettingsAppearanceTab.tsx

@@ -60,8 +60,6 @@ function SettingsAppearanceTab(props: {
   setHostClickBehavior: (behavior: "connect" | "select") => void;
   showOnlyUngroupedHostsInRoot: boolean;
   setShowOnlyUngroupedHostsInRoot: (enabled: boolean) => void;
-  tabBarPosition: 'top' | 'bottom';
-  setTabBarPosition: (position: 'top' | 'bottom') => void;
   showSftpTab: boolean;
   setShowSftpTab: (enabled: boolean) => void;
   showHostTreeSidebar: boolean;
@@ -131,8 +129,6 @@ function SettingsAppearanceTab(props: {
     setHostClickBehavior,
     showOnlyUngroupedHostsInRoot,
     setShowOnlyUngroupedHostsInRoot,
-    tabBarPosition,
-    setTabBarPosition,
     showSftpTab,
     setShowSftpTab,
     showHostTreeSidebar,
@@ -483,29 +479,6 @@ function SettingsAppearanceTab(props: {
             onChange={setShowOnlyUngroupedHostsInRoot}
           />
         </SettingRow>
-        <SettingRow
-          anchorId="appearance-tab-bar-position"
-          label={t('settings.appearance.tabBarPosition')}
-        >
-          <div className="flex items-center rounded-lg border border-border bg-muted/50 p-0.5">
-            {(['top', 'bottom'] as const).map((position) => (
-              <button
-                key={position}
-                type="button"
-                aria-pressed={tabBarPosition === position}
-                onClick={() => setTabBarPosition(position)}
-                className={cn(
-                  "px-2.5 py-1 rounded-md text-xs font-medium transition-colors",
-                  tabBarPosition === position
-                    ? "bg-background text-foreground shadow-sm"
-                    : "text-muted-foreground hover:text-foreground",
-                )}
-              >
-                {t(`settings.appearance.tabBarPosition.${position}`)}
-              </button>
-            ))}
-          </div>
-        </SettingRow>
         <SettingRow
           anchorId="appearance-vault-show-sftp-tab"
           label={t('settings.vault.showSftpTab')}

components/settings/tabs/SettingsTerminalTab.tsx

@@ -80,6 +80,10 @@ function SettingsTerminalTab(props: {
   setTerminalSidePanelAutoOpen: (enabled: boolean) => void;
   terminalSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
   setTerminalSidePanelAutoOpenTab: (tab: TerminalSidePanelAutoOpenTab) => void;
+  localShellSidePanelAutoOpen: boolean;
+  setLocalShellSidePanelAutoOpen: (enabled: boolean) => void;
+  localShellSidePanelAutoOpenTab: TerminalSidePanelAutoOpenTab;
+  setLocalShellSidePanelAutoOpenTab: (tab: TerminalSidePanelAutoOpenTab) => void;
   availableFonts: TerminalFont[];
   workspaceFocusStyle: 'dim' | 'border';
   setWorkspaceFocusStyle: (style: 'dim' | 'border') => void;
@@ -106,6 +110,10 @@ function SettingsTerminalTab(props: {
     setTerminalSidePanelAutoOpen,
     terminalSidePanelAutoOpenTab,
     setTerminalSidePanelAutoOpenTab,
+    localShellSidePanelAutoOpen,
+    setLocalShellSidePanelAutoOpen,
+    localShellSidePanelAutoOpenTab,
+    setLocalShellSidePanelAutoOpenTab,
     availableFonts,
     workspaceFocusStyle,
     setWorkspaceFocusStyle,
@@ -750,6 +758,33 @@ function SettingsTerminalTab(props: {
         </SettingRow>
       </div>
 
+      <SectionHeader title={t("settings.terminal.section.localShellSidePanel")} />
+      <div className="space-y-0 divide-y divide-border rounded-lg border bg-card px-4">
+        <SettingRow
+          anchorId="terminal-local-shell-side-panel-auto-open"
+          label={t("settings.terminal.localShellSidePanel.autoOpen")}
+          description={t("settings.terminal.localShellSidePanel.autoOpen.desc")}
+        >
+          <Toggle checked={localShellSidePanelAutoOpen} onChange={setLocalShellSidePanelAutoOpen} />
+        </SettingRow>
+
+        <SettingRow
+          label={t("settings.terminal.localShellSidePanel.autoOpenPane")}
+          description={t("settings.terminal.localShellSidePanel.autoOpenPane.desc")}
+        >
+          <Select
+            value={localShellSidePanelAutoOpenTab}
+            options={TERMINAL_SIDE_PANEL_AUTO_OPEN_TABS.map((tab) => ({
+              value: tab,
+              label: t(`settings.terminal.sidePanel.pane.${tab}`),
+            }))}
+            onChange={(value) => setLocalShellSidePanelAutoOpenTab(value as TerminalSidePanelAutoOpenTab)}
+            disabled={!localShellSidePanelAutoOpen}
+            className="w-36"
+          />
+        </SettingRow>
+      </div>
+
       <SectionHeader title={t("settings.terminal.section.keywordHighlight")} />
       <SettingsAnchor anchorId="terminal-keyword-highlight" className="rounded-lg border bg-card p-4">
         <div className="flex items-center justify-between mb-4">
@@ -859,6 +894,7 @@ function SettingsTerminalTab(props: {
             )}
           </div>
         </SettingRow>
+
       </div>
 
       <SectionHeader title={t("settings.terminal.section.connection")} />

components/settings/tabs/TerminalBehaviorSettings.tsx

@@ -180,6 +180,37 @@ export const TerminalBehaviorSettings: React.FC<TerminalBehaviorSettingsProps> =
           />
         </SettingRow>
 
+        <SettingRow
+          anchorId="terminal-confirm-multiline-paste"
+          label={t("settings.terminal.behavior.confirmMultilinePaste")}
+          description={t("settings.terminal.behavior.confirmMultilinePaste.desc")}
+        >
+          <Toggle
+            checked={terminalSettings.confirmBeforeMultilinePaste ?? false}
+            onChange={(v) => updateTerminalSetting("confirmBeforeMultilinePaste", v)}
+          />
+        </SettingRow>
+
+        <SettingRow
+          anchorId="terminal-confirm-multiline-paste-min-lines"
+          label={t("settings.terminal.behavior.confirmMultilinePasteMinLines")}
+          description={t("settings.terminal.behavior.confirmMultilinePasteMinLines.desc")}
+        >
+          <Input
+            type="number"
+            min={1}
+            max={1000}
+            value={terminalSettings.multilinePasteConfirmMinLines ?? 2}
+            onChange={(e) => {
+              const val = parseInt(e.target.value);
+              if (!isNaN(val) && val >= 1 && val <= 1000) {
+                updateTerminalSetting("multilinePasteConfirmMinLines", val);
+              }
+            }}
+            className="w-24"
+          />
+        </SettingRow>
+
         <SettingRow
           anchorId="terminal-shift-enter-newline"
           label={t("settings.terminal.behavior.shiftEnterNewline")}

components/settings/tabs/ai/ExternalMcpCard.tsx

@@ -21,9 +21,9 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "../../../ui/tooltip";
 import { Select, SettingCard, SettingRow, Toggle } from "../../../settings/settings-ui";
 import { getBridge } from "./types";
 
-type ExternalMcpClient = "codex" | "claude" | "grok" | "cursor";
+type ExternalMcpClient = "codex" | "claude" | "grok" | "cursor" | "other";
 
-const CLIENT_TABS: ExternalMcpClient[] = ["codex", "claude", "grok", "cursor"];
+const CLIENT_TABS: ExternalMcpClient[] = ["codex", "claude", "grok", "cursor", "other"];
 
 type CopyableCodeBlockProps = {
   label?: string;
@@ -304,6 +304,7 @@ export const ExternalMcpCard: React.FC = () => {
   const [codexStatus, setCodexStatus] = useState<ClientSetupStatus | null>(null);
   const [claudeStatus, setClaudeStatus] = useState<ClientSetupStatus | null>(null);
   const [grokStatus, setGrokStatus] = useState<ClientSetupStatus | null>(null);
+  const [universalSetupPrompt, setUniversalSetupPrompt] = useState("");
   const [isRefreshing, setIsRefreshing] = useState(false);
   const [isAddingCodex, setIsAddingCodex] = useState(false);
   const [isAddingClaude, setIsAddingClaude] = useState(false);
@@ -386,11 +387,19 @@ export const ExternalMcpCard: React.FC = () => {
     if (!options?.quiet) setIsRefreshing(true);
     try {
       if (includeClients) {
-        const [nextStatus, nextCodexStatus, nextClaudeStatus, nextGrokStatus] = await Promise.all([
+        const [
+          nextStatus,
+          nextCodexStatus,
+          nextClaudeStatus,
+          nextGrokStatus,
+          nextUniversalPrompt,
+        ] = await Promise.all([
           bridge.externalMcpGetStatus(),
           bridge.externalMcpCodexGetStatus(),
           bridge.externalMcpClaudeGetStatus(),
           bridge.externalMcpGrokGetStatus(),
+          bridge.externalMcpGetUniversalSetupPrompt?.()
+            ?? Promise.resolve({ ok: false, prompt: "" }),
         ]);
         setStatus(nextStatus as ExternalMcpStatus);
         if (enabled && nextStatus?.ok && !nextStatus.enabled) {
@@ -399,6 +408,11 @@ export const ExternalMcpCard: React.FC = () => {
         setCodexStatus(nextCodexStatus as ClientSetupStatus);
         setClaudeStatus(nextClaudeStatus as ClientSetupStatus);
         setGrokStatus(nextGrokStatus as ClientSetupStatus);
+        setUniversalSetupPrompt(
+          nextUniversalPrompt.ok && typeof nextUniversalPrompt.prompt === "string"
+            ? nextUniversalPrompt.prompt
+            : "",
+        );
       } else {
         const nextStatus = await bridge.externalMcpGetStatus();
         setStatus(nextStatus as ExternalMcpStatus);
@@ -540,7 +554,7 @@ export const ExternalMcpCard: React.FC = () => {
   }, [refreshStatus, t]);
 
   const selectedClientMeta = useMemo(() => {
-    if (selectedClient === "cursor") {
+    if (selectedClient === "cursor" || selectedClient === "other") {
       return {
         kind: "snippet" as const,
         statusView: null as StatusView | null,
@@ -817,7 +831,7 @@ export const ExternalMcpCard: React.FC = () => {
         <div
           role="tablist"
           aria-label={t("ai.externalMcp.clientConfiguration")}
-          className="grid grid-cols-4 gap-1 rounded-md bg-muted p-1"
+          className="grid grid-cols-5 gap-1 rounded-md bg-muted p-1"
         >
           {CLIENT_TABS.map((client) => {
             const active = selectedClient === client;
@@ -866,7 +880,9 @@ export const ExternalMcpCard: React.FC = () => {
             </div>
           ) : (
             <p className="text-xs text-muted-foreground leading-5">
-              {t("ai.externalMcp.cursor.description")}
+              {t(selectedClient === "other"
+                ? "ai.externalMcp.other.description"
+                : "ai.externalMcp.cursor.description")}
             </p>
           )}
 
@@ -894,16 +910,30 @@ export const ExternalMcpCard: React.FC = () => {
               />
             </>
           ) : (
-            <CopyableCodeBlock
-              label={t("ai.externalMcp.configSnippet")}
-              value={selectedClientMeta.snippet}
-              copyKey="cursor"
-              copied={copied}
-              onCopy={copyText}
-              copyLabel={t("ai.externalMcp.copy")}
-              copiedLabel={t("ai.externalMcp.copied")}
-              emptyLabel={t("ai.externalMcp.unavailable")}
-            />
+            <>
+              <CopyableCodeBlock
+                label={t("ai.externalMcp.configSnippet")}
+                value={selectedClientMeta.snippet}
+                copyKey="cursor"
+                copied={copied}
+                onCopy={copyText}
+                copyLabel={t("ai.externalMcp.copy")}
+                copiedLabel={t("ai.externalMcp.copied")}
+                emptyLabel={t("ai.externalMcp.unavailable")}
+              />
+              {selectedClient === "other" ? (
+                <CopyableCodeBlock
+                  label={t("ai.externalMcp.universalSetupPrompt")}
+                  value={universalSetupPrompt}
+                  copyKey="universal-setup-prompt"
+                  copied={copied}
+                  onCopy={copyText}
+                  copyLabel={t("ai.externalMcp.copy")}
+                  copiedLabel={t("ai.externalMcp.copied")}
+                  emptyLabel={t("ai.externalMcp.unavailable")}
+                />
+              ) : null}
+            </>
           )}
         </div>
       </div>

components/settings/tabs/ai/types.ts

@@ -178,6 +178,11 @@ export interface NetcattyAiBridge {
     idleTimeoutMinutes?: number;
     sessionIdleTimeoutMinutes?: number;
   }) => Promise<Record<string, unknown>>;
+  externalMcpGetUniversalSetupPrompt?: () => Promise<{
+    ok: boolean;
+    prompt?: string;
+    error?: string | null;
+  }>;
   externalMcpCodexGetStatus?: () => Promise<Record<string, unknown>>;
   externalMcpCodexAdd?: () => Promise<Record<string, unknown>>;
   externalMcpClaudeGetStatus?: () => Promise<Record<string, unknown>>;