@stevezhou/sisu 0.3.11 → 0.3.13

package/dist/runtime/launch.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RuntimeUnavailable = void 0;
+exports.MIN_PAGER_STAMP = exports.RuntimeUnavailable = void 0;
 exports.assertRuntimeAvailable = assertRuntimeAvailable;
 exports.grokBuildBinaryCandidates = grokBuildBinaryCandidates;
 exports.findGrokBuildBinary = findGrokBuildBinary;
@@ -185,15 +185,17 @@ function pagerStampMeetsRelease(stamped = installedPagerStamp(), release = clien
         return false;
     return comparePagerStamp(stamped, release) >= 0;
 }
-/** B-full only when the host env flag is on or the installed pager stamp matches this package. */
+/** First pager that speaks the access-point contract. Host patches may ship ahead of a rebuild. */
+exports.MIN_PAGER_STAMP = '0.3.11';
+/** B-full when the host env flag is on or the installed pager is at least MIN_PAGER_STAMP. */
 function accessPointBfullEnabled() {
-    return process.env.SISU_ACCESS_POINT_BFULL === '1' || pagerStampMeetsRelease();
+    return process.env.SISU_ACCESS_POINT_BFULL === '1' || pagerStampMeetsRelease(installedPagerStamp(), exports.MIN_PAGER_STAMP);
 }
-/** Installed ~/.sisu/bin pager must be this release; other paths (SISU_GROK_BIN / cargo) are dev. */
+/** Installed ~/.sisu/bin pager must be the access-point contract; other paths (SISU_GROK_BIN / cargo) are dev. */
 function pagerStampAllowsSpawn(binary) {
     if (path_1.default.resolve(binary) !== path_1.default.resolve(installedPagerPath()))
         return true;
-    return pagerStampMeetsRelease(installedPagerStamp(binary));
+    return pagerStampMeetsRelease(installedPagerStamp(binary), exports.MIN_PAGER_STAMP);
 }
 function sisuGrokBuildEnv() {
     const auth = (0, store_1.readAuth)();
@@ -205,6 +207,10 @@ function sisuGrokBuildEnv() {
     delete env.GROK_CODE_XAI_API_KEY;
     delete env.GROK_DEFAULT_MODEL;
     delete env.SISU_TOKEN;
+    // Must not set GROK_DISABLE_API_KEY_AUTH: AuthManager.vet_cached hides
+    // auth_mode=api_key snapshots, so the pager thinks there is no session
+    // and exits 10 (host login) in a loop.
+    delete env.GROK_DISABLE_API_KEY_AUTH;
     if (accessPointBfullEnabled()) {
         delete env.XAI_API_KEY;
         env.SISU_TOKEN = auth?.token || '';
@@ -246,7 +252,6 @@ function sisuGrokBuildEnv() {
         GROK_DISABLE_CLI_CHAT_PROXY: '1',
         GROK_TELEMETRY_ENABLED: '0',
         GROK_CHANGELOG_OFFLINE: '1',
-        GROK_DISABLE_API_KEY_AUTH: '1',
     };
 }
 function launchGrokBuildHeadless(prompt, cwd) {

package/dist/tui.js

@@ -36,6 +36,10 @@ function shouldUsePager(deps, env = process.env) {
         return false;
     return Boolean(process.stdout.isTTY);
 }
+/** Pager may leave the alt screen / hide the cursor when it exits 10. */
+function restoreInteractiveTerminal(io) {
+    io.write('\x1b[?1049l\x1b[?25h\x1b[?2004l\x1b[0m');
+}
 async function playMobiusIntro(io, options = {}) {
     const columns = options.columns ?? process.stdout.columns ?? 80;
     const frames = options.frames ?? 32;
@@ -207,7 +211,9 @@ async function runTui(io, deps = {}) {
     const columns = deps.columns ?? process.stdout.columns ?? 80;
     const animate = deps.animate ?? shouldAnimateSplash();
     try {
+        let openedBrowserLogin = false;
         const startWebLogin = async (notify) => {
+            openedBrowserLogin = true;
             return webLogin({
                 onStart: (info) => {
                     notify(`Open ${info.verification_uri_complete}`);
@@ -257,7 +263,7 @@ async function runTui(io, deps = {}) {
                 io.write(`${(0, logo_1.sisuSplash)(columns, true)}\n`);
             }
         }
-        if (usePager && !deps.pager) {
+        if (usePager && (deps.spawnGrokPager || !deps.pager)) {
             const spawnOnce = deps.spawnGrokPager ??
                 (() => {
                     const grokBin = (0, launch_1.findGrokBuildBinary)();
@@ -299,13 +305,18 @@ async function runTui(io, deps = {}) {
                     });
                 });
             if (deps.spawnGrokPager || ((0, launch_1.findGrokBuildBinary)() && process.stdout.isTTY)) {
-                // Login handoff: pager exits 10 → host web login → respawn.
+                // Login handoff: pager exits 10 → host web login at most once → respawn.
                 while (true) {
                     const code = await spawnOnce();
                     if (code === null)
                         break;
                     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`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevezhou/sisu",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "SiSu CLI — 思溯 / SiSu · 思有所溯",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",