From fa7416687bfe67d47b187c5b9c0dc8a5d2a95781 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Tue, 10 Jun 2025 11:06:01 -0400
Subject: [PATCH] Enhance ripgrep error handling and utility functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤖 Generated with [OpenCode](https://opencode.ai)

Co-Authored-By: OpenCode <noreply@opencode.ai>
---
 packages/opencode/src/ripgrep/index.ts | 27 +++++++++++---------------
 packages/opencode/src/util/error.ts    |  4 ++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/opencode/src/ripgrep/index.ts b/packages/opencode/src/ripgrep/index.ts
index 9e42262b..d98e9f13 100644
--- a/packages/opencode/src/ripgrep/index.ts
+++ b/packages/opencode/src/ripgrep/index.ts
@@ -62,21 +62,16 @@ export namespace Ripgrep {
       const archivePath = path.join(Global.Path.bin, filename)
       await Bun.write(archivePath, buffer)
       if (config.extension === "tar.gz") {
-        const proc = Bun.spawn(
-          [
-            "tar",
-            "-xzf",
-            archivePath,
-            "--strip-components=1",
-            "--wildcards",
-            "*/rg",
-          ],
-          {
-            cwd: Global.Path.bin,
-            stderr: "pipe",
-            stdout: "pipe",
-          },
-        )
+        const args = ["tar", "-xzf", archivePath, "--strip-components=1"]
+
+        if (process.platform === "darwin") args.push("--include=*/rg")
+        if (process.platform === "linux") args.push("--wildcards", "*/rg")
+
+        const proc = Bun.spawn(args, {
+          cwd: Global.Path.bin,
+          stderr: "pipe",
+          stdout: "pipe",
+        })
         await proc.exited
         if (proc.exitCode !== 0)
           throw new ExtractionFailedError({
@@ -89,7 +84,7 @@ export namespace Ripgrep {
           ["unzip", "-j", archivePath, "*/rg.exe", "-d", Global.Path.bin],
           {
             cwd: Global.Path.bin,
-            stderr: "ignore",
+            stderr: "pipe",
             stdout: "ignore",
           },
         )
diff --git a/packages/opencode/src/util/error.ts b/packages/opencode/src/util/error.ts
index 3e3cf421..7960fffb 100644
--- a/packages/opencode/src/util/error.ts
+++ b/packages/opencode/src/util/error.ts
@@ -1,4 +1,7 @@
 import { z, type ZodSchema } from "zod"
+import { Log } from "./log"
+
+const log = Log.create()
 
 export abstract class NamedError extends Error {
   abstract schema(): ZodSchema
@@ -24,6 +27,7 @@ export abstract class NamedError extends Error {
       ) {
         super(name, options)
         this.name = name
+        log.error(name, this.data)
       }
 
       static isInstance(input: any): input is InstanceType<typeof result> {