synsci 1.1.123 → 1.1.124

package/bin/synsci.mjs

@@ -12,7 +12,7 @@ if (process.env.__SYNSCI_LAUNCHER_PID) {
 }
 process.env.__SYNSCI_LAUNCHER_PID = String(process.pid)
 
-import { execSync, spawn } from "node:child_process"
+import { execFileSync, execSync, spawn } from "node:child_process"
 import { existsSync, readFileSync, realpathSync } from "node:fs"
 import { homedir } from "node:os"
 import { join } from "node:path"
@@ -66,21 +66,43 @@ function runQuiet(cmd) {
   catch { return null }
 }
 
-function isInstalled() {
-  const found = runQuiet("which synsci")
-  if (!found) return false
+function runFileQuiet(file, args = []) {
+  try { return execFileSync(file, args, { encoding: "utf-8", stdio: "pipe" }).trim() }
+  catch { return null }
+}
+
+function isLauncherPath(p) {
   try {
-    const real = realpathSync(found)
-    // Skip if resolves to this launcher itself — prevents the npx-cache recursion
-    // where `which synsci` finds the launcher's own bin and `synsci --version`
-    // re-invokes main() forever.
-    if (SELF_PATH && real === SELF_PATH) return false
-    // Belt-and-suspenders: an npx shim also routes back to a launcher
-    if (real.includes("/_npx/")) return false
-    return true
+    const real = realpathSync(p)
+    if (SELF_PATH && real === SELF_PATH) return true
+    if (real.includes("/_npx/")) return true
+    return false
   } catch { return false }
 }
 
+// Returns the absolute path to the real @synsci/cli binary, never the launcher
+// itself. Walks past PATH entries pointing at this script or any npx shim.
+function resolveCli() {
+  // 1. Global npm prefix (where `npm i -g @synsci/cli` puts it)
+  const prefix = runQuiet("npm prefix -g")
+  if (prefix) {
+    const cand = join(prefix, "bin", "synsci")
+    if (existsSync(cand) && !isLauncherPath(cand)) return cand
+  }
+  // 2. ~/.synsc/bin/synsci (used by @synsci/cli postinstall on some setups)
+  const synscBin = join(homedir(), ".synsc", "bin", "synsci")
+  if (existsSync(synscBin) && !isLauncherPath(synscBin)) return synscBin
+  // 3. Walk every PATH entry, return first that is NOT a launcher
+  for (const dir of (process.env.PATH || "").split(":")) {
+    if (!dir) continue
+    const cand = join(dir, "synsci")
+    if (existsSync(cand) && !isLauncherPath(cand)) return cand
+  }
+  return null
+}
+
+function isInstalled() { return resolveCli() !== null }
+
 function isConnected() {
   const xdgData = process.env.XDG_DATA_HOME || join(homedir(), ".local", "share")
   const sessionPath = join(xdgData, "synsc", "synsci-session.json")
@@ -111,8 +133,9 @@ async function main() {
   console.log()
 
   // --- Step 1: Install or upgrade ---
-  if (isInstalled()) {
-    const raw = runQuiet("synsci --version") || "unknown"
+  let cliPath = resolveCli()
+  if (cliPath) {
+    const raw = runFileQuiet(cliPath, ["--version"]) || "unknown"
     const isDev = raw === "local" || raw.includes("-")
     if (isDev) {
       ok(`synsci ${DIM}(dev build)${RESET}`)
@@ -125,7 +148,7 @@ async function main() {
       } else {
         s.update(`Upgrading ${current} \u2192 ${latest}...`)
         try {
-          execSync("synsci upgrade", { stdio: "pipe" })
+          execFileSync(cliPath, ["upgrade"], { stdio: "pipe" })
           s.ok(`Upgraded to ${latest}`)
         } catch {
           s.warn(`Upgrade failed, continuing with ${current}`)
@@ -136,9 +159,11 @@ async function main() {
     const s = spinner("Installing synsci...")
     try {
       execSync("npm i -g @synsci/cli@latest", { stdio: "pipe" })
+      cliPath = resolveCli()
+      if (!cliPath) throw new Error("real CLI not on PATH after install")
       s.ok("Installed synsci")
-    } catch {
-      s.fail("Install failed")
+    } catch (e) {
+      s.fail(`Install failed${e && e.message ? ": " + e.message : ""}`)
       console.log(`\n  Try manually: ${CYAN}npm i -g @synsci/cli${RESET}\n`)
       process.exit(1)
     }
@@ -150,7 +175,7 @@ async function main() {
   } else {
     console.log()
     try {
-      execSync("synsci connect login", { stdio: "inherit" })
+      execFileSync(cliPath, ["connect", "login"], { stdio: "inherit" })
     } catch {}
   }
 
@@ -167,7 +192,7 @@ async function main() {
   console.log()
 
   const cmd = choice === "2" ? ["web"] : []
-  const child = spawn("synsci", cmd, { stdio: "inherit" })
+  const child = spawn(cliPath, cmd, { stdio: "inherit" })
   child.on("close", (code) => process.exit(code ?? 0))
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "synsci",
-  "version": "1.1.123",
+  "version": "1.1.124",
   "description": "One command to install, connect, and launch Synthetic Sciences CLI",
   "license": "MIT",
   "type": "module",