slopcode 0.2.106 → 0.2.109

package/bin/slopcode

@@ -40,6 +40,7 @@ const archMap = {
   arm: "arm",
 }
 const supported = {
+  android: ["arm64", "x64"],
   darwin: ["arm64", "x64"],
   linux: ["arm64", "x64"],
   windows: ["x64"],
@@ -136,9 +137,8 @@ function supportsAvx2() {
 
 function names(prefix) {
   const kind = libc()
-  if (kind === "bionic") return []
-
-  const base = `${prefix}-${platform}-${arch}`
+  const base = kind === "bionic" ? `${prefix}-android-${arch}` : `${prefix}-${platform}-${arch}`
+  if (kind === "bionic") return [`@slopcode-ai/slopcode-android-${arch}`, base]
   const avx2 = supportsAvx2()
   const baseline = arch === "x64" && !avx2
 
@@ -206,25 +206,21 @@ function supportedMessage() {
 
 function termuxMessage() {
   return [
-    "SlopCode does not ship a native Android/Termux (bionic) binary yet.",
-    "Run SlopCode inside a Termux proot Linux distro:",
-    "  pkg install proot-distro",
-    "  proot-distro install debian",
-    "  proot-distro login debian",
-    "  apt update && apt install -y curl ca-certificates git",
-    "  curl -fsSL https://slopcode.dev/install | bash",
+    "SlopCode native Termux support needs the Android runtime package.",
+    "Install from Termux with optional npm dependencies enabled:",
+    "  pkg update",
+    "  pkg install nodejs git ripgrep neovim",
+    "  npm install -g slopcode@latest",
+    "If npm skipped optional dependencies, rerun with:",
+    "  npm install -g slopcode@latest --include=optional",
   ].join("\n")
 }
 
-if (libc() === "bionic") {
-  clearCache()
-  console.error(termuxMessage())
-  process.exit(1)
-}
+const useCache = libc() !== "bionic"
 
 const packageNames = names("slopcode-bin")
 const resolvedNames = Array.from(new Set([...packageNames, ...names("slopcode")]))
-const hit = cacheReady(resolvedNames)
+const hit = useCache ? cacheReady(resolvedNames) : undefined
 if (hit) {
   run(hit)
 }
@@ -268,6 +264,10 @@ function findBinary(startDir) {
 
 const resolved = resolveBinary() || findBinary(scriptDir)
 if (!resolved) {
+  if (libc() === "bionic") {
+    console.error(termuxMessage())
+    process.exit(1)
+  }
   console.error(
     "It seems that your package manager failed to install the right version of the slopcode CLI for your platform. You can try manually installing " +
       packageNames.map((n) => `\"${n}\"`).join(" or ") +

package/package.json

@@ -34,19 +34,19 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "0.2.106",
+  "version": "0.2.109",
   "license": "MIT",
   "optionalDependencies": {
-    "slopcode-bin-darwin-arm64": "0.2.106",
-    "slopcode-bin-linux-x64-baseline": "0.2.106",
-    "slopcode-bin-windows-x64": "0.2.106",
-    "slopcode-bin-linux-x64": "0.2.106",
-    "slopcode-bin-linux-x64-baseline-musl": "0.2.106",
-    "slopcode-bin-linux-x64-musl": "0.2.106",
-    "slopcode-bin-linux-arm64": "0.2.106",
-    "slopcode-bin-windows-x64-baseline": "0.2.106",
-    "slopcode-bin-linux-arm64-musl": "0.2.106",
-    "slopcode-bin-darwin-x64-baseline": "0.2.106",
-    "slopcode-bin-darwin-x64": "0.2.106"
+    "slopcode-bin-darwin-arm64": "0.2.109",
+    "slopcode-bin-linux-x64-baseline": "0.2.109",
+    "slopcode-bin-windows-x64": "0.2.109",
+    "slopcode-bin-linux-x64": "0.2.109",
+    "slopcode-bin-linux-x64-baseline-musl": "0.2.109",
+    "slopcode-bin-linux-x64-musl": "0.2.109",
+    "slopcode-bin-linux-arm64": "0.2.109",
+    "slopcode-bin-windows-x64-baseline": "0.2.109",
+    "slopcode-bin-linux-arm64-musl": "0.2.109",
+    "slopcode-bin-darwin-x64-baseline": "0.2.109",
+    "slopcode-bin-darwin-x64": "0.2.109"
   }
 }

package/postinstall.mjs

@@ -10,6 +10,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const require = createRequire(import.meta.url)
 const pkg = require("./package.json")
 const supported = {
+  android: ["arm64", "x64"],
   darwin: ["arm64", "x64"],
   linux: ["arm64", "x64"],
   windows: ["x64"],
@@ -91,9 +92,9 @@ function supportsAvx2(platform, arch) {
 }
 
 function names(platform, arch) {
-  const base = `slopcode-bin-${platform}-${arch}`
   const libc = detectLibc(platform, arch)
-  if (libc === "bionic") return []
+  const base = `slopcode-bin-${libc === "bionic" ? "android" : platform}-${arch}`
+  if (libc === "bionic") return [`@slopcode-ai/slopcode-android-${arch}`, base, `slopcode-android-${arch}`]
   const avx2 = supportsAvx2(platform, arch)
   const baseline = arch === "x64" && !avx2
 
@@ -141,13 +142,13 @@ function supportedMessage() {
 
 function termuxMessage() {
   return [
-    "SlopCode does not ship a native Android/Termux (bionic) binary yet.",
-    "Run SlopCode inside a Termux proot Linux distro:",
-    "  pkg install proot-distro",
-    "  proot-distro install debian",
-    "  proot-distro login debian",
-    "  apt update && apt install -y curl ca-certificates git",
-    "  curl -fsSL https://slopcode.dev/install | bash",
+    "SlopCode native Termux support needs the Android runtime package.",
+    "Install from Termux with optional npm dependencies enabled:",
+    "  pkg update",
+    "  pkg install nodejs git ripgrep neovim",
+    "  npm install -g slopcode@latest",
+    "If npm skipped optional dependencies, rerun with:",
+    "  npm install -g slopcode@latest --include=optional",
   ].join("\n")
 }
 
@@ -214,11 +215,6 @@ function writeMeta(input) {
 async function main() {
   try {
     const { platform, arch } = detectPlatformAndArch()
-    if (detectLibc(platform, arch) === "bionic") {
-      clearCache()
-      console.log(termuxMessage())
-      return
-    }
 
     if (!(supported[platform] ?? []).includes(arch)) {
       clearCache()
@@ -236,10 +232,19 @@ async function main() {
     const found = findBinary()
     if (!found) {
       clearCache()
-      console.log("No platform binary package detected during postinstall; runtime resolver will handle it")
+      console.log(
+        detectLibc(platform, arch) === "bionic"
+          ? termuxMessage()
+          : "No platform binary package detected during postinstall; runtime resolver will handle it",
+      )
       return
     }
 
+    if (found.libc === "bionic") {
+      clearCache()
+      console.log("Android/Termux runtime package detected; runtime resolver will launch it")
+      return
+    }
     clearCache()
     const target = path.join(__dirname, "bin", ".slopcode")
     const { targetPath } = prepareBinDirectory(".slopcode")