@axionorbital/tamarind 1.5.43 → 1.6.0

package/bin/tamarind

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+echo "Error: Tamarind's postinstall did not run, so the platform binary is missing." >&2
+echo "This happens with --ignore-scripts or package managers that skip postinstall." >&2
+echo "Fix: cd \"\$(npm root -g)/@axionorbital/tamarind\" && node postinstall.mjs" >&2
+exit 1

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@axionorbital/tamarind",
-  "version": "1.5.43",
+  "version": "1.6.0",
   "description": "Tamarind — verification-first coding agent for the terminal.",
   "bin": {
-    "tamarind": "bin/tamarind.mjs"
+    "tamarind": "bin/tamarind"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.mjs"
   },
   "files": [
     "bin",
+    "postinstall.mjs",
     "LICENSE",
     "THIRD-PARTY-NOTICES.md"
   ],
@@ -20,11 +24,10 @@
     "x64"
   ],
   "optionalDependencies": {
-    "@axionorbital/tamarind-darwin-arm64": "1.5.43",
-    "@axionorbital/tamarind-windows-x64": "1.5.43",
-    "@axionorbital/tamarind-linux-arm64": "1.5.43",
-    "@axionorbital/tamarind-linux-x64": "1.5.43",
-    "@axionorbital/tamarind-darwin-x64": "1.5.43"
+    "@axionorbital/tamarind-darwin-arm64": "1.6.0",
+    "@axionorbital/tamarind-linux-arm64": "1.6.0",
+    "@axionorbital/tamarind-linux-x64": "1.6.0",
+    "@axionorbital/tamarind-darwin-x64": "1.6.0"
   },
   "license": "UNLICENSED",
   "private": false,

package/postinstall.mjs

@@ -0,0 +1,157 @@
+#!/usr/bin/env node
+// Runs after `npm i -g @axionorbital/tamarind`. Picks the platform-matched
+// binary package that npm installed via optionalDependencies and links its
+// executable into ./bin/tamarind so the `tamarind` command works.
+
+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))
+const require = createRequire(import.meta.url)
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8"))
+
+const SCOPE = "@axionorbital/tamarind"
+
+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 = `${SCOPE}-${platform}-${arch}`
+// What to copy FROM the platform package (build.ts names the binary `tamarind`).
+const sourceBinary = platform === "windows" ? "tamarind.exe" : "tamarind"
+// Target matching the resolver's bin field, so the `tamarind` command links.
+const targetBinary = path.join(__dirname, "bin", "tamarind")
+
+function supportsAvx2() {
+  if (arch !== "x64") return false
+  if (platform === "linux") {
+    try {
+      return /(^|\s)avx2(\s|$)/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
+    } catch {
+      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"
+    } catch {
+      return false
+    }
+  }
+  return false
+}
+
+function isMusl() {
+  if (platform !== "linux") return false
+  try {
+    if (fs.existsSync("/etc/alpine-release")) return true
+  } catch {
+    // host may block the probe
+  }
+  try {
+    const result = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
+    return `${result.stdout || ""}${result.stderr || ""}`.toLowerCase().includes("musl")
+  } catch {
+    return false
+  }
+}
+
+function packageNames() {
+  const baseline = arch === "x64" && !supportsAvx2()
+  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`]
+  }
+  if (arch === "x64") return baseline ? [`${base}-baseline`, base] : [base, `${base}-baseline`]
+  return [base]
+}
+
+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
+}
+
+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 installPackage(name) {
+  const version = packageJson.optionalDependencies?.[name]
+  if (!version) return
+  const temp = fs.mkdtempSync(path.join(os.tmpdir(), "tamarind-install-"))
+  try {
+    const result = childProcess.spawnSync(
+      "npm",
+      ["install", "--ignore-scripts", "--no-save", "--loglevel=error", "--prefix", temp, `${name}@${version}`],
+      { stdio: "inherit", windowsHide: true },
+    )
+    if (result.status !== 0) return
+    const packageDir = path.join(temp, "node_modules", name)
+    copyBinary(path.join(packageDir, "bin", sourceBinary), targetBinary)
+    return true
+  } finally {
+    fs.rmSync(temp, { recursive: true, force: true })
+  }
+}
+
+function verifyBinary() {
+  const result = childProcess.spawnSync(targetBinary, ["--version"], {
+    encoding: "utf8",
+    stdio: "ignore",
+    windowsHide: true,
+  })
+  return result.status === 0
+}
+
+function main() {
+  for (const name of packageNames()) {
+    try {
+      copyBinary(resolveBinary(name), targetBinary)
+      if (verifyBinary()) return
+    } catch {
+      if (installPackage(name) && verifyBinary()) return
+    }
+  }
+  throw new Error(
+    `Could not find a Tamarind binary for your platform. Try manually installing ${packageNames()
+      .map((name) => JSON.stringify(name))
+      .join(" or ")}.`,
+  )
+}
+
+try {
+  main()
+} catch (error) {
+  console.error(error.message)
+  process.exit(1)
+}

package/bin/tamarind.mjs

@@ -1,133 +0,0 @@
-#!/usr/bin/env node
-// Resolver entry for `@axionorbital/tamarind`. Shipped as the package's `bin`
-// (bin/tamarind.mjs). At RUNTIME it resolves the platform-matched binary that npm
-// installed via this package's optionalDependencies and execs it, forwarding
-// argv, stdio, exit code and signals.
-//
-// Why a JS launcher instead of the old postinstall+stub: npm links a package's
-// `bin` BEFORE running install scripts, generating the Windows .cmd/.ps1 shims
-// from the bin target's shebang at that moment. The old design pointed `bin` at a
-// `#!/usr/bin/env sh` stub, so the shim baked in `sh` execution; postinstall then
-// overwrote the stub with a native Windows PE, leaving the shim running
-// `sh <tamarind.exe>` → "cannot execute binary file". Pointing `bin` at THIS node
-// script makes npm shim `node tamarind.mjs` identically on every OS — no
-// shebang/swap race, no extensionless-PE problem — and lets us drop the
-// postinstall entirely (optionalDependencies install natively, no scripts).
-
-import { createRequire } from "node:module"
-import fs from "node:fs"
-import os from "node:os"
-import path from "node:path"
-import childProcess from "node:child_process"
-const { spawnSync } = childProcess
-
-const require = createRequire(import.meta.url)
-
-// Resolution mirrors the prior postinstall so a given host picks the SAME
-// platform package. build.ts names dirs win32→windows.
-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 = `@axionorbital/tamarind-${platform}-${arch}`
-// Windows ships bin/tamarind.exe (a PE needs the extension to spawn); every other
-// platform ships bin/tamarind.
-const sourceBinary = platform === "windows" ? "tamarind.exe" : "tamarind"
-
-function supportsAvx2() {
-  if (arch !== "x64") return false
-  if (platform === "linux") {
-    try {
-      return /(^|\s)avx2(\s|$)/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
-    } catch {
-      return false
-    }
-  }
-  if (platform === "darwin") {
-    try {
-      const r = childProcess.spawnSync("sysctl", ["-n", "hw.optional.avx2_0"], { encoding: "utf8", timeout: 1500 })
-      return r.status === 0 && (r.stdout || "").trim() === "1"
-    } catch {
-      return false
-    }
-  }
-  return false
-}
-
-function isMusl() {
-  if (platform !== "linux") return false
-  try {
-    if (fs.existsSync("/etc/alpine-release")) return true
-  } catch {}
-  try {
-    const r = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
-    return `${r.stdout || ""}${r.stderr || ""}`.toLowerCase().includes("musl")
-  } catch {
-    return false
-  }
-}
-
-// Candidate package names, most-specific first, mirroring postinstall's chain so
-// baseline (no-AVX2) and musl variant packages resolve when present.
-function packageNames() {
-  const baseline = arch === "x64" && !supportsAvx2()
-  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`]
-  }
-  if (arch === "x64") return baseline ? [`${base}-baseline`, base] : [base, `${base}-baseline`]
-  return [base]
-}
-
-function resolveBinary() {
-  const tried = []
-  for (const name of packageNames()) {
-    tried.push(name)
-    try {
-      const pkgJson = require.resolve(`${name}/package.json`)
-      const bin = path.join(path.dirname(pkgJson), "bin", sourceBinary)
-      if (fs.existsSync(bin)) return bin
-    } catch {
-      // not installed for this host — try the next candidate
-    }
-  }
-  return { error: tried }
-}
-
-const resolved = resolveBinary()
-if (typeof resolved !== "string") {
-  console.error(
-    `Tamarind: no platform binary found for ${platform}-${arch}. Expected one of: ` +
-      `${resolved.error.join(", ")}. Reinstall with \`npm i -g @axionorbital/tamarind\` ` +
-      `(ensure optional dependencies are not disabled).`,
-  )
-  process.exit(1)
-}
-
-// Exec the native binary. stdio:"inherit" preserves the real TTY (raw mode for the
-// TUI). No shell:true — args pass through verbatim (no mangling/injection).
-const child = spawnSync(resolved, process.argv.slice(2), { stdio: "inherit", windowsHide: false })
-
-if (child.error) {
-  console.error(`Tamarind: failed to launch ${resolved}: ${child.error.message}`)
-  process.exit(1)
-}
-// Re-raise a terminating signal (Ctrl-C etc.) so the parent's exit reflects it;
-// otherwise forward the child's numeric exit code.
-if (child.signal) {
-  try {
-    process.kill(process.pid, child.signal)
-  } catch {}
-  process.exit(1)
-}
-process.exit(child.status ?? 0)