feat(cli): publish Node builds as opencode2-node

packages/cli/script/build-node.ts

@@ -57,7 +57,7 @@ const builder =
     : undefined
 
 for (const target of targets) {
-  console.log(`building cli-${targetName(target)}`)
+  console.log(`building cli-node-${targetName(target)}`)
   const assets = await collectNodeAssets(target)
   await rm("dist-node", { recursive: true, force: true })
   const assetHash = await hashNodeAssets(assets)
@@ -73,8 +73,8 @@ for (const target of targets) {
   }
   if (bundleOnly) continue
 
-  const name = `cli-${targetName(target)}`
-  const binary = target.platform === "win32" ? "opencode2.exe" : "opencode2"
+  const name = `cli-node-${targetName(target)}`
+  const binary = target.platform === "win32" ? "opencode2-node.exe" : "opencode2-node"
   const output = path.join(outdir, name, "bin", binary)
   if (!builder) throw new Error("Node SEA builder is unavailable")
   await mkdir(path.dirname(output), { recursive: true })

packages/cli/script/publish.ts

@@ -18,37 +18,55 @@ async function publish(dir: string, name: string, version: string) {
   await $`npm publish *.tgz --access public --tag ${Script.channel}`.cwd(dir)
 }
 
-const binaries: Record<string, string> = {}
-for (const filepath of new Bun.Glob("*/package.json").scanSync({ cwd: "./dist" })) {
-  const item = await Bun.file(`./dist/${filepath}`).json()
-  binaries[item.name] = item.version
+async function publishDistribution(input: { root: string; name: string; binary: string; packagePrefix: string }) {
+  const binaries: Record<string, string> = {}
+  for (const filepath of new Bun.Glob("*/package.json").scanSync({ cwd: input.root })) {
+    const item = await Bun.file(`${input.root}/${filepath}`).json()
+    if (!item.name.startsWith(input.packagePrefix)) continue
+    binaries[item.name] = item.version
+  }
+  console.log(input.name, "binaries", binaries)
+  const versions = new Set(Object.values(binaries))
+  if (versions.size > 1) throw new Error(`Binary package versions do not match for ${input.name}`)
+  const version = versions.values().next().value
+  if (!version) throw new Error(`No binary packages found for ${input.name}`)
+
+  await $`mkdir -p ${input.root}/${input.name}/bin`
+  await $`cp ./bin/opencode2.cjs ${input.root}/${input.name}/bin/${input.binary}`
+  await Bun.file(`${input.root}/${input.name}/package.json`).write(
+    JSON.stringify(
+      {
+        name: input.name,
+        bin: { [input.binary]: `./bin/${input.binary}` },
+        version,
+        license: pkg.license,
+        repository: { type: "git", url: "git+https://github.com/anomalyco/opencode.git" },
+        os: ["darwin", "linux", "win32"],
+        cpu: ["arm64", "x64"],
+        optionalDependencies: binaries,
+      },
+      null,
+      2,
+    ),
+  )
+
+  await Promise.all(
+    Object.entries(binaries).map(([name, version]) =>
+      publish(`${input.root}/${name.replace("@opencode-ai/", "")}`, name, version),
+    ),
+  )
+  await publish(`${input.root}/${input.name}`, input.name, version)
 }
-console.log("binaries", binaries)
-const version = Object.values(binaries)[0]
-const name = pkg.name
 
-await $`mkdir -p ./dist/${name}/bin`
-await $`cp ./bin/opencode2.cjs ./dist/${name}/bin/opencode2`
-await Bun.file(`./dist/${name}/package.json`).write(
-  JSON.stringify(
-    {
-      name,
-      bin: { opencode2: "./bin/opencode2" },
-      version,
-      license: pkg.license,
-      repository: { type: "git", url: "git+https://github.com/anomalyco/opencode.git" },
-      os: ["darwin", "linux", "win32"],
-      cpu: ["arm64", "x64"],
-      optionalDependencies: binaries,
-    },
-    null,
-    2,
-  ),
-)
-
-await Promise.all(
-  Object.entries(binaries).map(([name, version]) =>
-    publish(`./dist/${name.replace("@opencode-ai/", "")}`, name, version),
-  ),
-)
-await publish(`./dist/${name}`, name, version)
+await publishDistribution({
+  root: "./dist",
+  name: pkg.name,
+  binary: "opencode2",
+  packagePrefix: "@opencode-ai/cli-",
+})
+await publishDistribution({
+  root: "./dist/node",
+  name: "opencode2-node",
+  binary: "opencode2-node",
+  packagePrefix: "@opencode-ai/cli-node-",
+})

packages/cli/script/service-smoke.ts

@@ -7,9 +7,10 @@ import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
 
-const target = `cli-${process.platform === "win32" ? "windows" : process.platform}-${process.arch}`
-const directory = path.join(import.meta.dir, "..", "dist", target, "bin")
-const binary = path.join(directory, `opencode2${process.platform === "win32" ? ".exe" : ""}`)
+const nodeBuild = process.argv.includes("--node")
+const target = `cli${nodeBuild ? "-node" : ""}-${process.platform === "win32" ? "windows" : process.platform}-${process.arch}`
+const directory = path.join(import.meta.dir, "..", "dist", ...(nodeBuild ? ["node"] : []), target, "bin")
+const binary = path.join(directory, `opencode2${nodeBuild ? "-node" : ""}${process.platform === "win32" ? ".exe" : ""}`)
 if (!(await Bun.file(binary).exists())) throw new Error(`Missing compiled CLI in ${directory}`)
 
 const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-service-smoke-"))