slopcode 0.2.138 → 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)
-

package/bundle/index.js

@@ -56350,7 +56350,7 @@ var init_installation = __esm(async () => {
       await $2`${process.execPath} --version`.nothrow().quiet().text();
     }
     Installation.upgrade = upgrade;
-    Installation.VERSION = "0.2.138";
+    Installation.VERSION = "0.2.140";
     Installation.CHANNEL = "latest";
     Installation.USER_AGENT = `${product.id}/${Installation.CHANNEL}/${Installation.VERSION}/${Flag.SLOPCODE_CLIENT}`;
     async function latest(installMethod) {
@@ -405185,11 +405185,14 @@ await init_app();
 init_ui();
 import fs38 from "fs";
 import path103 from "path";
+function bionic() {
+  return process.env.SLOPCODE_BIONIC === "1" || process.env.TERMUX_VERSION !== undefined || process.env.PREFIX?.includes("/com.termux/");
+}
 function native(input2 = { platform: process.platform, override: process.env.SLOPCODE_ANDROID_TUI }) {
-  return input2.platform !== "android";
+  return !android(input2);
 }
 function android(input2 = { platform: process.platform, override: process.env.SLOPCODE_ANDROID_TUI }) {
-  return input2.platform === "android";
+  return input2.platform === "android" || input2.platform === process.platform && bionic();
 }
 function client5(root4 = process.env.SLOPCODE_ANDROID_ROOT) {
   const host2 = root4 && path103.join(root4, "bin", "slopcode-android-host");

package/bundle/worker.js

@@ -27961,7 +27961,7 @@ var init_installation = __esm(async () => {
       await $`${process.execPath} --version`.nothrow().quiet().text();
     }
     Installation.upgrade = upgrade;
-    Installation.VERSION = "0.2.138";
+    Installation.VERSION = "0.2.140";
     Installation.CHANNEL = "latest";
     Installation.USER_AGENT = `${product.id}/${Installation.CHANNEL}/${Installation.VERSION}/${Flag.SLOPCODE_CLIENT}`;
     async function latest(installMethod) {

package/package.json

@@ -36,20 +36,20 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "0.2.138",
+  "version": "0.2.140",
   "license": "MIT",
   "optionalDependencies": {
-    "slopcode-bin-darwin-x64-baseline": "0.2.138",
-    "slopcode-bin-linux-x64-baseline": "0.2.138",
-    "slopcode-bin-linux-x64-musl": "0.2.138",
-    "slopcode-bin-windows-x64": "0.2.138",
-    "slopcode-bin-darwin-x64": "0.2.138",
-    "slopcode-bin-windows-x64-baseline": "0.2.138",
-    "slopcode-bin-darwin-arm64": "0.2.138",
-    "slopcode-bin-linux-x64-baseline-musl": "0.2.138",
-    "slopcode-bin-linux-x64": "0.2.138",
-    "slopcode-bin-linux-arm64-musl": "0.2.138",
-    "slopcode-bin-linux-arm64": "0.2.138",
+    "slopcode-bin-darwin-x64-baseline": "0.2.140",
+    "slopcode-bin-linux-x64-baseline": "0.2.140",
+    "slopcode-bin-linux-x64-musl": "0.2.140",
+    "slopcode-bin-windows-x64": "0.2.140",
+    "slopcode-bin-darwin-x64": "0.2.140",
+    "slopcode-bin-windows-x64-baseline": "0.2.140",
+    "slopcode-bin-darwin-arm64": "0.2.140",
+    "slopcode-bin-linux-x64-baseline-musl": "0.2.140",
+    "slopcode-bin-linux-x64": "0.2.140",
+    "slopcode-bin-linux-arm64-musl": "0.2.140",
+    "slopcode-bin-linux-arm64": "0.2.140",
     "@oven/bun-linux-aarch64-android": "1.3.14",
     "@oven/bun-linux-x64-android": "1.3.14"
   }

package/postinstall.mjs

@@ -39,7 +39,7 @@ function termuxEnv() {
 }
 
 function detectLibc(platform, arch) {
-  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) {
@@ -59,7 +59,7 @@ function detectLibc(platform, arch) {
   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"
 }
@@ -142,7 +142,7 @@ function supportedMessage() {
 
 function termuxMessage() {
   return [
-    "SlopCode native Termux support could not install the Android runtime.",
+    "SlopCode native Termux support could not install the Android runtime/bootstrap.",
     "Install from Termux with:",
     "  pkg update",
     "  pkg install nodejs git ripgrep neovim tar",
@@ -163,6 +163,21 @@ function androidUrl(arch) {
   return `https://github.com/teamslop/slopcode/releases/download/v${pkg.version}/slopcode-android-${arch}.tar.gz`
 }
 
+const androidBunVersion = "1.3.14"
+
+function androidBunPackage(arch) {
+  return arch === "arm64" ? "bun-linux-aarch64-android" : "bun-linux-x64-android"
+}
+
+function androidBunTarget(arch) {
+  return path.join(__dirname, "node_modules", "@oven", androidBunPackage(arch))
+}
+
+function androidBunUrl(arch) {
+  const name = androidBunPackage(arch)
+  return `https://registry.npmjs.org/@oven/${name}/-/${name}-${androidBunVersion}.tgz`
+}
+
 async function androidAsset(arch, tmp) {
   if (process.env.SLOPCODE_ANDROID_ASSET_PATH) return process.env.SLOPCODE_ANDROID_ASSET_PATH
   const out = path.join(tmp, `slopcode-android-${arch}.tar.gz`)
@@ -206,6 +221,51 @@ async function installAndroid(arch) {
   }
 }
 
+async function androidBunAsset(arch, tmp) {
+  if (process.env.SLOPCODE_ANDROID_BUN_ASSET_PATH) return process.env.SLOPCODE_ANDROID_BUN_ASSET_PATH
+  const out = path.join(tmp, `${androidBunPackage(arch)}.tgz`)
+  const res = await fetch(process.env.SLOPCODE_ANDROID_BUN_ASSET_URL || androidBunUrl(arch))
+  if (!res.ok) throw new Error(`Failed to download Android Bun bootstrap: ${res.status} ${res.statusText}`)
+  await fs.promises.writeFile(out, Buffer.from(await res.arrayBuffer()))
+  return out
+}
+
+async function installAndroidBun(arch) {
+  const target = androidBunTarget(arch)
+  const existing = path.join(target, "bin", "bun")
+  if (fs.existsSync(existing)) {
+    fs.chmodSync(existing, 0o755)
+    return "detected"
+  }
+
+  const tmp = await fs.promises.mkdtemp(path.join(os.tmpdir(), "slopcode-android-bun-"))
+  try {
+    const archive = await androidBunAsset(arch, tmp)
+    const extract = path.join(tmp, "extract")
+    await fs.promises.mkdir(extract, { recursive: true })
+    const result = require("child_process").spawnSync("tar", ["-xzf", path.basename(archive), "-C", extract], {
+      cwd: path.dirname(archive),
+      encoding: "utf8",
+      timeout: 120000,
+    })
+    if (result.status !== 0) {
+      throw new Error((result.stderr || result.stdout || "tar failed").trim())
+    }
+    const source = fs.existsSync(path.join(extract, "package", "bin", "bun"))
+      ? path.join(extract, "package")
+      : extract
+    const binary = path.join(source, "bin", "bun")
+    if (!fs.existsSync(binary)) throw new Error("Downloaded Android Bun bootstrap is missing bin/bun")
+    await fs.promises.rm(target, { recursive: true, force: true })
+    await fs.promises.mkdir(path.dirname(target), { recursive: true })
+    await fs.promises.rename(source, target)
+    fs.chmodSync(path.join(target, "bin", "bun"), 0o755)
+    return "installed"
+  } finally {
+    await fs.promises.rm(tmp, { recursive: true, force: true })
+  }
+}
+
 function findBinary() {
   const { platform, arch } = detectPlatformAndArch()
   const binaryName = platform === "windows" ? "slopcode.exe" : "slopcode"
@@ -289,7 +349,8 @@ async function main() {
       if (detectLibc(platform, arch) === "bionic") {
         try {
           await installAndroid(arch)
-          console.log("Android/Termux runtime installed from GitHub release asset")
+          await installAndroidBun(arch)
+          console.log("Android/Termux runtime and bootstrap installed from release assets")
         } catch (error) {
           console.log(termuxMessage())
           console.error(error.message)
@@ -302,7 +363,13 @@ async function main() {
 
     if (found.libc === "bionic") {
       clearCache()
-      console.log("Android/Termux runtime package detected; runtime resolver will launch it")
+      try {
+        await installAndroidBun(arch)
+        console.log("Android/Termux runtime package detected; runtime resolver will launch it")
+      } catch (error) {
+        console.log(termuxMessage())
+        console.error(error.message)
+      }
       return
     }
     clearCache()