@songsid/agend 2.3.4-beta.3 → 2.3.4-beta.4

package/dist/dialog-screen-text.d.ts

@@ -0,0 +1,16 @@
+/**
+ * M-2269: what a detected dialog or prompt looked like, for the web Log. Claude Code never writes its permission
+ * dialogs, "Resume this conversation?" or limit banners to the transcript, and an alt-screen CLI leaves no tmux
+ * scrollback: the capture the scan already took is the only record of them. Read-only bookkeeping — taken from that
+ * capture, never a new one.
+ *
+ * The bottom of the screen (where a TUI draws its dialog), ANSI stripped, secrets masked, at most SCREEN_MAX_LINES
+ * lines and SCREEN_MAX_BYTES UTF-8 bytes. Empty when there is nothing to show.
+ */
+export declare const SCREEN_MAX_LINES = 30;
+export declare const SCREEN_MAX_BYTES = 2048;
+/** M-2281: the same cleaning with other bounds (the live install view keeps fewer lines, under a chat message's size). */
+export declare function dialogScreenText(pane: string | null | undefined, limits?: {
+    lines: number;
+    bytes: number;
+}): string;

package/dist/dialog-screen-text.js

@@ -0,0 +1,51 @@
+import { maskSecrets } from "./log-steps.js";
+/**
+ * M-2269: what a detected dialog or prompt looked like, for the web Log. Claude Code never writes its permission
+ * dialogs, "Resume this conversation?" or limit banners to the transcript, and an alt-screen CLI leaves no tmux
+ * scrollback: the capture the scan already took is the only record of them. Read-only bookkeeping — taken from that
+ * capture, never a new one.
+ *
+ * The bottom of the screen (where a TUI draws its dialog), ANSI stripped, secrets masked, at most SCREEN_MAX_LINES
+ * lines and SCREEN_MAX_BYTES UTF-8 bytes. Empty when there is nothing to show.
+ */
+export const SCREEN_MAX_LINES = 30;
+export const SCREEN_MAX_BYTES = 2048;
+// CSI / OSC / other ESC sequences, and the C0 controls that are not line structure.
+const ANSI = /\u001b(?:\[[0-?]*[ -/]*[@-~]|\][^\u0007\u001b]*(?:\u0007|\u001b\\)|[@-Z\\-_])/g;
+const CONTROLS = /[\u0000-\u0008\u000b-\u001f\u007f]/g;
+/**
+ * A line that is only base64 (16+ characters, PEM wraps at 64 — or shorter when rewrapped): the body of a key or
+ * certificate whose BEGIN line may not even be on screen (scrolled off the top of the capture itself), so the
+ * whole-capture mask above cannot see it. A dialog never needs such a line; it is masked whatever it is.
+ */
+const KEY_BODY = /^(\s*)[A-Za-z0-9+/]{16,}={0,2}\s*$/;
+function maskKeyBody(line) {
+    const m = KEY_BODY.exec(line);
+    return m && /[0-9+/]/.test(line) && /[A-Za-z]/.test(line) ? `${m[1]}[REDACTED]` : line;
+}
+/** M-2281: the same cleaning with other bounds (the live install view keeps fewer lines, under a chat message's size). */
+export function dialogScreenText(pane, limits = { lines: SCREEN_MAX_LINES, bytes: SCREEN_MAX_BYTES }) {
+    if (!pane)
+        return "";
+    const stripped = pane.replace(ANSI, "").replace(/\r\n?/g, "\n").replace(CONTROLS, "");
+    // #2967 review: mask the WHOLE capture before keeping its bottom — a private key whose BEGIN line sits above the cut
+    // would otherwise leave its body and END below it, where no rule can tell them apart from text any more.
+    const lines = maskSecrets(stripped).split("\n").map(l => maskKeyBody(l.replace(/\s+$/, "")));
+    while (lines.length && lines[lines.length - 1] === "")
+        lines.pop();
+    const tail = lines.slice(-limits.lines);
+    while (tail.length && tail[0] === "")
+        tail.shift();
+    let text = tail.join("\n");
+    // The byte cap keeps the bottom (the dialog and its options), cut at a whole line, then a whole character.
+    while (Buffer.byteLength(text, "utf8") > limits.bytes && text.includes("\n"))
+        text = text.slice(text.indexOf("\n") + 1);
+    if (Buffer.byteLength(text, "utf8") > limits.bytes) {
+        const chars = [...text];
+        while (chars.length && Buffer.byteLength(chars.join(""), "utf8") > limits.bytes)
+            chars.shift();
+        text = chars.join("");
+    }
+    return text;
+}
+//# sourceMappingURL=dialog-screen-text.js.map

package/dist/dialog-screen-text.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dialog-screen-text.js","sourceRoot":"","sources":["../src/dialog-screen-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAErC,oFAAoF;AACpF,MAAM,IAAI,GAAG,gFAAgF,CAAC;AAC9F,MAAM,QAAQ,GAAG,qCAAqC,CAAC;AAEvD;;;;GAIG;AACH,MAAM,QAAQ,GAAG,oCAAoC,CAAC;AACtD,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;AACzF,CAAC;AAED,0HAA0H;AAC1H,MAAM,UAAU,gBAAgB,CAAC,IAA+B,EAAE,MAAM,GAAqC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAE;IAC/J,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACtF,qHAAqH;IACrH,yGAAyG;IACzG,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7F,OAAO,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,KAAK,CAAC,GAAG,EAAE,CAAC;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE;QAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IACnD,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,2GAA2G;IAC3G,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxH,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK;YAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/F,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/fleet-manager.d.ts

@@ -3639,6 +3639,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     /** "Resend token" button (web login): only the requester may press it; the token never enters the channel. */
     private handleLoginTokenResend;
     private activeInstall;
+    /** M-2281: how long `/login`'s install window may run (a field so a smoke can shorten it). */
+    installTimeoutMs: number;
     /** An install that succeeded, between its success line and the sign-in it hands over to (#1131). */
     private installHandoff;
     /** Start a CLI install session. Caller enforces admin. */
@@ -3653,6 +3655,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     }): Promise<string>;
     /** Whether this backend's CLI is on the fleet's PATH (what `/login` installs when it is not). */
     isCliInstalled(backend: string): boolean;
+    /** M-2281: isCliInstalled without holding the fleet loop (a chat click's path: `which` on a slow PATH can take seconds). */
+    isCliInstalledOffLoop(backend: string): Promise<boolean>;
     /** Abort the active install (`/login cancel`) and remove its window. */
     cancelInstallSession(): Promise<string>;
     /** `command -v` on a login shell, so PATH additions from rc files count. */

package/dist/fleet-manager.js

@@ -27,6 +27,8 @@ import { clearPublicLinkOwner, readPublicLinkOwner, writePublicLinkOwner } from
 import { PUBLIC_PREVIEW_FRAME_SRC, PUBLIC_PREVIEW_TUNNEL_DIR, PublicPreview, publicPreviewWanted } from "./public-preview.js";
 import { CloudflaredProvider } from "./tunnel/cloudflared.js";
 import { ensureCloudflared } from "./tunnel/cloudflared-install.js";
+import { unattendedInstallCommand } from "./unattended-install.js";
+import { InstallStream } from "./install-stream.js";
 import { namedTestLane, runNamedLinkTest } from "./tunnel/named-link-test.js";
 import { daemonTopicMode, isWebOnlyFleetConfig } from "./web-only-fleet.js";
 import { OFFICE_SHARE_TUNNEL_DIR, OfficeShareService } from "./office-share-service.js";
@@ -107,7 +109,7 @@ import { WebhookEmitter } from "./webhook-emitter.js";
 import { TmuxControlClient } from "./tmux-control.js";
 import { safeHandler } from "./safe-async.js";
 import { RoutingEngine } from "./routing-engine.js";
-import { InstanceLifecycle, SupersededStartError, BACKEND_INSTALLATION_INFO, checkBinaryInstalled, } from "./instance-lifecycle.js";
+import { InstanceLifecycle, SupersededStartError, BACKEND_INSTALLATION_INFO, checkBinaryInstalled, checkBinaryInstalledAsync, } from "./instance-lifecycle.js";
 import { TopicArchiver } from "./topic-archiver.js";
 import { StatuslineWatcher } from "./statusline-watcher.js";
 import { applyInstanceConfigPatch, outboundHandlers } from "./outbound-handlers.js";
@@ -444,6 +446,8 @@ const CANCEL_BTN_LEDGER_FILE = "cancel-buttons.json";
 const PROGRESS_UPDATE_INTERVAL_MS = 60_000;
 /** Floor between tool-progress-driven bubble edits (Telegram flood safety). */
 const TOOL_PROGRESS_EDIT_MIN_MS = 4_000;
+/** M-2281: how long `/login`'s install window may run before it is stopped. */
+const INSTALL_TIMEOUT_MS = 10 * 60 * 1000;
 /** Elapsed time is only shown once work has clearly outlasted a quick answer. */
 /**
  * Default delay before the button starts showing elapsed time. Configurable via
@@ -17713,7 +17717,8 @@ export class FleetManager {
                 return admitted.refusal;
             opts = { ...opts, profile: admitted.profile };
         }
-        if (BACKEND_INSTALLATION_INFO[wanted] && !this.isCliInstalled(wanted)) {
+        // M-2281: asked off the fleet loop — this runs on a chat click.
+        if (BACKEND_INSTALLATION_INFO[wanted] && !(await this.isCliInstalledOffLoop(wanted))) {
             const flow = LOGIN_FLOWS[wanted];
             this.recordLoginFlow(wanted, flow && flow.remoteLogin !== "unsupported" ? "install_then_login" : "install_only", chat.userId);
             return opts.profile !== undefined
@@ -17938,6 +17943,8 @@ export class FleetManager {
     // installer, judge by exit code, verify the binary on a fresh login shell,
     // then sign in (the hand-off below).
     activeInstall = null;
+    /** M-2281: how long `/login`'s install window may run (a field so a smoke can shorten it). */
+    installTimeoutMs = INSTALL_TIMEOUT_MS;
     /** An install that succeeded, between its success line and the sign-in it hands over to (#1131). */
     installHandoff = null;
     /** Start a CLI install session. Caller enforces admin. */
@@ -17946,11 +17953,13 @@ export class FleetManager {
         const info = BACKEND_INSTALLATION_INFO[backend];
         if (!info)
             return t("install.unsupported", backendArg);
-        if (checkBinaryInstalled(info.binary))
-            return t("install.already", backend, info.binary);
         // Reserve the fleet-wide window before the first await (shared with web
         // login). Owned by this method until the session is published.
         const claim = this.loginWindow.tryClaim("install", backend);
+        if (claim && await checkBinaryInstalledAsync(info.binary)) {
+            this.loginWindow.release(claim);
+            return t("install.already", backend, info.binary);
+        }
         if (!claim)
             return this.loginWindow.busyMessage();
         let tmux;
@@ -17970,16 +17979,39 @@ export class FleetManager {
         // A synthetic flow: success is decided by the installer's exit code
         // (LoginSession treats a clean exit as success), never by pane text. The
         // session only judges that verdict; it does not read the output for URLs or prompts.
+        // M-2281 (#2980): no terminal to ask on, low priority, stoppable as a whole, the user's own $SHELL — see
+        // unattended-install.ts. A prompt nobody can answer fails at once instead of waiting out the timeout.
         const flow = {
             backend,
-            command: info.unattended ?? info.install,
+            command: unattendedInstallCommand(info.unattended ?? info.install),
             successPattern: /$^/,
-            timeoutMs: 10 * 60 * 1000,
+            timeoutMs: this.installTimeoutMs,
         };
+        // M-2281: the installer's output, live, in the chat that asked — no page shows this window.
+        // Telegram gets its own <pre> (its markdown conversion keeps a fence as literal backticks); others a fenced block.
+        const frameStyle = chat.adapter.type === "telegram" ? "html" : "markdown";
+        const stream = new InstallStream({
+            send: text => chat.adapter.sendText(chat.chatId, text, { threadId: chat.threadId, allowedMentions: { parse: [] } }),
+            edit: (messageId, text) => chat.adapter.editMessage(chat.chatId, messageId, text, chat.threadId, { format: frameStyle }),
+            warn: (message, err) => this.logger.debug({ backend, err: err?.message ?? String(err) }, message),
+        }, t("install.stream_running", backend), undefined, undefined, frameStyle);
+        const minutes = String(Math.max(1, Math.round(this.installTimeoutMs / 60_000)));
         const session = new LoginSession(flow, tmux, {
+            onProgress: pane => stream.update(pane),
             onDone: async ({ ok, detail, cleanupFailed }) => {
                 this.activeInstall = null;
                 this.loginWindow.release(claim);
+                // Between the install ending and the sign-in starting there is no
+                // session to cancel; this hand-off is what `/login cancel` stops — armed
+                // before the first await here, so a cancel during any of them counts.
+                const handoff = ok ? { backend, cancelled: false } : null;
+                if (handoff)
+                    this.installHandoff = handoff;
+                // The live view's last frame first, so the result line below follows the output it is about.
+                await stream.finish(ok ? t("install.stream_ok", backend)
+                    : detail === "timeout" ? t("install.stream_timeout", backend, minutes)
+                        : detail === "cancelled" ? t("install.stream_cancelled", backend)
+                            : t("install.stream_failed", backend)).catch(() => { });
                 if (cleanupFailed) {
                     await chat.adapter.sendText(chat.chatId, t("login.web_cleanup_failed", backend), { threadId: chat.threadId }).catch(() => { });
                 }
@@ -17987,15 +18019,12 @@ export class FleetManager {
                     // A cancel is user-initiated — the cancel command's own reply already
                     // said so; a second message here would be a duplicate.
                     if (detail !== "cancelled") {
-                        await chat.adapter.sendText(chat.chatId, t("install.failed", backend, detail), { threadId: chat.threadId }).catch(() => { });
+                        await chat.adapter.sendText(chat.chatId, detail === "timeout" ? t("install.timeout", backend, minutes) : t("install.failed", backend, detail), { threadId: chat.threadId }).catch(() => { });
                     }
                     return;
                 }
-                // Between the install ending and the sign-in starting there is no
-                // session to cancel; this hand-off is what `/login cancel` stops — from
-                // here on, as the login-shell lookup below is an await.
-                const handoff = { backend, cancelled: false };
-                this.installHandoff = handoff;
+                if (!handoff || handoff.cancelled || this.installHandoff !== handoff)
+                    return;
                 // The installer may only have added the binary to a profile PATH; a
                 // fresh login shell sees that, the fleet process's PATH may not.
                 const installedAt = (await this.locateBinaryOnLoginShell(info.binary)) ?? this.locateInInstallerBinDirs(info);
@@ -18068,6 +18097,11 @@ export class FleetManager {
         const info = BACKEND_INSTALLATION_INFO[backend];
         return !!info && checkBinaryInstalled(info.binary);
     }
+    /** M-2281: isCliInstalled without holding the fleet loop (a chat click's path: `which` on a slow PATH can take seconds). */
+    async isCliInstalledOffLoop(backend) {
+        const info = BACKEND_INSTALLATION_INFO[backend];
+        return !!info && await checkBinaryInstalledAsync(info.binary);
+    }
     /** Abort the active install (`/login cancel`) and remove its window. */
     async cancelInstallSession() {
         if (!this.activeInstall)