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

package/dist/install-stream.d.ts

@@ -0,0 +1,53 @@
+export declare const INSTALL_STREAM_LINES = 15;
+export declare const INSTALL_STREAM_BYTES = 1500;
+export declare const INSTALL_STREAM_EDIT_MIN_MS = 5000;
+export interface InstallStreamSink {
+    /** Post the message (its plain status line); its id is what the edits change. */
+    send(text: string): Promise<{
+        messageId: string;
+    } | undefined>;
+    /** Replace the message's text: a code block under the status line, in the stream's style (markdown or html). */
+    edit(messageId: string, text: string): Promise<void>;
+    warn?(message: string, err: unknown): void;
+}
+export interface InstallStreamClock {
+    now(): number;
+    setTimeout(fn: () => void, ms: number): unknown;
+    clearTimeout(handle: unknown): void;
+}
+/**
+ * The window's own text, without what tmux adds to it: a dead pane's "Pane is dead (status N, <date>)" line (drawn on
+ * the bottom row, below a screenful of blank rows), and runs of blank rows collapsed to one — else the last lines of a
+ * finished install would be blanks and that line.
+ */
+export declare function installerOutput(pane: string): string;
+/**
+ * How a frame is written: "markdown" (a fenced code block — Discord) or "html" (Telegram's own `<pre>`: its markdown
+ * conversion keeps a fence as literal backticks).
+ */
+export type InstallFrameStyle = "markdown" | "html";
+/** The window's last lines as a code block under a status line; just the status line when there are none. */
+export declare function renderInstallFrame(header: string, pane: string, style?: InstallFrameStyle): string;
+export declare class InstallStream {
+    private readonly sink;
+    private readonly header;
+    private readonly clock;
+    private readonly editMinMs;
+    private readonly style;
+    private messageId;
+    private shown;
+    private wanted;
+    private pane;
+    private lastAt;
+    private timer;
+    private inFlight;
+    private closed;
+    constructor(sink: InstallStreamSink, header: string, clock?: InstallStreamClock, editMinMs?: number, style?: InstallFrameStyle);
+    /** A new capture of the window. Never awaits; nothing is posted until the window shows something. */
+    update(pane: string): void;
+    /** Stop editing and write the final frame (the last capture, unless a later one is given) over the message. */
+    finish(header: string, pane?: string): Promise<void>;
+    private schedule;
+    /** `header`: the frame's status line as plain text — what a new message is first posted as. */
+    private write;
+}

package/dist/install-stream.js

@@ -0,0 +1,134 @@
+/**
+ * M-2281 (#2980): the installer's output, live, in the chat that asked `/login` to install a CLI. No page shows the
+ * `agend-login-<backend>` window (it is not an instance), so the chat is where its progress is seen.
+ *
+ * One message, edited in place: the last INSTALL_STREAM_LINES lines of the window, ANSI stripped and secrets masked
+ * (dialogScreenText — the whole capture is masked before its bottom is kept), under INSTALL_STREAM_BYTES so it fits
+ * a Discord (2000) or Telegram (4096) message. At most one edit per INSTALL_STREAM_EDIT_MIN_MS, one in flight, none
+ * for an unchanged frame. The frames come from the session's own poll capture — nothing here reads the pane.
+ *
+ * Fire-and-forget from the poll: update() only records the frame and arms a timer. finish() stops the edits and
+ * writes the final frame (success / failed / timed out / cancelled) over the same message.
+ */
+import { dialogScreenText } from "./dialog-screen-text.js";
+export const INSTALL_STREAM_LINES = 15;
+export const INSTALL_STREAM_BYTES = 1_500;
+export const INSTALL_STREAM_EDIT_MIN_MS = 5_000;
+const realClock = {
+    now: () => performance.now(),
+    setTimeout: (fn, ms) => { const t = setTimeout(fn, ms); t.unref?.(); return t; },
+    clearTimeout: handle => clearTimeout(handle),
+};
+/**
+ * The window's own text, without what tmux adds to it: a dead pane's "Pane is dead (status N, <date>)" line (drawn on
+ * the bottom row, below a screenful of blank rows), and runs of blank rows collapsed to one — else the last lines of a
+ * finished install would be blanks and that line.
+ */
+export function installerOutput(pane) {
+    return pane.replace(/^Pane is dead\b.*$/gm, "").replace(/\n(?:[ \t]*\n){2,}/g, "\n\n");
+}
+const escapeHtml = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+/** The window's last lines as a code block under a status line; just the status line when there are none. */
+export function renderInstallFrame(header, pane, style = "markdown") {
+    const body = dialogScreenText(installerOutput(pane), { lines: INSTALL_STREAM_LINES, bytes: INSTALL_STREAM_BYTES });
+    if (!body)
+        return style === "html" ? escapeHtml(header) : header;
+    // HTML: everything escaped, the only tag is ours. Markdown: a fence inside the output would close the block early,
+    // so its backticks become look-alikes.
+    return style === "html"
+        ? `${escapeHtml(header)}\n<pre>${escapeHtml(body)}</pre>`
+        : `${header}\n\`\`\`\n${body.replace(/`/g, "ˋ")}\n\`\`\``;
+}
+export class InstallStream {
+    sink;
+    header;
+    clock;
+    editMinMs;
+    style;
+    messageId;
+    shown = "";
+    wanted = "";
+    pane = "";
+    lastAt = Number.NEGATIVE_INFINITY;
+    timer = null;
+    inFlight = null;
+    closed = false;
+    constructor(sink, header, clock = realClock, editMinMs = INSTALL_STREAM_EDIT_MIN_MS, style = "markdown") {
+        this.sink = sink;
+        this.header = header;
+        this.clock = clock;
+        this.editMinMs = editMinMs;
+        this.style = style;
+    }
+    /** A new capture of the window. Never awaits; nothing is posted until the window shows something. */
+    update(pane) {
+        if (this.closed)
+            return;
+        this.pane = pane;
+        const frame = renderInstallFrame(this.header, pane, this.style);
+        if (frame === renderInstallFrame(this.header, "", this.style) && this.messageId === undefined)
+            return;
+        this.wanted = frame;
+        this.schedule();
+    }
+    /** Stop editing and write the final frame (the last capture, unless a later one is given) over the message. */
+    async finish(header, pane) {
+        this.closed = true;
+        if (this.timer !== null) {
+            this.clock.clearTimeout(this.timer);
+            this.timer = null;
+        }
+        await this.inFlight;
+        const frame = renderInstallFrame(header, pane ?? this.pane, this.style);
+        // Nothing was ever shown: the result message says it all.
+        if (this.messageId === undefined && frame === renderInstallFrame(header, "", this.style))
+            return;
+        // The final edit keeps the rate too: it waits out what is left of the interval rather than skip it.
+        const wait = this.lastAt + this.editMinMs - this.clock.now();
+        if (wait > 0)
+            await new Promise(resolve => this.clock.setTimeout(resolve, wait));
+        await this.write(frame, header);
+    }
+    schedule() {
+        if (this.timer !== null || this.inFlight || this.wanted === this.shown)
+            return;
+        const delay = Math.max(0, this.lastAt + this.editMinMs - this.clock.now());
+        this.timer = this.clock.setTimeout(() => {
+            this.timer = null;
+            if (this.closed)
+                return;
+            const frame = this.wanted;
+            this.inFlight = this.write(frame, this.header).finally(() => {
+                this.inFlight = null;
+                if (!this.closed)
+                    this.schedule();
+            });
+        }, delay);
+    }
+    /** `header`: the frame's status line as plain text — what a new message is first posted as. */
+    async write(frame, header) {
+        if (frame === this.shown)
+            return;
+        this.lastAt = this.clock.now();
+        try {
+            if (this.messageId === undefined) {
+                // Posted as its plain status line, and every frame goes in by an edit: the message is then one kind from start
+                // to end (Telegram posts a text with a code block as a rich message, but edits text with HTML).
+                const sent = await this.sink.send(header);
+                if (!sent?.messageId)
+                    return;
+                this.messageId = sent.messageId;
+                await this.sink.edit(this.messageId, frame);
+            }
+            else {
+                await this.sink.edit(this.messageId, frame);
+            }
+            this.shown = frame;
+        }
+        catch (err) {
+            // A refused edit (rate limit, a reconnect) is tried again with the next frame, after the interval.
+            this.sink.warn?.("install output edit failed", err);
+        }
+    }
+}
+//# sourceMappingURL=install-stream.js.map

package/dist/install-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install-stream.js","sourceRoot":"","sources":["../src/install-stream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AACvC,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAC1C,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAgBhD,MAAM,SAAS,GAAuB;IACpC,GAAG,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;IAC5B,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChF,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,MAAwB,CAAC;CAC/D,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACzF,CAAC;AAQD,MAAM,UAAU,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAE/G,6GAA6G;AAC7G,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,IAAY,EAAE,KAAK,GAAsB,UAAU;IACpG,MAAM,IAAI,GAAG,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACnH,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACjE,mHAAmH;IACnH,uCAAuC;IACvC,OAAO,KAAK,KAAK,MAAM;QACrB,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,UAAU,CAAC,IAAI,CAAC,QAAQ;QACzD,CAAC,CAAC,GAAG,MAAM,aAAa,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC;AAC9D,CAAC;AAED,MAAM,OAAO,aAAa;IAWL,IAAI;IACJ,MAAM;IACN,KAAK;IACL,SAAS;IACT,KAAK;IAdhB,SAAS,CAAqB;IAC9B,KAAK,GAAG,EAAE,CAAC;IACX,MAAM,GAAG,EAAE,CAAC;IACZ,IAAI,GAAG,EAAE,CAAC;IACV,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC;IAClC,KAAK,GAAY,IAAI,CAAC;IACtB,QAAQ,GAAyB,IAAI,CAAC;IACtC,MAAM,GAAG,KAAK,CAAC;IAEvB,YACmB,IAAuB,EACvB,MAAc,EACd,KAAK,GAAuB,SAAS,EACrC,SAAS,GAAG,0BAA0B,EACtC,KAAK,GAAsB,UAAU;oBAJrC,IAAI;sBACJ,MAAM;qBACN,KAAK;yBACL,SAAS;qBACT,KAAK;IACrB,CAAC;IAEJ,qGAAqG;IACrG,MAAM,CAAC,IAAY;QACjB,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,KAAK,KAAK,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;YAAE,OAAO;QACtG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,+GAA+G;IAC/G,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,IAAa;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAAC,CAAC;QACpF,MAAM,IAAI,CAAC,QAAQ,CAAC;QACpB,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACxE,0DAA0D;QAC1D,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,KAAK,kBAAkB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO;QACjG,oGAAoG;QACpG,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC7D,IAAI,IAAI,GAAG,CAAC;YAAE,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACvF,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAEO,QAAQ;QACd,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK;YAAE,OAAO;QAC/E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE;YACtC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,IAAI,CAAC,MAAM;gBAAE,OAAO;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC1D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IAED,+FAA+F;IACvF,KAAK,CAAC,KAAK,CAAC,KAAa,EAAE,MAAc;QAC/C,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK;YAAE,OAAO;QACjC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACjC,+GAA+G;gBAC/G,gGAAgG;gBAChG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,CAAC,IAAI,EAAE,SAAS;oBAAE,OAAO;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,mGAAmG;YACnG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;CACF"}

package/dist/instance-lifecycle.d.ts

@@ -41,6 +41,11 @@ export interface BackendInstallationInfo {
 export declare const BACKEND_INSTALLATION_INFO: Readonly<Record<string, BackendInstallationInfo>>;
 /** Check one executable using the same PATH visible to the fleet process. */
 export declare function checkBinaryInstalled(binary: string): boolean;
+/**
+ * M-2281 (#2980): the same check without holding the fleet loop — for paths a chat click runs (`/login`'s install
+ * routing), where a slow PATH (WSL's /mnt/c entries) would otherwise stall every adapter for up to the timeout.
+ */
+export declare function checkBinaryInstalledAsync(binary: string): Promise<boolean>;
 /**
  * Return why an instance daemon PID must not receive SIGTERM, or null when the
  * stale-process cleanup may proceed. daemon.pid historically stores the shared
@@ -366,6 +371,13 @@ export declare class InstanceLifecycle {
     /** Max retries before giving up and pausing. */
     private static readonly CAPACITY_BACKOFF_MAX;
     constructor(ctx: LifecycleContext);
+    /** M-2269: the last dialog text logged per instance — the same screen seen again on later scans is not logged again. */
+    private readonly lastLoggedScreen;
+    /**
+     * M-2269: `{ screen }` for a dialog/prompt event's Log row (the daemon already stripped, masked and capped it), or
+     * nothing when there is none or it is the same text this instance's Log already has. Bookkeeping only.
+     */
+    private screenForLog;
     /** Seed only the Codex daemon replacing a scheduled capacity retry. */
     private applyCapacityBackoffBaseline;
     /**

package/dist/instance-lifecycle.js

@@ -5,6 +5,7 @@ import { existsSync, readFileSync, mkdirSync, realpathSync, writeFileSync, statS
 import { ensureInstanceDir } from "./private-dir.js";
 import { assertNoSessionOomStop } from "./session-oom-stop.js";
 import { execFileSync } from "node:child_process";
+import { execFile } from "./child-process.js";
 import { join, basename, dirname, resolve, sep as pathSep } from "node:path";
 import { access } from "node:fs/promises";
 import { getAgendHome, ensureWorkspaceGit } from "./paths.js";
@@ -65,6 +66,20 @@ export const BACKEND_INSTALLATION_INFO = {
 export function checkBinaryInstalled(binary) {
     return measureSyncWork("lifecycle.checkBinaryInstalled", () => checkBinaryInstalledSync(binary));
 }
+/**
+ * M-2281 (#2980): the same check without holding the fleet loop — for paths a chat click runs (`/login`'s install
+ * routing), where a slow PATH (WSL's /mnt/c entries) would otherwise stall every adapter for up to the timeout.
+ */
+export function checkBinaryInstalledAsync(binary) {
+    return new Promise(resolve => {
+        try {
+            execFile("which", [binary], { timeout: 2000 }, err => resolve(!err));
+        }
+        catch {
+            resolve(false);
+        }
+    });
+}
 function checkBinaryInstalledSync(binary) {
     try {
         execFileSync("which", [binary], { stdio: "pipe", timeout: 2000 });
@@ -322,6 +337,20 @@ export class InstanceLifecycle {
     constructor(ctx) {
         this.ctx = ctx;
     }
+    /** M-2269: the last dialog text logged per instance — the same screen seen again on later scans is not logged again. */
+    lastLoggedScreen = new Map();
+    /**
+     * M-2269: `{ screen }` for a dialog/prompt event's Log row (the daemon already stripped, masked and capped it), or
+     * nothing when there is none or it is the same text this instance's Log already has. Bookkeeping only.
+     */
+    screenForLog(name, screen) {
+        if (typeof screen !== "string" || !screen)
+            return {};
+        if (this.lastLoggedScreen.get(name) === screen)
+            return {};
+        this.lastLoggedScreen.set(name, screen);
+        return { screen };
+    }
     /** Seed only the Codex daemon replacing a scheduled capacity retry. */
     applyCapacityBackoffBaseline(name, backendName, daemon) {
         if (backendName !== "codex")
@@ -937,7 +966,7 @@ export class InstanceLifecycle {
             // position, so the human must LOOK and pick the option explicitly — no
             // fixed key sequence; a known dialog whose auto-dismiss did not take gets
             // the keys we would have pressed.
-            this.ctx.eventLog?.insert(name, "dialog_parked", { description: data.description, holdOnly: data.holdOnly });
+            this.ctx.eventLog?.insert(name, "dialog_parked", { description: data.description, holdOnly: data.holdOnly, ...this.screenForLog(name, data.screen) });
             this.ctx.logger.warn({ name, description: data.description, holdOnly: data.holdOnly }, "Instance is parked on a CLI dialog — not auto-answering");
             if (this.ctx.isPlannedRestart())
                 return;
@@ -983,7 +1012,7 @@ export class InstanceLifecycle {
         // #2822: a usage-limit hold began or ended — Needs you lists it while it lasts.
         daemon.on("usage_hold", () => this.ctx.onAttentionChanged?.(name));
         daemon.on("interactive_prompt", safeHandler(async (data) => {
-            this.ctx.eventLog?.insert(name, "interactive_prompt", { kind: data.kind });
+            this.ctx.eventLog?.insert(name, "interactive_prompt", { kind: data.kind, ...this.screenForLog(name, data.screen) });
             this.ctx.logger.warn({ name, kind: data.kind, prompt: data.prompt }, "Instance is waiting for interactive terminal input");
             if (this.ctx.isPlannedRestart()) {
                 this.ctx.logger.info({ name }, "Interactive prompt notification suppressed — planned restart in progress");