@songsid/agend 2.3.3-beta.6 → 2.3.3-beta.8

package/dist/notify-socket.js

@@ -0,0 +1,45 @@
+import { statSync } from "node:fs";
+import { userInfo } from "node:os";
+/** Only ENOENT proves it gone: a socket this process may not stat (EACCES) is not called missing. */
+function socketExists(path) {
+    try {
+        statSync(path);
+        return true;
+    }
+    catch (error) {
+        return error.code !== "ENOENT";
+    }
+}
+/**
+ * Why a notification cannot arrive, when the socket itself says so (log only): a filesystem socket (an '@' one is
+ * abstract and has no file) that no longer exists. On a user unit it lives in the user manager's runtime dir,
+ * /run/user/<uid>; when that dir is removed (logind, at the last session's end without linger) or replaced without its
+ * systemd/ subdir (seen on WSL with linger on), the manager's notify socket is gone, READY and WATCHDOG never reach
+ * systemd and it restarts the fleet. Restarting user@<uid> recreates it. null: nothing to say.
+ * A module of its own, with no side effects: sd-notify.ts takes NOTIFY_SOCKET out of the environment when it loads,
+ * and `agend doctor` asks this too.
+ */
+export function notifySocketProblem(socket, exists = socketExists) {
+    if (!socket || socket.startsWith("@"))
+        return null;
+    try {
+        if (exists(socket))
+            return null;
+    }
+    catch {
+        return null;
+    }
+    const runtime = /^\/run\/user\/(\d+)\//.exec(socket);
+    let user = "<user>";
+    try {
+        user = userInfo().username || user;
+    }
+    catch { /* no passwd entry: the placeholder */ }
+    // Restarting user@<uid> ends everything that manager runs, the fleet included; a user who is not root needs sudo.
+    const sudo = runtime && runtime[1] !== "0" ? "sudo " : "";
+    const hint = runtime
+        ? `the user manager's notify socket is gone (/run/user/${runtime[1]} was removed or replaced without its systemd/ dir): ${sudo}systemctl restart user@${runtime[1]}.service (recreates /run/user/${runtime[1]}/systemd/notify; it also restarts the fleet and everything else that user runs, so run it from a host shell, not from an agent); if \`loginctl show-user ${user} -p Linger\` says no, also ${sudo}loginctl enable-linger ${user}`
+        : `systemd's notify socket ${socket} does not exist`;
+    return { socketMissing: true, socket, hint };
+}
+//# sourceMappingURL=notify-socket.js.map

package/dist/notify-socket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notify-socket.js","sourceRoot":"","sources":["../src/notify-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,qGAAqG;AACrG,SAAS,YAAY,CAAC,IAAY;IAChC,IAAI,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,OAAQ,KAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;IAAC,CAAC;AACnH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAA0B,EAAE,MAAM,GAA8B,YAAY;IAC9G,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,CAAC;QAAC,IAAI,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,CAAC;QAAC,IAAI,GAAG,QAAQ,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,sCAAsC,CAAC,CAAC;IAC5F,kHAAkH;IAClH,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,MAAM,IAAI,GAAG,OAAO;QAClB,CAAC,CAAC,uDAAuD,OAAO,CAAC,CAAC,CAAC,uDAAuD,IAAI,0BAA0B,OAAO,CAAC,CAAC,CAAC,iCAAiC,OAAO,CAAC,CAAC,CAAC,4JAA4J,IAAI,8BAA8B,IAAI,0BAA0B,IAAI,EAAE;QAC/a,CAAC,CAAC,2BAA2B,MAAM,iBAAiB,CAAC;IACvD,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC/C,CAAC"}

package/dist/quota-notice.d.ts

@@ -0,0 +1,23 @@
+/**
+ * A backend's quota, usage-limit or credit notice as the person reads it (user, 2026-10-30): one short line, the
+ * backend and what ran out — "⚠️ Codex 用量用完，已暫停" / "⚠️ Codex usage limit used up — paused". "Paused" only when
+ * the instance really is; a reset time only where AgEnD already reads one from the CLI. The instance's name is added
+ * by the lifecycle (plainNoticeLine) only where the line is posted outside its own topic. The incident's `message`
+ * stays the unlocalised English one, for logs and webhooks.
+ */
+export type QuotaWhat = "usage" | "api_credits" | "api_quota" | "workspace_credits" | "workspace_usage" | "quota" | "quota_credits" | "requests" | "weekly";
+export type QuotaReset = {
+    at: string;
+} | {
+    in: string;
+};
+export declare function quotaLine(backend: string, what: QuotaWhat, opts?: {
+    paused?: boolean;
+    reset?: QuotaReset;
+}): string;
+/** The same line for a backend that pauses the instance. */
+export declare function quotaPausedLine(backend: string, what: QuotaWhat, reset?: QuotaReset): string;
+/** Claude's own words for when it continues ("at 1:50pm", "in 3h") as a reset time; anything else as said. */
+export declare function claudeResetTime(when: string): QuotaReset;
+/** Codex's "less than N% of your <period> limit" warning. */
+export declare function quotaLowLine(period: string, percent: string): string;

package/dist/quota-notice.js

@@ -0,0 +1,22 @@
+import { t } from "./locale.js";
+export function quotaLine(backend, what, opts = {}) {
+    const line = t(opts.paused ? "inst.quota_line_paused" : "inst.quota_line", backend, t(`inst.quota_what.${what}`));
+    if (!opts.reset)
+        return line;
+    return "at" in opts.reset ? t("inst.quota_reset_at", line, opts.reset.at) : t("inst.quota_reset_in", line, opts.reset.in);
+}
+/** The same line for a backend that pauses the instance. */
+export function quotaPausedLine(backend, what, reset) {
+    return quotaLine(backend, what, { paused: true, reset });
+}
+/** Claude's own words for when it continues ("at 1:50pm", "in 3h") as a reset time; anything else as said. */
+export function claudeResetTime(when) {
+    const m = /^(at|in)\s+(.+)$/i.exec(when.trim());
+    return m ? (m[1].toLowerCase() === "in" ? { in: m[2] } : { at: m[2] }) : { at: when.trim() };
+}
+/** Codex's "less than N% of your <period> limit" warning. */
+export function quotaLowLine(period, percent) {
+    const key = `inst.quota_period.${period.toLowerCase()}`;
+    return t("inst.quota_low", t(key), percent);
+}
+//# sourceMappingURL=quota-notice.js.map

package/dist/quota-notice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quota-notice.js","sourceRoot":"","sources":["../src/quota-notice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,aAAa,CAAC;AAahC,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,IAAe,EAAE,IAAI,GAA6C,EAAE;IAC7G,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,iBAAiB,EAAE,OAAO,EAAE,CAAC,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,CAAC;IAClH,IAAI,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAC7B,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAC5H,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,IAAe,EAAE,KAAkB;IAClF,OAAO,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,8GAA8G;AAC9G,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;AAClG,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,OAAe;IAC1D,MAAM,GAAG,GAAG,qBAAqB,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;IACxD,OAAO,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC"}

package/dist/sd-notify.d.ts

@@ -1,4 +1,6 @@
 import { execFileSync } from "node:child_process";
+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/
@@ -31,6 +33,7 @@ export declare function sendSystemdNotificationAsync(state: string, socket: stri
 export declare function sdNotify(state: string): void;
 /** Where a skipped or failed notification is said (the fleet's logger). Unset: nothing is said. */
 export type SdNotifyWarn = (fields: Record<string, unknown>, message: string) => void;
+/** The fleet sets this as it starts: the first time, a socket that is already gone is said once (log only). */
 export declare function setSdNotifyWarn(sink: SdNotifyWarn | null): void;
 /** Repeated unchanged ownership skips may coalesce; delivery failures never do. */
 export declare const SD_NOTIFY_WARN_INTERVAL_MS: number;
@@ -46,6 +49,8 @@ export interface SdNotifierDeps {
     send: (state: string, socket: string, onDone: (error: Error | null) => void) => void;
     warn: () => SdNotifyWarn | null;
     now?: () => number;
+    /** Why the socket cannot be reached, added to a failure's fields (notifySocketProblem). */
+    socketProblem?: (socket: string) => Record<string, unknown> | null;
 }
 /**
  * The notification path, with what it depends on passed in (tests). A skipped notification used to be silent: a
@@ -55,6 +60,11 @@ export interface SdNotifierDeps {
 export declare function createSdNotifier(deps: SdNotifierDeps): ((state: string) => void) & {
     cancelRetry(): void;
 };
+/**
+ * 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 declare function reportNotifySocketAtStart(warn: SdNotifyWarn, socket?: string | undefined, problem?: (socket: string | undefined) => Record<string, unknown> | null): boolean;
 /**
  * Blocking variant, for the one case where the process is about to exit.
  *
@@ -63,4 +73,3 @@ export declare function createSdNotifier(deps: SdNotifierDeps): ((state: string)
  * should use this.
  */
 export declare function sdNotifyBlocking(state: string): void;
-export {};

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/
@@ -59,7 +61,15 @@ export function sdNotify(state) {
     defaultNotifier(state);
 }
 let warnSink = null;
-export function setSdNotifyWarn(sink) { warnSink = sink; }
+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. */
@@ -115,9 +125,10 @@ export function createSdNotifier(deps) {
             // 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)) }, "systemd-notify failed; systemd's watchdog may not be fed");
+                    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) {
@@ -150,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.
  *

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/topic-commands.js

@@ -1949,8 +1949,9 @@ export class TopicCommands {
         if (!classic)
             return [];
         const ids = new Set();
+        // The gate's own test (isClassicChannel): this bot's rooms, and an untyped legacy room the primary adapter serves.
         for (const room of classic.getAll())
-            if (room.adapterId === adapterId)
+            if (classic.isClassicChannel(room.channelId, adapterId))
                 ids.add(String(room.channelId));
         const d = classic.getDefaults();
         for (const list of [d.allowed_users, d.admin_users, d.allowed_groups])