slopcode 0.2.137 → 0.2.140

package/bin/slopcode

@@ -77,7 +77,7 @@ function termuxEnv() {
 }
 
 function libc() {
-  if (platform === "android") return "bionic"
+  if (platform === "android" || termuxEnv()) return "bionic"
   if (platform !== "linux") return
   const report = process.report?.getReport?.()
   if (typeof report?.header?.glibcVersionRuntime === "string" && report.header.glibcVersionRuntime) {
@@ -97,7 +97,7 @@ function libc() {
   const text = ((result.stdout || "") + (result.stderr || "")).toLowerCase()
   if (text.includes("musl")) return "musl"
   if (text.includes("glibc") || text.includes("gnu libc")) return "glibc"
-  if (text.includes("bionic") || termuxEnv()) return "bionic"
+  if (text.includes("bionic")) return "bionic"
   const loader = arch === "arm64" ? "/lib/ld-musl-aarch64.so.1" : arch === "x64" ? "/lib/ld-musl-x86_64.so.1" : ""
   if (loader && fs.existsSync(loader)) return "musl"
 }
@@ -223,7 +223,18 @@ function androidDoctor(args) {
 }
 
 function androidInteractive(args) {
-  return !androidDoctor(args) && !args.includes("--self-test")
+  return !androidDoctor(args) && args[0] !== "--version" && !args.includes("--self-test")
+}
+
+function findNodeModuleFile(startDir, parts) {
+  let current = startDir
+  for (;;) {
+    const candidate = path.join(current, "node_modules", ...parts)
+    if (fs.existsSync(candidate)) return candidate
+    const parent = path.dirname(current)
+    if (parent === current) return
+    current = parent
+  }
 }
 
 function androidBun(arch) {
@@ -231,7 +242,9 @@ function androidBun(arch) {
   return [
     process.env.SLOPCODE_BUN_PATH,
     path.join(rootDir, "node_modules", "@oven", name, "bin", "bun"),
+    findNodeModuleFile(scriptDir, ["@oven", name, "bin", "bun"]),
     path.join(rootDir, "node_modules", ".bin", process.platform === "win32" ? "bun.cmd" : "bun"),
+    findNodeModuleFile(scriptDir, [".bin", process.platform === "win32" ? "bun.cmd" : "bun"]),
   ].find((item) => item && fs.existsSync(item))
 }
 
@@ -296,8 +309,14 @@ if (!resolved) {
 }
 
 const args = process.argv.slice(2)
-if (platform === "android" && androidInteractive(args)) {
+if (libc() === "bionic" && androidInteractive(args)) {
   const bun = androidBun(arch)
+  if (!fs.existsSync(androidBundle)) {
+    console.error(
+      "SlopCode Android CLI bootstrap bundle is missing. Reinstall from Termux with: npm install -g slopcode@latest --include=optional",
+    )
+    process.exit(1)
+  }
   if (bun && fs.existsSync(androidBundle)) {
     const runtimeRoot = path.dirname(path.dirname(resolved.path))
     run(bun, {
@@ -313,13 +332,12 @@ if (platform === "android" && androidInteractive(args)) {
       },
     })
   }
-  if (fs.existsSync(androidBundle) && !bun) {
+  if (!bun) {
     console.error(
-      "SlopCode Android CLI bootstrap is missing. Reinstall from Termux with: npm install -g slopcode@latest --include=optional",
+      "SlopCode Android CLI bootstrap is missing. Run npm rebuild slopcode or reinstall from Termux with: npm install -g slopcode@latest --include=optional",
     )
     process.exit(1)
   }
 }
 
 run(resolved.path)
-