@cubic-dev-ai/cli 1.6.2-beijing.2 → 1.6.3

package/bin/cubic

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+
+import fs from "fs"
+import path from "path"
+import { spawnSync } from "child_process"
+import { fileURLToPath } from "url"
+
+function platformName() {
+  if (process.platform === "win32") return "windows"
+  return process.platform
+}
+
+function archName() {
+  if (process.arch === "ia32") return "x86"
+  return process.arch
+}
+
+function resolveBinary() {
+  if (process.env.CUBIC_BIN_PATH) return process.env.CUBIC_BIN_PATH
+
+  const script = fs.realpathSync(fileURLToPath(import.meta.url))
+  const platform = platformName()
+  const arch = archName()
+  const name = `@cubic-dev-ai/cli-${platform}-${arch}`
+  const binary = platform === "windows" ? "cubic.exe" : "cubic"
+  let dir = path.dirname(script)
+
+  while (true) {
+    const candidate = path.join(dir, "node_modules", name, "bin", binary)
+    if (fs.existsSync(candidate)) return candidate
+
+    const parent = path.dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+
+  console.error(
+    `It seems that your package manager failed to install the right version of the cubic CLI for your platform. You can try manually installing the "${name}" package`,
+  )
+  process.exit(1)
+}
+
+const binary = resolveBinary()
+const args = process.argv.slice(2)
+const command = args.length === 0 && process.env.npm_command === "exec" ? ["setup", "--mode", "install"] : args
+const result = spawnSync(binary, command, /*__CUBIC_SPAWN_OPTS__*/ { stdio: "inherit", windowsHide: false })
+
+if (result.error) {
+  console.error(result.error.message)
+  process.exit(1)
+}
+
+if (result.signal) {
+  try {
+    process.kill(process.pid, result.signal)
+  } catch {
+    process.exit(1)
+  }
+}
+
+process.exit(result.status ?? 1)

package/bin/cubic.cmd

@@ -25,7 +25,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
     set "arch=x64"
 )
 
-set "name=@cubic-dev-ai\cli-!platform!-!arch!"
+set "name=@cubic-dev-ai/cli-!platform!-!arch!"
 set "binary=cubic.exe"
 
 rem Search for the binary starting from script location

package/bin/cubic.wrapper

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+
+import fs from "fs"
+import path from "path"
+import { spawnSync } from "child_process"
+import { fileURLToPath } from "url"
+
+function platformName() {
+  if (process.platform === "win32") return "windows"
+  return process.platform
+}
+
+function archName() {
+  if (process.arch === "ia32") return "x86"
+  return process.arch
+}
+
+function resolveBinary() {
+  if (process.env.CUBIC_BIN_PATH) return process.env.CUBIC_BIN_PATH
+
+  const script = fs.realpathSync(fileURLToPath(import.meta.url))
+  const platform = platformName()
+  const arch = archName()
+  const name = `@cubic-dev-ai/cli-${platform}-${arch}`
+  const binary = platform === "windows" ? "cubic.exe" : "cubic"
+  let dir = path.dirname(script)
+
+  while (true) {
+    const candidate = path.join(dir, "node_modules", name, "bin", binary)
+    if (fs.existsSync(candidate)) return candidate
+
+    const parent = path.dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+
+  console.error(
+    `It seems that your package manager failed to install the right version of the cubic CLI for your platform. You can try manually installing the "${name}" package`,
+  )
+  process.exit(1)
+}
+
+const binary = resolveBinary()
+const args = process.argv.slice(2)
+const command = args.length === 0 && process.env.npm_command === "exec" ? ["setup", "--mode", "install"] : args
+const result = spawnSync(binary, command, /*__CUBIC_SPAWN_OPTS__*/ { stdio: "inherit", windowsHide: false })
+
+if (result.error) {
+  console.error(result.error.message)
+  process.exit(1)
+}
+
+if (result.signal) {
+  try {
+    process.kill(process.pid, result.signal)
+  } catch {
+    process.exit(1)
+  }
+}
+
+process.exit(result.status ?? 1)

package/package.json

@@ -1,27 +1,30 @@
 {
   "name": "@cubic-dev-ai/cli",
-  "version": "1.6.2-beijing.2",
   "type": "module",
   "bin": {
-    "cubic": "./bin/cubic.cmd"
+    "cubic": "./bin/cubic"
   },
   "scripts": {
-    "preinstall": "node ./preinstall.mjs",
-    "postinstall": "node ./postinstall.mjs"
+    "preinstall": "bun ./preinstall.mjs || node ./preinstall.mjs",
+    "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "os": [
-    "win32"
-  ],
-  "cpu": [
-    "x64"
-  ],
+  "version": "1.6.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mrge-io/cubic-cli.git",
     "directory": "packages/cubic"
   },
   "optionalDependencies": {
-    "@cubic-dev-ai/cli-windows-x64": "1.6.2-beijing.2",
-    "@cubic-dev-ai/cli-windows-x64-baseline": "1.6.2-beijing.2"
+    "@cubic-dev-ai/cli-linux-arm64": "1.6.3",
+    "@cubic-dev-ai/cli-linux-x64": "1.6.3",
+    "@cubic-dev-ai/cli-linux-x64-baseline": "1.6.3",
+    "@cubic-dev-ai/cli-linux-arm64-musl": "1.6.3",
+    "@cubic-dev-ai/cli-linux-x64-musl": "1.6.3",
+    "@cubic-dev-ai/cli-linux-x64-baseline-musl": "1.6.3",
+    "@cubic-dev-ai/cli-darwin-arm64": "1.6.3",
+    "@cubic-dev-ai/cli-darwin-x64": "1.6.3",
+    "@cubic-dev-ai/cli-darwin-x64-baseline": "1.6.3",
+    "@cubic-dev-ai/cli-windows-x64": "1.6.3",
+    "@cubic-dev-ai/cli-windows-x64-baseline": "1.6.3"
   }
-}
+}

package/preinstall.mjs

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
 
-import fs from "fs"
-import path from "path"
 import os from "os"
-import { fileURLToPath } from "url"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 function main() {
   if (os.platform() !== "win32") {
@@ -13,27 +8,7 @@ function main() {
     return
   }
 
-  console.log("Windows detected: Modifying package.json bin entry")
-
-  // Read package.json
-  const packageJsonPath = path.join(__dirname, "package.json")
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"))
-
-  // Modify bin to point to .cmd file on Windows
-  packageJson.bin = {
-    cubic: "./bin/cubic.cmd",
-  }
-
-  // Write it back
-  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
-  console.log("Updated package.json bin to use cubic.cmd")
-
-  // Now you can also remove the Unix script if you want
-  const unixScript = path.join(__dirname, "bin", "cubic")
-  if (fs.existsSync(unixScript)) {
-    console.log("Removing Unix shell script")
-    fs.unlinkSync(unixScript)
-  }
+  console.log("Windows detected: using Node bin wrapper")
 }
 
 try {