From e539efe2b9a627927ffcb1420098a69038d042e2 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Mon, 20 Apr 2026 00:49:46 -0500
Subject: fix: patch arborist to get around bun bug (#23460)

---
 packages/opencode/package.json           |  1 +
 packages/opencode/src/npm/config.ts      |  0
 packages/opencode/src/npmcli-config.d.ts | 43 ++++++++++++++++++++++++++++++++
 packages/shared/src/types.d.ts           |  2 ++
 4 files changed, 46 insertions(+)
 create mode 100644 packages/opencode/src/npm/config.ts
 create mode 100644 packages/opencode/src/npmcli-config.d.ts

(limited to 'packages')

diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 42f30b45e..4644922fc 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -110,6 +110,7 @@
     "@lydell/node-pty": "catalog:",
     "@modelcontextprotocol/sdk": "1.27.1",
     "@npmcli/arborist": "9.4.0",
+    "@npmcli/config": "10.8.1",
     "@octokit/graphql": "9.0.2",
     "@octokit/rest": "catalog:",
     "@openauthjs/openauth": "catalog:",
diff --git a/packages/opencode/src/npm/config.ts b/packages/opencode/src/npm/config.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/opencode/src/npmcli-config.d.ts b/packages/opencode/src/npmcli-config.d.ts
new file mode 100644
index 000000000..c9b20517a
--- /dev/null
+++ b/packages/opencode/src/npmcli-config.d.ts
@@ -0,0 +1,43 @@
+declare module "@npmcli/config" {
+  type Data = Record<string, unknown>
+  type Where = "default" | "builtin" | "global" | "user" | "project" | "env" | "cli"
+
+  namespace Config {
+    interface Options {
+      definitions: Data
+      shorthands: Record<string, string | string[]>
+      npmPath: string
+      flatten?: (input: Data, flat?: Data) => Data
+      nerfDarts?: string[]
+      argv?: string[]
+      cwd?: string
+      env?: NodeJS.ProcessEnv
+      execPath?: string
+      platform?: NodeJS.Platform
+      warn?: boolean
+    }
+  }
+
+  class Config {
+    constructor(input: Config.Options)
+
+    readonly data: Map<Where, { source: string | null }>
+    readonly flat: Data
+
+    load(): Promise<void>
+  }
+
+  export = Config
+}
+
+declare module "@npmcli/config/lib/definitions" {
+  export const definitions: Record<string, unknown>
+  export const shorthands: Record<string, string | string[]>
+  export const flatten: (input: Record<string, unknown>, flat?: Record<string, unknown>) => Record<string, unknown>
+  export const nerfDarts: string[]
+  export const proxyEnv: string[]
+}
+
+declare module "@npmcli/config/lib/definitions/index.js" {
+  export * from "@npmcli/config/lib/definitions"
+}
diff --git a/packages/shared/src/types.d.ts b/packages/shared/src/types.d.ts
index b5d667f1d..60e1639ad 100644
--- a/packages/shared/src/types.d.ts
+++ b/packages/shared/src/types.d.ts
@@ -5,6 +5,7 @@ declare module "@npmcli/arborist" {
     progress?: boolean
     savePrefix?: string
     ignoreScripts?: boolean
+    [key: string]: unknown
   }
 
   export interface ArboristNode {
@@ -24,6 +25,7 @@ declare module "@npmcli/arborist" {
     add?: string[]
     save?: boolean
     saveType?: "prod" | "dev" | "optional" | "peer"
+    [key: string]: unknown
   }
 
   export class Arborist {
-- 
cgit v1.2.3