From 55787f2caa1051d1d4a8921a460ac8f7b1f3692d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haris=20Gu=C5=A1i=C4=87?= <harisgusic.dev@gmail.com>
Date: Sat, 1 Nov 2025 15:34:21 +0100
Subject: [PATCH] fix: tui: Handle Clipboard.copy errors properly (#3685)

---
 packages/opencode/src/cli/cmd/tui/app.tsx          |  3 ++-
 packages/opencode/src/cli/cmd/tui/ui/toast.tsx     | 14 +++++++++++++-
 .../opencode/src/cli/cmd/tui/util/clipboard.ts     |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/app.tsx b/packages/opencode/src/cli/cmd/tui/app.tsx
index 2427432e..ab475071 100644
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -296,8 +296,9 @@ function App() {
           /* @ts-expect-error */
           renderer.writeOut(finalOsc52)
           await Clipboard.copy(text)
+            .then(() => toast.show({ message: "Copied to clipboard", variant: "info" }))
+            .catch(toast.error)
           renderer.clearSelection()
-          toast.show({ message: "Copied to clipboard", variant: "info" })
         }
       }}
     >
diff --git a/packages/opencode/src/cli/cmd/tui/ui/toast.tsx b/packages/opencode/src/cli/cmd/tui/ui/toast.tsx
index f742635e..24d630c7 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/toast.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/toast.tsx
@@ -49,7 +49,7 @@ function init() {
 
   let timeoutHandle: NodeJS.Timeout | null = null
 
-  return {
+  const toast = {
     show(options: ToastOptions) {
       const parsedOptions = TuiEvent.ToastShow.properties.parse(options)
       const { duration, ...currentToast } = parsedOptions
@@ -59,10 +59,22 @@ function init() {
         setStore("currentToast", null)
       }, duration).unref()
     },
+    error: (err: any) => {
+      if (err instanceof Error)
+        return toast.show({
+          variant: "error",
+          message: err.message,
+        })
+      toast.show({
+        variant: "error",
+        message: "An unknown error has occurred",
+      })
+    },
     get currentToast(): ToastOptions | null {
       return store.currentToast
     },
   }
+  return toast
 }
 
 export type ToastContext = ReturnType<typeof init>
diff --git a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
index b0bd59eb..6d4c07de 100644
--- a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
+++ b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
@@ -76,7 +76,7 @@ export namespace Clipboard {
           const proc = Bun.spawn(["wl-copy"], { stdin: "pipe", stdout: "ignore", stderr: "ignore" })
           proc.stdin.write(text)
           proc.stdin.end()
-          await proc.exited.catch(() => {})
+          await proc.exited
         }
       }
       if (Bun.which("xclip")) {
@@ -117,7 +117,7 @@ export namespace Clipboard {
 
     console.log("clipboard: no native support")
     return async (text: string) => {
-      await clipboardy.write(text).catch(() => {})
+      await clipboardy.write(text)
     }
   })