synsci 1.2.2 → 1.2.5

package/bin/synsci.mjs

@@ -40,18 +40,18 @@ const SHOW_CURSOR = "\x1b[?25h"
 const CLEAR_LINE = "\x1b[2K\r"
 
 const LOGO = [
-  " ██████╗ ██████╗ ███████╗███╗   ██╗",
-  "██╔═══██╗██╔══██╗██╔════╝████╗  ██║",
-  "██║   ██║██████╔╝█████╗  ██╔██╗ ██║",
-  "██║   ██║██╔═══╝ ██╔══╝  ██║╚██╗██║",
-  "╚██████╔╝██║     ███████╗██║ ╚████║",
-  " ╚═════╝ ╚═╝     ╚══════╝╚═╝  ╚═══╝",
-  "███████╗ ██████╗██╗███████╗███╗   ██╗ ██████╗███████╗",
-  "██╔════╝██╔════╝██║██╔════╝████╗  ██║██╔════╝██╔════╝",
-  "███████╗██║     ██║█████╗  ██╔██╗ ██║██║     █████╗  ",
-  "╚════██║██║     ██║██╔══╝  ██║╚██╗██║██║     ██╔══╝  ",
-  "███████║╚██████╗██║███████╗██║ ╚████║╚██████╗███████╗",
-  "╚══════╝ ╚═════╝╚═╝╚══════╝╚═╝  ╚═══╝ ╚═════╝╚══════╝",
+  "███████╗██╗   ██╗███╗   ██╗████████╗██╗  ██╗███████╗████████╗██╗ ██████╗",
+  "██╔════╝╚██╗ ██╔╝████╗  ██║╚══██╔══╝██║  ██║██╔════╝╚══██╔══╝██║██╔════╝",
+  "███████╗ ╚████╔╝ ██╔██╗ ██║   ██║   ███████║█████╗     ██║   ██║██║     ",
+  "╚════██║  ╚██╔╝  ██║╚██╗██║   ██║   ██╔══██║██╔══╝     ██║   ██║██║     ",
+  "███████║   ██║   ██║ ╚████║   ██║   ██║  ██║███████╗   ██║   ██║╚██████╗",
+  "╚══════╝   ╚═╝   ╚═╝  ╚═══╝   ╚═╝   ╚═╝  ╚═╝╚══════╝   ╚═╝   ╚═╝ ╚═════╝",
+  "███████╗ ██████╗██╗███████╗███╗   ██╗ ██████╗███████╗███████╗",
+  "██╔════╝██╔════╝██║██╔════╝████╗  ██║██╔════╝██╔════╝██╔════╝",
+  "███████╗██║     ██║█████╗  ██╔██╗ ██║██║     █████╗  ███████╗",
+  "╚════██║██║     ██║██╔══╝  ██║╚██╗██║██║     ██╔══╝  ╚════██║",
+  "███████║╚██████╗██║███████╗██║ ╚████║╚██████╗███████╗███████║",
+  "╚══════╝ ╚═════╝╚═╝╚══════╝╚═╝  ╚═══╝ ╚═════╝╚══════╝╚══════╝",
 ]
 
 function ok(msg) { console.log(`  ${GREEN}✓${RESET} ${msg}`) }
@@ -115,6 +115,19 @@ function resolveCli() {
   return null
 }
 
+// The deprecated `@synsci/cli` package links the same `openscience` bin. npm
+// refuses to overwrite a bin file owned by another package (EEXIST), so a
+// stale global install dead-ends the upgrade — and its old binary shadows the
+// real one on PATH. `npm ls` exits nonzero when the package is absent but
+// 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 }
+}
+
 function isConnected() {
   const xdgData = process.env.XDG_DATA_HOME || join(homedir(), ".local", "share")
   const sessionPath = join(xdgData, "openscience", "openscience-session.json")
@@ -126,8 +139,37 @@ function isConnected() {
   } catch { return false }
 }
 
-function hasAtlas() {
-  return runQuiet("atlas --version") !== null
+function atlasVersion() {
+  const raw = runQuiet("atlas --version")
+  return raw ? raw.replace(/[^0-9.]/g, "") : null
+}
+
+// Install the Atlas CLI, or bring an existing install up to date. Returns
+// true when a working `atlas` binary is on PATH afterwards.
+async function installOrUpdateAtlas() {
+  const current = atlasVersion()
+  if (current) {
+    const s = spinner("Checking Atlas CLI for updates...")
+    const latest = runQuiet("npm view @synsci/atlas version")
+    if (!latest || current === latest) {
+      s.ok(`atlas ${current} ${DIM}(up to date)${RESET}`)
+      return true
+    }
+    s.update(`Upgrading Atlas CLI ${current} → ${latest}...`)
+    if (runQuiet("npm i -g @synsci/atlas@latest") !== null) {
+      s.ok(`Upgraded Atlas CLI to ${latest}`)
+    } else {
+      s.warn(`Atlas CLI upgrade failed, continuing with ${current}`)
+    }
+    return true
+  }
+  const s = spinner("Installing Atlas CLI...")
+  if (runQuiet("npm i -g @synsci/atlas@latest") !== null && atlasVersion()) {
+    s.ok("Installed Atlas CLI")
+    return true
+  }
+  s.warn(`Atlas CLI install failed, you can retry later: ${CYAN}npm i -g @synsci/atlas${RESET}`)
+  return false
 }
 
 async function ask(question) {
@@ -145,10 +187,19 @@ async function main() {
   console.log()
   for (const line of LOGO) console.log(`   ${CYAN}${line}${RESET}`)
   console.log()
-  console.log(`   ${BOLD}OpenScience${RESET} ${DIM}the open-source AI research workspace${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 ---
+  if (hasDeprecatedCli()) {
+    const s = spinner("Removing the deprecated @synsci/cli so it can't shadow the openscience command...")
+    if (runQuiet("npm rm -g @synsci/cli") !== null) {
+      s.ok("Removed the deprecated @synsci/cli")
+    } else {
+      s.warn(`Couldn't remove the deprecated @synsci/cli — if install fails, run: ${CYAN}npm rm -g @synsci/cli${RESET}`)
+    }
+  }
+
   let cliPath = resolveCli()
   if (cliPath) {
     const raw = runFileQuiet(cliPath, ["--version"]) || "unknown"
@@ -174,14 +225,39 @@ async function main() {
   } else {
     const s = spinner("Installing OpenScience...")
     try {
-      execSync("npm i -g @synsci/openscience@latest", { stdio: "pipe" })
+      try {
+        execSync("npm i -g @synsci/openscience@latest", { stdio: "pipe" })
+      } catch (e) {
+        // npm refuses to overwrite a bin file owned by another package
+        // (EEXIST). If the conflict is the deprecated @synsci/cli, remove it
+        // and retry once before falling back to the standalone installer.
+        const stderr = e && e.stderr ? String(e.stderr) : ""
+        const conflict = stderr.includes("EEXIST") && (stderr.includes("@synsci/cli") || hasDeprecatedCli())
+        if (!conflict) throw e
+        s.update("Removing the deprecated @synsci/cli so it can't shadow the openscience command...")
+        runQuiet("npm rm -g @synsci/cli")
+        s.update("Retrying the OpenScience install...")
+        execSync("npm i -g @synsci/openscience@latest", { stdio: "pipe" })
+      }
       cliPath = resolveCli()
       if (!cliPath) throw new Error("openscience not on PATH after install")
       s.ok("Installed OpenScience")
-    } catch (e) {
-      s.fail(`Install failed${e && e.message ? ": " + e.message : ""}`)
-      console.log(`\n  Try manually: ${CYAN}npm i -g @synsci/openscience${RESET}\n`)
-      process.exit(1)
+    } catch {
+      // 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).
+      s.update("npm -g failed, trying the standalone installer...")
+      try {
+        execSync("curl -fsSL https://openscience.sh/install | bash", { stdio: "pipe" })
+        cliPath = resolveCli()
+        if (!cliPath) throw new Error("openscience not found after install")
+        s.ok("Installed OpenScience")
+      } catch (e2) {
+        s.fail(`Install failed${e2 && e2.message ? ": " + e2.message : ""}`)
+        console.log(`\n  Try manually: ${CYAN}npm i -g @synsci/openscience${RESET}`)
+        console.log(`  or:           ${CYAN}curl -fsSL https://openscience.sh/install | bash${RESET}\n`)
+        process.exit(1)
+      }
     }
   }
 
@@ -191,23 +267,40 @@ async function main() {
   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()
 
-  const setup = await ask(`  ${DIM}❯${RESET} Choose [1/2]: `)
+  const setup = await ask(`  ${DIM}❯${RESET} Choose [1/2/3]: `)
   console.log()
 
-  if (setup === "2") {
-    if (!hasAtlas()) {
-      const s = spinner("Installing Atlas CLI...")
-      try {
-        execSync("npm i -g @synsci/atlas@latest", { stdio: "pipe" })
-        s.ok("Installed Atlas CLI")
-      } catch {
-        s.warn(`Atlas CLI install failed, you can retry later: ${CYAN}npm i -g @synsci/atlas${RESET}`)
-      }
+  if (setup === "3") {
+    // Atlas-CLI-only path: install/upgrade, verify, hand off to `atlas`.
+    // No workspace launch — this option exists for people who want the
+    // research CLI on a box without opening the browser app.
+    const installed = await installOrUpdateAtlas()
+    if (!installed) process.exit(1)
+    const s = spinner("Running atlas doctor...")
+    if (runQuiet("atlas doctor") !== null) {
+      s.ok("atlas doctor passed")
+    } else {
+      s.warn(`atlas doctor reported issues — run ${CYAN}atlas doctor${RESET} for details`)
+    }
+    if (isConnected()) {
+      ok("Connected to Atlas")
     } else {
-      ok("Atlas CLI already installed")
+      console.log()
+      console.log(`  ${DIM}Connect your Atlas account for managed credentials:${RESET} ${CYAN}openscience connect login${RESET}`)
     }
+    console.log()
+    console.log(`  ${BOLD}Next steps${RESET}`)
+    console.log(`    ${CYAN}atlas --help${RESET}   ${DIM}see everything the CLI can do${RESET}`)
+    console.log(`    ${CYAN}atlas doctor${RESET}   ${DIM}check credentials and environment${RESET}`)
+    console.log()
+    process.exit(0)
+  }
+
+  if (setup === "2") {
+    await installOrUpdateAtlas()
     if (isConnected()) {
       ok("Connected to Atlas")
     } else {
@@ -226,7 +319,7 @@ async function main() {
   console.log(`  ${DIM}Opening the workspace in your browser…${RESET}`)
   console.log()
 
-  const child = spawn(cliPath, ["web"], { stdio: "inherit" })
+  const child = spawn(cliPath, ["web", ...process.argv.slice(2)], { stdio: "inherit" })
   child.on("close", (code) => process.exit(code ?? 0))
 }
 

package/package.json

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