From fa17a1bbade37cc2c5798cd1bfeb2504b3a6efdc Mon Sep 17 00:00:00 2001
From: Merge Sim <sim@local>
Date: Mon, 31 Aug 2026 13:06:51 -0700
Subject: [PATCH] fix(daemon): retain pending kill promise

---
 src/main/daemon/terminal-host.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/daemon/terminal-host.ts b/src/main/daemon/terminal-host.ts
index 0d2a97c3118..ce386165e54 100644
--- a/src/main/daemon/terminal-host.ts
+++ b/src/main/daemon/terminal-host.ts
@@ -170,9 +170,11 @@ export class TerminalHost {
         opts.incarnationId &&
         (!currentSession || opts.incarnationId !== currentSession.incarnationId)
       ) {
-        return { fenceUnavailable: true }
+        return Promise.resolve({ fenceUnavailable: true })
       }
-      return opts.immediate ? this.sessionTeardown.requestImmediate(sessionId) : pending
+      return opts.immediate
+        ? (this.sessionTeardown.requestImmediate(sessionId) ?? pending)
+        : pending
     }
     const session = this.getAliveSession(sessionId)
     if (opts.incarnationId && opts.incarnationId !== session.incarnationId) {