@songsid/agend 2.2.0-beta.17 → 2.2.0-beta.19

package/dist/fleet-manager.js

@@ -7,7 +7,7 @@ import { SettingsExecution, settingsRevision, noteSettingsWrite, settingsFileRes
 import { performance } from "node:perf_hooks";
 import { withSpawnHoldReply } from "./spawn-hold-reply.js";
 import { gatewayRequestContext } from "./web-request-context.js";
-import { createPublicWebGateway } from "./public-web-gateway.js";
+import { createPublicWebGateway, PUBLIC_GATEWAY_RECEIVE_MS } from "./public-web-gateway.js";
 import { handleWebIconRequest } from "./web-icons.js";
 import { trackWebServer } from "./web-server-drain.js";
 import { renderPublicLinkProgress, ThrottledMessageEditor } from "./public-link-progress.js";
@@ -144,7 +144,7 @@ import { WEB_NAME_FALLBACK, safeWebName, validateWebName, webNameInUse, webPerso
 import { ReplyButtonStore, parseReplyButtons, replyButtonClickText, replyButtonsFallbackText, REPLY_BUTTON_PREFIX } from "./reply-buttons.js";
 import { ReplyButtonsController } from "./reply-buttons-controller.js";
 import { parsePoll } from "./reply-polls.js";
-import { publicAttachment, sweepOrphanedUploads, WebFileLedger } from "./web-upload.js";
+import { isUploadRequest, limitRequestReceive, publicAttachment, sweepOrphanedUploads, UPLOAD_REQUEST_TIMEOUT_MS, uploadLimits, WebFileLedger } from "./web-upload.js";
 import { REPLY_FILES_MAX_BYTES, snapshotReplyFile, sweepReplySnapshots, webFilesDir } from "./web-reply-files.js";
 import { handleViewRequest, isViewPath, profileIdentities, resolveInstanceIdentity } from "./view-api.js";
 import { downloadStickerImage } from "./channel/sticker-download.js";
@@ -162,7 +162,7 @@ import { tightenInstanceDirs } from "./private-dir.js";
 import { decideSlash } from "./slash-authz.js";
 import { canonicalCommand, commandSpec, decideCommand, ruleFor } from "./command-table.js";
 import { runVisibilityCommand } from "./cross-instance-notice.js";
-import { installedChannel, isPrereleaseVersion, updateNoticeKey } from "./update-check.js";
+import { installedChannel, updateNoticeKey } from "./update-check.js";
 import { resolveInstalledAgend } from "./update-dispatch.js";
 import { resolveUpdateLaunch, openUpdateLog, updateLogPath, watchUpdateLaunch } from "./update-launch.js";
 import { admitProfileLogin, LoginController, LOGIN_TOKEN_RESEND_PREFIX, POST_LOGIN_RECOVERY_DEADLINE_MS } from "./login-controller.js";
@@ -802,7 +802,8 @@ export class FleetManager {
     /** #1565: the web chat history's files (set at fleet start, once the home and the instances are known). */
     webChatStore = null;
     /** Uploaded files and the files the dashboard may fetch back (uploads, reply attachments). */
-    webFiles = new WebFileLedger();
+    // #1937: the upload limits are the config's, read on each use (agend reload applies a change to the next upload).
+    webFiles = new WebFileLedger({ limits: () => uploadLimits(this.fleetConfig?.web) });
     /** #1770: per instance, its last web reply still copying its files — the next one is shown after it, in order. */
     webReplyOrder = new Map();
     /** #1770: an instance's web-files byte cap (a field, so a test can make it small). */
@@ -1319,8 +1320,10 @@ export class FleetManager {
             return false;
         reactions.consume();
         this.afterUserInboundDelivered(set.instance, inbound, deliveryEpoch);
+        // The web chat shows the click as its button's label (a chip); `text` stays what the agent was given.
         this.emitSseEvent("message", {
             instance: set.instance, sender: by.username, role: "user", text: content, ts, ...(web ? { messageId } : {}),
+            click: { label: button.label, of: set.id },
         });
         return true;
     }
@@ -2828,6 +2831,14 @@ export class FleetManager {
                     return null;
                 }
             },
+            paneFollow: (name) => {
+                try {
+                    return this.lifecycle.daemons.get(name)?.compactPaneUi() != null;
+                }
+                catch {
+                    return false;
+                }
+            },
             changed: () => this.emitSseEvent("status", this.getUiStatus()),
         });
     }
@@ -7280,7 +7291,12 @@ export class FleetManager {
                 else if (msg.type === "raw_paste_written") {
                     // Board 003648ac: a web /compact's paste reached the pane (or never will): its watch starts, or ends as lost.
                     if (typeof msg.id === "string")
-                        this.compactWatchService?.pasted(name, msg.id, msg.outcome === "written", { owner: msg.owner, checkpoint: msg.checkpoint });
+                        this.compactWatchService?.pasted(name, msg.id, msg.outcome === "written", { owner: msg.owner, checkpoint: msg.checkpoint, pane: msg.pane });
+                }
+                else if (msg.type === "compact_pane_result") {
+                    // Board 907c7899: kiro's pane said how that /compact ended.
+                    if (typeof msg.id === "string")
+                        this.compactWatchService?.paneResult(name, msg.id, msg.owner, msg.outcome);
                 }
                 else if (msg.type === "runtime_switch_result") {
                     // #1690: what our own runtime /model came to (the daemon answered claude's "Switch model?" or saw the result).
@@ -14609,6 +14625,7 @@ export class FleetManager {
                 messageId: typeof m.messageId === "string" ? m.messageId : undefined,
                 role: typeof m.role === "string" ? m.role : undefined,
                 buttons: m.buttons,
+                click: m.click,
             });
             broadcastSseEvent(this.sseClients, event, recorded, onError, this.webChatHistory.cursorOf(recorded));
             return;
@@ -19371,37 +19388,41 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             const currentVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version ?? "0.0.0";
             const latest = await npmVersion("@songsid/agend");
             let target = latest;
+            let fromChannel = false;
             // The same channel rule as `agend update` (#1259): an alpha follows @alpha, any other prerelease @beta.
             const channel = installedChannel(currentVersion);
             if (channel !== "latest") {
-                // Prerelease users track their own channel (never fall back to @latest,
-                // which is older, and an alpha is never offered @beta), but should also
-                // hear when a newer STABLE ships — pick whichever is the newest.
                 let pre = "";
                 try {
                     pre = await npmVersion(`@songsid/agend@${channel}`);
                 }
                 catch { /* no such tag */ }
-                target = pre || latest;
-                if (latest && this.semverGt(latest, target))
+                // #1926: a beta install hears about @beta only: beta users stay on the beta line after a stable ships, so
+                // @latest is not their target. Taking the higher of the two made a same-core stable (2.2.0 over beta.16) the
+                // target, which the same-core guard then dropped, so the newer beta.17 was never announced.
+                target = pre;
+                fromChannel = true;
+                // An alpha is still told about a stable that passed its own minor (with --stable, #1259): only a stable of
+                // another core that is newer than its channel's release. A same-core @latest (2.2.0 for 2.2.0-alpha.3) is not
+                // taken from @latest and no longer hides a newer alpha; once the release points @alpha at it, it comes from
+                // @alpha like any channel release.
+                const core = (v) => v.replace(/^v/, "").split("-")[0];
+                if (channel === "alpha" && latest && core(latest) !== core(currentVersion) && (!pre || this.semverGt(latest, pre))) {
                     target = latest;
+                    fromChannel = false;
+                }
             }
-            // A beta already at/ahead of its matching stable must NOT be told to
-            // "update" to that stable — e.g. 2.0.11-beta.41 already contains everything
-            // in stable 2.0.11, so semverGt(2.0.11, 2.0.11-beta.41) being true (a stable
-            // outranks a prerelease of the same core) is a false positive here. Suppress
-            // only that same-core stable-vs-my-beta case; a higher stable core (2.0.12)
-            // or a newer beta (2.0.11-beta.50) still notifies via semverGt below.
-            const core = (v) => v.replace(/^v/, "").split("-")[0];
-            const betaSupersedesStable = isPrereleaseVersion(currentVersion) && !isPrereleaseVersion(target) && core(target) === core(currentVersion);
             // Only notify when target is genuinely newer (semver), so a beta user on
             // 2.0.8-beta.16 is never told that stable 2.0.7 is "available".
-            if (target && !betaSupersedesStable && this.semverGt(target, currentVersion)) {
+            if (target && this.semverGt(target, currentVersion)) {
                 const generalId = this.findGeneralInstance();
                 if (generalId) {
                     // No release URL — Discord's SuppressEmbeds proved unreliable and the
                     // link preview looked bad. Version + /update instruction is enough.
-                    this.notifyInstanceTopic(generalId, t(updateNoticeKey(currentVersion, target), `v${target}`, `v${currentVersion}`));
+                    // From the install's own channel tag, this is what /update installs — even a stable the release pointed the
+                    // tag at (2.2.0 on @alpha / @beta): the plain /update text, never "/update stays on … use --stable" (#1928).
+                    const key = fromChannel ? "update.available_current" : updateNoticeKey(currentVersion, target);
+                    this.notifyInstanceTopic(generalId, t(key, `v${target}`, `v${currentVersion}`));
                 }
             }
         }
@@ -19468,6 +19489,10 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
     /** Shared handler dispatcher; gateway admission is enforced by its separate listener. */
     dispatchWebHttp(req, res, port, closing = false) {
         try {
+            // #1937: the listeners allow an upload long enough for a slow link; every other request keeps its old bound on
+            // arriving whole — 10 s through the public link's gateway, Node's 300 s here.
+            if (!isUploadRequest(req))
+                limitRequestReceive(req, gatewayRequestContext(req) ? PUBLIC_GATEWAY_RECEIVE_MS : 300_000);
             res.setHeader("Content-Type", "application/json");
             // No Referer to a tunnel host, an upstream proxy, or any page linked from
             // the panel — the dashboard URL is itself a credential-bearing address.
@@ -19809,6 +19834,10 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         if (!this.webToken || !this.webSessions)
             this.initializeWebAuthTokens();
         const server = createServer((req, res) => this.dispatchWebHttp(req, res, port, drain.closing));
+        // #1937: Node's default (300 s to receive a request) would cut a large upload on a slow link. The listener allows
+        // more; the upload route keeps its own clocks (no byte for a minute, or 30 minutes in all), and every other request
+        // keeps the old 300 s (limitRequestReceive in dispatchWebHttp).
+        server.requestTimeout = UPLOAD_REQUEST_TIMEOUT_MS;
         const drain = trackWebServer(server);
         this.healthServer = server;
         this.healthServerDrain = drain;