refactor(tui): remove session tab restoration changes

jlongster · Aug 26, 2026 · Aug 25, 2026 · Aug 25, 2026 · Aug 25, 2026 · Aug 25, 2026
commit a6313493956b0a10f03d64c523958e77af00b35c
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
@@ -646,11 +646,6 @@ function App(props: { pair?: DialogPairCredentials }) {
           sessionID: args.sessionID,
           prompt: startupPrompt,
         })
-      } else if (!args.sessionID && !args.continue && !args.fork && !startup.initialRoute && sessionTabs.enabled()) {
-        const sessionID = sessionTabs.selected()
-        if (sessionID && sessionTabs.tabs().some((tab) => tab.sessionID === sessionID)) {
-          route.navigate({ type: "session", sessionID })
-        }
       }
     })
   })

diff --git a/packages/tui/src/context/session-tabs.tsx b/packages/tui/src/context/session-tabs.tsx
@@ -29,7 +29,6 @@ import {
 
 type TabsState = {
   tabs: SessionTab[]
-  selectedSessionID?: string
   // Kept empty for rollback compatibility with clients that still read this field.
   unread: Record<string, unknown>
 }
@@ -142,18 +141,13 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
       const members = data.session.family(session)
       return members.length > 0 ? members : [session]
     }
-    const normalize = (value: TabsState) => {
-      const tabs = value.tabs.reduce<SessionTab[]>((tabs, tab) => {
+    const normalize = (value: TabsState) => ({
+      tabs: value.tabs.reduce<SessionTab[]>((tabs, tab) => {
         const sessionID = root(tab.sessionID)
         return openSessionTab(tabs, { sessionID, title: title(sessionID, tab.title) })
-      }, [])
-      const selected = value.selectedSessionID && root(value.selectedSessionID)
-      return {
-        tabs,
-        ...(selected && tabs.some((tab) => tab.sessionID === selected) ? { selectedSessionID: selected } : {}),
-        unread: {},
-      }
-    }
+      }, []),
+      unread: {},
+    })
     const current = () => (route.data.type === "session" ? root(route.data.sessionID) : undefined)
     const newTab = createMemo((open = false) => {
       if (route.data.type === "home") return true
@@ -204,14 +198,7 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
           promotedSession = undefined
           cancelledTabs.delete(sessionID)
           history = recordSessionTabHistory(history, sessionID)
-          if (state().tabs.some((tab) => tab.sessionID === sessionID)) {
-            if (state().selectedSessionID !== sessionID) {
-              update((draft) => {
-                if (!cancelledTabs.has(sessionID)) draft.selectedSessionID = sessionID
-              })
-            }
-            return
-          }
+          if (state().tabs.some((tab) => tab.sessionID === sessionID)) return
           const fallback = newTab() ? NEW_SESSION_TAB_TITLE : undefined
           const temporary = previews() && !permanent
           const replaced = temporary ? previewID() : undefined
@@ -227,12 +214,10 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
               const index = draft.tabs.findIndex((item) => item.sessionID === replaced)
               if (index !== -1) {
                 draft.tabs[index] = tab
-                draft.selectedSessionID = sessionID
                 return
               }
             }
             draft.tabs = openSessionTab(draft.tabs, tab)
-            draft.selectedSessionID = sessionID
           })
         },
       ),
@@ -282,8 +267,6 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
         const next = normalize(draft)
         draft.tabs = next.tabs
         draft.unread = next.unread
-        if (next.selectedSessionID) draft.selectedSessionID = next.selectedSessionID
-        else delete draft.selectedSessionID
       })
     })
 
@@ -375,10 +358,6 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
       history = previous.history
       update((draft) => {
         draft.tabs = closeSessionTab(draft.tabs, target).tabs
-        if (draft.selectedSessionID === target) {
-          if (next) draft.selectedSessionID = next
-          else delete draft.selectedSessionID
-        }
       })
       setPromptPulses((pulses) => {
         if (pulses[target] === undefined) return pulses
@@ -401,9 +380,6 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
         return newTab()
       },
       current,
-      selected() {
-        return state().selectedSessionID
-      },
       status,
       scrollAnchor(sessionID: string) {
         const target = root(sessionID)

diff --git a/packages/tui/test/context/session-tabs.test.tsx b/packages/tui/test/context/session-tabs.test.tsx
@@ -559,32 +559,12 @@ test("stores session tabs for the current working directory by default", async (
     expect(stored.global).toEqual({ tabs: [], unread: {} })
     expect(Object.keys(stored.cwd)).toEqual([directory])
     expect(stored.cwd[directory].tabs.map((tab: { sessionID: string }) => tab.sessionID)).toEqual(["first"])
-    expect(stored.cwd[directory].selectedSessionID).toBe("first")
     expect(stored.cwd[directory].unread).toEqual({})
   } finally {
     await setup.destroy()
   }
 })
 
-test("persists selection when returning to an already open session tab", async () => {
-  const setup = await renderSessionTabs("first", { persisted: ["first", "second"] })
-
-  try {
-    await wait(() => setup.tabs.selected() === "first")
-    setup.tabs.select("second")
-    await wait(() => setup.tabs.selected() === "second")
-    setup.tabs.select("first")
-    await wait(() => setup.tabs.selected() === "first")
-    await setup.flush()
-
-    const stored = await Bun.file(path.join(setup.state, "test", "tui", "tabs.json")).json()
-    expect(stored.cwd[directory].selectedSessionID).toBe("first")
-    expect(stored.cwd[directory].tabs.map((tab: { sessionID: string }) => tab.sessionID)).toEqual(["first", "second"])
-  } finally {
-    await setup.destroy()
-  }
-})
-
 test("keeps scroll anchors for open session tabs", async () => {
   const setup = await renderSessionTabs("first")