too-many-claw 1.0.6 → 1.0.7

package/dist/cli.js

@@ -1249,11 +1249,39 @@ var ConfigManager = class {
     if (discord?.token) {
       settings.token = discord.token;
     }
-    if (discord?.guildId) {
+    if (channelsDiscord?.guilds) {
+      const guildIds = Object.keys(channelsDiscord.guilds);
+      if (guildIds.length > 0) {
+        const firstGuildId = guildIds[0];
+        if (!settings.guildId && /^\d{17,19}$/.test(firstGuildId)) {
+          settings.guildId = firstGuildId;
+        }
+        const guildConfig = channelsDiscord.guilds[firstGuildId];
+        if (guildConfig?.channels) {
+          const channelKeys = Object.keys(guildConfig.channels);
+          const channelIds = [];
+          for (const channelKey of channelKeys) {
+            if (/^\d{17,19}$/.test(channelKey)) {
+              channelIds.push(channelKey);
+            }
+          }
+          if (channelIds.length > 0 && !settings.chatChannelId) {
+            settings.chatChannelId = channelIds[0];
+          }
+          if (channelIds.length > 1 && !settings.statusChannelId) {
+            settings.statusChannelId = channelIds[1];
+          }
+          if (channelIds.length > 0) {
+            settings.allowedChannels = channelIds;
+          }
+        }
+      }
+    }
+    if (!settings.guildId && discord?.guildId) {
       settings.guildId = discord.guildId;
-    } else if (discord?.serverId) {
+    } else if (!settings.guildId && discord?.serverId) {
       settings.guildId = discord.serverId;
-    } else if (discord?.allowlist?.guilds && discord.allowlist.guilds.length > 0) {
+    } else if (!settings.guildId && discord?.allowlist?.guilds && discord.allowlist.guilds.length > 0) {
       settings.guildId = discord.allowlist.guilds[0];
     }
     if (channelsDiscord?.channel) {
@@ -2571,6 +2599,19 @@ program.command("debug").description("Debug OpenClaw configuration detection").o
           console.log(chalk3.gray(`  \u25CB ${path2} - not found`));
         }
       });
+      const guilds = rawConfig?.channels?.discord?.guilds;
+      if (guilds && typeof guilds === "object") {
+        console.log(chalk3.white("\nGuilds found in channels.discord.guilds:"));
+        const guildIds = Object.keys(guilds);
+        guildIds.forEach((guildId) => {
+          const guildConfig = guilds[guildId];
+          const channelKeys = guildConfig?.channels ? Object.keys(guildConfig.channels) : [];
+          console.log(chalk3.green(`  \u2713 Guild: ${guildId}`));
+          if (channelKeys.length > 0) {
+            console.log(chalk3.gray(`    Channels: ${channelKeys.join(", ")}`));
+          }
+        });
+      }
       if (options.raw) {
         console.log(chalk3.yellow("\n\u26A0 Raw OpenClaw config (may contain sensitive data):"));
         console.log(chalk3.gray(JSON.stringify(rawConfig, null, 2)));