From 82a20cb8e262fa6928bceea62250ea10ed877cdb Mon Sep 17 00:00:00 2001
From: dannyward630 <djwarding888@gmail.com>
Date: Thu, 18 Jun 2026 20:39:05 +0200
Subject: [PATCH] fix(session): handle missing binary attachments

---
 packages/opencode/src/session/prompt.ts | 39 ++++++++++++++++++-------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.ts
index b3f85c813f20..a8b35f16a623 100644
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -929,22 +929,41 @@ export const layer = Layer.effect(
                 ]
               }
 
-              return [
-                {
-                  messageID: info.id,
+              const readExit = yield* fsys.readFile(filepath).pipe(Effect.exit)
+              const readCall = {
+                messageID: info.id,
+                sessionID: input.sessionID,
+                type: "text" as const,
+                synthetic: true,
+                text: `Called the Read tool with the following input: {"filePath":"${filepath}"}`,
+              }
+              if (Exit.isFailure(readExit)) {
+                const error = Cause.squash(readExit.cause)
+                yield* Effect.logError("failed to read binary file", { error, filepath })
+                const message = error instanceof Error ? error.message : String(error)
+                yield* events.publish(Session.Event.Error, {
                   sessionID: input.sessionID,
-                  type: "text",
-                  synthetic: true,
-                  text: `Called the Read tool with the following input: {"filePath":"${filepath}"}`,
-                },
+                  error: new NamedError.Unknown({ message }).toObject(),
+                })
+                return [
+                  readCall,
+                  {
+                    messageID: info.id,
+                    sessionID: input.sessionID,
+                    type: "text",
+                    synthetic: true,
+                    text: `Read tool failed to read ${filepath} with the following error: ${message}`,
+                  },
+                ]
+              }
+              return [
+                readCall,
                 {
                   id: part.id,
                   messageID: info.id,
                   sessionID: input.sessionID,
                   type: "file",
-                  url:
-                    `data:${mime};base64,` +
-                    Buffer.from(yield* fsys.readFile(filepath).pipe(Effect.catch(Effect.die))).toString("base64"),
+                  url: `data:${mime};base64,` + Buffer.from(readExit.value).toString("base64"),
                   mime,
                   filename: part.filename!,
                   source: part.source,