From f88e39563d458c150911e90af0a78a5e6f437714 Mon Sep 17 00:00:00 2001
From: Melody Ruch <396921921@qq.com>
Date: Thu, 13 Aug 2026 01:58:35 +0800
Subject: [PATCH] fix(ssh): raise host-key prompt above connection dialog

---
 .../src/components/ssh/SshHostKeyPromptDialog.vue     | 11 ++++++++++-
 .../ssh/__tests__/SshHostKeyPromptDialog.spec.ts      |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue b/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue
index 27d9716f6a..f46dbbe14a 100644
--- a/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue
+++ b/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue
@@ -238,7 +238,16 @@ function submitSecret() {
 
 <template>
   <Dialog v-model:open="visible">
-    <DialogContent class="sm:max-w-[460px]" :show-close-button="false" @interact-outside.prevent @escape-key-down.prevent>
+    <!-- Every dialog portal teleports into <body> when its component mounts, so
+    body order (and therefore paint order at the shared z-50) is fixed by mount
+    order, not by which dialog opened last. This prompt mounts once at app start,
+    so a dialog mounted on demand later (e.g. the connection editor) paints over
+    it while still being demoted to pointer-events:none as the lower modal layer
+    — the prompt is invisible, the dialog is dead, and the window is stuck. This
+    is a blocking prompt, so keep it above every other layer in the app (the
+    tallest today are the image preview at 80/81 and the sidebar overlays at
+    100). -->
+    <DialogContent class="sm:max-w-[460px]" overlay-class="z-[200]" portal-class="z-[200]" :show-close-button="false" @interact-outside.prevent @escape-key-down.prevent>
       <DialogHeader>
         <DialogTitle>
           {{ t(isSecretPrompt ? "connection.sshInteractiveTitle" : "connection.sshHostKeyVerifyTitle") }}
diff --git a/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts b/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts
index 66ce055127..61b31b5213 100644
--- a/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts
+++ b/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts
@@ -124,6 +124,15 @@ describe("SshHostKeyPromptDialog web bridge", () => {
     expect(dialogSource).not.toContain(':dismissible="false"');
   });
 
+  it("stacks above dialogs that mount later than it does", () => {
+    // Dialog portals teleport into <body> when their component mounts, so paint
+    // order at the shared z-50 follows mount order. This prompt mounts once at
+    // app start, so an on-demand dialog (e.g. the connection editor) would bury
+    // it and block the whole window. It must opt out of the default layer.
+    expect(dialogSource).toContain('overlay-class="z-[200]"');
+    expect(dialogSource).toContain('portal-class="z-[200]"');
+  });
+
   it("shows an SSE host-key prompt and posts the user's acceptance", async () => {
     await mountDialog();