@stevezhou/sisu 0.3.13 → 0.3.15

package/README.md

@@ -13,7 +13,7 @@ sisu login
 sisu
 ```
 
-`npm install -g` is a small JS package. postinstall fetches the stamped SiSu TUI pager for **this package version** into `~/.sisu/bin` when a prebuilt exists. GitHub Release tags ship `darwin-arm64`, `linux-x64`, and `linux-arm64`. `darwin-x64` is opt-in (`workflow_dispatch` with `platforms` containing `darwin-x64`) and often missing; platforms without a binary, or a missing GitHub Release asset, keep the Node TUI.
+Postinstall links `sisu` into `~/.local/bin` (Debian/login PATH) and prints an `export PATH=...` line if this shell still cannot see the command. `npm install -g` is a small JS package. It also fetches the stamped SiSu TUI pager for **this package version** into `~/.sisu/bin` when a prebuilt exists. GitHub Release tags ship `darwin-arm64`, `linux-x64`, and `linux-arm64`. `darwin-x64` is opt-in (`workflow_dispatch` with `platforms` containing `darwin-x64`) and often missing; platforms without a binary, or a missing GitHub Release asset, keep the Node TUI.
 
 Requires Node.js 20 or newer. `npx sisu` works without a global install.
 

package/dist/tui.js

@@ -305,7 +305,9 @@ async function runTui(io, deps = {}) {
                     });
                 });
             if (deps.spawnGrokPager || ((0, launch_1.findGrokBuildBinary)() && process.stdout.isTTY)) {
-                // Login handoff: pager exits 10 → host web login at most once → respawn.
+                // Login handoff: pager exits 10 → host web login at most once → respawn
+                // grok-pager. Never fall through to the Node TUI while the grok binary ran.
+                let retriedWithSession = false;
                 while (true) {
                     const code = await spawnOnce();
                     if (code === null)
@@ -313,19 +315,23 @@ async function runTui(io, deps = {}) {
                     if (code !== exports.SISU_LOGIN_EXIT_CODE)
                         return code;
                     restoreInteractiveTerminal(io);
-                    if (auth() || openedBrowserLogin) {
-                        io.write('sisu: session already saved; not opening another login page.\n');
-                        break;
-                    }
-                    try {
-                        const email = await startWebLogin((line) => io.write(`${line}\n`));
-                        io.write(`logged in as ${email}\n`);
+                    if (!auth() && !openedBrowserLogin) {
+                        try {
+                            const email = await startWebLogin((line) => io.write(`${line}\n`));
+                            io.write(`logged in as ${email}\n`);
+                        }
+                        catch (error) {
+                            io.write(`${error instanceof Error ? error.message : String(error)}\n`);
+                            io.write('login failed — run `sisu login`\n');
+                            return 1;
+                        }
+                        continue;
                     }
-                    catch (error) {
-                        io.write(`${error instanceof Error ? error.message : String(error)}\n`);
-                        io.write('login failed — run `sisu login`\n');
-                        return 1;
+                    if (retriedWithSession) {
+                        io.write('sisu: grok pager still requesting login after a saved session.\n');
+                        return exports.SISU_LOGIN_EXIT_CODE;
                     }
+                    retriedWithSession = true;
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevezhou/sisu",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "SiSu CLI — 思溯 / SiSu · 思有所溯",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",
@@ -26,7 +26,8 @@
     "NOTICE",
     "third_party/grok-build",
     "scripts/postinstall.js",
-    "scripts/install-pager.js"
+    "scripts/install-pager.js",
+    "scripts/ensure-cli-path.js"
   ],
   "publishConfig": {
     "access": "public"

package/scripts/ensure-cli-path.js

@@ -0,0 +1,107 @@
+#!/usr/bin/env node
+/** After `npm i -g`, put `sisu` on a PATH users actually have.
+ *  npm's global bin is often missing from Debian/login PATH.
+ */
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+
+function pathDirs(pathEnv = process.env.PATH || '') {
+  return pathEnv.split(path.delimiter).filter(Boolean)
+}
+
+function pathContains(dir, pathEnv = process.env.PATH || '') {
+  const target = path.resolve(dir)
+  return pathDirs(pathEnv).some((entry) => {
+    try {
+      return path.resolve(entry) === target
+    } catch {
+      return false
+    }
+  })
+}
+
+function globalSisuBin(options = {}) {
+  const name = options.platform === 'win32' ? 'sisu.cmd' : 'sisu'
+  const prefix = options.prefix || process.env.npm_config_prefix || ''
+  const fromPrefix = prefix
+    ? (options.platform === 'win32' ? path.join(prefix, name) : path.join(prefix, 'bin', name))
+    : ''
+  const fromLayout = path.resolve(
+    options.packageRoot || path.join(__dirname, '..'),
+    '..',
+    '..',
+    options.platform === 'win32' ? name : path.join('bin', name),
+  )
+  const exists = options.exists || ((file) => fs.existsSync(file))
+  for (const candidate of [fromPrefix, fromLayout]) {
+    if (candidate && exists(candidate)) return candidate
+  }
+  return fromPrefix || fromLayout
+}
+
+function userLocalBin(home = os.homedir()) {
+  return path.join(home, '.local', 'bin')
+}
+
+function ensureUserShim(target, options = {}) {
+  if ((options.platform || process.platform) === 'win32') return null
+  if (!target) return null
+  const dir = userLocalBin(options.home || os.homedir())
+  const dest = path.join(dir, 'sisu')
+  fs.mkdirSync(dir, { recursive: true, mode: 0o755 })
+  try {
+    if (fs.lstatSync(dest)) fs.unlinkSync(dest)
+  } catch {
+    // missing
+  }
+  fs.symlinkSync(path.resolve(target), dest)
+  try {
+    fs.chmodSync(dest, 0o755)
+  } catch {
+    // symlink mode follows the target on most POSIX
+  }
+  return dest
+}
+
+function pathHint(npmBin, localBin, pathEnv = process.env.PATH || '') {
+  const dirs = []
+  if (localBin && !pathContains(localBin, pathEnv)) dirs.push(localBin)
+  if (npmBin && !pathContains(npmBin, pathEnv)) dirs.push(npmBin)
+  if (!dirs.length) return ''
+  return `export PATH="${dirs.join(':')}:$PATH" && hash -r`
+}
+
+function installCliPath(options = {}) {
+  const writes = options.write || ((text) => process.stdout.write(text))
+  const platform = options.platform || process.platform
+  const bin = globalSisuBin(options)
+  const npmBinDir = bin ? path.dirname(bin) : ''
+  let shim = null
+  try {
+    shim = ensureUserShim(bin, options)
+  } catch (error) {
+    writes(`sisu: could not link ~/.local/bin/sisu (${error instanceof Error ? error.message : String(error)})\n`)
+  }
+  const localDir = shim ? path.dirname(shim) : userLocalBin(options.home)
+  const hint = pathHint(npmBinDir, localDir, options.pathEnv)
+  if (bin) writes(`sisu: command -> ${shim || bin}\n`)
+  if (hint) {
+    writes('sisu: if `sisu` is not found in this shell, run:\n')
+    writes(`  ${hint}\n`)
+  }
+  return { bin, shim, hint }
+}
+
+module.exports = {
+  ensureUserShim,
+  globalSisuBin,
+  installCliPath,
+  pathContains,
+  pathHint,
+  userLocalBin,
+}
+
+if (require.main === module) {
+  installCliPath()
+}

package/scripts/postinstall.js

@@ -3,6 +3,13 @@
  *  Never fail `npm install` — Node TUI still works without the binary.
  */
 const { installPager } = require('./install-pager')
+const { installCliPath } = require('./ensure-cli-path')
+
+try {
+  installCliPath()
+} catch (error) {
+  process.stdout.write(`sisu: path setup skipped (${error instanceof Error ? error.message : String(error)})\n`)
+}
 
 installPager().then(
   (result) => {