@songsid/agend 2.0.11-beta.26 → 2.0.11-beta.28

package/dist/fleet-manager.js

@@ -8,6 +8,8 @@ import { sdNotify } from "./sd-notify.js";
 import yaml from "js-yaml";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+/** Fallback access policy for a channel with no `access:` block — open (no gate). */
+const DEFAULT_OPEN_ACCESS = { mode: "open", allowed_users: [], max_pending_codes: 0, code_expiry_minutes: 0 };
 import { isProbeableRouteTarget } from "./fleet-context.js";
 import { loadFleetConfig, DEFAULT_COST_GUARD, DEFAULT_DAILY_SUMMARY, DEFAULT_INSTANCE_CONFIG } from "./config.js";
 import { EventLog } from "./event-log.js";
@@ -678,6 +680,23 @@ export class FleetManager {
                     }
                 }
             }
+            // Guard against a stale/invalid general topic_id. An old auto-general
+            // could have written the TG-convention "1" for a Discord general; the DC
+            // adapter then throws fetching channel "1" → unhandled → fleet crash loop.
+            // Unbind (+ warn) so it's simply skipped, never routed to a bogus channel.
+            let fixedGeneral = false;
+            for (const [name, cfg] of Object.entries(this.fleetConfig.instances)) {
+                if (!cfg.general_topic || cfg.topic_id == null)
+                    continue;
+                const adapterId = this.instanceWorldBinding.get(name) ?? cfg.channel_id;
+                if (this.getChannelConfig(adapterId)?.type === "discord" && !/^\d{17,}$/.test(String(cfg.topic_id))) {
+                    this.logger.warn({ name, topic_id: cfg.topic_id }, "Discord general topic_id is not a valid channel — unbinding to avoid a crash loop");
+                    delete cfg.topic_id;
+                    fixedGeneral = true;
+                }
+            }
+            if (fixedGeneral)
+                this.saveFleetConfig();
             // Auto-create topics AFTER adapter is ready (needs adapter.createTopic)
             await this.topicCommands.autoCreateTopics();
             const routeSummary = this.routing.rebuild(this.fleetConfig);
@@ -820,7 +839,7 @@ export class FleetManager {
         }
         const accessDir = join(this.dataDir, "access");
         mkdirSync(accessDir, { recursive: true });
-        const accessManager = new AccessManager(channelConfig.access, join(accessDir, "access.json"));
+        const accessManager = new AccessManager(channelConfig.access ?? DEFAULT_OPEN_ACCESS, join(accessDir, "access.json"));
         this.accessManager = accessManager;
         const inboxDir = join(this.dataDir, "inbox");
         mkdirSync(inboxDir, { recursive: true });
@@ -1103,7 +1122,7 @@ export class FleetManager {
         }
         const accessDir = join(this.dataDir, "access");
         mkdirSync(accessDir, { recursive: true });
-        const accessManager = new AccessManager(channelConfig.access, join(accessDir, `access-${adapterId}.json`));
+        const accessManager = new AccessManager(channelConfig.access ?? DEFAULT_OPEN_ACCESS, join(accessDir, `access-${adapterId}.json`));
         const inboxDir = join(this.dataDir, "inbox");
         mkdirSync(inboxDir, { recursive: true });
         const adapter = await createAdapter(channelConfig, {