From 53f8dac3e438862a4c7424b16489b21038f3f893 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Wed, 22 Apr 2026 12:23:31 +0200
Subject: [PATCH 1/2] fix(tui): recover when a requested session is missing

Handle invalid `-s/--session` lookups without throwing during TUI startup so the
app returns to home instead of getting stuck on a blank session screen.
---
 .../src/cli/cmd/tui/routes/session/index.tsx       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 06be5dfbefbf..5b7e39adde5f 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -76,6 +76,7 @@ import { usePromptRef } from "../../context/prompt"
 import { useExit } from "../../context/exit"
 import { Filesystem } from "@/util"
 import { Global } from "@/global"
+import { errorMessage } from "@/util/error"
 import { PermissionPrompt } from "./permission"
 import { QuestionPrompt } from "./question"
 import { DialogExportOptions } from "../../ui/dialog-export-options"
@@ -182,10 +183,15 @@ export function Session() {
 
   createEffect(async () => {
     const previousWorkspace = project.workspace.current()
-    const result = await sdk.client.session.get({ sessionID: route.sessionID }, { throwOnError: true })
-    if (!result.data) {
+    const sessionID = route.sessionID
+    const result = await sdk.client.session.get({ sessionID })
+
+    if (result.error || !result.data) {
       toast.show({
-        message: `Session not found: ${route.sessionID}`,
+        message:
+          result.response?.status === 404
+            ? `Session not found: ${sessionID}`
+            : errorMessage(result.error ?? `Failed to load session: ${sessionID}`),
         variant: "error",
       })
       navigate({ type: "home" })
@@ -203,7 +209,7 @@ export function Session() {
         await sync.bootstrap({ fatal: false })
       } catch (e) {}
     }
-    await sync.session.sync(route.sessionID)
+    await sync.session.sync(sessionID)
     if (scroll) scroll.scrollBy(100_000)
   })
 

From b0fbf18fb33eca69d253aabc77690641deea13e2 Mon Sep 17 00:00:00 2001
From: Simon Klee <hello@simonklee.dk>
Date: Wed, 22 Apr 2026 12:34:57 +0200
Subject: [PATCH 2/2] show error notification for 5s

---
 packages/opencode/src/cli/cmd/tui/routes/session/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 5b7e39adde5f..92e48f1d2694 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -193,6 +193,7 @@ export function Session() {
             ? `Session not found: ${sessionID}`
             : errorMessage(result.error ?? `Failed to load session: ${sessionID}`),
         variant: "error",
+        duration: 5000,
       })
       navigate({ type: "home" })
       return