From 84dc0f5930b4b91b6c6af74478ff54982935f0e2 Mon Sep 17 00:00:00 2001
From: Chris Farhood <chris@farhood.org>
Date: Fri, 24 Apr 2026 22:10:42 +0000
Subject: [PATCH] fix: merge parsedError + podFailureDescription so OOMKilled
 surfaces in errorMessage

When both a JSONL error (e.g. "killed") and a pod terminated reason (e.g. "OOMKilled")
are present, join them with "; " so the richer pod classification is never silently
dropped by the parsedError short-circuit.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 src/server/execute.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/execute.ts b/src/server/execute.ts
index a1ea24b..bac9fa2 100644
--- a/src/server/execute.ts
+++ b/src/server/execute.ts
@@ -549,8 +549,9 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
   const podFailureDescription = podTerminatedReason
     ? `Pod exited: ${podTerminatedReason}${synthesizedExitCode != null ? ` (exit ${synthesizedExitCode})` : ""}`
     : null;
+  const errorParts = [parsedError, podFailureDescription].filter(Boolean);
   const fallbackErrorMessage =
-    parsedError || podFailureDescription || firstStderrLine || `OpenCode exited with code ${synthesizedExitCode ?? -1}`;
+    errorParts.join("; ") || firstStderrLine || `OpenCode exited with code ${synthesizedExitCode ?? -1}`;
 
   return {
     exitCode: synthesizedExitCode,