@stevezhou/sisu 0.3.10 → 0.3.12

package/dist/runtime/launch.js

@@ -3,11 +3,12 @@ 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;
 exports.sisuRuntimeApiBase = sisuRuntimeApiBase;
+exports.purgeXaiEngineAuth = purgeXaiEngineAuth;
 exports.writeSisuGrokConfig = writeSisuGrokConfig;
 exports.migrateGrokScratchToEngine = migrateGrokScratchToEngine;
 exports.purgeChangelogCache = purgeChangelogCache;
@@ -75,10 +76,27 @@ function findGrokBuildBinary() {
 function sisuRuntimeApiBase(apiBase) {
     return (0, adapter_1.openaiCompatUrl)(apiBase).replace(/\/chat\/completions$/, '');
 }
+/** Drop leftover grok.com / auth.x.ai sessions from the pager engine store. */
+function purgeXaiEngineAuth(engine = (0, store_1.sisuEngineHome)()) {
+    const file = path_1.default.join(engine, 'auth.json');
+    if (!fs_1.default.existsSync(file))
+        return file;
+    try {
+        const raw = fs_1.default.readFileSync(file, 'utf8');
+        if (!/auth\.x\.ai|accounts\.x\.ai|grok\.com/i.test(raw))
+            return file;
+        fs_1.default.writeFileSync(file, '{}\n', { encoding: 'utf8', mode: 0o600 });
+    }
+    catch {
+        // missing / busy — next launch retries
+    }
+    return file;
+}
 function writeSisuGrokConfig() {
     const auth = (0, store_1.readAuth)();
     const engine = (0, store_1.sisuEngineHome)();
     fs_1.default.mkdirSync(engine, { recursive: true, mode: 0o700 });
+    purgeXaiEngineAuth(engine);
     const file = path_1.default.join(engine, 'config.toml');
     const runtimeBase = sisuRuntimeApiBase(auth?.api_base || process.env.SISU_API_BASE || store_1.DEFAULT_API_BASE);
     const body = [
@@ -167,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)();
@@ -187,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 || '';
@@ -207,6 +231,7 @@ function sisuGrokBuildEnv() {
             email: auth.email || undefined,
         });
     }
+    purgeXaiEngineAuth(engine);
     return {
         ...env,
         SISU_ACCESS_POINT: '1',
@@ -227,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

@@ -257,7 +257,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)();
@@ -300,12 +300,17 @@ async function runTui(io, deps = {}) {
                 });
             if (deps.spawnGrokPager || ((0, launch_1.findGrokBuildBinary)() && process.stdout.isTTY)) {
                 // Login handoff: pager exits 10 → host web login → respawn.
+                // If a session is already on disk, do not mint another device code.
                 while (true) {
                     const code = await spawnOnce();
                     if (code === null)
                         break;
                     if (code !== exports.SISU_LOGIN_EXIT_CODE)
                         return code;
+                    if (auth()) {
+                        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.10",
+  "version": "0.3.12",
   "description": "SiSu CLI — 思溯 / SiSu · 思有所溯",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",