node v2 cli support (#36309)

packages/cli/src/services/service-config.ts

@@ -5,6 +5,7 @@ import { Service } from "@opencode-ai/client/effect/service"
 import { Effect, FileSystem, Option, Schema } from "effect"
 import { randomBytes } from "crypto"
 import path from "path"
+import { selfCommand } from "../util/process"
 
 // The CLI's service configuration file, plus the Service.EnsureOptions binding that
 // points the client package's service operations at this CLI: which
@@ -78,13 +79,10 @@ const paths = Effect.gen(function* () {
 export const options = Effect.fnUntraced(function* () {
   const { file, legacyFile } = yield* paths
   yield* migrateRegistration(legacyFile, file)
-  const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
-  const entrypoint = compiled ? undefined : process.argv[1]
-  if (!compiled && entrypoint === undefined) return yield* Effect.fail(new Error("Failed to resolve CLI entrypoint"))
   return {
     file,
     version: InstallationVersion,
-    command: [process.execPath, ...(entrypoint ? [entrypoint] : []), "serve", "--service"],
+    command: [...selfCommand(), "serve", "--service"],
   }
 })
 

packages/cli/src/services/standalone.ts

@@ -4,7 +4,7 @@ import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Effect, Schema, Stream } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { randomBytes } from "node:crypto"
-import path from "node:path"
+import { selfCommand } from "../util/process"
 
 const Ready = Schema.Struct({ url: Schema.String })
 const decodeReady = Schema.decodeUnknownPromise(Schema.fromJsonString(Ready))
@@ -14,10 +14,7 @@ type Options = {
 }
 
 function command(password: string, options: Options) {
-  const compiled = path.basename(process.execPath).replace(/\.exe$/, "") !== "bun"
-  const entrypoint = compiled ? [] : process.argv[1] ? [process.argv[1]] : []
-  if (!compiled && entrypoint.length === 0) throw new Error("Failed to resolve CLI entrypoint")
-  const [executable, ...args] = options.command ?? [process.execPath, ...entrypoint, "serve"]
+  const [executable, ...args] = options.command ?? [...selfCommand(), "serve"]
   if (!executable) throw new Error("Failed to resolve standalone server command")
   return ChildProcess.make(executable, [...args, "--stdio", "--port", "0"], {
     cwd: process.cwd(),

packages/cli/src/services/update-preflight.tsx

@@ -7,6 +7,7 @@ import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { registerOpencodeSpinner } from "@opencode-ai/tui/component/register-spinner"
 import { SPINNER_FRAMES } from "@opencode-ai/tui/component/spinner"
 import { go } from "@opencode-ai/tui/logo"
+import { setTimeout } from "node:timers/promises"
 import {
   batch,
   createEffect,
@@ -123,7 +124,7 @@ async function open(from?: string): Promise<Session> {
   let shownAt = performance.now()
   const waitForStage = async () => {
     const remaining = stageFloor - (performance.now() - shownAt)
-    if (remaining > 0) await Bun.sleep(remaining)
+    if (remaining > 0) await setTimeout(remaining)
   }
   const advance = async (stage: number) => {
     await waitForStage()
@@ -140,11 +141,11 @@ async function open(from?: string): Promise<Session> {
     setOutcome(next)
     const completed = await Promise.race([
       settled.promise.then(() => true),
-      Bun.sleep(transitionDuration + 500).then(() => false),
+      setTimeout(transitionDuration + 500).then(() => false),
     ])
     resolveOutcome = undefined
     setAnimating(false)
-    if (completed) await Bun.sleep(hold)
+    if (completed) await setTimeout(hold)
   }
   let closing: Promise<void> | undefined
   let transferred = false
@@ -154,7 +155,7 @@ async function open(from?: string): Promise<Session> {
       setAnimating(false)
       if (renderer.isDestroyed) return
       renderer.pause()
-      await Promise.race([renderer.idle(), Bun.sleep(500)])
+      await Promise.race([renderer.idle(), setTimeout(500)])
       renderer.destroy()
     })())
   let loading: Promise<void> | undefined
@@ -178,7 +179,7 @@ async function open(from?: string): Promise<Session> {
       renderer.screenMode = "alternate-screen"
       renderer.consoleMode = "console-overlay"
       renderer.requestRender()
-      await Promise.race([renderer.idle(), Bun.sleep(500)])
+      await Promise.race([renderer.idle(), setTimeout(500)])
       transferred = true
       return {
         renderer,

packages/cli/src/services/updater.ts

@@ -12,11 +12,16 @@ import { parse, type ParseError } from "jsonc-parser"
 import path from "node:path"
 import semver from "semver"
 
+declare const OPENCODE_CLI_NAME: string | undefined
+
 export type Policy = boolean | "notify"
 export type Action = "none" | "upgrade"
 type Method = "npm" | "pnpm" | "bun" | "yarn"
 
-const packageName = "@opencode-ai/cli"
+const packageName =
+  typeof OPENCODE_CLI_NAME === "string" && OPENCODE_CLI_NAME === "opencode2-node"
+    ? OPENCODE_CLI_NAME
+    : "@opencode-ai/cli"
 
 export interface Interface {
   readonly check: () => Effect.Effect<void>