From 51e4cabfda66859d1d5198c8109858ad48a39560 Mon Sep 17 00:00:00 2001
From: Shoubhit Dash <shoubhit2005@gmail.com>
Date: Fri, 26 Jun 2026 14:44:01 +0530
Subject: [PATCH] fix(tui): inline renderer error handling

---
 packages/tui/src/app.tsx                     | 46 ++++++++++----------
 packages/tui/test/app-lifecycle.test.tsx     | 12 -----
 packages/tui/test/app-renderer-init.test.tsx | 35 +++++++++++++++
 3 files changed, 57 insertions(+), 36 deletions(-)
 create mode 100644 packages/tui/test/app-renderer-init.test.tsx

diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index b675ade175..fecf71b6c8 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -8,7 +8,7 @@ import { ClipboardProvider, useClipboard } from "./context/clipboard"
 import { ExitProvider, useExit } from "./context/exit"
 import { EpilogueProvider } from "./context/epilogue"
 import * as Selection from "./util/selection"
-import { createCliRenderer, MouseButton, type CliRenderer } from "@opentui/core"
+import { createCliRenderer, MouseButton } from "@opentui/core"
 import { RouteProvider, useRoute } from "./context/route"
 import {
   Switch,
@@ -177,35 +177,33 @@ function isVersionGreater(left: string, right: string) {
   return a.prerelease.localeCompare(b.prerelease, undefined, { numeric: true }) > 0
 }
 
-export function initializeRenderer(config: TuiConfig.Resolved, factory = createCliRenderer) {
-  return Effect.tryPromise({
-    try: () =>
-      factory({
-        externalOutputMode: "passthrough",
-        targetFps: 60,
-        gatherStats: false,
-        exitOnCtrlC: false,
-        useKittyKeyboard: {},
-        autoFocus: false,
-        openConsoleOnError: false,
-        useMouse: !Flag.OPENCODE_DISABLE_MOUSE && config.mouse,
-        consoleOptions: {
-          keyBindings: [{ name: "y", ctrl: true, action: "copy-selection" }],
-        },
-      }),
-    catch: (error) => (error instanceof Error ? error : new Error(String(error))),
-  })
-}
-
 export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
   const global = yield* Global.Service
   const exit = { epilogue: undefined as string | undefined, reason: undefined as unknown }
   const result = yield* Effect.scoped(
     Effect.gen(function* () {
-      const renderer = yield* Effect.acquireRelease(initializeRenderer(input.config), (renderer) =>
-        Effect.sync(() => {
-          destroyRenderer(renderer)
+      const renderer = yield* Effect.acquireRelease(
+        Effect.tryPromise({
+          try: () =>
+            createCliRenderer({
+              externalOutputMode: "passthrough",
+              targetFps: 60,
+              gatherStats: false,
+              exitOnCtrlC: false,
+              useKittyKeyboard: {},
+              autoFocus: false,
+              openConsoleOnError: false,
+              useMouse: !Flag.OPENCODE_DISABLE_MOUSE && input.config.mouse,
+              consoleOptions: {
+                keyBindings: [{ name: "y", ctrl: true, action: "copy-selection" }],
+              },
+            }),
+          catch: (error) => (error instanceof Error ? error : new Error(String(error))),
         }),
+        (renderer) =>
+          Effect.sync(() => {
+            destroyRenderer(renderer)
+          }),
       )
       win32DisableProcessedInput()
       const keymap = createDefaultOpenTuiKeymap(renderer)
diff --git a/packages/tui/test/app-lifecycle.test.tsx b/packages/tui/test/app-lifecycle.test.tsx
index 9ac6b21015..d3983ae8e0 100644
--- a/packages/tui/test/app-lifecycle.test.tsx
+++ b/packages/tui/test/app-lifecycle.test.tsx
@@ -6,18 +6,6 @@ import { Global } from "@opencode-ai/core/global"
 import { createTuiResolvedConfig } from "./fixture/tui-runtime"
 import { createEventSource, createFetch, directory, json } from "./fixture/tui-sdk"
 
-test("renderer initialization preserves the original error message", async () => {
-  const message = 'Failed to open library "opentui.dll": error code 126'
-  const { initializeRenderer } = await import("../src/app")
-  const factory = async () => {
-    throw new Error(message)
-  }
-
-  await expect(
-    Effect.runPromise(initializeRenderer(createTuiResolvedConfig({ plugin_enabled: {} }), factory)),
-  ).rejects.toThrow(message)
-})
-
 test("SIGHUP clears title and disposes scoped resources once", async () => {
   const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
   const core = await import("@opentui/core")
diff --git a/packages/tui/test/app-renderer-init.test.tsx b/packages/tui/test/app-renderer-init.test.tsx
new file mode 100644
index 0000000000..89f9e122bb
--- /dev/null
+++ b/packages/tui/test/app-renderer-init.test.tsx
@@ -0,0 +1,35 @@
+import { expect, mock, test } from "bun:test"
+import { Effect } from "effect"
+import { Global } from "@opencode-ai/core/global"
+import { createTuiResolvedConfig } from "./fixture/tui-runtime"
+
+test("run preserves the original renderer initialization error message", async () => {
+  const message = 'Failed to open library "opentui.dll": error code 126'
+  const core = await import("@opentui/core")
+  mock.module("@opentui/core", () => ({
+    ...core,
+    createCliRenderer: async () => {
+      throw new Error(message)
+    },
+  }))
+
+  try {
+    const { run } = await import("../src/app")
+
+    await expect(
+      Effect.runPromise(
+        run({
+          url: "http://test",
+          config: createTuiResolvedConfig({ plugin_enabled: {} }),
+          args: {},
+          pluginHost: {
+            async start() {},
+            async dispose() {},
+          },
+        }).pipe(Effect.provide(Global.defaultLayer)),
+      ),
+    ).rejects.toThrow(message)
+  } finally {
+    mock.restore()
+  }
+})