From e48a4b21a95a2d4aa217a8edd75e2a67043b9abb Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Thu, 1 Oct 2026 20:58:10 +0400
Subject: [PATCH 1/7] test(gui): use the current tab close label

---
 crates/omnyssh-gui/ui/e2e/terminal.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
index b6d43c2a..cd213a3d 100644
--- a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
@@ -130,7 +130,7 @@ test('host-first: spawn a terminal from a card, run a command, see output, then
   await expect(page.locator('.xterm-rows')).toContainText('RESULT-OK');
 
   // Closing the tab tears the terminal down.
-  await page.getByRole('button', { name: 'Close web-1 · terminal' }).click();
+  await page.getByRole('button', { name: 'Close web-1' }).click();
   await expect(page.locator('.xterm')).toHaveCount(0);
   await expect(page.getByRole('button', { name: 'web-1 · terminal', exact: true })).toHaveCount(0);
 });

From a632adf78d1f68197525849baa00c33cd23c3ac8 Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Thu, 1 Oct 2026 20:58:10 +0400
Subject: [PATCH 2/7] fix(gui): survive repeated snippet tags and shared host
 names

---
 crates/omnyssh-gui/ui/e2e/palette.spec.ts     | 27 ++++++++++++++++---
 crates/omnyssh-gui/ui/e2e/snippets.spec.ts    | 27 ++++++++++++++++---
 .../src/lib/components/CommandPalette.svelte  |  3 +--
 .../ui/src/lib/screens/SnippetRunner.svelte   | 10 ++++---
 .../ui/src/lib/screens/Snippets.svelte        |  6 ++---
 crates/omnyssh-gui/ui/src/lib/stores/hosts.ts | 11 ++++++++
 .../ui/src/lib/stores/palette.test.ts         |  6 +++++
 .../omnyssh-gui/ui/src/lib/stores/palette.ts  |  5 +++-
 8 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/crates/omnyssh-gui/ui/e2e/palette.spec.ts b/crates/omnyssh-gui/ui/e2e/palette.spec.ts
index 4ed84193..362fd5e9 100644
--- a/crates/omnyssh-gui/ui/e2e/palette.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/palette.spec.ts
@@ -30,7 +30,7 @@ const HOSTS = [
   }
 ];
 
-async function bootWithHosts(page: Page): Promise<void> {
+async function bootWithHosts(page: Page, hosts = HOSTS): Promise<void> {
   await page.addInitScript((hosts) => {
     let cbid = 0;
     (window as unknown as { __TAURI_INTERNALS__: unknown }).__TAURI_INTERNALS__ = {
@@ -42,10 +42,10 @@ async function bootWithHosts(page: Page): Promise<void> {
         return id;
       }
     };
-  }, HOSTS);
+  }, hosts);
   await page.goto('/');
   // The status-bar total confirms `list_hosts` resolved into the store.
-  await expect(page.getByText('2 hosts')).toBeVisible();
+  await expect(page.getByText(`${hosts.length} hosts`)).toBeVisible();
 }
 
 test('⌘K navigator jumps to a host by opening a session', async ({ page }) => {
@@ -91,3 +91,24 @@ test('a spawner opens the host-picker and spawns a session for the chosen host',
   await expect(row).toBeVisible();
   await expect(row).toHaveAttribute('aria-current', 'true');
 });
+
+test('lists a shared host name once, as the host a session opens', async ({ page }) => {
+  const twin = { ...HOSTS[0], hostname: 'web-1b.example.com', user: 'admin' };
+  await bootWithHosts(page, [...HOSTS, twin]);
+
+  await page.getByRole('button', { name: 'Terminal' }).click();
+  const picker = page.getByRole('dialog', { name: 'Pick a host' });
+  const web = picker.getByRole('button', { name: /web-1/ });
+  await expect(web).toHaveCount(1);
+  await expect(web).toContainText('deploy@web-1.example.com');
+  await picker.getByRole('textbox').fill('web-1b');
+  await expect(picker.getByText('No matching hosts.')).toBeVisible();
+  await page.keyboard.press('Escape');
+
+  await page.keyboard.press('Control+k');
+  const listed = page
+    .getByRole('dialog', { name: 'Command palette' })
+    .getByRole('button', { name: /web-1/ });
+  await expect(listed).toHaveCount(1);
+  await expect(listed).toContainText('deploy@web-1.example.com');
+});
diff --git a/crates/omnyssh-gui/ui/e2e/snippets.spec.ts b/crates/omnyssh-gui/ui/e2e/snippets.spec.ts
index cd2b9317..39ccaf0f 100644
--- a/crates/omnyssh-gui/ui/e2e/snippets.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/snippets.spec.ts
@@ -15,7 +15,7 @@ const SNIPPETS = [
   { name: 'restart-web', command: 'systemctl restart {{service}}', scope: 'global', params: ['service'] }
 ];
 
-async function boot(page: Page, snippetsFixture = SNIPPETS): Promise<void> {
+async function boot(page: Page, snippetsFixture = SNIPPETS, hostsFixture = HOSTS): Promise<void> {
   await page.addInitScript(
     ({ hosts, snippets }) => {
       let cbid = 0;
@@ -74,11 +74,11 @@ async function boot(page: Page, snippetsFixture = SNIPPETS): Promise<void> {
         }
       };
     },
-    { hosts: HOSTS, snippets: snippetsFixture }
+    { hosts: hostsFixture, snippets: snippetsFixture }
   );
   await page.goto('/');
   // The status-bar total confirms the app booted and `list_hosts` resolved.
-  await expect(page.getByText('2 hosts')).toBeVisible();
+  await expect(page.getByText(`${hostsFixture.length} hosts`)).toBeVisible();
   await page.getByRole('button', { name: 'Snippets', exact: true }).click();
   // The Snippets screen loads its list on mount.
   await expect(page.getByRole('heading', { name: 'Snippets' })).toBeVisible();
@@ -178,3 +178,24 @@ test('renders duplicate-named snippets without crashing (core never dedups names
   await expect(page.getByText('git pull')).toBeVisible();
   await expect(page.getByText('systemctl restart app')).toBeVisible();
 });
+
+test('renders a snippet with a repeated tag (nothing dedups tags)', async ({ page }) => {
+  await boot(page, [{ name: 'backup', command: 'pg_dump app', scope: 'global', tags: ['db', 'db'] }]);
+
+  await expect(page.getByText('pg_dump app')).toBeVisible();
+  await expect(page.getByText('db', { exact: true })).toHaveCount(2);
+});
+
+test('lists a shared host name once in the runner, as the host a run uses', async ({ page }) => {
+  const twin = { ...HOSTS[0], hostname: 'web-1b.example.com', user: 'admin' };
+  await boot(page, SNIPPETS, [...HOSTS, twin]);
+
+  await page.getByRole('button', { name: 'Run uptime' }).click();
+  const runner = page.getByRole('dialog', { name: 'Run snippet' });
+  const web = runner.getByRole('checkbox', { name: 'web-1' });
+  await expect(web).toHaveCount(1);
+  await expect(web).toContainText('deploy@web-1.example.com');
+  await web.click();
+  await expect(web).toHaveAttribute('aria-checked', 'true');
+  await expect(runner.getByText('Run on 1 of 2')).toBeVisible();
+});
diff --git a/crates/omnyssh-gui/ui/src/lib/components/CommandPalette.svelte b/crates/omnyssh-gui/ui/src/lib/components/CommandPalette.svelte
index aec878d7..fe5aad46 100644
--- a/crates/omnyssh-gui/ui/src/lib/components/CommandPalette.svelte
+++ b/crates/omnyssh-gui/ui/src/lib/components/CommandPalette.svelte
@@ -177,8 +177,7 @@
         {#if items.length === 0}
           <li class="px-3 py-6 text-center text-sm text-muted">{emptyMessage}</li>
         {:else}
-          <!-- Keyed by position: rows are stateless, and host names are not guaranteed
-               unique, so a name key could throw each_key_duplicate. -->
+          <!-- Keyed by position: rows are stateless. -->
           {#each items as item, i (i)}
             {#if $palette.mode === 'navigate' && i === firstSession}
               <li class={sectionHead}>Sessions</li>
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/SnippetRunner.svelte b/crates/omnyssh-gui/ui/src/lib/screens/SnippetRunner.svelte
index 5e24f995..9d55ede6 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/SnippetRunner.svelte
+++ b/crates/omnyssh-gui/ui/src/lib/screens/SnippetRunner.svelte
@@ -6,7 +6,7 @@
   import type { SnippetDto } from '$lib/bindings';
   import { Button, StatusDot, Icon } from '$lib/theme';
   import Modal from '$lib/components/Modal.svelte';
-  import { hosts } from '$lib/stores/hosts';
+  import { hosts, firstOfEachName } from '$lib/stores/hosts';
   import { statuses } from '$lib/stores/statuses';
   import { streamerMode, displayHostname } from '$lib/stores/streamer';
   import { hostStatusDot } from '$lib/stores/palette';
@@ -39,6 +39,10 @@
     )
   );
 
+  // One row per name, the first: the backend runs a name on its first host, so a
+  // second row would only toggle along with it.
+  const choices = $derived(firstOfEachName($hosts));
+
   /** Focus the first param input on open for a keyboard-first run. */
   function autofocus(node: HTMLInputElement, active: boolean): void {
     if (active) node.focus();
@@ -84,13 +88,13 @@
 
     <div class="space-y-2">
       <h3 class="text-[11px] font-medium uppercase tracking-[0.18em] text-faint">
-        Run on {selected.size} of {$hosts.length}
+        Run on {selected.size} of {choices.length}
       </h3>
       {#if $hosts.length === 0}
         <p class="text-sm text-muted">No hosts configured.</p>
       {:else}
         <ul class="space-y-1">
-          {#each $hosts as host (host.name)}
+          {#each choices as host (host.name)}
             {@const checked = selected.has(host.name)}
             <li>
               <button
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/Snippets.svelte b/crates/omnyssh-gui/ui/src/lib/screens/Snippets.svelte
index 258edf1a..035a2e38 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/Snippets.svelte
+++ b/crates/omnyssh-gui/ui/src/lib/screens/Snippets.svelte
@@ -121,8 +121,8 @@
       {/if}
     </div>
   {:else}
-    <!-- Keyed by position: the core never dedups snippet names, so a name key could
-         throw each_key_duplicate and blank the whole screen. -->
+    <!-- Keyed by position: the core never dedups snippet names or tags, so a value
+         key could throw each_key_duplicate and blank the whole screen. -->
     <ul class="min-h-0 flex-1 space-y-2 overflow-y-auto">
       {#each filtered as snippet, i (i)}
         <li>
@@ -131,7 +131,7 @@
               <div class="flex flex-wrap items-center gap-2">
                 <span class="truncate font-medium" title={snippet.name}>{snippet.name}</span>
                 <Chip>{snippet.scope === 'host' && snippet.host ? `host · ${snippet.host}` : 'global'}</Chip>
-                {#each snippet.tags ?? [] as tag (tag)}
+                {#each snippet.tags ?? [] as tag, t (t)}
                   <Chip variant="outline">{tag}</Chip>
                 {/each}
               </div>
diff --git a/crates/omnyssh-gui/ui/src/lib/stores/hosts.ts b/crates/omnyssh-gui/ui/src/lib/stores/hosts.ts
index 3cc80f9b..cd9f6b14 100644
--- a/crates/omnyssh-gui/ui/src/lib/stores/hosts.ts
+++ b/crates/omnyssh-gui/ui/src/lib/stores/hosts.ts
@@ -3,3 +3,14 @@ import type { HostDto } from '$lib/bindings';
 
 /** The known hosts, kept in sync by the `hosts-loaded` event (tech-gui.md §3.5). */
 export const hosts = writable<HostDto[]>([]);
+
+/** The first host of each name. The backend opens a name on its first host, so a
+ *  later namesake can't be reached by name and a picker lists it once. */
+export function firstOfEachName(list: HostDto[]): HostDto[] {
+  const seen = new Set<string>();
+  return list.filter((h) => {
+    if (seen.has(h.name)) return false;
+    seen.add(h.name);
+    return true;
+  });
+}
diff --git a/crates/omnyssh-gui/ui/src/lib/stores/palette.test.ts b/crates/omnyssh-gui/ui/src/lib/stores/palette.test.ts
index c7d6915f..cd7d20f5 100644
--- a/crates/omnyssh-gui/ui/src/lib/stores/palette.test.ts
+++ b/crates/omnyssh-gui/ui/src/lib/stores/palette.test.ts
@@ -63,6 +63,12 @@ describe('paletteItems — filter & sections', () => {
   it('an empty query keeps everything', () => {
     expect(paletteItems('navigate', hosts, sessions, '   ')).toHaveLength(5);
   });
+
+  it('lists a shared host name once, as its first host, whatever the query', () => {
+    const twins = [host('web-1'), host('web-1', { hostname: 'twin.example.com' })];
+    expect(paletteItems('pickHost', twins, [], '')).toEqual([{ kind: 'host', host: twins[0] }]);
+    expect(paletteItems('navigate', twins, [], 'twin')).toHaveLength(0);
+  });
 });
 
 describe('paletteSignature — stable across volatile updates', () => {
diff --git a/crates/omnyssh-gui/ui/src/lib/stores/palette.ts b/crates/omnyssh-gui/ui/src/lib/stores/palette.ts
index 79251999..263c4665 100644
--- a/crates/omnyssh-gui/ui/src/lib/stores/palette.ts
+++ b/crates/omnyssh-gui/ui/src/lib/stores/palette.ts
@@ -1,6 +1,7 @@
 import { writable } from 'svelte/store';
 import type { ConnectionStatusDto, HostDto } from '$lib/bindings';
 import type { Status } from '$lib/theme';
+import { firstOfEachName } from './hosts';
 import type { Session } from './sessions';
 
 // The ⌘K overlay and the host-picker are one component in two modes (tech-gui.md §2):
@@ -39,7 +40,9 @@ export function paletteItems(
   sessions: Session[],
   query: string
 ): PaletteItem[] {
-  const hostRows: PaletteItem[] = hosts
+  // One row per name, the first: a session opens a name on its first host, so a second
+  // row would open that one too. Deduped before the query, so no search shows the twin.
+  const hostRows: PaletteItem[] = firstOfEachName(hosts)
     .filter((h) => matches(hostHaystack(h), query))
     .map((host) => ({ kind: 'host', host }));
   if (mode === 'pickHost') return hostRows;

From c2ef5c36643d4d349a6a149ad061455eef442e9f Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Thu, 1 Oct 2026 20:58:10 +0400
Subject: [PATCH 3/7] fix(tui): align file sizes after wide names

---
 Cargo.lock                            |  1 +
 crates/omnyssh/Cargo.toml             |  1 +
 crates/omnyssh/src/ui/file_manager.rs | 83 +++++++++++++++++++++++----
 3 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bd16236f..9e08dbec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3342,6 +3342,7 @@ dependencies = [
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
+ "unicode-width 0.2.0",
  "vt100-omnyssh",
 ]
 
diff --git a/crates/omnyssh/Cargo.toml b/crates/omnyssh/Cargo.toml
index 0e8aa212..503bb2d3 100644
--- a/crates/omnyssh/Cargo.toml
+++ b/crates/omnyssh/Cargo.toml
@@ -23,6 +23,7 @@ omnyssh-core = { path = "../omnyssh-core", version = "1.1.4" }
 # TUI
 ratatui = "0.29"
 crossterm = "0.28"
+unicode-width = "0.2"
 
 tokio = { workspace = true }
 
diff --git a/crates/omnyssh/src/ui/file_manager.rs b/crates/omnyssh/src/ui/file_manager.rs
index 85f69a23..4d1a070d 100644
--- a/crates/omnyssh/src/ui/file_manager.rs
+++ b/crates/omnyssh/src/ui/file_manager.rs
@@ -17,6 +17,7 @@ use ratatui::{
     },
     Frame,
 };
+use unicode_width::UnicodeWidthStr;
 
 use crate::app::{
     AppAction, FileManagerPopup, FileManagerView, FilePanelView, FmPanel, FormField, ViewState,
@@ -435,17 +436,7 @@ fn render_panel(
                 .width
                 .saturating_sub(2 + 3 + 1 + 1 + 1 + size_str.len() as u16)
                 as usize;
-            let name_display: String = if entry.name.chars().count() > name_width {
-                let truncated = entry
-                    .name
-                    .char_indices()
-                    .nth(name_width.saturating_sub(1))
-                    .map(|(i, _)| &entry.name[..i])
-                    .unwrap_or(&entry.name);
-                format!("{}…", truncated)
-            } else {
-                format!("{:<width$}", entry.name, width = name_width)
-            };
+            let name_display = fit_name(&entry.name, name_width);
 
             let mut spans = vec![
                 Span::styled(
@@ -1000,6 +991,27 @@ fn format_size(bytes: u64) -> String {
     }
 }
 
+/// Pads or cuts `name` to `width` cells. Measured as a string, the way ratatui
+/// places the size after it: per char, wide (CJK) names and emoji sequences come
+/// out the wrong length and push the size off its column.
+fn fit_name(name: &str, width: usize) -> String {
+    let full = name.width();
+    if full <= width {
+        return format!("{name}{}", " ".repeat(width - full));
+    }
+    let mut kept = "";
+    for (i, c) in name.char_indices() {
+        let next = &name[..i + c.len_utf8()];
+        // One cell stays free for the ellipsis.
+        if next.width() >= width {
+            break;
+        }
+        kept = next;
+    }
+    let pad = width.saturating_sub(kept.width() + 1);
+    format!("{kept}…{}", " ".repeat(pad))
+}
+
 /// Sanitizes preview content to prevent UI overflow.
 ///
 /// - Filters out non-printable characters (except newline and tab)
@@ -1045,3 +1057,52 @@ fn sanitize_preview_content(content: &str, max_width: usize, max_lines: usize) -
         })
         .collect()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use omnyssh_core::ssh::sftp::FileEntry;
+
+    fn file(name: &str, size: u64) -> FileEntry {
+        FileEntry {
+            name: name.to_string(),
+            path: format!("/{name}"),
+            size,
+            is_dir: false,
+        }
+    }
+
+    #[test]
+    fn wide_names_keep_sizes_in_the_last_column() {
+        let panel = FilePanelView {
+            entries: vec![
+                file("local-recent.log", 13),
+                file("local-日本.txt", 14),
+                file(&format!("{}.txt", "日本".repeat(9)), 2048),
+                file(&format!("{}.txt", "❤\u{fe0f}".repeat(20)), 7),
+                file(&format!("{}.txt", "👨\u{200d}👩\u{200d}👧".repeat(20)), 8),
+            ],
+            ..FilePanelView::default()
+        };
+        let backend = ratatui::backend::TestBackend::new(40, 7);
+        let mut terminal = ratatui::Terminal::new(backend).expect("terminal");
+        terminal
+            .draw(|frame| {
+                let theme = crate::ui::theme::Theme::default();
+                render_panel(frame, frame.area(), &panel, "LOCAL", true, &theme);
+            })
+            .expect("draw");
+        let buffer = terminal.backend().buffer();
+        // Column 38 is the last one inside the right border.
+        for (y, size) in [
+            (1, " 13B"),
+            (2, " 14B"),
+            (3, " 2.0K"),
+            (4, " 7B"),
+            (5, " 8B"),
+        ] {
+            let row: String = (0..=38).map(|x| buffer[(x, y)].symbol()).collect();
+            assert!(row.ends_with(size), "{row:?}");
+        }
+    }
+}

From 9aa3646fca9c666b44ac4871d20adb7dff949fed Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Thu, 1 Oct 2026 20:58:10 +0400
Subject: [PATCH 4/7] fix(gui): give the keyboard back to the terminal when a
 picker closes

---
 crates/omnyssh-gui/ui/e2e/passphrase.spec.ts  | 22 +++++++++
 crates/omnyssh-gui/ui/e2e/terminal.spec.ts    | 49 +++++++++++++++++--
 .../ui/src/lib/screens/TerminalView.svelte    | 21 +++++---
 3 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/crates/omnyssh-gui/ui/e2e/passphrase.spec.ts b/crates/omnyssh-gui/ui/e2e/passphrase.spec.ts
index 3ffdc5f3..272acddc 100644
--- a/crates/omnyssh-gui/ui/e2e/passphrase.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/passphrase.spec.ts
@@ -218,6 +218,28 @@ test('closing the dialog hands the keyboard back to the terminal it covered', as
   await expect(terminalInput).toBeFocused();
 });
 
+test('a prompt that opens just as a terminal comes back keeps the keyboard', async ({ page }) => {
+  await boot(page, { lockedAtLaunch: false, terminal: 'ok' });
+
+  await page.getByTitle('sh on web-1').click();
+  await expect(page.locator('.xterm-helper-textarea')).toBeFocused();
+  await page.getByRole('button', { name: 'Dashboard', exact: true }).click();
+
+  // Showing the tab queues the terminal's focus for the next frame; the prompt opens
+  // before that frame, in the same task.
+  await page.evaluate(async (key) => {
+    document.querySelector<HTMLButtonElement>('button[aria-label="web-1 · terminal"]')?.click();
+    for (let i = 0; i < 5; i++) await Promise.resolve();
+    (window as unknown as { __fire: (e: string, p: unknown) => void }).__fire(
+      'key-passphrase-required',
+      { hostName: 'web-2', keyPath: key }
+    );
+  }, KEY);
+  await page.evaluate(() => new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(r))));
+
+  await expect(page.getByRole('dialog', { name: 'Unlock SSH key' }).getByLabel('Passphrase')).toBeFocused();
+});
+
 test('cancelling while an unlock is running leaves the next key alone', async ({ page }) => {
   await boot(page, { lockedAtLaunch: true, unlockDelay: 500 });
 
diff --git a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
index cd213a3d..fc49245a 100644
--- a/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
+++ b/crates/omnyssh-gui/ui/e2e/terminal.spec.ts
@@ -60,9 +60,14 @@ async function boot(page: Page): Promise<void> {
               const chId = (args.onOutput as { id: number }).id;
               const sid = ++nextSession;
               sessionChannel[sid] = chId;
-              // A shell prompt proves the streamed output renders + flips status to connected.
-              if (!win.__silent) setTimeout(() => sendToChannel(chId, 'omnyssh-ready> '), 0);
-              return Promise.resolve(sid);
+              const open = (): number => {
+                // A shell prompt proves the streamed output renders + flips status to connected.
+                if (!win.__silent) setTimeout(() => sendToChannel(chId, 'omnyssh-ready> '), 0);
+                return sid;
+              };
+              // A test can hold the open, as a slow connect does, until it calls __release.
+              if (win.__holdOpen) return new Promise((resolve) => (win.__release = () => resolve(open())));
+              return Promise.resolve(open());
             }
             case 'terminal_write': {
               const { sessionId, data } = args as { sessionId: number; data: number[] };
@@ -148,6 +153,44 @@ test('action-first: the Terminal spawner opens the host picker, then a live term
   await expect(page.locator('.xterm-rows')).toContainText('omnyssh-ready');
 });
 
+test('dismissing the host picker hands the keyboard back to the terminal', async ({ page }) => {
+  await boot(page);
+  await page.getByTitle('sh on web-1').click();
+  await expect(page.locator('.xterm-rows')).toContainText('omnyssh-ready');
+  await expect(page.locator('.xterm-helper-textarea')).toBeFocused();
+
+  await page.getByRole('button', { name: 'SFTP', exact: true }).click();
+  await expect(page.getByRole('dialog', { name: 'Pick a host' })).toBeVisible();
+  await page.keyboard.press('Escape');
+  await expect(page.getByRole('dialog')).toHaveCount(0);
+  await expect(page.locator('.xterm-helper-textarea')).toBeFocused();
+
+  // Clicking the tab that is already active takes the keyboard to it as well.
+  await page.getByRole('button', { name: 'web-1 · terminal', exact: true }).click();
+  await expect(page.locator('.xterm-helper-textarea')).toBeFocused();
+  await page.keyboard.press('Enter');
+  await expect(page.locator('.xterm-rows')).toContainText('RESULT-OK');
+});
+
+test('a terminal that opens under the palette leaves the keyboard to it', async ({ page }) => {
+  await boot(page);
+  await page.evaluate(() => ((window as unknown as Record<string, unknown>).__holdOpen = true));
+  await page.getByTitle('sh on web-1').click();
+  await page.getByTitle('Command palette (⌘K)').click();
+  const query = page.getByRole('dialog', { name: 'Command palette' }).getByRole('textbox');
+  await expect(query).toBeFocused();
+
+  await page.evaluate(() => (window as unknown as { __release: () => void }).__release());
+  await expect(page.locator('.xterm-rows')).toContainText('omnyssh-ready');
+  // Two frames, so the terminal's own focus pass has run.
+  await page.evaluate(() => new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(r))));
+
+  await page.keyboard.type('db');
+  await expect(query).toBeFocused();
+  await expect(query).toHaveValue('db');
+  expect(await page.evaluate(() => (window as unknown as { __writes?: unknown }).__writes)).toBeUndefined();
+});
+
 test('toggling the theme re-themes a live terminal (§5.1)', async ({ page }) => {
   await boot(page);
   await page.getByTitle('sh on web-1').click();
diff --git a/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte b/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
index 975f9b17..8a09e600 100644
--- a/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
+++ b/crates/omnyssh-gui/ui/src/lib/screens/TerminalView.svelte
@@ -17,6 +17,8 @@
   import { terminalDidExit } from '$lib/ipc/router';
   import { lastError } from '$lib/stores/notifications';
   import { dialogs } from '$lib/stores/dialogs';
+  import { palette } from '$lib/stores/palette';
+  import { activeEntity } from '$lib/stores/activeEntity';
   import {
     terminalOpen,
     terminalWrite,
@@ -66,6 +68,12 @@
     });
   }
 
+  /** No dialog or palette holds the keyboard: keystrokes meant for a key passphrase
+   *  must never reach the shell. */
+  function keyboardFree(): boolean {
+    return get(dialogs).length === 0 && !get(palette).open;
+  }
+
   /** The remote side ended the session: the tab stays for its last output, and the
    *  backend has nothing left to write or resize. Read from the store, which a late
    *  channel message can follow the exit into. */
@@ -221,7 +229,7 @@
       resizeObserver.observe(container);
 
       ready = true;
-      if (active && get(dialogs).length === 0) term.focus();
+      if (active && keyboardFree()) term.focus();
     })().catch((err) => {
       // `terminal_open` itself failed (e.g. the session could not be spawned): no
       // PtyExited follows, so mark the tab failed here instead of leaving it hung.
@@ -242,15 +250,16 @@
     term = undefined;
   });
 
-  // Becoming visible: a hidden container measured 0, so refit and take focus.
-  // An open dialog keeps the keyboard (keystrokes meant for a key passphrase must
-  // never reach the shell); the terminal takes it back once the last one closes.
+  // Becoming visible: a hidden container measured 0, so refit and take focus. Also
+  // when a dialog or the palette closes, and when the active tab is clicked again,
+  // which moves focus to the tab without changing `active`. The keyboard check runs
+  // in the frame, since a dialog can open before it.
   $effect(() => {
     if (active && ready) {
-      const free = $dialogs.length === 0;
+      void [$dialogs, $palette, $activeEntity];
       requestAnimationFrame(() => {
         safeFit();
-        if (free) term?.focus();
+        if (keyboardFree()) term?.focus();
         syncScrolled();
       });
     }

From f5422b8ae43f78f4b763b1c948f44c06dda7810d Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Fri, 2 Oct 2026 01:30:10 +0400
Subject: [PATCH 5/7] fix(tui): never write control characters from server text
 to the terminal

---
 crates/omnyssh/src/ui/mod.rs | 178 ++++++++++++++++++++++++++++++++++-
 1 file changed, 177 insertions(+), 1 deletion(-)

diff --git a/crates/omnyssh/src/ui/mod.rs b/crates/omnyssh/src/ui/mod.rs
index 532d3ab8..a652516f 100644
--- a/crates/omnyssh/src/ui/mod.rs
+++ b/crates/omnyssh/src/ui/mod.rs
@@ -1,4 +1,5 @@
 use ratatui::{
+    buffer::Buffer,
     layout::{Constraint, Direction, Layout},
     Frame,
 };
@@ -18,10 +19,33 @@ pub mod theme;
 
 /// Top-level render function. Called once per frame from the main loop.
 ///
+/// Server text such as file and process names lands in cells verbatim, and the
+/// backend prints each cell as is, so the finished frame is cleaned here rather
+/// than in every widget that might show such a name. A frame drawn any other
+/// way skips that cleanup.
+pub fn render(frame: &mut Frame, state: &AppState, view: &ViewState) {
+    draw(frame, state, view);
+    defuse_controls(frame.buffer_mut());
+}
+
+/// Replaces each cell holding a C0 or C1 control or DEL with U+FFFD, so no
+/// escape sequence reaches the terminal. A tab, common in command output,
+/// becomes a space. ratatui gives a control a cell of its own, one column
+/// wide, so the layout stays as drawn.
+fn defuse_controls(buf: &mut Buffer) {
+    for cell in &mut buf.content {
+        if cell.symbol() == "\t" {
+            cell.set_symbol(" ");
+        } else if cell.symbol().contains(char::is_control) {
+            cell.set_symbol("\u{fffd}");
+        }
+    }
+}
+
 /// Dispatches to the active screen renderer, then overlays the
 /// status bar and any visible popups. Never panics — missing data is shown
 /// as placeholders.
-pub fn render(frame: &mut Frame, state: &AppState, view: &ViewState) {
+fn draw(frame: &mut Frame, state: &AppState, view: &ViewState) {
     // Check minimum terminal size.
     let area = frame.area();
     if area.width < 80 || area.height < 24 {
@@ -99,3 +123,155 @@ pub fn render(frame: &mut Frame, state: &AppState, view: &ViewState) {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::sync::{Arc, Mutex};
+
+    use omnyssh_core::event::{Metrics, ProcessInfo};
+    use omnyssh_core::ssh::client::Host;
+    use omnyssh_core::ssh::sftp::FileEntry;
+    use ratatui::{backend::TestBackend, buffer::Cell, style::Color, Terminal};
+
+    use super::*;
+    use crate::app::{FmPanel, SnippetResultEntry, TermTab};
+
+    // Names a hostile server can give a file or a process.
+    const HOSTILE: [&str; 3] = ["\x1b]0;PWNED\x07", "\x1b[31mRED", "\x1b[2J"];
+
+    fn draw_app(state: &AppState, view: &ViewState) -> Buffer {
+        let mut terminal = Terminal::new(TestBackend::new(120, 40)).expect("terminal");
+        terminal.draw(|f| render(f, state, view)).expect("draw");
+        terminal.backend().buffer().clone()
+    }
+
+    // The buffer is what the backend prints to the terminal.
+    fn assert_no_controls(buf: &Buffer) {
+        for cell in &buf.content {
+            let symbol = cell.symbol();
+            assert!(!symbol.contains(char::is_control), "{symbol:?}");
+        }
+    }
+
+    fn text(buf: &Buffer) -> String {
+        buf.content.iter().map(Cell::symbol).collect()
+    }
+
+    #[test]
+    fn file_names_reach_the_terminal_defused() {
+        let state = AppState {
+            screen: Screen::FileManager,
+            ..AppState::default()
+        };
+        let mut view = ViewState::default();
+        let fm = &mut view.file_manager;
+        fm.active_panel = FmPanel::Remote;
+        fm.connected_host = Some("web".into());
+        fm.remote.cwd = "/tmp".into();
+        fm.remote.entries = HOSTILE
+            .iter()
+            .map(|name| FileEntry {
+                name: name.to_string(),
+                path: format!("/tmp/{name}"),
+                size: 14,
+                is_dir: false,
+            })
+            .collect();
+        // The preview repeats the name in its title.
+        fm.preview_path = Some("/tmp/\x1b[2J".into());
+        fm.preview_content = Some("hello".into());
+
+        let buf = draw_app(&state, &view);
+        assert_no_controls(&buf);
+        let text = text(&buf);
+        for shown in [
+            "\u{fffd}]0;PWNED\u{fffd}",
+            "\u{fffd}[31mRED",
+            "\u{fffd}[2J ─",
+        ] {
+            assert!(text.contains(shown), "{shown:?}");
+        }
+    }
+
+    #[test]
+    fn process_names_reach_the_terminal_defused() {
+        let mut state = AppState {
+            screen: Screen::DetailView,
+            ..AppState::default()
+        };
+        state.hosts.push(Host {
+            name: "web".into(),
+            ..Host::default()
+        });
+        let top_processes = HOSTILE
+            .iter()
+            .map(|name| ProcessInfo {
+                name: name.to_string(),
+                cpu_percent: 50.0,
+                mem_percent: 1.0,
+            })
+            .collect();
+        state.metrics.insert(
+            "web".into(),
+            Metrics {
+                top_processes: Some(top_processes),
+                ..Metrics::default()
+            },
+        );
+        let mut view = ViewState::default();
+        view.host_list.filtered_indices = vec![0];
+
+        let buf = draw_app(&state, &view);
+        assert_no_controls(&buf);
+        assert!(text(&buf).contains("\u{fffd}[31mRED"));
+    }
+
+    #[test]
+    fn tabs_in_snippet_output_draw_as_spaces() {
+        let mut view = ViewState::default();
+        view.snippets_view.popup = Some(SnippetPopup::Results {
+            entries: vec![SnippetResultEntry {
+                host_name: "web".into(),
+                snippet_name: "hosts".into(),
+                output: Ok("127.0.0.1\tlocalhost".into()),
+                pending: false,
+            }],
+            scroll: 0,
+        });
+
+        let buf = draw_app(&AppState::default(), &view);
+        assert_no_controls(&buf);
+        assert!(text(&buf).contains("127.0.0.1 localhost"));
+    }
+
+    #[test]
+    fn terminal_tabs_keep_their_colours() {
+        let state = AppState {
+            screen: Screen::Terminal,
+            ..AppState::default()
+        };
+        let mut parser = vt100::Parser::new(24, 80, 0);
+        parser.process(b"\x1b[31mRED\x1b[0m plain");
+        let mut view = ViewState::default();
+        view.terminal_view.tabs.push(TermTab {
+            session_id: 1,
+            host_name: "web".into(),
+            has_activity: false,
+            parser: Arc::new(Mutex::new(parser)),
+            scroll_offset: 0,
+            saw_output: true,
+            ended: false,
+        });
+
+        let buf = draw_app(&state, &view);
+        assert_no_controls(&buf);
+        let at = buf
+            .content
+            .windows(9)
+            .position(|w| w.iter().map(Cell::symbol).collect::<String>() == "RED plain")
+            .expect("output drawn");
+        let colours: Vec<Color> = buf.content[at..at + 9].iter().map(|c| c.fg).collect();
+        assert_eq!(colours[..3], [Color::Red; 3]);
+        assert_eq!(colours[3..], [Color::Reset; 6]);
+    }
+}

From 212ee6fdc2eb05049c50678a247921992cad59b3 Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Thu, 1 Oct 2026 20:58:10 +0400
Subject: [PATCH 6/7] docs(changelog): note the snippet, file list, focus and
 escape fixes

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb0a2eff..a0062f0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Versions follow [Semantic Versioning](https://semver.org/).
 
 ### Bug Fixes
 - **Security: a server that offers a host key of another type than the one saved for it is refused.** OmnySSH compared the offered key only with saved keys of the same type. A host saved with its Ed25519 key that suddenly offered only an RSA or ECDSA key was therefore taken for a new host: the key was saved and the login went ahead, password included, and the dashboard did this in the background without anyone connecting. Someone intercepting the connection could get past the saved key this way. Like `ssh`, OmnySSH now refuses any key that matches none of those saved for the host, whatever its type, and says which type is saved. A server that really dropped the type of key it was saved with needs its old key removed once, as `ssh` also asks.
+- **Security: the terminal app no longer lets server-supplied names control your terminal.** A file or process name with escape sequences went to the terminal as is, so anyone who can create a file in a folder you browse could retitle the terminal, recolour text or clear the screen. Control characters in anything the app draws now show as �, tabs as spaces, and a file keeps its exact name for transfers.
 - **A changed host key names its type and, on Windows, whose list held the old one.** OmnySSH 1.1.3 and earlier kept host keys in `%USERPROFILE%\ssh\known_hosts`, a list that PuTTY and OpenSSH never read. When a server was reinstalled, or a new one took over its address, OmnySSH refused it while PuTTY and PowerShell's `ssh` connected, and nothing said why they disagree. A refusal from that file now says it is the list OmnySSH kept up to 1.1.3. Every refusal also names the type of the key the server offered, ED25519, ECDSA or RSA, and the command that prints that key's fingerprint on the server: a server has one key of each type, and comparing the wrong one shows a mismatch that is not there.
 - **Servers from the RHEL/CentOS 6 era connect.** OpenSSH before 5.7 failed with "no common key exchange method". Its only key exchange without SHA-1 is diffie-hellman-group-exchange-sha256, which OmnySSH did not offer. Its only host keys are ssh-rsa and ssh-dss, and it predates the rsa-sha2 signatures, so an RSA key could not log in either. OmnySSH now offers diffie-hellman-group-exchange-sha256 and the ssh-rsa host key after every other method, so a server that supports anything newer negotiates exactly as before. An RSA key signs with SHA-1 only for a server that accepts nothing else: one that lists only ssh-rsa as the signatures it takes, or whose version, OpenSSH before 7.2 or Dropbear before 2020.79, predates that list, as PuTTY and `ssh` before 8.8 sign for it. SHA-1 key exchange, CBC ciphers and DSA keys are still left out.
 - **FreeBSD hosts show CPU, RAM, load average and top processes.** A FreeBSD server's card showed only disk and uptime: its `top` rejects the options OmnySSH passed, it has neither `free` nor `/proc`, and its `ps` read the list of columns as a single column. CPU is now measured from the kernel's tick counters over one second, so each update of a FreeBSD host takes a second longer. RAM is read from the kernel's page counts, with free and inactive memory, the buffer cache and the ZFS ARC above its minimum counted as available, as htop counts them, so a server on ZFS does not look nearly full. The kernel's idle process, which `ps` charges with all idle time, is left out of the top processes. Where `/proc/loadavg` is missing, the load average now comes from `uptime`, which also fills it in for macOS hosts in the terminal app's host details. As on any system, an account whose login shell is csh or tcsh still shows no metrics.
@@ -18,6 +19,9 @@ Versions follow [Semantic Versioning](https://semver.org/).
 - **A server with no algorithm in common says which kind is missing and what it offers.** The error read "No common algorithm", and a key exchange mismatch even "Unknown algorithm", without saying whether the key exchange, host key, cipher or MAC was the problem, so there was nothing to go on. It now reads, for example, "no common cipher; the server offers aes128-cbc". Servers that offer only methods OmnySSH leaves out on purpose, such as SHA-1 Diffie-Hellman or CBC ciphers, still do not connect.
 - **macOS: a host on your local network that fails with "No route to host" says macOS may be blocking it.** macOS keeps an app away from devices on the local network until you allow it, and a blocked connection fails at once with "No route to host (os error 65)", while the router usually stays reachable because it is also your DNS server, so it looked like a fault on that one machine. The error now adds that macOS may be blocking the app and where to allow it: System Settings, Privacy & Security, Local Network, then reopen the app. The desktop app also now carries the explanation macOS shows when it asks for that permission. The terminal app needs the permission for the terminal it runs in; Apple's Terminal has it already.
 - **A terminal the server closes right after login stays open and shows why.** A Synology NAS gives a shell only to administrators: any other account logs in, gets DSM's "Permission denied, please try again." and the session ends. `ssh` shows that message, but OmnySSH closed the tab the moment the session ended, so the terminal seemed to vanish right after the password while file sessions to the same NAS worked. In both apps, a terminal tab that showed anything now stays open when the remote side ends its session, including after `exit` or a dropped connection, with "[Connection closed. Press Enter to close this tab.]" under the last output. Enter or Esc closes it, and it takes no other input. A terminal that fails before showing anything still closes, with the reason in the status bar. The desktop app could also drop the last lines a session printed just before it ended; they now always arrive.
+- **A snippet with the same tag twice no longer empties the Snippets screen.** Tags typed as `db, db` in a snippet form, or written so into `snippets.toml`, left the desktop app's Snippets screen blank, so the snippet could not even be opened to fix it. The Run dialog broke the same way when two hosts share a name, as two `Host` blocks with one name in `~/.ssh/config` give. It now lists that name once, for the host a run goes to. The host picker and the command palette listed such a name twice, and either row opened the first host; they now list it once too.
+- **Sizes in the terminal app's file manager stay in their column next to wide file names.** A name with Chinese, Japanese or Korean characters or emoji, which take two cells each, pushed its size past the panel's edge, so a 14-byte file read `1`. Names are now padded and cut by the cells they take.
+- **Closing the host picker with Esc gives the keyboard back to the terminal.** In the desktop app, clicking SFTP or Terminal in the sidebar over an open terminal and then pressing Esc left the keyboard on the sidebar, so typing reached nothing until you clicked in the terminal. The command palette's sidebar button had the same problem, and so did clicking the terminal's own tab. A terminal that finishes connecting while the palette is open, or comes into view just as a passphrase prompt opens, no longer takes the keyboard from it.
 
 ---
 

From a178f55b900b7f16f93e34350c87ec0ffc1528f1 Mon Sep 17 00:00:00 2001
From: Tim Hartmann <timhartmann7@proton.me>
Date: Fri, 2 Oct 2026 13:49:40 +0400
Subject: [PATCH 7/7] build(core): allow clippy 1.99's double_must_use on
 async_trait output

---
 crates/omnyssh-core/src/ssh/password.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/omnyssh-core/src/ssh/password.rs b/crates/omnyssh-core/src/ssh/password.rs
index 070ba7ae..984a6a4d 100644
--- a/crates/omnyssh-core/src/ssh/password.rs
+++ b/crates/omnyssh-core/src/ssh/password.rs
@@ -150,6 +150,9 @@ pub(crate) enum NoAnswer {
 
 /// Asks the user for a login password while a connection authenticates.
 #[async_trait]
+// async_trait < 0.1.92 marks the future it boxes `#[must_use]` a second time;
+// clippy 1.99 flags that, older clippy doesn't know the lint.
+#[allow(unknown_lints, clippy::double_must_use)]
 pub(crate) trait AskPassword: Send {
     async fn ask(&mut self, prompt: Prompt<'_>) -> Result<String, NoAnswer>;
 }