ominibot 2.0.12 → 3.0.0

package/README.md

@@ -42,4 +42,4 @@ The right binary for your machine is installed automatically:
 - Documentation: https://ominibot.com/docs
 - Support: https://ominibot.com/support
 
-Version 2.0.12. Copyright (c) Ominibot. MIT licensed.
+Version 3.0.0. Copyright (c) Ominibot. MIT licensed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ominibot",
-  "version": "2.0.12",
+  "version": "3.0.0",
   "description": "Ominibot - Picks the model, plans the work, checks its own output, and ships",
   "keywords": [
     "ai",
@@ -36,13 +36,13 @@
     "x64"
   ],
   "optionalDependencies": {
-    "ominibot-linux-x64": "2.0.12",
-    "ominibot-linux-arm64": "2.0.12",
-    "ominibot-linux-x64-musl": "2.0.12",
-    "ominibot-linux-arm64-musl": "2.0.12",
-    "ominibot-darwin-x64": "2.0.12",
-    "ominibot-darwin-arm64": "2.0.12",
-    "ominibot-windows-x64": "2.0.12",
-    "ominibot-windows-arm64": "2.0.12"
+    "ominibot-linux-x64": "3.0.0",
+    "ominibot-linux-arm64": "3.0.0",
+    "ominibot-linux-x64-musl": "3.0.0",
+    "ominibot-linux-arm64-musl": "3.0.0",
+    "ominibot-darwin-x64": "3.0.0",
+    "ominibot-darwin-arm64": "3.0.0",
+    "ominibot-windows-x64": "3.0.0",
+    "ominibot-windows-arm64": "3.0.0"
   }
 }

package/postinstall.mjs

@@ -1,36 +1,29 @@
 #!/usr/bin/env node
 
-import childProcess from "child_process"
-import fs from "fs"
-import os from "os"
-import path from "path"
-import { createRequire } from "module"
-import { fileURLToPath } from "url"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
+import childProcess from "node:child_process"
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { createRequire } from "node:module"
+import { fileURLToPath } from "node:url"
+
+const directory = path.dirname(fileURLToPath(import.meta.url))
 const require = createRequire(import.meta.url)
-const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8"))
-
-const platformMap = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-}
-const archMap = {
-  x64: "x64",
-  arm64: "arm64",
-  arm: "arm",
-}
-
-const platform = platformMap[os.platform()] ?? os.platform()
-const arch = archMap[os.arch()] ?? os.arch()
-const base = `ominibot-${platform}-${arch}`
-const sourceBinary = platform === "windows" ? "ominibot.exe" : "ominibot"
-const targetBinary = path.join(__dirname, "bin", "ominibot.exe")
+const packageJson = JSON.parse(fs.readFileSync(path.join(directory, "package.json"), "utf8"))
+const command = Object.keys(packageJson.bin ?? {})[0]
+if (!command) throw new Error("Ominibot package does not declare a binary")
+const sourceCommand = packageJson.ominibotSourceBinary ?? command
+
+const platform = { darwin: "darwin", linux: "linux", win32: "windows" }[os.platform()] ?? os.platform()
+const arch = { x64: "x64", arm64: "arm64", arm: "arm" }[os.arch()] ?? os.arch()
+const sourceBinary = platform === "windows" ? `${sourceCommand}.exe` : sourceCommand
+const targetBinary = path.resolve(directory, packageJson.bin[command])
+const dependencies = packageJson.optionalDependencies ?? {}
+const base = Object.keys(dependencies).find((name) => name.endsWith(`-${platform}-${arch}`))
+if (!base) throw new Error(`Ominibot does not provide a binary for ${platform}-${arch}`)
 
 function supportsAvx2() {
   if (arch !== "x64") return false
-
   if (platform === "linux") {
     try {
       return /(^|\s)avx2(\s|$)/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
@@ -38,27 +31,23 @@ function supportsAvx2() {
       return false
     }
   }
-
   if (platform === "darwin") {
     try {
       const result = childProcess.spawnSync("sysctl", ["-n", "hw.optional.avx2_0"], {
         encoding: "utf8",
         timeout: 1500,
       })
-      if (result.status !== 0) return false
-      return (result.stdout || "").trim() === "1"
+      return result.status === 0 && (result.stdout || "").trim() === "1"
     } catch {
       return false
     }
   }
-
   if (platform === "windows") {
-    const command =
+    const script =
       '(Add-Type -MemberDefinition "[DllImport(""kernel32.dll"")] public static extern bool IsProcessorFeaturePresent(int ProcessorFeature);" -Name Kernel32 -Namespace Win32 -PassThru)::IsProcessorFeaturePresent(40)'
-
     for (const executable of ["powershell.exe", "pwsh.exe", "pwsh", "powershell"]) {
       try {
-        const result = childProcess.spawnSync(executable, ["-NoProfile", "-NonInteractive", "-Command", command], {
+        const result = childProcess.spawnSync(executable, ["-NoProfile", "-NonInteractive", "-Command", script], {
           encoding: "utf8",
           timeout: 3000,
           windowsHide: true,
@@ -72,20 +61,13 @@ function supportsAvx2() {
       }
     }
   }
-
   return false
 }
 
 function isMusl() {
   if (platform !== "linux") return false
-
   try {
     if (fs.existsSync("/etc/alpine-release")) return true
-  } catch {
-    // Ignore filesystem probes that are blocked by the host.
-  }
-
-  try {
     const result = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
     return `${result.stdout || ""}${result.stderr || ""}`.toLowerCase().includes("musl")
   } catch {
@@ -95,79 +77,90 @@ function isMusl() {
 
 function packageNames() {
   const baseline = arch === "x64" && !supportsAvx2()
+  const names =
+    platform === "linux"
+      ? isMusl()
+        ? arch === "x64"
+          ? baseline
+            ? [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base]
+            : [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]
+          : [`${base}-musl`, base]
+        : arch === "x64"
+          ? baseline
+            ? [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`]
+            : [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]
+          : [base, `${base}-musl`]
+      : arch === "x64"
+        ? baseline
+          ? [`${base}-baseline`, base]
+          : [base, `${base}-baseline`]
+        : [base]
+  return names.filter((name) => dependencies[name])
+}
 
-  if (platform === "linux") {
-    if (isMusl()) {
-      if (arch === "x64")
-        return baseline
-          ? [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base]
-          : [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]
-      return [`${base}-musl`, base]
-    }
-
-    if (arch === "x64")
-      return baseline
-        ? [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`]
-        : [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]
-    return [base, `${base}-musl`]
+function copyBinary(source) {
+  if (!fs.existsSync(source)) throw new Error(`Binary not found at ${source}`)
+  fs.mkdirSync(path.dirname(targetBinary), { recursive: true })
+  if (fs.existsSync(targetBinary)) {
+    try {
+      fs.unlinkSync(targetBinary)
+    } catch {}
   }
-
-  if (arch === "x64") return baseline ? [`${base}-baseline`, base] : [base, `${base}-baseline`]
-  return [base]
+  try {
+    fs.linkSync(source, targetBinary)
+  } catch {
+    fs.copyFileSync(source, targetBinary)
+  }
+  fs.chmodSync(targetBinary, 0o755)
 }
 
 function resolveBinary(name) {
-  const packageJsonPath = require.resolve(`${name}/package.json`)
-  const binaryPath = path.join(path.dirname(packageJsonPath), "bin", sourceBinary)
-  if (!fs.existsSync(binaryPath)) throw new Error(`Binary not found at ${binaryPath}`)
-  return binaryPath
+  const packagePath = require.resolve(`${name}/package.json`)
+  // Package managers keep an older platform package when the matching version is not yet on the registry,
+  // which would silently install the previous release under the new launcher.
+  const version = JSON.parse(fs.readFileSync(packagePath, "utf8")).version
+  if (version !== dependencies[name]) throw new Error(`${name} is ${version}, expected ${dependencies[name]}`)
+  return path.join(path.dirname(packagePath), "bin", sourceBinary)
 }
 
 function installPackage(name) {
-  const version = packageJson.optionalDependencies?.[name]
-  if (!version) return
-
   const temp = fs.mkdtempSync(path.join(os.tmpdir(), "ominibot-install-"))
   try {
     const result = childProcess.spawnSync(
       "npm",
-      ["install", "--ignore-scripts", "--no-save", "--loglevel=error", "--prefix", temp, `${name}@${version}`],
+      [
+        "install",
+        "--ignore-scripts",
+        "--no-save",
+        "--loglevel=error",
+        "--prefix",
+        temp,
+        `${name}@${dependencies[name]}`,
+      ],
       { stdio: "inherit", windowsHide: true },
     )
-    if (result.status !== 0) return
-    const packageDir = path.join(temp, "node_modules", name)
-    copyBinary(path.join(packageDir, "bin", sourceBinary), targetBinary)
+    if (result.status !== 0) return false
+    copyBinary(path.join(temp, "node_modules", name, "bin", sourceBinary))
     return true
   } finally {
     fs.rmSync(temp, { recursive: true, force: true })
   }
 }
 
-function copyBinary(source, target) {
-  if (!fs.existsSync(source)) throw new Error(`Binary not found at ${source}`)
-  fs.mkdirSync(path.dirname(target), { recursive: true })
-  if (fs.existsSync(target)) fs.unlinkSync(target)
-  try {
-    fs.linkSync(source, target)
-  } catch {
-    fs.copyFileSync(source, target)
-  }
-  fs.chmodSync(target, 0o755)
-}
-
 function verifyBinary() {
-  const result = childProcess.spawnSync(targetBinary, ["--version"], {
-    encoding: "utf8",
-    stdio: "ignore",
-    windowsHide: true,
-  })
-  return result.status === 0
+  return (
+    childProcess.spawnSync(targetBinary, ["--version"], {
+      stdio: "ignore",
+      windowsHide: true,
+    }).status === 0
+  )
 }
 
 function main() {
-  for (const name of packageNames()) {
+  const names = packageNames()
+  for (const name of names) {
     try {
-      copyBinary(resolveBinary(name), targetBinary)
+      copyBinary(resolveBinary(name))
       if (verifyBinary()) return
     } catch {
       if (installPackage(name) && verifyBinary()) return
@@ -176,16 +169,14 @@ function main() {
 
   throw new Error(
     ominibotUnsupportedReason() ??
-    `It seems your package manager failed to install the right ominibot CLI package. Try manually installing ${packageNames()
-      .map((name) => JSON.stringify(name))
-      .join(" or ")}.`,
+    `Failed to install Ominibot. Try manually installing ${names.map((name) => JSON.stringify(name)).join(" or ")}.`,
   )
 }
 
 try {
   main()
 } catch (error) {
-  console.error(error.message)
+  console.error(error instanceof Error ? error.message : String(error))
   process.exit(1)
 }