synsci 1.2.5 → 1.2.7

package/bin/synsci.mjs

@@ -25,7 +25,11 @@ import { createInterface } from "node:readline"
 import { fileURLToPath } from "node:url"
 
 const SELF_PATH = (() => {
-  try { return realpathSync(fileURLToPath(import.meta.url)) } catch { return "" }
+  try {
+    return realpathSync(fileURLToPath(import.meta.url))
+  } catch {
+    return ""
+  }
 })()
 
 const BOLD = "\x1b[1m"
@@ -54,8 +58,12 @@ const LOGO = [
   "╚══════╝ ╚═════╝╚═╝╚══════╝╚═╝  ╚═══╝ ╚═════╝╚══════╝╚══════╝",
 ]
 
-function ok(msg) { console.log(`  ${GREEN}✓${RESET} ${msg}`) }
-function warn(msg) { console.log(`  ${YELLOW}⚠${RESET} ${msg}`) }
+function ok(msg) {
+  console.log(`  ${GREEN}✓${RESET} ${msg}`)
+}
+function warn(msg) {
+  console.log(`  ${YELLOW}⚠${RESET} ${msg}`)
+}
 
 function spinner(msg) {
   const frames = ["◒", "◐", "◓", "◑"]
@@ -65,21 +73,50 @@ function spinner(msg) {
     process.stdout.write(`${CLEAR_LINE}  ${CYAN}${frames[i++ % frames.length]}${RESET} ${msg}`)
   }, 80)
   return {
-    ok(result) { clearInterval(id); process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`); ok(result) },
-    warn(result) { clearInterval(id); process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`); warn(result) },
-    fail(result) { clearInterval(id); process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`); console.log(`  ${RED}✗${RESET} ${result}`) },
-    update(m) { msg = m },
+    ok(result) {
+      clearInterval(id)
+      process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`)
+      ok(result)
+    },
+    warn(result) {
+      clearInterval(id)
+      process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`)
+      warn(result)
+    },
+    fail(result) {
+      clearInterval(id)
+      process.stdout.write(`${CLEAR_LINE}${SHOW_CURSOR}`)
+      console.log(`  ${RED}✗${RESET} ${result}`)
+    },
+    update(m) {
+      msg = m
+    },
   }
 }
 
 function runQuiet(cmd) {
-  try { return execSync(cmd, { encoding: "utf-8", stdio: "pipe" }).trim() }
-  catch { return null }
+  try {
+    return execSync(cmd, { encoding: "utf-8", stdio: "pipe" }).trim()
+  } catch {
+    return null
+  }
+}
+
+// Windows global installs expose a .cmd shim, which can't be exec'd
+// directly — it needs a shell (and the path quoted for it).
+const isCmdShim = (p) => process.platform === "win32" && p.toLowerCase().endsWith(".cmd")
+
+function execCli(file, args = [], opts = {}) {
+  if (isCmdShim(file)) return execSync(['"' + file + '"', ...args].join(" "), opts)
+  return execFileSync(file, args, opts)
 }
 
 function runFileQuiet(file, args = []) {
-  try { return execFileSync(file, args, { encoding: "utf-8", stdio: "pipe" }).trim() }
-  catch { return null }
+  try {
+    return execCli(file, args, { encoding: "utf-8", stdio: "pipe" }).trim()
+  } catch {
+    return null
+  }
 }
 
 function isLauncherPath(p) {
@@ -88,7 +125,9 @@ function isLauncherPath(p) {
     if (SELF_PATH && real === SELF_PATH) return true
     if (real.includes("/_npx/")) return true
     return false
-  } catch { return false }
+  } catch {
+    return false
+  }
 }
 
 // Returns the absolute path to the real @synsci/openscience binary (`openscience`).
@@ -97,20 +136,29 @@ function isLauncherPath(p) {
 // `--version` so half-broken installs are skipped instead of accepted.
 function resolveCli() {
   const candidates = []
-  // 1. Global npm prefix (where `npm i -g @synsci/openscience` puts it)
+  // 1. Global npm prefix (where `npm i -g @synsci/openscience` puts it).
+  // On Windows the global bin dir is the prefix itself and the entry is an
+  // openscience.cmd shim; on POSIX it's <prefix>/bin/openscience.
   const prefix = runQuiet("npm prefix -g")
-  if (prefix) candidates.push(join(prefix, "bin", "openscience"))
-  // 2. ~/.openscience/bin/openscience (curl-installer location)
-  candidates.push(join(homedir(), ".openscience", "bin", "openscience"))
+  if (prefix) {
+    if (process.platform === "win32") candidates.push(join(prefix, "openscience.cmd"))
+    else candidates.push(join(prefix, "bin", "openscience"))
+  }
+  // 2. ~/.openscience/bin/openscience (curl-installer location, POSIX only)
+  if (process.platform !== "win32") candidates.push(join(homedir(), ".openscience", "bin", "openscience"))
 
   for (const cand of candidates) {
     if (!existsSync(cand) || isLauncherPath(cand)) continue
     try {
-      const ver = execFileSync(cand, ["--version"], {
-        encoding: "utf-8", stdio: "pipe", timeout: 5000,
+      const ver = execCli(cand, ["--version"], {
+        encoding: "utf-8",
+        stdio: "pipe",
+        timeout: 5000,
       }).trim()
       if (/^\d/.test(ver)) return cand
-    } catch { /* unrunnable candidate, try next */ }
+    } catch {
+      /* unrunnable candidate, try next */
+    }
   }
   return null
 }
@@ -122,10 +170,16 @@ function resolveCli() {
 // still prints JSON, so read stdout either way.
 function hasDeprecatedCli() {
   let out = ""
-  try { out = execSync("npm ls -g @synsci/cli --depth=0 --json", { encoding: "utf-8", stdio: "pipe" }) }
-  catch (e) { out = e && typeof e.stdout === "string" ? e.stdout : "" }
-  try { return Boolean(JSON.parse(out).dependencies["@synsci/cli"]) }
-  catch { return false }
+  try {
+    out = execSync("npm ls -g @synsci/cli --depth=0 --json", { encoding: "utf-8", stdio: "pipe" })
+  } catch (e) {
+    out = e && typeof e.stdout === "string" ? e.stdout : ""
+  }
+  try {
+    return Boolean(JSON.parse(out).dependencies["@synsci/cli"])
+  } catch {
+    return false
+  }
 }
 
 function isConnected() {
@@ -136,10 +190,17 @@ function isConnected() {
     const data = JSON.parse(readFileSync(sessionPath, "utf-8"))
     if (!data.access_token || !data.expires_at) return false
     return new Date(data.expires_at) > new Date()
-  } catch { return false }
+  } catch {
+    return false
+  }
 }
 
 function atlasVersion() {
+  // `atlas` on PATH may be Ariga Atlas or the MongoDB Atlas CLI, whose
+  // --version output also survives the digit filter. Only trust the command
+  // when the global @synsci/atlas package is present to own it.
+  const owned = runQuiet("npm ls -g @synsci/atlas --depth=0")
+  if (!owned || !owned.includes("@synsci/atlas")) return null
   const raw = runQuiet("atlas --version")
   return raw ? raw.replace(/[^0-9.]/g, "") : null
 }
@@ -175,19 +236,27 @@ async function installOrUpdateAtlas() {
 async function ask(question) {
   const rl = createInterface({ input: process.stdin, output: process.stdout })
   return new Promise((resolve) => {
-    rl.question(question, (answer) => { rl.close(); resolve(answer.trim()) })
+    rl.question(question, (answer) => {
+      rl.close()
+      resolve(answer.trim())
+    })
   })
 }
 
 async function main() {
   process.on("exit", () => process.stdout.write(SHOW_CURSOR))
-  process.on("SIGINT", () => { process.stdout.write(SHOW_CURSOR); process.exit(130) })
+  process.on("SIGINT", () => {
+    process.stdout.write(SHOW_CURSOR)
+    process.exit(130)
+  })
 
   // --- Logo ---
   console.log()
   for (const line of LOGO) console.log(`   ${CYAN}${line}${RESET}`)
   console.log()
-  console.log(`   ${BOLD}Synthetic Sciences${RESET} ${DIM}OpenScience, the open-source AI research workspace · Atlas, the research platform${RESET}`)
+  console.log(
+    `   ${BOLD}Synthetic Sciences${RESET} ${DIM}OpenScience, the open-source AI research workspace · Atlas, the research platform${RESET}`,
+  )
   console.log()
 
   // --- Step 1: Install or upgrade the OpenScience CLI ---
@@ -215,7 +284,7 @@ async function main() {
       } else {
         s.update(`Upgrading ${current} → ${latest}...`)
         try {
-          execFileSync(cliPath, ["upgrade"], { stdio: "pipe" })
+          execCli(cliPath, ["upgrade"], { stdio: "pipe" })
           s.ok(`Upgraded to ${latest}`)
         } catch {
           s.warn(`Upgrade failed, continuing with ${current}`)
@@ -243,6 +312,13 @@ async function main() {
       if (!cliPath) throw new Error("openscience not on PATH after install")
       s.ok("Installed OpenScience")
     } catch {
+      // The standalone installer is a bash script; on native Windows there's
+      // no bash to pipe it into, so don't suggest a fallback that can't run.
+      if (process.platform === "win32") {
+        s.fail("Install failed")
+        console.log(`\n  Try manually: ${CYAN}npm i -g @synsci/openscience${RESET}\n`)
+        process.exit(1)
+      }
       // Global npm installs commonly fail on permissions. Fall back to the
       // standalone installer, which lands in ~/.openscience/bin without sudo
       // (resolveCli already checks that location).
@@ -265,9 +341,15 @@ async function main() {
   console.log()
   console.log(`  ${BOLD}How do you want to run it?${RESET}`)
   console.log()
-  console.log(`    ${BOLD}1${RESET}  ${CYAN}OpenScience${RESET}         ${DIM}free and open source, bring your own API keys, no account${RESET}`)
-  console.log(`    ${BOLD}2${RESET}  ${CYAN}OpenScience + Atlas${RESET} ${DIM}managed models, wallet billing, research graph & compute${RESET}`)
-  console.log(`    ${BOLD}3${RESET}  ${CYAN}Atlas CLI${RESET}           ${DIM}just the Atlas research CLI — maps, runs, and compute from the terminal${RESET}`)
+  console.log(
+    `    ${BOLD}1${RESET}  ${CYAN}OpenScience${RESET}         ${DIM}free and open source, bring your own API keys, no account${RESET}`,
+  )
+  console.log(
+    `    ${BOLD}2${RESET}  ${CYAN}OpenScience + Atlas${RESET} ${DIM}managed models, wallet billing, research graph & compute${RESET}`,
+  )
+  console.log(
+    `    ${BOLD}3${RESET}  ${CYAN}Atlas CLI${RESET}           ${DIM}just the Atlas research CLI — maps, runs, and compute from the terminal${RESET}`,
+  )
   console.log()
 
   const setup = await ask(`  ${DIM}❯${RESET} Choose [1/2/3]: `)
@@ -289,7 +371,9 @@ async function main() {
       ok("Connected to Atlas")
     } else {
       console.log()
-      console.log(`  ${DIM}Connect your Atlas account for managed credentials:${RESET} ${CYAN}openscience connect login${RESET}`)
+      console.log(
+        `  ${DIM}Connect your Atlas account for managed credentials:${RESET} ${CYAN}openscience connect login${RESET}`,
+      )
     }
     console.log()
     console.log(`  ${BOLD}Next steps${RESET}`)
@@ -306,7 +390,7 @@ async function main() {
     } else {
       console.log()
       try {
-        execFileSync(cliPath, ["connect", "login"], { stdio: "inherit" })
+        execCli(cliPath, ["connect", "login"], { stdio: "inherit" })
       } catch {}
     }
   } else {
@@ -319,7 +403,10 @@ async function main() {
   console.log(`  ${DIM}Opening the workspace in your browser…${RESET}`)
   console.log()
 
-  const child = spawn(cliPath, ["web", ...process.argv.slice(2)], { stdio: "inherit" })
+  const webArgs = ["web", ...process.argv.slice(2)]
+  const child = isCmdShim(cliPath)
+    ? spawn(['"' + cliPath + '"', ...webArgs].join(" "), { stdio: "inherit", shell: true })
+    : spawn(cliPath, webArgs, { stdio: "inherit" })
   child.on("close", (code) => process.exit(code ?? 0))
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "synsci",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Install wizard for OpenScience, the open-source AI research workspace (optionally with Atlas)",
   "license": "Apache-2.0",
   "type": "module",
@@ -25,4 +25,4 @@
     "url": "git+https://github.com/synthetic-sciences/openscience.git"
   },
   "homepage": "https://syntheticsciences.ai"
-}
+}