@stevezhou/sisu 0.3.17 → 0.3.19

package/README.md

@@ -40,7 +40,7 @@ Postinstall also puts `sisu` on a PATH users actually have: `~/.local/bin` on Un
 
 `npx sisu` works without a global install.
 
-`sisu update` reinstalls that stamped pager for the installed CLI version. It is not a grok-style background auto-updater.
+`sisu update` upgrades the CLI to the latest npm release (same prefix as this install) and lets postinstall fetch that version's pager. If you are already on latest, it force-reinstalls the pager. It is not a grok-style background auto-updater.
 
 ## Login
 

package/dist/main.js

@@ -2,6 +2,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.helpText = helpText;
+exports.pagerResumeArgs = pagerResumeArgs;
 exports.runCli = runCli;
 const module_1 = require("module");
 const commands_1 = require("./commands");
@@ -10,6 +11,7 @@ const client_1 = require("./client");
 const logo_1 = require("./logo");
 const store_1 = require("./store");
 const tui_1 = require("./tui");
+const update_1 = require("./update");
 const req = (0, module_1.createRequire)(__filename);
 function defaultInstallPager(options) {
     const { installPager } = req('../scripts/install-pager.js');
@@ -30,7 +32,7 @@ Usage:
   sisu login --token <jwt> [--api <url>]
   sisu logout
   sisu status
-  sisu update                 reinstall the stamped local pager for this CLI version
+  sisu update                 upgrade CLI to latest and reinstall the pager
   sisu open <dir> --project <project-id>
   sisu ls [--project <project-id>]
   sisu exec "<prompt>" [--project <id>] [--model <name>] [--new] [--stub]
@@ -41,6 +43,7 @@ Usage:
   sisu thread <conversation-id>
   sisu training --on|--off
   sisu                 interactive TUI (思溯 / SiSu · 思有所溯)
+  sisu --resume <id>          reopen a local pager session
   sisu --version
   sisu help
 
@@ -57,6 +60,19 @@ function flag(args, name) {
         return undefined;
     return args[index + 1];
 }
+function pagerResumeArgs(argv) {
+    const [command, ...args] = argv;
+    if (command === '--resume') {
+        return args[0] && !args[0].startsWith('-') ? ['--resume', args[0]] : ['--resume'];
+    }
+    if (command && command !== 'tui')
+        return [];
+    const index = args.indexOf('--resume');
+    if (index === -1)
+        return [];
+    const id = args[index + 1];
+    return id && !id.startsWith('-') ? ['--resume', id] : ['--resume'];
+}
 function parseArgs(args) {
     const flags = {};
     const rest = [];
@@ -87,20 +103,21 @@ async function runCli(argv, deps = {}) {
         process.stdout.write(`sisu ${client_1.SISU_CLIENT_VERSION} — ${logo_1.SISU_BRAND.zh} ${logo_1.SISU_BRAND.en} · ${logo_1.SISU_BRAND.headline}\n`);
         return 0;
     }
-    if (!command || command === 'tui') {
-        return (0, tui_1.runTui)((0, tui_1.defaultTuiIo)());
+    if (!command || command === 'tui' || command === '--resume') {
+        return (0, tui_1.runTui)((0, tui_1.defaultTuiIo)(), { pagerArgs: pagerResumeArgs(argv) });
     }
     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;
+        return (0, update_1.runUpdate)({
+            fetchLatest: deps.fetchLatest ?? (() => (0, update_1.fetchLatestVersion)(http)),
+            installPackage: deps.installPackage ?? ((version) => (0, update_1.installNpmPackage)(version)),
+            installPager: deps.installPager ?? defaultInstallPager,
+            write: (text) => {
+                process.stdout.write(text);
+            },
+            writeErr: (text) => {
+                process.stderr.write(text);
+            },
+        });
     }
     if (command === 'status') {
         process.stdout.write(`${await (0, commands_1.statusCommand)(http_1.defaultHttp)}\n`);

package/dist/tui.js

@@ -264,8 +264,10 @@ async function runTui(io, deps = {}) {
             }
         }
         if (usePager && (deps.spawnGrokPager || !deps.pager)) {
-            const spawnOnce = deps.spawnGrokPager ??
-                (() => {
+            const pagerArgs = deps.pagerArgs ?? [];
+            const spawnOnce = (deps.spawnGrokPager
+                ? () => deps.spawnGrokPager(pagerArgs)
+                : () => {
                     const grokBin = (0, launch_1.findGrokBuildBinary)();
                     if (!grokBin || !process.stdout.isTTY) {
                         return Promise.resolve(null);
@@ -291,7 +293,7 @@ async function runTui(io, deps = {}) {
                             return (0, transcriptEvents_1.postTranscriptEvent)(http, current.api_base || store_1.DEFAULT_API_BASE, current.token, event);
                         },
                     });
-                    const child = (0, child_process_1.spawn)(grokBin, [], {
+                    const child = (0, child_process_1.spawn)(grokBin, pagerArgs, {
                         stdio: 'inherit',
                         env,
                         cwd: process.cwd(),

package/dist/update.js

@@ -0,0 +1,94 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.planUpdate = planUpdate;
+exports.npmGlobalPrefix = npmGlobalPrefix;
+exports.npmCliPath = npmCliPath;
+exports.fetchLatestVersion = fetchLatestVersion;
+exports.installNpmPackage = installNpmPackage;
+exports.runUpdate = runUpdate;
+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 http_1 = require("./http");
+const launch_1 = require("./runtime/launch");
+const store_1 = require("./store");
+function planUpdate(current, latest) {
+    if (latest && (0, launch_1.comparePagerStamp)(latest, current) > 0) {
+        return { action: 'upgrade', from: current, to: latest };
+    }
+    return { action: 'pager', version: current };
+}
+function npmGlobalPrefix(packageRoot = path_1.default.join(__dirname, '..')) {
+    const resolved = path_1.default.resolve(packageRoot);
+    const needle = `${path_1.default.sep}node_modules${path_1.default.sep}`;
+    const idx = resolved.lastIndexOf(needle);
+    if (idx <= 0)
+        return '';
+    const before = resolved.slice(0, idx);
+    if (path_1.default.basename(before) === 'lib')
+        return path_1.default.dirname(before);
+    return before;
+}
+function npmCliPath(home = (0, store_1.getSisuHome)()) {
+    const unix = path_1.default.join(home, 'node', 'bin', 'npm');
+    const win = path_1.default.join(home, 'node', 'npm.cmd');
+    if (fs_1.default.existsSync(unix))
+        return unix;
+    if (fs_1.default.existsSync(win))
+        return win;
+    return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+async function fetchLatestVersion(http = http_1.defaultHttp) {
+    const response = await http('https://registry.npmjs.org/@stevezhou/sisu/latest', {
+        headers: { Accept: 'application/json' },
+    });
+    if (!response.ok)
+        throw new Error(`npm registry ${response.status}`);
+    const body = (await response.json());
+    const version = String(body.version || '').trim();
+    if (!version)
+        throw new Error('npm registry missing version');
+    return version;
+}
+function installNpmPackage(version, options = {}) {
+    const npm = options.npm || npmCliPath();
+    const prefix = options.prefix === undefined ? npmGlobalPrefix() : options.prefix;
+    const args = ['install', '-g', `@stevezhou/sisu@${version}`];
+    if (prefix)
+        args.push('--prefix', prefix);
+    const result = (options.spawn || child_process_1.spawnSync)(npm, args, { stdio: 'inherit' });
+    if ((result.status ?? 1) !== 0) {
+        throw new Error(`npm install failed (${result.status ?? 'spawn'})`);
+    }
+}
+async function runUpdate(options) {
+    const current = options.currentVersion || client_1.SISU_CLIENT_VERSION;
+    const writeErr = options.writeErr || options.write;
+    let latest = null;
+    try {
+        latest = await options.fetchLatest();
+    }
+    catch (error) {
+        options.write(`sisu update: could not check npm (${error instanceof Error ? error.message : String(error)}); reinstalling pager\n`);
+    }
+    const plan = planUpdate(current, latest);
+    if (plan.action === 'upgrade') {
+        options.write(`sisu: cli ${plan.from} -> ${plan.to}\n`);
+        await options.installPackage(plan.to);
+        options.write(`sisu: cli ${plan.to} installed (pager via postinstall). restart sisu.\n`);
+        return 0;
+    }
+    const result = await options.installPager({ force: true });
+    if (result.ok) {
+        options.write(result.skipped
+            ? `pager already current${result.dest ? ` at ${result.dest}` : ''}\n`
+            : `installed pager${result.dest ? ` to ${result.dest}` : ''}\n`);
+        return 0;
+    }
+    writeErr(`sisu update: ${result.reason || 'pager install failed'}\n`);
+    return result.skipped ? 0 : 1;
+}

package/package.json

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