summrise-agent 1.2.452 → 1.2.454

package/bin/summrise.js

@@ -57,6 +57,13 @@ exports.autostartArgv = autostartArgv;
 exports.playwrightProbePs = playwrightProbePs;
 exports.busyIsFresh = busyIsFresh;
 exports.latestCdnVersion = latestCdnVersion;
+exports.latestNpmVersion = latestNpmVersion;
+exports.newestOf = newestOf;
+exports.latestReleaseVersion = latestReleaseVersion;
+exports.cdnBase = cdnBase;
+exports.componentUrl = componentUrl;
+exports.resolveComponent = resolveComponent;
+exports.ensureElectron = ensureElectron;
 exports.statusReport = statusReport;
 exports.isBehind = isBehind;
 exports.behindBy = behindBy;
@@ -78,6 +85,7 @@ exports.rollbackVersionOk = rollbackVersionOk;
 const child_process_1 = require("child_process");
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const EXE_SRC = path.join(__dirname, "..", "summrise-agent.exe");
 // C1 (2026-08-28): the registry is the single source of truth for the install
@@ -740,6 +748,135 @@ function latestCdnVersion() {
         return null;
     }
 }
+/**
+ * The registry's own answer to "what is latest", asked in the smallest way npm
+ * offers: `/-/package/<name>/dist-tags` is a few bytes, where the packument is a
+ * document. Same 3 s cap and the same rule as the CDN read — a failure is
+ * `null`, which the report renders as "could NOT be checked", never as
+ * agreement.
+ */
+function latestNpmVersion() {
+    const r = (0, child_process_1.spawnSync)("curl", [
+        "-s",
+        "-m",
+        "3",
+        "https://registry.npmjs.org/-/package/summrise-agent/dist-tags",
+    ], { encoding: "utf8", timeout: 5000 });
+    if (r.status !== 0 || !r.stdout)
+        return null;
+    try {
+        const j = JSON.parse(r.stdout);
+        const v = j && typeof j.latest === "string" ? j.latest.trim() : "";
+        // A dist-tag can point at a prerelease; the device's update path only
+        // understands x.y.z, and a tag it cannot parse is not a version.
+        return /^\d+\.\d+\.\d+$/.test(v) ? v : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** The newer of two release versions; either may be unknown. */
+function newestOf(a, b) {
+    if (!a)
+        return b;
+    if (!b)
+        return a;
+    const ta = versionTriple(a);
+    const tb = versionTriple(b);
+    if (!ta)
+        return b;
+    if (!tb)
+        return a;
+    for (let i = 0; i < 3; i++) {
+        if (ta[i] !== tb[i])
+            return ta[i] > tb[i] ? a : b;
+    }
+    return a;
+}
+/**
+ * What "latest" means now that there are TWO channels: the newer of the CDN's
+ * `version.json` and the registry's dist-tag. `null` only when NEITHER
+ * answered — one silent channel must not be reported as agreement, which is the
+ * property the CDN-only version already had.
+ */
+function latestReleaseVersion() {
+    return newestOf(latestCdnVersion(), latestNpmVersion());
+}
+/** The release host this CLI already trusts for version checks. */
+function cdnBase() {
+    return (process.env.SUMMRISE_CDN || "https://agent.saisi.online").replace(/\/+$/, "");
+}
+/** Where a boxed component lives on that host. Pure — the tests pin it. */
+function componentUrl(name) {
+    return `${cdnBase()}/summrise-agent/${name}`;
+}
+/**
+ * A boxed component's local path: the copy inside the package if it is there,
+ * otherwise the release host's route for it, downloaded to a temp file.
+ *
+ * WHY THIS EXISTS (2026-09-23). The npm package carries NONE of the big
+ * binaries on purpose (cloudflared 54 MB, playwright 31 MB, electron 234 MB), so
+ * "not in the package" used to mean "you do not get it, ever" — setup printed a
+ * line and moved on. The same shape for cloudflared left a freshly migrated
+ * device with no tunnel, and a device with no tunnel is INVISIBLE TO THE
+ * CONSOLE while looking perfectly healthy from inside: an hour of that is what
+ * this function is for. The release host serves all three, and for cloudflared
+ * it proxies a PINNED upstream asset, which the agent's own sha256 pin then
+ * checks again on the path it uses.
+ *
+ * `null` when neither source works: every component here is optional to the
+ * AGENT, and a failed fetch must not fail the install.
+ */
+function resolveComponent(name, pkgPath) {
+    if (fs.existsSync(pkgPath))
+        return pkgPath;
+    const dest = path.join(fs.mkdtempSync(path.join(os.tmpdir(), "summrise-comp-")), name);
+    // -f: an HTTP error is a FAILURE, not a 404 page written to disk (the
+    // HTML-polluted download that round-54 exists to remember).
+    const r = (0, child_process_1.spawnSync)("curl", ["-fsSL", "-m", "300", "-o", dest, componentUrl(name)], { encoding: "utf8", timeout: 320000 });
+    if (r.status !== 0 || !fs.existsSync(dest) || fs.statSync(dest).size === 0) {
+        return null;
+    }
+    console.log(`setup: ${name} fetched from the release host (not in the package)`);
+    return dest;
+}
+/**
+ * Ensure the desktop shell's electron RUNTIME. The shell's sources are ~90 KB
+ * and ship in the package; the runtime is 234 MB and deliberately does not.
+ *
+ * WHY IT IS FETCHED AND NOT `npx electron`: the release host serves a PINNED
+ * upstream proxy of the official build (v33.4.11 when this was written), so a
+ * device behind the GFW needs no GitHub access and no ELECTRON_MIRROR — the two
+ * things that made the hand-install on 2026-09-23 need a mirror variable at all.
+ * `npx electron` would also mean rewriting the launcher, which calls
+ * `<shell>\node_modules\electron\dist\electron.exe` directly.
+ *
+ * The zip's ROOT is the dist contents (`LICENSES.chromium.html` is its first
+ * entry — measured through the route, not assumed), so it expands into `dist`.
+ * Idempotent, and non-fatal: an install without a window still installs an agent.
+ */
+function ensureElectron() {
+    const elDir = path.join(DESK_DIR, "node_modules", "electron");
+    const dist = path.join(elDir, "dist");
+    if (fs.existsSync(path.join(dist, "electron.exe")))
+        return dist;
+    const zip = resolveComponent("electron-win32-x64.zip", path.join(__dirname, "..", "electron-win32-x64.zip"));
+    if (!zip)
+        return null;
+    fs.mkdirSync(dist, { recursive: true });
+    sh(`powershell -NoProfile -Command "Expand-Archive -Force -Path '${(0, exports.psq)(zip)}' -DestinationPath '${(0, exports.psq)(dist)}'"`);
+    if (!fs.existsSync(path.join(dist, "electron.exe")))
+        return null;
+    try {
+        // The electron package's own lookup file; the launcher does not need it, but
+        // anything that resolves the package the npm way will.
+        fs.writeFileSync(path.join(elDir, "path.txt"), "electron.exe");
+    }
+    catch {
+        /* best-effort */
+    }
+    return dist;
+}
 function statusReport(f) {
     const out = [];
     out.push(f.agentRunning === null
@@ -1410,8 +1547,8 @@ const commands = {
         // B2: stage the boxed playwright bundle (node_modules ONLY — node.exe is
         // NOT bundled; the system node detected below runs it). Single small
         // artifact in the npm package, Summrise version-locked.
-        const PW_ZIP = path.join(__dirname, "..", "summrise-playwright.zip");
-        if (fs.existsSync(PW_ZIP)) {
+        const PW_ZIP = resolveComponent("summrise-playwright.zip", path.join(__dirname, "..", "summrise-playwright.zip"));
+        if (PW_ZIP) {
             const pwDir = PW_DIR;
             fs.mkdirSync(pwDir, { recursive: true });
             sh(`powershell -NoProfile -Command "Expand-Archive -Force -Path '${(0, exports.psq)(PW_ZIP)}' -DestinationPath '${(0, exports.psq)(COMPONENTS_DIR)}'"`);
@@ -1446,7 +1583,7 @@ const commands = {
             }
         }
         else {
-            console.log("setup: summrise-playwright.zip not in package (browser tools disabled)");
+            console.error("setup: WARNING -- the playwright bundle could not be obtained (not in the package, and the release host did not serve it); browser tools stay disabled.");
         }
         // Node runtime: the device has node (npm works), but the agent runs as
         // SYSTEM which may not see the user PATH — resolve the ABSOLUTE node path
@@ -1469,12 +1606,19 @@ const commands = {
         }
         // C2: stage the boxed cloudflared binary into components/ (optional — local
         // mode works without it; only used when the user opts into public access).
-        const CF_SRC = path.join(__dirname, "..", "cloudflared.exe");
-        if (fs.existsSync(CF_SRC)) {
+        const CF_SRC = resolveComponent("cloudflared.exe", path.join(__dirname, "..", "cloudflared.exe"));
+        if (CF_SRC) {
             fs.mkdirSync(COMPONENTS_DIR, { recursive: true });
             fs.copyFileSync(CF_SRC, path.join(COMPONENTS_DIR, "cloudflared.exe"));
             console.log("setup: cloudflared staged (tunnel optional -- `summrise tunnel install` to enable)");
         }
+        else {
+            // This branch used to be SILENT, and that silence is what the 2026-09-23
+            // migration cost an hour of: a device with no cloudflared has no tunnel,
+            // and a device with no tunnel cannot be reached from the console at all
+            // while `summrise status` reports it healthy from inside.
+            console.error("setup: WARNING -- cloudflared could NOT be staged (not in the package, and the release host did not serve it); this device will be unreachable from the console until the binary can be fetched.");
+        }
         // P2-4: record the boxed-component versions (never fail-closed).
         writeBoxedVersions(DIR, path.join(__dirname, ".."));
         // round-330: Tauri summrise-desktop staging removed (retired).
@@ -1487,6 +1631,13 @@ const commands = {
         console.log(deskStaged > 0
             ? `setup: summrise-desktop-electron sources staged (${deskStaged} files)`
             : "setup: summrise-desktop-electron sources NOT staged -- the package did not ship them; the desktop shell will not update");
+        // …and the runtime those sources need. Sources without a runtime is a shell
+        // that cannot start: no window, and (before this) nothing in the output said
+        // why — the operator saw only an absent window.
+        const elDist = ensureElectron();
+        console.log(elDist
+            ? "setup: electron runtime ready for the desktop shell"
+            : "setup: WARNING -- the electron runtime could not be obtained (not in the package, and the release host did not serve it); start-desktop.ps1 will not open a window until it can be fetched.");
         // Layout v2: write the start-desktop.ps1 launcher into scripts\ (the
         // SummriseDesktop onlogon task + desktop Summrise.lnk both call it). Was never
         // written before — a real gap that left the shell unlaunchable.
@@ -1726,13 +1877,14 @@ const commands = {
         catch {
             /* best-effort */
         }
-        // What the CDN advertises, so `status` can answer "is this device current" —
-        // the question every round of this project's log answered by hand. Bounded
-        // HARD (3 s): `status` is the command an operator runs when something is
-        // already wrong, and a status that hangs on a network blip is worse than one
-        // that says it could not check. A failure yields `null`, which the report
-        // renders as "could NOT be checked" — never as agreement.
-        const latestVersion = latestCdnVersion();
+        // What the TWO channels advertise, so `status` can answer "is this device
+        // current" — the question every round of this project's log answered by
+        // hand. Bounded HARD (3 s each): `status` is the command an operator runs
+        // when something is already wrong, and a status that hangs on a network
+        // blip is worse than one that says it could not check. `null` only when
+        // BOTH are silent, which the report renders as "could NOT be checked" —
+        // never as agreement.
+        const latestVersion = latestReleaseVersion();
         for (const line of statusReport({
             agentRunning: agentState === "unknown" ? null : agentState === "yes",
             installDir: DIR,
@@ -1853,15 +2005,15 @@ const commands = {
         // `agent_update` reads that file as its LOCAL version. An older CLI therefore stamps the install with the version it
         // already has, the swap installs the same build, and nothing moves. Refuse before touching the device, and say the
         // thing that works — the release flow has always been two steps.
-        const cdnLatest = latestCdnVersion();
+        const latest = latestReleaseVersion();
         const selfVersion = String(require("../package.json").version || "");
-        if (cdnLatest && selfVersion && isBehind(selfVersion, cdnLatest)) {
-            console.error(`update: this CLI is ${selfVersion} and the CDN has ${cdnLatest}.` +
+        if (latest && selfVersion && isBehind(selfVersion, latest)) {
+            console.error(`update: this CLI is ${selfVersion} and the release channel has ${latest}.` +
                 "\n  Updating from here would stamp the device with " +
                 selfVersion +
                 " and change nothing, because the device reads <install>/.summrise-release (written by this package) as its version." +
                 "\n  Install the new CLI first, then update again:" +
-                '\n    npm i -g --prefix (Split-Path (Get-Command summrise).Source) https://agent.saisi.online/summrise-agent/summrise-agent-latest.tgz' +
+                "\n    npm i -g summrise-agent" +
                 "\n    summrise update");
             process.exit(1);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "summrise-agent",
-  "version": "1.2.452",
+  "version": "1.2.454",
   "description": "Summrise Agent — Windows device MCP server (terminal/SSH/serial) + panel. Self-hosted npm distribution.",
   "//build": "唯一构建路径：在本目录执行 npm run build。它是自包含的：经 npm exec 按需拉取 typescript@5，无需预装任何 node_modules（干净检出可跑；旧脚本引用 ../summrise-desktop-electron/node_modules/.bin/tsc，干净检出必 ENOENT）。必须用 npm exec --package … -- tsc 的形式：npx 会吃掉传给 tsc 的 -p/--outDir 等参数（round-435：npx 写法从未真正跑通过）。先编 electron TS（--noCheck 纯 emit，与 release.yml 一致）同步两处 src/*.js，再编 src/summrise.ts 到 bin/summrise.js 并校验 round-298 标记（弱 oracle，只证某次构建发生，新鲜性由 publish-release.sh 的 tsc 重编 + cmp 门保证）。",
   "bin": {