From be8116e2ea3aed66c9d63e0cac2af47bd3e91be5 Mon Sep 17 00:00:00 2001
From: Simon D'Morias <simon@hisflat.com>
Date: Tue, 16 Dec 2025 12:21:51 +0000
Subject: [PATCH] fix: preserve argument boundaries in run command (#4979)

---
 packages/opencode/src/cli/cmd/run.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/opencode/src/cli/cmd/run.ts b/packages/opencode/src/cli/cmd/run.ts
index 23456c75e..3a0b2f23f 100644
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -88,7 +88,9 @@ export const RunCommand = cmd({
       })
   },
   handler: async (args) => {
-    let message = [...args.message, ...(args["--"] || [])].join(" ")
+    let message = [...args.message, ...(args["--"] || [])]
+      .map((arg) => (arg.includes(" ") ? `"${arg.replace(/"/g, '\\"')}"` : arg))
+      .join(" ")
 
     const fileParts: any[] = []
     if (args.file) {