@songsid/agend 2.2.0-alpha.3 → 2.2.0-alpha.4

package/dist/discord-general.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Discord general_channel_id location helper.
+ *
+ * The wizard wrote general_channel_id at the connection top level from c25045b0
+ * until #1552 fixed it to write under channel.options.  Runtime code uses this
+ * helper so that existing fleet.yaml files with the old top-level field keep
+ * working; options is authoritative when both are present.
+ */
+/**
+ * Return the Discord General channel id from a connection, or null.
+ * Reads channel.options.general_channel_id first (canonical location),
+ * falls back to the legacy top-level channel.general_channel_id for files
+ * written by the wizard from c25045b0 until #1552.
+ */
+export declare function discordGeneralChannelId(ch: Record<string, unknown>): string | null;

package/dist/discord-general.js

@@ -0,0 +1,24 @@
+/**
+ * Discord general_channel_id location helper.
+ *
+ * The wizard wrote general_channel_id at the connection top level from c25045b0
+ * until #1552 fixed it to write under channel.options.  Runtime code uses this
+ * helper so that existing fleet.yaml files with the old top-level field keep
+ * working; options is authoritative when both are present.
+ */
+/**
+ * Return the Discord General channel id from a connection, or null.
+ * Reads channel.options.general_channel_id first (canonical location),
+ * falls back to the legacy top-level channel.general_channel_id for files
+ * written by the wizard from c25045b0 until #1552.
+ */
+export function discordGeneralChannelId(ch) {
+    const fromOptions = ch.options?.general_channel_id;
+    if (fromOptions != null && String(fromOptions))
+        return String(fromOptions);
+    const legacy = ch.general_channel_id;
+    if (legacy != null && String(legacy))
+        return String(legacy);
+    return null;
+}
+//# sourceMappingURL=discord-general.js.map

package/dist/discord-general.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discord-general.js","sourceRoot":"","sources":["../src/discord-general.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,EAA2B;IACjE,MAAM,WAAW,GAAI,EAAE,CAAC,OAA+C,EAAE,kBAAkB,CAAC;IAC5F,IAAI,WAAW,IAAI,IAAI,IAAI,MAAM,CAAC,WAAW,CAAC;QAAE,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,EAAE,CAAC,kBAAkB,CAAC;IACrC,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/fleet-manager.js

@@ -6,6 +6,7 @@ import { SettingsExecution, settingsRevision, noteSettingsWrite, settingsFileRes
 import { performance } from "node:perf_hooks";
 import { gatewayRequestContext } from "./web-request-context.js";
 import { createPublicWebGateway } from "./public-web-gateway.js";
+import { handleWebIconRequest } from "./web-icons.js";
 import { renderPublicLinkProgress, ThrottledMessageEditor } from "./public-link-progress.js";
 import { PublicWebLink, publicLinkSettings } from "./public-web-link.js";
 import { TunnelPurposeLane } from "./tunnel/purpose-lane.js";
@@ -130,6 +131,7 @@ import { ReplyButtonsController } from "./reply-buttons-controller.js";
 import { publicAttachment, sweepOrphanedUploads, WebFileLedger } from "./web-upload.js";
 import { handleViewRequest, isViewPath, profileIdentities, resolveInstanceIdentity } from "./view-api.js";
 import { envFileKeys } from "./token-env-name.js";
+import { discordGeneralChannelId } from "./discord-general.js";
 import { parseEnvText } from "./env-file.js";
 import { isDisallowedIntentsError, isRejectedTokenError } from "./discord-permissions.js";
 import { filterUsageProviders, formatDiscordUsageActivity, getUsageSnapshot, handleUsageRequest, isUsagePath, usageProviderIdForBackend } from "./usage/usage-api.js";
@@ -5199,8 +5201,8 @@ export class FleetManager {
         for (const need of [...needsGeneral]) {
             const matchIdx = unboundGenerals.findIndex(([, inst]) => {
                 const topicId = String(inst.topic_id ?? "");
-                if (need.ch.type === "discord" && need.ch.options?.general_channel_id) {
-                    return topicId === String(need.ch.options.general_channel_id);
+                if (need.ch.type === "discord" && discordGeneralChannelId(need.ch)) {
+                    return topicId === discordGeneralChannelId(need.ch);
                 }
                 if (need.ch.type === "telegram") {
                     return topicId === "1" || topicId === "";
@@ -10208,9 +10210,9 @@ export class FleetManager {
         if (generalTopic != null)
             return { chatId, opts: { threadId: String(generalTopic) } };
         if (cfg?.type === "discord") {
-            const configured = cfg.options?.general_channel_id;
-            if (configured != null && String(configured)) {
-                return { chatId, opts: { threadId: String(configured) } };
+            const configured = discordGeneralChannelId(cfg);
+            if (configured) {
+                return { chatId, opts: { threadId: configured } };
             }
             return null; // a guild id is not a channel; sending would always fail
         }
@@ -15968,9 +15970,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                 token_env: channel.bot_token_env,
                 token_present: !!process.env[channel.bot_token_env] || stored.has(channel.bot_token_env),
                 group_id: channel.group_id != null ? String(channel.group_id) : null,
-                general_channel_id: channel.options?.general_channel_id != null
-                    ? String(channel.options.general_channel_id)
-                    : null,
+                general_channel_id: discordGeneralChannelId(channel),
                 ...this.connectionStatus(id, state, world),
                 ...(world ? { identity: { id: world.botUserId ?? null, username: world.botUsername ?? null } } : {}),
             };
@@ -17354,14 +17354,10 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                 return;
             }
             const requestPath = new URL(req.url ?? "/", `http://localhost:${port}`).pathname;
-            // Browsers request this automatically and AgEnD does not ship an icon.
-            // It is neither user data nor an API route, so do not turn the harmless
-            // probe into a noisy web-token 401 in the browser console.
-            if (req.method === "GET" && requestPath === "/favicon.ico") {
-                res.writeHead(204);
-                res.end();
+            // Branding is public, after Host admission: automatic favicon requests
+            // must not become noisy web-token 401s in the browser console.
+            if (handleWebIconRequest(req, res, requestPath))
                 return;
-            }
             // Public: the health probe, /agent (instance-token auth of its own), the
             // sign-in surface, and /view's reads unless web.view_access says otherwise.
             if (bypassesWebGate(req, requestPath, this.fleetConfig, p => !gatewayRequestContext(req) && (isViewPath(p) || isUsagePath(p)))) {