slopcode 0.2.138 → 0.2.141

package/bin/slopcode

@@ -7,7 +7,19 @@ const path = require("path")
 const os = require("os")
 const pkg = require("../package.json")
 
+const startupStart = Date.now()
+function startupTraceEnabled() {
+  const value = (process.env.SLOPCODE_ANDROID_STARTUP_LOG || "").toLowerCase()
+  return value === "1" || value === "true" || value === "on"
+}
+
+function startupLog(phase, extra = {}) {
+  if (!startupTraceEnabled()) return
+  console.error(JSON.stringify({ event: "android.startup", phase, ms: Date.now() - startupStart, ...extra }))
+}
+
 function run(target, options = {}) {
+  startupLog("launcher.exec", { target: path.basename(target) })
   const result = childProcess.spawnSync(target, options.args || process.argv.slice(2), {
     stdio: "inherit",
     env: options.env ? { ...process.env, ...options.env } : process.env,
@@ -51,6 +63,7 @@ const supported = {
 
 const rawPlatform = process.env.SLOPCODE_TEST_PLATFORM || os.platform()
 const rawArch = process.env.SLOPCODE_TEST_ARCH || os.arch()
+startupLog("launcher.start", { platform: rawPlatform, arch: rawArch })
 let platform = platformMap[rawPlatform]
 if (!platform) {
   platform = rawPlatform
@@ -77,7 +90,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 +110,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 +236,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 +255,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,10 +322,22 @@ if (!resolved) {
 }
 
 const args = process.argv.slice(2)
-if (platform === "android" && androidInteractive(args)) {
+if (libc() === "bionic" && androidInteractive(args)) {
   const bun = androidBun(arch)
+  startupLog("launcher.android.interactive", {
+    runtime: path.basename(resolved.path),
+    bun: bun ? path.basename(bun) : undefined,
+    legacy: process.env.SLOPCODE_ANDROID_BOOTSTRAP === "legacy",
+  })
+  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))
+    startupLog("launcher.android.legacy_bundle", { bundle: androidBundle })
     run(bun, {
       args: [androidBundle, ...args],
       env: {
@@ -313,13 +351,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)
-