From 43ff2ee9ccb4edfa19b54469d42ec863cba862ca Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Thu, 30 Jul 2026 13:02:52 +0000
Subject: [PATCH] fix(app): close missing child session tabs

---
 .../e2e/regression/subagent-child-navigation.spec.ts   |  4 +++-
 packages/app/src/context/tabs.tsx                      | 10 ++++++++++
 packages/app/src/pages/session.tsx                     |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/app/e2e/regression/subagent-child-navigation.spec.ts b/packages/app/e2e/regression/subagent-child-navigation.spec.ts
index 019cc156ec..5e92d033eb 100644
--- a/packages/app/e2e/regression/subagent-child-navigation.spec.ts
+++ b/packages/app/e2e/regression/subagent-child-navigation.spec.ts
@@ -39,7 +39,9 @@ test("shows the not found fallback when the viewed session is deleted", async ({
   })
 
   await expect(page.getByText("This session cannot be found")).toBeVisible()
-  await expect(page.getByRole("button", { name: "Close Tab" })).toBeVisible()
+  await page.getByRole("button", { name: "Close Tab" }).click()
+  await expect(page).toHaveURL(/\/$/)
+  await expect(page.getByText("This session cannot be found")).toHaveCount(0)
   await expect(page.getByRole("heading", { name: taskDescription })).toHaveCount(0)
 })
 
diff --git a/packages/app/src/context/tabs.tsx b/packages/app/src/context/tabs.tsx
index 75191d54cf..0e02ee763b 100644
--- a/packages/app/src/context/tabs.tsx
+++ b/packages/app/src/context/tabs.tsx
@@ -249,6 +249,16 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
         removeDraftPersisted(draftID)
       },
       removeTab,
+      // Child routes share their root session's tab, so the route ID cannot
+      // identify the tab once a deleted child falls back to an error page.
+      removeActiveTab(key: ServerConnection.Key) {
+        const index = store.findIndex((tab) => tab.server === key && tabKey(tab) === recentKey())
+        if (index === -1) {
+          navigate("/")
+          return
+        }
+        removeTab(index)
+      },
       // User-initiated close: records the tab so it can be reopened.
       // Cleanup paths (missing sessions, archive, server removal) go through
       // removeTab and friends directly and are not recorded.
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index c6e3a5fcbb..2b886096f9 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -211,7 +211,7 @@ function SessionErrorFallback(props: { error: unknown; sessionID?: string; serve
   })
   const closeTab = () => {
     if (!props.sessionID) return
-    tabs.removeSessionTab({ server: props.serverKey ?? server.key, sessionId: props.sessionID })
+    tabs.removeActiveTab(props.serverKey ?? server.key)
   }
   if (isCurrentSessionNotFoundError(props.error, props.sessionID)) {
     return (