@songsid/agend 2.3.2 → 2.3.3-beta.10

package/dist/sd-notify.js

@@ -3,6 +3,8 @@ import { execFile } from "./child-process.js";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgendHome } from "./paths.js";
+import { notifySocketProblem } from "./notify-socket.js";
+export { notifySocketProblem };
 /**
  * Keep systemd's notification socket private to the fleet process. The socket
  * path is a capability: any child that inherits it can send READY/WATCHDOG/
@@ -51,64 +53,106 @@ export function sendSystemdNotificationAsync(state, socket, environment, execute
     catch { /* reporting must never throw out of a child callback */ } });
 }
 /**
- * Send a notification without blocking the event loop.
- *
- * The watchdog ping exists to prove this process is still turning its event
- * loop. Proving it with `execFileSync` stopped the loop for as long as the fork
- * took — up to the 5s timeout — every 30 seconds, and forking is slowest exactly
- * when the machine is loaded, i.e. when the ping matters. A fire-and-forget spawn
- * says the same thing about liveness (the timer fired, the call was made) without
- * contradicting itself.
- *
- * Still a subprocess: Node does not expose AF_UNIX datagram sockets, so
- * systemd-notify remains the only way to reach NOTIFY_SOCKET from here.
+ * Wait for the notify child asynchronously. execFile still has a synchronous
+ * fork cost under host pressure; the shorter heartbeat interval and bounded
+ * retry restore margin without an independent heartbeat or changing barriers.
  */
 export function sdNotify(state) {
     defaultNotifier(state);
 }
 let warnSink = null;
-export function setSdNotifyWarn(sink) { warnSink = sink; }
-/** At most one warning per kind in this window: a ping is every 30 s, the log must not be. */
+let startChecked = false;
+/** The fleet sets this as it starts: the first time, a socket that is already gone is said once (log only). */
+export function setSdNotifyWarn(sink) {
+    warnSink = sink;
+    if (sink && !startChecked) {
+        startChecked = true;
+        reportNotifySocketAtStart(sink);
+    }
+}
+/** Repeated unchanged ownership skips may coalesce; delivery failures never do. */
 export const SD_NOTIFY_WARN_INTERVAL_MS = 10 * 60_000;
+/** More opportunities within WatchdogSec=60, still driven by the main loop. */
+export const SD_WATCHDOG_INTERVAL_MS = 10_000;
+export const SD_NOTIFY_RETRY_MS = 1_000;
+/** Liveness is sampled only by the fleet's main loop, never an independent sender. */
+export function startSdWatchdog(notify = sdNotify) {
+    return setInterval(() => notify("WATCHDOG=1"), SD_WATCHDOG_INTERVAL_MS);
+}
 /**
  * The notification path, with what it depends on passed in (tests). A skipped notification used to be silent: a
  * fleet.pid naming another process, or a systemd-notify that failed, stopped the watchdog being fed with nothing in
- * the log, and the abort that followed looked like a hang. Now each says so, rate-limited per kind.
+ * the log, and the abort that followed looked like a hang. Delivery failures include the child outcome on every attempt; ownership skips coalesce.
  */
 export function createSdNotifier(deps) {
     const now = deps.now ?? (() => performance.now());
     const lastWarnAt = new Map();
-    const warn = (kind, fields, message) => {
-        const sink = deps.warn();
-        if (!sink)
-            return;
-        const at = now(), last = lastWarnAt.get(kind);
+    let retryTimer = null;
+    let generation = 0;
+    const cancelRetry = () => {
+        generation++;
+        if (retryTimer)
+            clearTimeout(retryTimer);
+        retryTimer = null;
+    };
+    const warnOwner = (fields) => {
+        const at = now(), last = lastWarnAt.get("not_owner");
         if (last !== undefined && at - last < SD_NOTIFY_WARN_INTERVAL_MS)
             return;
-        lastWarnAt.set(kind, at);
+        lastWarnAt.set("not_owner", at);
         try {
-            sink(fields, message);
+            deps.warn()?.(fields, "systemd notification not sent: fleet.pid does not name this process, so systemd's watchdog is not being fed");
         }
         catch { /* reporting must never break the ping */ }
     };
-    return (state) => {
-        if (!deps.socket)
+    const attempt = (state, retry, epoch) => {
+        if (!deps.socket || epoch !== generation)
             return;
         const pid = deps.pid(), recorded = deps.recordedPid();
         if (recorded !== pid) {
-            warn("not_owner", { state, pid, recordedPid: recorded }, "systemd notification not sent: fleet.pid does not name this process, so systemd's watchdog is not being fed");
+            warnOwner({ state, pid, recordedPid: recorded });
             return;
         }
+        const startedAt = now();
+        let completed = false;
+        const done = (error) => {
+            if (completed)
+                return;
+            completed = true;
+            if (!error)
+                return;
+            const detail = error;
+            // Every failed attempt is visible, including a failed retry. A later
+            // successful ping needs no warning; only unchanged ownership skips coalesce.
+            try {
+                const why = deps.socket ? (deps.socketProblem ?? notifySocketProblem)(deps.socket) : null;
+                deps.warn()?.({ state, retry, error: error.message, code: detail.code ?? null,
+                    signal: detail.signal ?? null, killed: detail.killed ?? false,
+                    elapsedMs: Math.max(0, Math.round(now() - startedAt)), ...why }, "systemd-notify failed; systemd's watchdog may not be fed");
+            }
+            catch { /* reporting must never break the ping */ }
+            if (state === "WATCHDOG=1" && !retry && epoch === generation) {
+                retryTimer = setTimeout(() => {
+                    retryTimer = null;
+                    attempt(state, true, epoch); // owner is checked again, and a retry never retries itself
+                }, SD_NOTIFY_RETRY_MS);
+                retryTimer.unref?.();
+            }
+        };
         try {
-            deps.send(state, deps.socket, error => {
-                if (error)
-                    warn("notify_failed", { state, error: error.message, code: error.code }, "systemd-notify failed; systemd's watchdog may not be fed");
-            });
+            deps.send(state, deps.socket, done);
         }
         catch (error) {
-            warn("notify_failed", { state, error: error.message }, "systemd-notify could not be started; systemd's watchdog may not be fed");
+            done(error instanceof Error ? error : new Error(String(error)));
         }
     };
+    const notify = (state) => {
+        // A regular ping supersedes an older retry; STOPPING/READY also fence any
+        // in-flight failure callback from rearming a heartbeat after lifecycle changes.
+        cancelRetry();
+        attempt(state, false, generation);
+    };
+    return Object.assign(notify, { cancelRetry });
 }
 const defaultNotifier = createSdNotifier({
     socket: notifySocket,
@@ -117,6 +161,20 @@ const defaultNotifier = createSdNotifier({
     send: (state, socket, onDone) => sendSystemdNotificationAsync(state, socket, process.env, undefined, onDone),
     warn: () => warnSink,
 });
+/**
+ * Once at startup (log only): the socket systemd gave this process is already gone, so READY will not arrive either.
+ * Returns whether it said so.
+ */
+export function reportNotifySocketAtStart(warn, socket = notifySocket, problem = notifySocketProblem) {
+    const why = problem(socket);
+    if (!why)
+        return false;
+    try {
+        warn(why, "systemd's notify socket is missing; READY and WATCHDOG cannot reach systemd");
+    }
+    catch { /* best effort */ }
+    return true;
+}
 /**
  * Blocking variant, for the one case where the process is about to exit.
  *
@@ -125,6 +183,7 @@ const defaultNotifier = createSdNotifier({
  * should use this.
  */
 export function sdNotifyBlocking(state) {
+    defaultNotifier.cancelRetry();
     if (!notifySocket || !isFleetOwner())
         return;
     try {

package/dist/sd-notify.js.map

@@ -1 +1 @@
-{"version":3,"file":"sd-notify.js","sourceRoot":"","sources":["../src/sd-notify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sd-notify.js","sourceRoot":"","sources":["../src/sd-notify.ts"],"names":[],"mappings":"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"}

package/dist/search/search-docs.d.ts

@@ -8,7 +8,7 @@
  */
 import type { WebChatMessage } from "../web-chat-history.js";
 import type { SearchDoc } from "./search-store.js";
-/** A chat row's doc, or null when it is not searched (a status line, an effect offer, nothing to find). */
+/** A chat row's doc, or null when it is not searched (a status line, nothing to find). */
 export declare function chatDoc(m: WebChatMessage): SearchDoc | null;
 export interface CrossInstanceRecord {
     messageId: string;

package/dist/search/search-docs.js

@@ -1,7 +1,7 @@
 const time = (iso, fallback = Date.now()) => { const t = typeof iso === "string" ? Date.parse(iso) : NaN; return Number.isFinite(t) ? t : fallback; };
-/** A chat row's doc, or null when it is not searched (a status line, an effect offer, nothing to find). */
+/** A chat row's doc, or null when it is not searched (a status line, nothing to find). */
 export function chatDoc(m) {
-    if ((m.role !== "user" && m.role !== "agent") || m.effectTrial)
+    if (m.role !== "user" && m.role !== "agent")
         return null;
     const words = m.click?.label ?? m.text ?? "";
     const files = (m.attachments ?? []).map(a => a.name).filter(Boolean).join(" ");

package/dist/search/search-docs.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-docs.js","sourceRoot":"","sources":["../../src/search/search-docs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"search-docs.js","sourceRoot":"","sources":["../../src/search/search-docs.ts"],"names":[],"mappings":"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"}

package/dist/settings-api.d.ts

@@ -40,6 +40,16 @@ export interface SettingsApiContext extends AppShellContext {
         queued: boolean;
         already_running?: boolean;
     };
+    /** #2906: the fixed address's Test connection (closed step codes only; never the token). */
+    testNamedLink?(input: {
+        hostname: unknown;
+        port: unknown;
+        protocol: unknown;
+        token?: unknown;
+        current?: () => boolean;
+    }): Promise<import("./tunnel/named-link-test.js").NamedTestResult | {
+        busy: true;
+    }>;
     /** #1920 phase 3: Settings → Web sign-ins → Guests. */
     guestOverview?(): unknown;
     /** #2667: the ClassicBot rooms' instance names — a guest grant may name one, so a save's validation knows them. */
@@ -51,6 +61,11 @@ export interface SettingsApiContext extends AppShellContext {
         count: number;
         durable: boolean;
     };
+    /** #2855: a removed guest's own preferences go with it. */
+    forgetGuestPrefs?(owner: {
+        adapterId: string;
+        userId: string;
+    }): void;
     /** #2348 delta §5: one audit entry per person whose granted agents changed with a save (event log, the Log tab). */
     noteGuestGrantChange?(change: {
         by: string | null;
@@ -59,6 +74,7 @@ export interface SettingsApiContext extends AppShellContext {
         added: string[];
         removed: string[];
         endedSessions: number;
+        level?: "chat" | "trusted";
     }): void;
     /** #2348: the people AgEnD has seen in chat (the Guests picker), never a fleet admin or a bot. */
     guestPeople?(): unknown;
@@ -87,7 +103,6 @@ export interface SettingsApiContext extends AppShellContext {
     getRawFleetConfig(): RawFleetConfig;
     saveFleetConfig(explicitPatches?: RawConfigPatch[]): void;
     /** Refresh managed guidance and web clients after a committed experimental setting change. */
-    canvasWorkerSettingChanged?(): void;
     lifecycle: {
         isPaused(name: string): boolean;
         pause(name: string): Promise<void>;

package/dist/settings-api.js

@@ -4,7 +4,7 @@ import { DEFAULT_REPLY_TRIGGERS } from "./reply-triggers.js";
 import { PUBLIC_TUNNEL_SECRET_ID, PUBLIC_TUNNEL_TOKEN_HINT } from "./public-tunnel-config.js";
 import { withSpawnHoldReply } from "./spawn-hold-reply.js";
 import { normalizeSettingsInstancePatch, removesInstanceOverride } from "./settings-instance-patch.js";
-import { isSettingsReplay, settingsRequestExecution, settingsRequestLocalAdmin, settingsWrite } from "./settings-request-capability.js";
+import { isSettingsReplay, settingsRequestExecution, settingsWrite } from "./settings-request-capability.js";
 import { noteSettingsWrite, settingsUndo, undoSettingsPaths } from "./settings-transaction.js";
 import { readBoundedWebBody } from "./web-body.js";
 import { gatewayRequestContext } from "./web-request-context.js";
@@ -346,6 +346,47 @@ export function handleSettingsRequest(req, res, url, ctx) {
         }
         return true;
     }
+    // #2906 (the user, 2026-11-01): Settings → Access → Test connection, on the fixed-address values as filled in. Admin
+    // only and never over the public link, like the rest of Access; the typed token is read from the body once, used
+    // only in the test connector's environment, and never echoed — the answer is closed step codes.
+    if (method === "POST" && path === "/api/settings/public-link/test") {
+        if (gatewayRequestContext(req)) {
+            json(res, 403, { error: "web_settings_not_over_public_link" }, true);
+            return true;
+        }
+        const caller = guestSettingsCaller(req, url, ctx);
+        if (!caller) {
+            json(res, 403, { error: "An admin sign-in is required" }, true);
+            return true;
+        }
+        if (!ctx.testNamedLink) {
+            json(res, 501, { error: "test unavailable" }, true);
+            return true;
+        }
+        // #2907 review: the same admin, still current, after the body's await — and again before anything is started.
+        const current = () => guestSettingsCaller(req, url, ctx) === caller;
+        readBody(req, 16 * 1024).then(async (buf) => {
+            if (!permitWebContinuation(req, res, ctx))
+                return;
+            if (!current())
+                return json(res, 401, { error: "no longer authorized" }, true);
+            let body;
+            try {
+                body = JSON.parse(buf.toString("utf-8") || "{}");
+            }
+            catch {
+                return json(res, 400, { error: "invalid JSON" }, true);
+            }
+            if (!body || typeof body !== "object" || Array.isArray(body))
+                return json(res, 400, { error: "invalid body" }, true);
+            const result = await ctx.testNamedLink({ hostname: body.hostname, port: body.origin_port, protocol: body.protocol, token: body.token, current });
+            if ("busy" in result)
+                return json(res, 409, { error: "test_running" }, true);
+            json(res, 200, { steps: result.steps, hostname: result.hostname, port: result.port, ...(result.cleanup ? { cleanup: result.cleanup } : {}) }, true);
+        }).catch(() => { if (!res.headersSent)
+            json(res, 400, { error: "bad request" }, true); });
+        return true;
+    }
     // Generic provider API-key registry.  Unlike the legacy connection token
     // routes, this endpoint accepts a code-owned spec id only; env key, origin,
     // auth header and verifier are resolved server-side.  The body is consumed
@@ -894,12 +935,6 @@ export function handleSettingsRequest(req, res, url, ctx) {
             const parsed = parseWebSettingsBody(body);
             if ("error" in parsed)
                 return json(res, 400, { error: parsed.error });
-            if (parsed.canvasWorker !== undefined && !settingsRequestLocalAdmin(req)) {
-                const actor = evaluateWebRequest(req, url, ctx.webToken ?? null, ctx.webSessions, { touch: false });
-                if (actor.kind !== "allow" || actor.via !== "session" || actor.session.tier !== "admin" || actor.session.surface !== "local") {
-                    return json(res, 403, { error: "canvas_worker_setting_needs_local_admin" });
-                }
-            }
             const { session: sessionPatch, terminal: terminalPatch } = parsed;
             // #2499 review: who is saving, asked now, before the save — a session policy saved with it can end this very session
             // (a shorter sign-in time), and the audit must still name who did it. A confirmation's replay is no one's: null.
@@ -907,10 +942,6 @@ export function handleSettingsRequest(req, res, url, ctx) {
             const changes = [];
             let web = { ...cfg.web };
             let webTerminal = cfg.web_terminal;
-            if (parsed.canvasWorker !== undefined) {
-                web.experimental = { ...web.experimental, canvas_worker: parsed.canvasWorker };
-                changes.push({ path: ["web", "experimental", "canvas_worker"], value: parsed.canvasWorker });
-            }
             if (parsed.notifyLogin !== undefined) {
                 const holder = { defaults: cfg.defaults, web };
                 setNoticeMode(holder, "login", parsed.notifyLogin);
@@ -1020,9 +1051,6 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 ctx.logger.warn({ err }, "settings: web save refused");
                 return json(res, 500, { ok: false, error: err.message });
             }
-            if (parsed.canvasWorker !== undefined && (previous.web?.experimental?.canvas_worker === true) !== parsed.canvasWorker) {
-                ctx.canvasWorkerSettingChanged?.();
-            }
             // #2348: a grant taken away (or emptied) ends that person's guest access now — sessions, an outstanding code, and
             // remembered browsers — not at their next request. A narrowed grant keeps its sessions; they see less from now on.
             const ended = new Map();
@@ -1036,6 +1064,15 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 catch (err) {
                     ctx.logger.warn({ err }, "settings: could not end a removed guest's sessions");
                 }
+                // #2855: removed (not just emptied): the guest's own preferences go too. Its name stays for its past messages.
+                if (grant === null) {
+                    try {
+                        ctx.forgetGuestPrefs?.({ adapterId: key.slice(0, at), userId: key.slice(at + 1) });
+                    }
+                    catch (err) {
+                        ctx.logger.warn({ err }, "settings: could not delete a removed guest's preferences");
+                    }
+                }
             }
             // #2348 delta §5: every grant change is audited, widening (confirmed in General, replayed here) or narrowing (at
             // once) alike: who, how, the agents added and taken away. Agent names only; never message content. Shown under
@@ -1046,10 +1083,13 @@ export function handleSettingsRequest(req, res, url, ctx) {
                 for (const key of new Set([...Object.keys(was), ...Object.keys(now)])) {
                     const a = new Set(Object.hasOwn(was, key) ? was[key].instances : []), b = new Set(Object.hasOwn(now, key) ? now[key].instances : []);
                     const added = [...b].filter((n) => !a.has(n)), removed = [...a].filter((n) => !b.has(n));
-                    if (!added.length && !removed.length)
+                    // #2855: a kept grant's level, when it changed (Chat ↔ Trusted).
+                    const levelOf = (g) => (g?.level === "trusted" ? "trusted" : "chat");
+                    const level = Object.hasOwn(was, key) && Object.hasOwn(now, key) && levelOf(was[key]) !== levelOf(now[key]) ? levelOf(now[key]) : undefined;
+                    if (!added.length && !removed.length && !level)
                         continue;
                     try {
-                        ctx.noteGuestGrantChange({ by, via, account: key, added, removed, endedSessions: ended.get(key) ?? 0 });
+                        ctx.noteGuestGrantChange({ by, via, account: key, added, removed, endedSessions: ended.get(key) ?? 0, ...(level ? { level } : {}) });
                     }
                     catch (err) {
                         ctx.logger.warn({ err }, "settings: could not audit a guest grant change");