oh-my-opencode 3.17.14 → 3.17.15

package/dist/cli/index.js

@@ -6653,25 +6653,128 @@ var init_external_plugin_detector = __esm(() => {
   init_plugin_identity();
 });
 
+// src/shared/bun-spawn-shim.ts
+import { spawn as nodeSpawn, spawnSync as nodeSpawnSync } from "child_process";
+import { Readable, Writable } from "stream";
+function emptyReadableStream() {
+  return new ReadableStream({
+    start(controller) {
+      controller.close();
+    }
+  });
+}
+function toReadableStream(stream) {
+  if (!stream)
+    return emptyReadableStream();
+  return Readable.toWeb(stream);
+}
+function emptyWritableStream() {
+  return new Writable({
+    write(_chunk, _encoding, callback) {
+      callback();
+    }
+  });
+}
+function resolveCommand(cmdOrOpts, optsArg) {
+  const isObj = !Array.isArray(cmdOrOpts);
+  const opts = isObj ? cmdOrOpts : optsArg ?? {};
+  return {
+    cmd: isObj ? cmdOrOpts.cmd : cmdOrOpts,
+    opts
+  };
+}
+function resolveStdio(options) {
+  if (options.stdio)
+    return options.stdio;
+  return [options.stdin ?? "ignore", options.stdout ?? "pipe", options.stderr ?? "inherit"];
+}
+function wrapNodeProcess(proc) {
+  let exitCode = null;
+  const exited = new Promise((resolve4, reject) => {
+    proc.on("exit", (code) => {
+      exitCode = code ?? 1;
+      resolve4(exitCode);
+    });
+    proc.on("error", (error) => {
+      if (exitCode === null) {
+        exitCode = 1;
+        reject(error);
+      }
+    });
+  });
+  return {
+    get exitCode() {
+      return exitCode;
+    },
+    exited,
+    stdout: toReadableStream(proc.stdout),
+    stderr: toReadableStream(proc.stderr),
+    stdin: proc.stdin ?? emptyWritableStream(),
+    kill(signal) {
+      if (proc.killed || exitCode !== null)
+        return;
+      try {
+        proc.kill(signal);
+      } catch (error) {
+        if (!String(error).includes("kill"))
+          throw error;
+      }
+    },
+    pid: proc.pid,
+    ref() {
+      proc.ref();
+    },
+    unref() {
+      proc.unref();
+    }
+  };
+}
+function spawn(cmdOrOpts, opts) {
+  if (IS_BUN)
+    return runtime.Bun.spawn(cmdOrOpts, opts);
+  const { cmd, opts: options } = resolveCommand(cmdOrOpts, opts);
+  const [bin, ...args] = cmd;
+  const proc = nodeSpawn(bin, args, {
+    cwd: options.cwd,
+    env: options.env,
+    stdio: resolveStdio(options),
+    detached: options.detached
+  });
+  return wrapNodeProcess(proc);
+}
+var runtime, IS_BUN;
+var init_bun_spawn_shim = __esm(() => {
+  runtime = globalThis;
+  IS_BUN = typeof runtime.Bun !== "undefined";
+});
+
 // src/shared/archive-entry-validator.ts
 var init_archive_entry_validator = () => {};
 
 // src/shared/zip-entry-listing/python-zip-entry-listing.ts
-var init_python_zip_entry_listing = () => {};
+var init_python_zip_entry_listing = __esm(() => {
+  init_bun_spawn_shim();
+});
 
 // src/shared/zip-entry-listing/powershell-zip-entry-listing.ts
-var init_powershell_zip_entry_listing = () => {};
+var init_powershell_zip_entry_listing = __esm(() => {
+  init_bun_spawn_shim();
+});
 
 // src/shared/zip-entry-listing/tar-zip-entry-listing.ts
 var init_tar_zip_entry_listing = __esm(() => {
+  init_bun_spawn_shim();
   init_logger();
 });
 
 // src/shared/zip-entry-listing/read-zip-symlink-target.ts
-var init_read_zip_symlink_target = () => {};
+var init_read_zip_symlink_target = __esm(() => {
+  init_bun_spawn_shim();
+});
 
 // src/shared/zip-entry-listing/zipinfo-zip-entry-listing.ts
 var init_zipinfo_zip_entry_listing = __esm(() => {
+  init_bun_spawn_shim();
   init_read_zip_symlink_target();
 });
 
@@ -6685,6 +6788,7 @@ var init_zip_entry_listing = __esm(() => {
 
 // src/shared/zip-extractor.ts
 var init_zip_extractor = __esm(() => {
+  init_bun_spawn_shim();
   init_archive_entry_validator();
   init_zip_entry_listing();
 });
@@ -6697,6 +6801,7 @@ function getCachedBinaryPath(cacheDir, binaryName) {
   return existsSync6(binaryPath) ? binaryPath : null;
 }
 var init_binary_downloader = __esm(() => {
+  init_bun_spawn_shim();
   init_archive_entry_validator();
   init_zip_extractor();
 });
@@ -50635,31 +50740,38 @@ var init_server_health = __esm(() => {
 });
 
 // src/tools/interactive-bash/tmux-path-resolver.ts
-var init_tmux_path_resolver = () => {};
+var init_tmux_path_resolver = __esm(() => {
+  init_bun_spawn_shim();
+});
 
 // src/shared/tmux/tmux-utils/pane-dimensions.ts
 var init_pane_dimensions = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
 });
 
 // src/shared/tmux/tmux-utils/pane-spawn.ts
 var init_pane_spawn = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
   init_server_health();
 });
 // src/shared/tmux/tmux-utils/pane-replace.ts
 var init_pane_replace = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
 });
 
 // src/shared/tmux/tmux-utils/window-spawn.ts
 var init_window_spawn = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
   init_server_health();
 });
 
 // src/shared/tmux/tmux-utils/session-spawn.ts
 var init_session_spawn = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
   init_server_health();
 });
@@ -50668,6 +50780,7 @@ var init_stale_session_sweep = () => {};
 
 // src/shared/tmux/tmux-utils/layout.ts
 var init_layout = __esm(() => {
+  init_bun_spawn_shim();
   init_tmux_path_resolver();
 });
 
@@ -52054,16 +52167,15 @@ var init_write_omo_config = __esm(() => {
 });
 
 // src/shared/spawn-with-windows-hide.ts
-var {spawn: bunSpawn } = globalThis.Bun;
-import { spawn as nodeSpawn } from "child_process";
-import { Readable } from "stream";
-function toReadableStream(stream) {
+import { spawn as nodeSpawn2 } from "child_process";
+import { Readable as Readable2 } from "stream";
+function toReadableStream2(stream) {
   if (!stream) {
     return;
   }
-  return Readable.toWeb(stream);
+  return Readable2.toWeb(stream);
 }
-function wrapNodeProcess(proc) {
+function wrapNodeProcess2(proc) {
   let resolveExited;
   let exitCode = null;
   const exited = new Promise((resolve4) => {
@@ -52084,8 +52196,8 @@ function wrapNodeProcess(proc) {
       return exitCode;
     },
     exited,
-    stdout: toReadableStream(proc.stdout),
-    stderr: toReadableStream(proc.stderr),
+    stdout: toReadableStream2(proc.stdout),
+    stderr: toReadableStream2(proc.stderr),
     kill(signal) {
       try {
         if (!signal) {
@@ -52099,19 +52211,21 @@ function wrapNodeProcess(proc) {
 }
 function spawnWithWindowsHide(command, options) {
   if (process.platform !== "win32") {
-    return bunSpawn(command, options);
+    return spawn(command, options);
   }
   const [cmd, ...args] = command;
-  const proc = nodeSpawn(cmd, args, {
+  const proc = nodeSpawn2(cmd, args, {
     cwd: options.cwd,
     env: options.env,
-    stdio: [options.stdin ?? "pipe", options.stdout ?? "pipe", options.stderr ?? "pipe"],
+    stdio: [options.stdin ?? "ignore", options.stdout ?? "pipe", options.stderr ?? "inherit"],
     windowsHide: true,
     shell: true
   });
-  return wrapNodeProcess(proc);
+  return wrapNodeProcess2(proc);
 }
-var init_spawn_with_windows_hide = () => {};
+var init_spawn_with_windows_hide = __esm(() => {
+  init_bun_spawn_shim();
+});
 
 // src/cli/config-manager/opencode-binary.ts
 async function findOpenCodeBinaryWithVersion() {
@@ -52678,10 +52792,10 @@ var require_resolveCommand = __commonJS((exports, module) => {
     }
     return resolved;
   }
-  function resolveCommand(parsed) {
+  function resolveCommand2(parsed) {
     return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
   }
-  module.exports = resolveCommand;
+  module.exports = resolveCommand2;
 });
 
 // node_modules/cross-spawn/lib/util/escape.js
@@ -52749,19 +52863,19 @@ var require_readShebang = __commonJS((exports, module) => {
 // node_modules/cross-spawn/lib/parse.js
 var require_parse = __commonJS((exports, module) => {
   var path6 = __require("path");
-  var resolveCommand = require_resolveCommand();
+  var resolveCommand2 = require_resolveCommand();
   var escape = require_escape();
   var readShebang = require_readShebang();
   var isWin = process.platform === "win32";
   var isExecutableRegExp = /\.(?:com|exe)$/i;
   var isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
   function detectShebang(parsed) {
-    parsed.file = resolveCommand(parsed);
+    parsed.file = resolveCommand2(parsed);
     const shebang = parsed.file && readShebang(parsed.file);
     if (shebang) {
       parsed.args.unshift(parsed.file);
       parsed.command = shebang;
-      return resolveCommand(parsed);
+      return resolveCommand2(parsed);
     }
     return parsed.file;
   }
@@ -52857,21 +52971,21 @@ var require_cross_spawn = __commonJS((exports, module) => {
   var cp = __require("child_process");
   var parse7 = require_parse();
   var enoent = require_enoent();
-  function spawn(command, args, options) {
+  function spawn2(command, args, options) {
     const parsed = parse7(command, args, options);
     const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
     enoent.hookChildProcess(spawned, parsed);
     return spawned;
   }
-  function spawnSync(command, args, options) {
+  function spawnSync2(command, args, options) {
     const parsed = parse7(command, args, options);
     const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
     result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
     return result;
   }
-  module.exports = spawn;
-  module.exports.spawn = spawn;
-  module.exports.sync = spawnSync;
+  module.exports = spawn2;
+  module.exports.spawn = spawn2;
+  module.exports.sync = spawnSync2;
   module.exports._parse = parse7;
   module.exports._enoent = enoent;
 });
@@ -53882,7 +53996,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "3.17.14",
+  version: "3.17.15",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -53904,7 +54018,8 @@ var package_default = {
     "./schema.json": "./dist/oh-my-opencode.schema.json"
   },
   scripts: {
-    build: "bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
+    build: "bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
+    "build:node-require-shim": "bun run script/patch-node-require-shim.ts",
     "build:all": "bun run build && bun run build:binaries",
     "build:binaries": "bun run script/build-binaries.ts",
     "build:schema": "bun run script/build-schema.ts",
@@ -53962,17 +54077,17 @@ var package_default = {
     zod: "^4.3.0"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "3.17.14",
-    "oh-my-opencode-darwin-x64": "3.17.14",
-    "oh-my-opencode-darwin-x64-baseline": "3.17.14",
-    "oh-my-opencode-linux-arm64": "3.17.14",
-    "oh-my-opencode-linux-arm64-musl": "3.17.14",
-    "oh-my-opencode-linux-x64": "3.17.14",
-    "oh-my-opencode-linux-x64-baseline": "3.17.14",
-    "oh-my-opencode-linux-x64-musl": "3.17.14",
-    "oh-my-opencode-linux-x64-musl-baseline": "3.17.14",
-    "oh-my-opencode-windows-x64": "3.17.14",
-    "oh-my-opencode-windows-x64-baseline": "3.17.14"
+    "oh-my-opencode-darwin-arm64": "3.17.15",
+    "oh-my-opencode-darwin-x64": "3.17.15",
+    "oh-my-opencode-darwin-x64-baseline": "3.17.15",
+    "oh-my-opencode-linux-arm64": "3.17.15",
+    "oh-my-opencode-linux-arm64-musl": "3.17.15",
+    "oh-my-opencode-linux-x64": "3.17.15",
+    "oh-my-opencode-linux-x64-baseline": "3.17.15",
+    "oh-my-opencode-linux-x64-musl": "3.17.15",
+    "oh-my-opencode-linux-x64-musl-baseline": "3.17.15",
+    "oh-my-opencode-windows-x64": "3.17.15",
+    "oh-my-opencode-windows-x64-baseline": "3.17.15"
   },
   overrides: {},
   trustedDependencies: [
@@ -71449,12 +71564,12 @@ function createOpencodeClient(config2) {
 var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 
 // node_modules/@opencode-ai/sdk/dist/process.js
-import { spawnSync } from "child_process";
+import { spawnSync as spawnSync2 } from "child_process";
 function stop(proc) {
   if (proc.exitCode !== null || proc.signalCode !== null)
     return;
   if (process.platform === "win32" && proc.pid) {
-    const out = spawnSync("taskkill", ["/pid", String(proc.pid), "/T", "/F"], { windowsHide: true });
+    const out = spawnSync2("taskkill", ["/pid", String(proc.pid), "/T", "/F"], { windowsHide: true });
     if (!out.error && out.status === 0)
       return;
   }
@@ -79775,7 +79890,7 @@ async function findAvailablePort2(startPort = DEFAULT_PORT) {
 }
 
 // src/features/mcp-oauth/oauth-authorization-flow.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { createHash as createHash2, randomBytes as randomBytes2 } from "crypto";
 import { createServer } from "http";
 function generateCodeVerifier() {
@@ -79856,7 +79971,7 @@ function openBrowser(url2) {
     args = [url2];
   }
   try {
-    const child = spawn(command, args, { stdio: "ignore", detached: true });
+    const child = spawn2(command, args, { stdio: "ignore", detached: true });
     child.on("error", () => {});
     child.unref();
   } catch {}