@songsid/agend 2.3.0-beta.20 → 2.3.0-beta.22

package/dist/fleet-manager.d.ts

@@ -1,5 +1,6 @@
 import { type HumanOrigin } from "./human-delivery-receipts.js";
 import { SettingsExecution } from "./settings-transaction.js";
+import { AppIconStore } from "./web-app-icon.js";
 import type { LoginCodeOwner } from "./web-login.js";
 import { type ProfileTicket } from "./runtime-cpu-profile.js";
 import type { CpuProfile } from "./cpu-profile.js";
@@ -57,6 +58,7 @@ export declare function applyTaskListCap<T extends {
 import { type PublicPreviewForUi } from "./web-api.js";
 import { type LogAnswer, type LogQuery } from "./log-service.js";
 import { WebChatHistory } from "./web-chat-history.js";
+import { type WebEchoCopy } from "./web-reactions.js";
 import { SeenUsers, type MentionNames, type MentionQuery } from "./web-mentions.js";
 import { WebPrefsStore } from "./web-prefs.js";
 import { OwnerCssStore } from "./web-owner-css-store.js";
@@ -611,6 +613,9 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
         tagline?: string;
         bio?: string;
     };
+    private appIconStore?;
+    /** #2308: the person's own app icon (Settings → Web appearance), under the state dir; none set: the bundled one. */
+    get appIcon(): AppIconStore;
     private ownerCssStore?;
     /** #1629 r4 §3: each person's own CSS; which version is in force is their `css.active` in the web preferences. */
     get ownerCss(): OwnerCssStore;
@@ -1120,8 +1125,28 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      * #1920 §5.2: a web message's channel copy was sent — it is now what the channel saw. Kept so (and on disk), and sent
      * to the guests' streams only: an admin's page already has it, and nothing about it changed for them.
      */
-    webMessageInChannel(instance: string, messageId: string): void;
-    sendClassicWebEcho(instance: string, text: string, sender?: string): Promise<number>;
+    webMessageInChannel(instance: string, messageId: string, copies?: readonly WebEchoCopy[]): void;
+    /** #2305: a web message's channel copies (topic, ClassicBot rooms), newest WEB_ECHO_COPIES_MAX, this process only. */
+    private webEchoCopies;
+    private rememberWebEchoCopies;
+    /**
+     * #2305: an instance's reaction to a web chat message (`messageId`, the id it was handed): its minimal reply, as on
+     * the platforms. Kept on the message's row (and on disk), shown live (`reactions` on the stream), and put on the
+     * message's channel copies when this process sent them — in the background, each within WEB_MIRROR_TIMEOUT_MS, so a
+     * slow or rate-limited platform never holds the tool's answer (best effort: a copy's failure or timeout is logged,
+     * never the tool's). `mirrored`: how many copies took it, when that is known.
+     * The tool's errors: an emoji outside the web set or one of the instance's delivery marks (web-reactions.ts), or a
+     * message the chat does not have. An emoji the message already has is a success that changes nothing.
+     */
+    reactToWebMessage(instance: string, messageId: string, raw: unknown): Promise<{
+        ok: true;
+        mirrored: Promise<number>;
+    } | {
+        ok: false;
+        error: string;
+    }>;
+    /** #2305: `copies` collects each room's copy (its message id), for a reaction to the web message. */
+    sendClassicWebEcho(instance: string, text: string, sender?: string, copies?: WebEchoCopy[]): Promise<number>;
     /**
      * #1666: a delivered web chat message starts the same cancel/progress lifecycle in the instance's topic as a platform
      * inbound (afterUserInboundDelivered): the same bubble, ticker and retire rules. Not its ✅ tracking — the web message
@@ -3753,6 +3778,7 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     verifyProviderSecret(input: {
         specId: string;
         secret: string;
+        clear?: boolean;
         sessionBinding: string;
         idempotencyKey: string;
     }): Promise<{

package/dist/fleet-manager.js

@@ -1,3 +1,4 @@
+import { PUBLIC_TUNNEL_TOKEN_ENV, validPublicTunnelToken } from "./public-tunnel-config.js";
 import { humanOwnerObjectId, webHumanOrigin } from "./human-delivery-receipts.js";
 import { SettingsBaselines } from "./settings-baseline.js";
 import { SettingsConfirmationStore } from "./settings-confirmation.js";
@@ -8,7 +9,8 @@ import { performance } from "node:perf_hooks";
 import { withSpawnHoldReply } from "./spawn-hold-reply.js";
 import { gatewayRequestContext } from "./web-request-context.js";
 import { createPublicWebGateway, PUBLIC_GATEWAY_RECEIVE_MS } from "./public-web-gateway.js";
-import { handleWebIconRequest } from "./web-icons.js";
+import { handleWebIconRequest, useAppIconStore } from "./web-icons.js";
+import { AppIconStore } from "./web-app-icon.js";
 import { trackWebServer } from "./web-server-drain.js";
 import { renderPublicLinkProgress, ThrottledMessageEditor } from "./public-link-progress.js";
 import { PublicWebLink, publicLinkSettings } from "./public-web-link.js";
@@ -143,6 +145,7 @@ export function applyTaskListCap(tasks, filterAssignee, filterStatus) {
 import { handleWebRequest, broadcastSseEvent, broadcastToGuests, SSE_HEARTBEAT_MS } from "./web-api.js";
 import { LogService } from "./log-service.js";
 import { WebChatHistory, WEB_CHAT_TEXT_MAX, isWebMessageId, newWebMessageId, webChatFrom } from "./web-chat-history.js";
+import { WEB_ECHO_COPIES_MAX, WEB_MIRROR_TIMEOUT_MS, webReactionEmoji, webReactionProblem } from "./web-reactions.js";
 import { WebChatDiskStore } from "./web-chat-store.js";
 import { SeenUsers, resolveMentions } from "./web-mentions.js";
 import { OPERATOR, WebPrefsStore } from "./web-prefs.js";
@@ -250,7 +253,7 @@ import { checkSelfRestartAllowance, recordSelfRestartAttempt } from "./self-rest
 import { SecretStore } from "./secret-store.js";
 import { opaqueId, safeSecretError, SECRET_CHALLENGE_TTL_MS, } from "./connection-secrets.js";
 import { verifyDiscordToken, verifyTelegramToken } from "./provider-probe.js";
-import { PROVIDER_SECRET_SPECS, providerSecretSpec, providerRegistryEnvKeys, isReservedProviderEnvKey, verifyProviderSecret, } from "./provider-secret-registry.js";
+import { PROVIDER_SECRET_SPECS, PUBLIC_TUNNEL_SECRET_SPEC, providerSecretSpec, providerRegistryEnvKeys, isReservedProviderEnvKey, verifyProviderSecret, } from "./provider-secret-registry.js";
 /** A self-restart is a whole service restart; 120s is the apply budget, not this. */
 const SELF_RESTART_DEADLINE_MS = 300_000;
 import { APPLY_FLEET_TARGET, ApplyJobStore, viewOf, } from "./apply-job.js";
@@ -1174,6 +1177,11 @@ export class FleetManager {
         const card = resolveCard(name, humanCards(this.dataDir).get(name), this.themeStore.get(name).theme.card);
         return { ...(card.tagline ? { tagline: card.tagline.text } : {}), ...(card.bio ? { bio: card.bio.text } : {}) };
     }
+    appIconStore;
+    /** #2308: the person's own app icon (Settings → Web appearance), under the state dir; none set: the bundled one. */
+    get appIcon() {
+        return (this.appIconStore ??= new AppIconStore(this.dataDir));
+    }
     ownerCssStore;
     /** #1629 r4 §3: each person's own CSS; which version is in force is their `css.active` in the web preferences. */
     get ownerCss() {
@@ -3792,12 +3800,61 @@ export class FleetManager {
      * #1920 §5.2: a web message's channel copy was sent — it is now what the channel saw. Kept so (and on disk), and sent
      * to the guests' streams only: an admin's page already has it, and nothing about it changed for them.
      */
-    webMessageInChannel(instance, messageId) {
+    webMessageInChannel(instance, messageId, copies = []) {
+        // #2305: the copies' own message ids, so an instance's reaction to the web message is put on them too.
+        if (copies.length)
+            this.rememberWebEchoCopies(messageId, copies);
         const m = this.webChatHistory.markChannel(instance, messageId);
         if (m)
             broadcastToGuests(this.sseClients, "message", m, (err) => this.logger.debug({ err }, "SSE client write failed; evicting"));
     }
-    async sendClassicWebEcho(instance, text, sender = WEB_NAME_FALLBACK) {
+    /** #2305: a web message's channel copies (topic, ClassicBot rooms), newest WEB_ECHO_COPIES_MAX, this process only. */
+    webEchoCopies = new Map();
+    rememberWebEchoCopies(messageId, copies) {
+        const list = [...(this.webEchoCopies.get(messageId) ?? []), ...copies.filter(c => c && typeof c.adapter?.react === "function" && c.messageId)];
+        this.webEchoCopies.delete(messageId);
+        this.webEchoCopies.set(messageId, list);
+        while (this.webEchoCopies.size > WEB_ECHO_COPIES_MAX)
+            this.webEchoCopies.delete(this.webEchoCopies.keys().next().value);
+    }
+    /**
+     * #2305: an instance's reaction to a web chat message (`messageId`, the id it was handed): its minimal reply, as on
+     * the platforms. Kept on the message's row (and on disk), shown live (`reactions` on the stream), and put on the
+     * message's channel copies when this process sent them — in the background, each within WEB_MIRROR_TIMEOUT_MS, so a
+     * slow or rate-limited platform never holds the tool's answer (best effort: a copy's failure or timeout is logged,
+     * never the tool's). `mirrored`: how many copies took it, when that is known.
+     * The tool's errors: an emoji outside the web set or one of the instance's delivery marks (web-reactions.ts), or a
+     * message the chat does not have. An emoji the message already has is a success that changes nothing.
+     */
+    async reactToWebMessage(instance, messageId, raw) {
+        const problem = webReactionProblem(raw, this.statusEmojiAvoidList(instance));
+        if (problem)
+            return { ok: false, error: problem };
+        const emoji = webReactionEmoji(raw);
+        const r = this.webChatHistory.addReaction(instance, messageId, emoji);
+        if (!r)
+            return { ok: false, error: `react: ${messageId} is not a message in ${instance}'s web chat now (it left the history, or it is from before AgEnD restarted) — answer with reply instead` };
+        if (!r.added)
+            return { ok: true, mirrored: Promise.resolve(0) };
+        this.emitSseEvent("reactions", { instance, boot: r.message.boot, id: r.message.id, reactions: r.message.reactions ?? [] });
+        const mirrorOne = (copy) => {
+            let timer;
+            const timeout = new Promise((_, reject) => {
+                timer = setTimeout(() => reject(new Error(`no answer in ${WEB_MIRROR_TIMEOUT_MS} ms`)), WEB_MIRROR_TIMEOUT_MS);
+                timer.unref?.();
+            });
+            return Promise.race([Promise.resolve().then(() => copy.adapter.react(copy.chatId, copy.messageId, reactionForm(copy.adapter.type, emoji), copy.threadId)), timeout])
+                .then(() => 1, (err) => {
+                this.logger.warn({ err, instance, adapter: copy.adapter.type }, "Reaction on a web message's channel copy failed (shown on the web)");
+                return 0;
+            })
+                .finally(() => clearTimeout(timer));
+        };
+        const mirrored = Promise.all((this.webEchoCopies.get(messageId) ?? []).map(mirrorOne)).then(n => n.reduce((a, b) => a + b, 0));
+        return { ok: true, mirrored };
+    }
+    /** #2305: `copies` collects each room's copy (its message id), for a reaction to the web message. */
+    async sendClassicWebEcho(instance, text, sender = WEB_NAME_FALLBACK, copies) {
         const guard = this.webChannelEchoGuards.get(instance);
         const handled = new Set();
         let posted = 0;
@@ -3827,7 +3884,9 @@ export class FleetManager {
             try {
                 if (!adapter?.sendText)
                     continue;
-                await adapter.sendText(entry.channelId, text, { format: "text", allowedMentions: { parse: [] } });
+                const sent = await adapter.sendText(entry.channelId, text, { format: "text", allowedMentions: { parse: [] } });
+                if (copies && sent && typeof sent.messageId === "string" && sent.messageId)
+                    copies.push({ adapter, chatId: entry.channelId, messageId: sent.messageId });
                 ClassicChannelManager.logMessage(instance, sender, text, new Date());
                 posted++;
             }
@@ -5866,7 +5925,7 @@ export class FleetManager {
             dataDir: this.dataDir, web: () => this.fleetConfig?.web,
             permitted: owner => this.publicOwnerCurrent(owner),
             reserve: id => this.getTunnelLane().reserve("dashboard", id),
-            createGateway: (exposureId, current, open, failed) => createPublicWebGateway({ exposureId, isCurrent: current, isOpen: open, onError: failed,
+            createGateway: (exposureId, current, open, failed, named) => createPublicWebGateway({ ...named, exposureId, isCurrent: current, isOpen: open, onError: failed,
                 dispatch: (req, res) => this.dispatchWebHttp(req, res, this.fleetConfig?.health_port ?? 19280) }),
             revoke: id => {
                 this.webLoginCodes?.revokeAudience(id);
@@ -9649,6 +9708,17 @@ export class FleetManager {
             });
             return;
         }
+        // #2305: a reaction to a web chat message is the web chat's own (any fleet, web-only included): never an adapter's.
+        if (tool === "react" && typeof args.message_id === "string" && isWebMessageId(args.message_id)) {
+            // The socket's own instance, never a session name the caller wrote itself (as checkToolPermission: it was not
+            // identified) — a channel tool's call from a daemon carries none anyway (#2310 review).
+            const r = await this.reactToWebMessage(instanceName, args.message_id, args.emoji);
+            if (r.ok)
+                respond("ok");
+            else
+                respond(null, r.error);
+            return;
+        }
         // A fleet with no chat platform at all is driven from the web dashboard alone: a reply has nowhere
         // else to go, and "retry shortly" would have the agent retry forever. It goes to the web chat.
         const webOnlyReply = tool === "reply" && this.worlds.size === 0 && this.isWebOnlyFleet();
@@ -19285,6 +19355,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         await this.retirePendingNoncePrompts();
         this.topicArchiver.stop();
         this.taskBoardWaker?.stop();
+        this.appIconStore?.close();
         this.scheduler?.shutdown();
         // What it was sent is written first (bounded: search-index.ts close()).
         const search = this.searchIndex;
@@ -20006,12 +20077,12 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         return this.fleetConfig?.web?.provider_secrets === true;
     }
     listProviderSecrets() {
-        return PROVIDER_SECRET_SPECS.map(spec => ({
+        return [...PROVIDER_SECRET_SPECS, PUBLIC_TUNNEL_SECRET_SPEC].map(spec => ({
             id: spec.id,
             display_name: spec.displayName,
             kind: spec.kind,
             token_present: !!process.env[spec.envKey],
-            verifier: spec.verifier ? "available" : "unsupported",
+            verifier: spec.kind === "tunnel_token" ? "local_format" : spec.verifier ? "available" : "unsupported",
             activation: spec.activation,
             stale_consumers: this.providerSecretStaleConsumers(spec.envKey),
         }));
@@ -20021,7 +20092,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         // a child process's private environment safely, so report the conservative
         // set of already-running children; the UI can then say "restart these"
         // rather than claiming an existing process reloaded.
-        if (envKey === "GROQ_API_KEY")
+        if (envKey === "GROQ_API_KEY" || envKey === PUBLIC_TUNNEL_TOKEN_ENV)
             return [];
         return [...this.children.keys()].sort();
     }
@@ -20039,9 +20110,11 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         if (!spec || !this.providerSecretEnvAllowed(spec.envKey)) {
             return { ok: false, status: "invalid", error: "provider secret is not configured" };
         }
-        if (!spec.verifier)
+        const tunnel = spec.kind === "tunnel_token";
+        if (!tunnel && !spec.verifier)
             return { ok: false, status: "unsupported_verifier", error: "this provider has no supported verifier" };
-        if (!input.secret || input.secret.length > 4096 || /[\r\n\0]/.test(input.secret) || /[^\x20-\x7e]/.test(input.secret)) {
+        if (input.clear && (!tunnel || input.secret !== "") || tunnel && !(input.clear === true && input.secret === "" || validPublicTunnelToken(input.secret))
+            || !input.clear && (!input.secret || input.secret.length > 4096 || /[\r\n\0]/.test(input.secret) || /[^\x20-\x7e]/.test(input.secret))) {
             return { ok: false, status: "invalid", error: "secret is invalid" };
         }
         const challengeKey = `${input.sessionBinding}:api_key:${spec.id}:${spec.envKey}:${input.idempotencyKey}`;
@@ -20052,7 +20125,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         }
         if (existingId)
             this.providerSecretChallengesByKey.delete(challengeKey);
-        const result = await verifyProviderSecret(spec, input.secret, this.providerSecretHttpClient);
+        const result = tunnel ? { ok: true } : await verifyProviderSecret(spec, input.secret, this.providerSecretHttpClient);
         if (!result.ok) {
             // Do not log provider detail: the HTTP verifier already redacted it and
             // this endpoint has no need to disclose whether a key was close to valid.
@@ -20140,6 +20213,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
     async runProviderSecretApply(job, secret, execution) {
         const spec = providerSecretSpec(job.specId);
         const allowed = new Set([
+            PUBLIC_TUNNEL_TOKEN_ENV,
             ...PROVIDER_SECRET_SPECS.map(item => item.envKey),
             ...(this.fleetConfig?.channels ?? (this.fleetConfig?.channel ? [this.fleetConfig.channel] : [])).map(channel => channel.bot_token_env),
         ]);
@@ -20153,7 +20227,14 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             // Construct inside the transaction: symlink/permission refusal must
             // settle the job as a safe failure, not escape the queued microtask.
             store = new SecretStore(join(this.dataDir, ".env"), allowed, { owner: execution?.owner });
-            const write = () => { before = store.write(job.envKey, secret); wrote = true; process.env[job.envKey] = secret; };
+            const write = () => {
+                before = spec.kind === "tunnel_token" && !secret ? store.clear(job.envKey) : store.write(job.envKey, secret);
+                wrote = true;
+                if (secret)
+                    process.env[job.envKey] = secret;
+                else
+                    delete process.env[job.envKey];
+            };
             if (execution)
                 execution.mutate(write);
             else
@@ -20175,12 +20256,12 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             job.finishedAt = Date.now();
         }
         catch (err) {
-            const safe = safeSecretError(err, secret);
+            const safe = spec?.kind === "tunnel_token" ? "connector token change failed" : safeSecretError(err, secret);
             this.logger.warn({ specId: job.specId, reason: safe }, "Provider API-key apply failed");
             try {
                 // Memory and disk have separate receipts: a host-edited file must
                 // remain, but cannot strand our owned process value or hook snapshot.
-                if (wrote && process.env[job.envKey] === secret) {
+                if (wrote && (process.env[job.envKey] ?? "") === secret) {
                     if (previousProcessValue === undefined)
                         delete process.env[job.envKey];
                     else
@@ -20220,6 +20301,10 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
      * hot activation contract explicit and gives tests a failure seam; no generic
      * SIGHUP or caller-provided hook is ever executed. */
     async runProviderSecretReloadHook(hookId, _next, _previous) {
+        if (hookId === "cloudflare.public_link") {
+            await this.publicWebLink?.close("connector token changed");
+            return;
+        }
         if (hookId !== "groq.voice")
             throw new Error("unknown provider secret reload hook");
         const before = this.providerSecretHotSnapshots.get(hookId);
@@ -21498,6 +21583,8 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                 return;
             // Branding is public, after Host admission: automatic favicon requests
             // must not become noisy web-token 401s in the browser console.
+            // #2308: the icon routes and the pages' icon links follow the app icon set in Settings.
+            useAppIconStore(this.appIcon);
             if (handleWebIconRequest(req, res, requestPath))
                 return;
             // Public: the health probe, /agent (instance-token auth of its own), the