@stevezhou/sisu 0.3.0 → 0.3.2

package/NOTICE

@@ -5,8 +5,9 @@ This product includes grok-build first-party source (Apache-2.0)
 from https://github.com/xai-org/grok-build, Copyright 2023-2026 SpaceXAI.
 
 The grok-build tree lives at vendor/grok-build/ together with its
-LICENSE and THIRD-PARTY-NOTICES. SiSu二次开发 replaces xAI login,
+LICENSE and THIRD-PARTY-NOTICES. The npm package ships the same
+attribution from third_party/grok-build/. SiSu二次开发 replaces xAI login,
 telemetry defaults, branding, and the model/quota endpoint so the
 user-facing binary is SiSu (`sisu`), not the official `grok` client.
 
-See vendor/grok-build/NOTICE for the grok-build-specific attribution.
+See third_party/grok-build/NOTICE for the grok-build-specific attribution.

package/dist/http.js

@@ -46,6 +46,12 @@ async function defaultHttp(url, init) {
 function errorDetail(body, fallback) {
     if (typeof body?.detail === 'string')
         return body.detail;
+    // FastAPI object detail (e.g. 402 quota_exhausted: { message, code }).
+    if (body?.detail && typeof body.detail === 'object') {
+        if (typeof body.detail.message === 'string' && body.detail.message.trim()) {
+            return body.detail.message;
+        }
+    }
     if (typeof body?.error === 'string')
         return body.error;
     if (typeof body?.message === 'string')

package/dist/main.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.helpText = helpText;
 exports.runCli = runCli;
+const module_1 = require("module");
 const commands_1 = require("./commands");
 const http_1 = require("./http");
 const client_1 = require("./client");
 const logo_1 = require("./logo");
 const store_1 = require("./store");
 const tui_1 = require("./tui");
+const req = (0, module_1.createRequire)(__filename);
+function defaultInstallPager(options) {
+    const { installPager } = req('../scripts/install-pager.js');
+    return installPager(options);
+}
 function helpText() {
     return `${(0, logo_1.sisuProductSurfaces)().helpAbout}
 
@@ -24,6 +30,7 @@ Usage:
   sisu login --token <jwt> [--api <url>]
   sisu logout
   sisu status
+  sisu update                 reinstall the stamped local pager
   sisu open <dir> --project <project-id>
   sisu ls [--project <project-id>]
   sisu exec "<prompt>" [--project <id>] [--model <name>] [--new] [--stub]
@@ -82,6 +89,18 @@ async function runCli(argv, deps = {}) {
     if (!command || command === 'tui') {
         return (0, tui_1.runTui)((0, tui_1.defaultTuiIo)());
     }
+    if (command === 'update') {
+        const install = deps.installPager ?? defaultInstallPager;
+        const result = await install({ force: true });
+        if (result.ok) {
+            process.stdout.write(result.skipped
+                ? `pager already current${result.dest ? ` at ${result.dest}` : ''}\n`
+                : `installed pager${result.dest ? ` to ${result.dest}` : ''}\n`);
+            return 0;
+        }
+        process.stderr.write(`sisu update: ${result.reason || 'pager install failed'}\n`);
+        return result.skipped ? 0 : 1;
+    }
     if (command === 'status') {
         process.stdout.write(`${await (0, commands_1.statusCommand)(http_1.defaultHttp)}\n`);
         return 0;

package/dist/runtime/launch.js

@@ -3,18 +3,54 @@ 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.assertRuntimeAvailable = assertRuntimeAvailable;
 exports.grokBuildBinaryCandidates = grokBuildBinaryCandidates;
 exports.findGrokBuildBinary = findGrokBuildBinary;
 exports.sisuRuntimeApiBase = sisuRuntimeApiBase;
 exports.writeSisuGrokConfig = writeSisuGrokConfig;
+exports.migrateGrokScratchToEngine = migrateGrokScratchToEngine;
+exports.purgeChangelogCache = purgeChangelogCache;
+exports.installedPagerPath = installedPagerPath;
+exports.pagerStampPath = pagerStampPath;
+exports.installedPagerStamp = installedPagerStamp;
+exports.comparePagerStamp = comparePagerStamp;
+exports.pagerStampMeetsRelease = pagerStampMeetsRelease;
+exports.accessPointBfullEnabled = accessPointBfullEnabled;
+exports.pagerStampAllowsSpawn = pagerStampAllowsSpawn;
 exports.sisuGrokBuildEnv = sisuGrokBuildEnv;
 exports.launchGrokBuildHeadless = launchGrokBuildHeadless;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const client_1 = require("../client");
 const store_1 = require("../store");
 const suite_1 = require("./suite");
 const adapter_1 = require("./adapter");
+const SCRATCH_DIRS = ['sessions', 'worktrees', 'hooks', 'logs'];
+class RuntimeUnavailable extends Error {
+    constructor(message = 'SiSu runtime is not available') {
+        super(message);
+        this.name = 'RuntimeUnavailable';
+    }
+}
+exports.RuntimeUnavailable = RuntimeUnavailable;
+async function assertRuntimeAvailable(http, apiBase) {
+    const url = `${apiBase.replace(/\/+$/, '')}/api/runtime/health`;
+    let response;
+    try {
+        response = await http(url, { headers: { Accept: 'application/json' } });
+    }
+    catch (error) {
+        throw new RuntimeUnavailable(error instanceof Error ? error.message : String(error));
+    }
+    if (!response || !response.ok) {
+        throw new RuntimeUnavailable(`health ${response?.status ?? 'unreachable'}`);
+    }
+    const body = (await response.json().catch(() => null));
+    if (!body || body.ok !== true)
+        throw new RuntimeUnavailable('health body missing ok');
+}
 function grokBuildBinaryCandidates() {
     const env = (process.env.SISU_GROK_BIN || '').trim();
     const root = (0, suite_1.grokBuildRoot)();
@@ -41,10 +77,10 @@ function sisuRuntimeApiBase(apiBase) {
 }
 function writeSisuGrokConfig() {
     const auth = (0, store_1.readAuth)();
-    const home = (0, store_1.getSisuHome)();
-    fs_1.default.mkdirSync(home, { recursive: true, mode: 0o700 });
-    const file = path_1.default.join(home, 'config.toml');
-    const runtimeBase = sisuRuntimeApiBase(auth?.api_base || process.env.SISU_API_BASE || 'https://www.sisu.chat');
+    const engine = (0, store_1.sisuEngineHome)();
+    fs_1.default.mkdirSync(engine, { recursive: true, mode: 0o700 });
+    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 = [
         '# sisu-managed grok-build config — SiSu auth + models + quota',
         '[endpoints]',
@@ -57,28 +93,124 @@ function writeSisuGrokConfig() {
     }
     return file;
 }
+function migrateGrokScratchToEngine(home) {
+    const engine = path_1.default.join(home, 'engine');
+    fs_1.default.mkdirSync(engine, { recursive: true, mode: 0o700 });
+    for (const name of SCRATCH_DIRS) {
+        const from = path_1.default.join(home, name);
+        const to = path_1.default.join(engine, name);
+        if (!fs_1.default.existsSync(from))
+            continue;
+        if (fs_1.default.existsSync(to)) {
+            for (const entry of fs_1.default.readdirSync(from)) {
+                const src = path_1.default.join(from, entry);
+                const dest = path_1.default.join(to, entry);
+                if (!fs_1.default.existsSync(dest))
+                    fs_1.default.renameSync(src, dest);
+            }
+            // Keep leftover colliding entries. Never rm -rf a tree we skipped.
+            if (fs_1.default.readdirSync(from).length === 0)
+                fs_1.default.rmdirSync(from);
+        }
+        else {
+            fs_1.default.renameSync(from, to);
+        }
+    }
+}
+function purgeChangelogCache(home, engine) {
+    for (const root of [home, engine]) {
+        if (!fs_1.default.existsSync(root))
+            continue;
+        for (const entry of fs_1.default.readdirSync(root)) {
+            if (!entry.startsWith('CHANGELOG'))
+                continue;
+            try {
+                fs_1.default.unlinkSync(path_1.default.join(root, entry));
+            }
+            catch {
+                // ignore missing / busy
+            }
+        }
+    }
+}
+function installedPagerPath() {
+    return path_1.default.join((0, store_1.getSisuHome)(), 'bin', process.platform === 'win32' ? 'xai-grok-pager.exe' : 'xai-grok-pager');
+}
+function pagerStampPath(dest = installedPagerPath()) {
+    return `${dest}.version`;
+}
+function installedPagerStamp(dest = installedPagerPath()) {
+    try {
+        return fs_1.default.readFileSync(pagerStampPath(dest), 'utf8').trim();
+    }
+    catch {
+        return '';
+    }
+}
+function comparePagerStamp(stamped, release) {
+    const parse = (value) => value.trim().split(/[.-]/).map((part) => Number.parseInt(part, 10) || 0);
+    const left = parse(stamped);
+    const right = parse(release);
+    const n = Math.max(left.length, right.length);
+    for (let i = 0; i < n; i += 1) {
+        const delta = (left[i] ?? 0) - (right[i] ?? 0);
+        if (delta !== 0)
+            return delta;
+    }
+    return 0;
+}
+function pagerStampMeetsRelease(stamped = installedPagerStamp(), release = client_1.SISU_CLIENT_VERSION) {
+    if (!stamped || !release)
+        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. */
+function accessPointBfullEnabled() {
+    return process.env.SISU_ACCESS_POINT_BFULL === '1' || pagerStampMeetsRelease();
+}
+/** Installed ~/.sisu/bin pager must be this release; 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));
+}
 function sisuGrokBuildEnv() {
     const auth = (0, store_1.readAuth)();
-    const home = (0, store_1.getSisuHome)();
-    const runtimeBase = auth ? sisuRuntimeApiBase(auth.api_base) : '';
+    const engine = (0, store_1.sisuEngineHome)();
+    const apiBase = auth?.api_base || process.env.SISU_API_BASE || store_1.DEFAULT_API_BASE;
+    const runtime = sisuRuntimeApiBase(apiBase);
     const env = { ...process.env };
+    delete env.SISU_HOME;
+    delete env.GROK_CODE_XAI_API_KEY;
     delete env.GROK_DEFAULT_MODEL;
+    delete env.SISU_TOKEN;
+    if (accessPointBfullEnabled()) {
+        delete env.XAI_API_KEY;
+        env.SISU_TOKEN = auth?.token || '';
+    }
+    else {
+        env.XAI_API_KEY = auth?.token || '';
+    }
     return {
         ...env,
-        GROK_HOME: process.env.GROK_HOME || home,
-        SISU_HOME: home,
-        GROK_TELEMETRY_ENABLED: process.env.GROK_TELEMETRY_ENABLED || '0',
-        XAI_API_KEY: process.env.XAI_API_KEY || auth?.token || '',
-        SISU_API_BASE: auth?.api_base || process.env.SISU_API_BASE || 'https://www.sisu.chat',
+        SISU_ACCESS_POINT: '1',
+        GROK_HOME: engine,
+        GROK_AUTH_PATH: path_1.default.join(engine, 'auth.json'),
+        SISU_AUTH_PATH: (0, store_1.sisuAuthPath)(),
+        SISU_ACCOUNT_EMAIL: auth?.email || '',
+        SISU_ACCOUNT_PLAN: auth?.plan_code || '',
+        SISU_API_BASE: apiBase,
+        SISU_CLIENT_VERSION: client_1.SISU_CLIENT_VERSION,
         SISU_CONVERSATION_ID: (0, store_1.ensureConversationId)(),
-        ...(runtimeBase
-            ? {
-                GROK_XAI_API_BASE_URL: runtimeBase,
-                XAI_API_BASE_URL: runtimeBase,
-                GROK_MODELS_BASE_URL: runtimeBase,
-                GROK_MODELS_LIST_URL: `${runtimeBase}/models`,
-            }
-            : {}),
+        GROK_XAI_API_BASE_URL: runtime,
+        XAI_API_BASE_URL: runtime,
+        GROK_MODELS_BASE_URL: runtime,
+        GROK_MODELS_LIST_URL: `${runtime}/models`,
+        GROK_CLI_CHAT_PROXY_BASE_URL: runtime,
+        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/store.js

@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_API_BASE = void 0;
 exports.getSisuHome = getSisuHome;
+exports.sisuEngineHome = sisuEngineHome;
+exports.sisuAuthPath = sisuAuthPath;
 exports.readAuth = readAuth;
 exports.writeAuth = writeAuth;
 exports.readSession = readSession;
@@ -24,9 +26,15 @@ function getSisuHome() {
     const override = (process.env.SISU_HOME || '').trim();
     return override || path_1.default.join(os_1.default.homedir(), '.sisu');
 }
-function authPath() {
+function sisuEngineHome() {
+    return path_1.default.join(getSisuHome(), 'engine');
+}
+function sisuAuthPath() {
     return path_1.default.join(getSisuHome(), 'auth.json');
 }
+function authPath() {
+    return sisuAuthPath();
+}
 function workspacePath() {
     return path_1.default.join(getSisuHome(), 'workspace-paths.json');
 }

package/dist/tui.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SISU_LOGIN_EXIT_CODE = void 0;
 exports.shouldAnimateSplash = shouldAnimateSplash;
 exports.playMobiusIntro = playMobiusIntro;
 exports.playTreeIntro = playTreeIntro;
@@ -20,6 +21,8 @@ const store_1 = require("./store");
 const launch_1 = require("./runtime/launch");
 const transport_1 = require("./runtime/transport");
 const child_process_1 = require("child_process");
+/** Pager exits with this code so the host runs `sisu login` and respawns. */
+exports.SISU_LOGIN_EXIT_CODE = 10;
 function shouldAnimateSplash(env = process.env, tty = Boolean(process.stdout.isTTY)) {
     if (env.SISU_TUI_STATIC === '1')
         return false;
@@ -199,11 +202,48 @@ async function runTui(io, deps = {}) {
     const training = deps.training ?? commands_1.setTrainingCommand;
     const auth = deps.auth ?? store_1.readAuth;
     const webLogin = deps.webLogin ?? commands_1.webLoginCommand;
+    const probe = deps.probe ?? launch_1.assertRuntimeAvailable;
     const columns = deps.columns ?? process.stdout.columns ?? 80;
     const animate = deps.animate ?? shouldAnimateSplash();
     try {
-        const account = auth();
-        const usePager = Boolean(deps.pager || shouldUsePager(deps));
+        const startWebLogin = async (notify) => {
+            return webLogin({
+                onStart: (info) => {
+                    notify(`Open ${info.verification_uri_complete}`);
+                    notify(`Confirm code ${info.user_code}`);
+                },
+            }, http);
+        };
+        let account = auth();
+        if (!account) {
+            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;
+            }
+            account = auth();
+            if (!account) {
+                io.write('login failed — run `sisu login`\n');
+                return 1;
+            }
+        }
+        let runtimeOk = true;
+        try {
+            await probe(http, account.api_base);
+        }
+        catch (error) {
+            if (!(error instanceof launch_1.RuntimeUnavailable))
+                throw error;
+            runtimeOk = false;
+            io.write(`SiSu runtime is not available at ${account.api_base}/api/runtime. ` +
+                `This CLI will not fall back to xAI. Using the Node TUI.\n`);
+        }
+        // Health failure never spawns the pager (injected or grok binary).
+        const usePager = runtimeOk && Boolean(deps.pager || deps.spawnGrokPager || shouldUsePager(deps));
         if (!usePager) {
             if (animate) {
                 await playTreeIntro(io, {
@@ -216,24 +256,51 @@ async function runTui(io, deps = {}) {
                 io.write(`${(0, logo_1.sisuSplash)(columns, true)}\n`);
             }
         }
-        const startWebLogin = async (notify) => {
-            return webLogin({
-                onStart: (info) => {
-                    notify(`Open ${info.verification_uri_complete}`);
-                    notify(`Confirm code ${info.user_code}`);
-                },
-            }, http);
-        };
         if (usePager && !deps.pager) {
-            const grokBin = (0, launch_1.findGrokBuildBinary)();
-            if (grokBin && process.stdout.isTTY) {
-                (0, launch_1.writeSisuGrokConfig)();
-                io.close?.();
-                const child = (0, child_process_1.spawn)(grokBin, [], { stdio: 'inherit', env: (0, launch_1.sisuGrokBuildEnv)(), cwd: process.cwd() });
-                return await new Promise((resolve) => {
-                    child.on('exit', (code) => resolve(code ?? 1));
-                    child.on('error', () => resolve(1));
+            const spawnOnce = deps.spawnGrokPager ??
+                (() => {
+                    const grokBin = (0, launch_1.findGrokBuildBinary)();
+                    if (!grokBin || !process.stdout.isTTY) {
+                        return Promise.resolve(null);
+                    }
+                    if (!(0, launch_1.pagerStampAllowsSpawn)(grokBin)) {
+                        io.write('sisu: refusing to spawn a pager older than this CLI. Reinstall the pager or run `sisu` after postinstall.\n');
+                        return Promise.resolve(null);
+                    }
+                    const home = (0, store_1.getSisuHome)();
+                    const engine = (0, store_1.sisuEngineHome)();
+                    (0, launch_1.migrateGrokScratchToEngine)(home);
+                    (0, launch_1.purgeChangelogCache)(home, engine);
+                    (0, launch_1.writeSisuGrokConfig)();
+                    io.close?.();
+                    const child = (0, child_process_1.spawn)(grokBin, [], {
+                        stdio: 'inherit',
+                        env: (0, launch_1.sisuGrokBuildEnv)(),
+                        cwd: process.cwd(),
+                    });
+                    return new Promise((resolve) => {
+                        child.on('exit', (code) => resolve(code ?? 1));
+                        child.on('error', () => resolve(1));
+                    });
                 });
+            if (deps.spawnGrokPager || ((0, launch_1.findGrokBuildBinary)() && process.stdout.isTTY)) {
+                // Login handoff: pager exits 10 → host web login → respawn.
+                while (true) {
+                    const code = await spawnOnce();
+                    if (code === null)
+                        break;
+                    if (code !== exports.SISU_LOGIN_EXIT_CODE)
+                        return code;
+                    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;
+                    }
+                }
             }
         }
         if (usePager) {
@@ -262,8 +329,6 @@ async function runTui(io, deps = {}) {
             });
         }
         io.write(`${await status(http)}\n`);
-        if (!account)
-            io.write('Not logged in. Type /login to sign in with your browser.\n');
         io.write(`${tuiHelp()}\n\n`);
         let newConversation = false;
         while (true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stevezhou/sisu",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "SiSu CLI — 思溯 / SiSu · 思有所溯",
   "license": "UNLICENSED",
   "homepage": "https://www.sisu.chat",
@@ -24,6 +24,7 @@
     "dist",
     "README.md",
     "NOTICE",
+    "third_party/grok-build",
     "scripts/postinstall.js",
     "scripts/install-pager.js"
   ],

package/scripts/install-pager.js

@@ -8,7 +8,7 @@ const os = require('os')
 const path = require('path')
 const zlib = require('zlib')
 
-const SUPPORTED = new Set(['darwin-arm64'])
+const SUPPORTED = new Set(['darwin-arm64', 'darwin-x64', 'linux-x64', 'linux-arm64'])
 const BIN = process.platform === 'win32' ? 'xai-grok-pager.exe' : 'xai-grok-pager'
 
 function readVersion() {