shardwire 1.2.0 → 1.4.0

package/dist/index.mjs

@@ -6,6 +6,7 @@ var BOT_EVENT_NAMES = [
   "messageCreate",
   "messageUpdate",
   "messageDelete",
+  "messageBulkDelete",
   "messageReactionAdd",
   "messageReactionRemove",
   "guildCreate",
@@ -15,7 +16,10 @@ var BOT_EVENT_NAMES = [
   "guildMemberUpdate",
   "threadCreate",
   "threadUpdate",
-  "threadDelete"
+  "threadDelete",
+  "channelCreate",
+  "channelUpdate",
+  "channelDelete"
 ];
 var BOT_ACTION_NAMES = [
   "sendMessage",
@@ -36,7 +40,14 @@ var BOT_ACTION_NAMES = [
   "addMemberRole",
   "removeMemberRole",
   "addMessageReaction",
-  "removeOwnMessageReaction"
+  "removeOwnMessageReaction",
+  "timeoutMember",
+  "removeMemberTimeout",
+  "createChannel",
+  "editChannel",
+  "deleteChannel",
+  "createThread",
+  "archiveThread"
 ];
 var DISCORD_GATEWAY_INTENT_ENTRIES = Object.entries(GatewayIntentBits).filter(
   (entry) => typeof entry[1] === "number"
@@ -50,6 +61,7 @@ var EVENT_REQUIRED_INTENTS = {
   messageCreate: ["GuildMessages"],
   messageUpdate: ["GuildMessages"],
   messageDelete: ["GuildMessages"],
+  messageBulkDelete: ["GuildMessages"],
   messageReactionAdd: ["GuildMessageReactions"],
   messageReactionRemove: ["GuildMessageReactions"],
   guildCreate: ["Guilds"],
@@ -59,11 +71,16 @@ var EVENT_REQUIRED_INTENTS = {
   guildMemberUpdate: ["GuildMembers"],
   threadCreate: ["Guilds"],
   threadUpdate: ["Guilds"],
-  threadDelete: ["Guilds"]
+  threadDelete: ["Guilds"],
+  channelCreate: ["Guilds"],
+  channelUpdate: ["Guilds"],
+  channelDelete: ["Guilds"]
 };
 function getAvailableEvents(intents) {
   const enabled = new Set(intents);
-  return BOT_EVENT_NAMES.filter((eventName) => EVENT_REQUIRED_INTENTS[eventName].every((intent) => enabled.has(intent)));
+  return BOT_EVENT_NAMES.filter(
+    (eventName) => EVENT_REQUIRED_INTENTS[eventName].every((intent) => enabled.has(intent))
+  );
 }
 
 // src/discord/runtime/adapter.ts
@@ -80,6 +97,7 @@ var ActionExecutionError = class extends Error {
 
 // src/discord/runtime/discordjs-adapter.ts
 import {
+  ChannelType,
   Client,
   DiscordAPIError,
   Events,
@@ -155,6 +173,20 @@ function serializeMessage(message) {
     ...message.reference.guildId ? { guildId: message.reference.guildId } : {}
   } : void 0;
   const components = "components" in message && message.components && message.components.length > 0 ? message.components.map((row) => row.toJSON()) : void 0;
+  const channelMeta = (() => {
+    if (!("channel" in message) || !message.channel) {
+      return {};
+    }
+    const ch = message.channel;
+    const meta = {};
+    if (typeof ch.type === "number") {
+      meta.channelType = ch.type;
+    }
+    if ("parentId" in ch && typeof ch.parentId === "string") {
+      meta.parentChannelId = ch.parentId;
+    }
+    return meta;
+  })();
   return {
     id: message.id,
     channelId: message.channelId,
@@ -173,7 +205,8 @@ function serializeMessage(message) {
     })) : [],
     embeds: serializeEmbeds(message),
     ...components ? { components } : {},
-    ...reference ? { reference } : {}
+    ...reference ? { reference } : {},
+    ...channelMeta
   };
 }
 function serializeGuild(guild) {
@@ -195,12 +228,43 @@ function serializeThread(thread) {
     ...typeof thread.locked === "boolean" ? { locked: thread.locked } : {}
   };
 }
+function serializeChannel(channel) {
+  const base = {
+    id: channel.id,
+    type: channel.type
+  };
+  if ("name" in channel) {
+    base.name = channel.name ?? null;
+  }
+  if ("guildId" in channel && typeof channel.guildId === "string") {
+    base.guildId = channel.guildId;
+  }
+  if ("parentId" in channel) {
+    base.parentId = channel.parentId;
+  }
+  return base;
+}
 function serializeDeletedMessage(message) {
+  const channelMeta = (() => {
+    if (!("channel" in message) || !message.channel) {
+      return {};
+    }
+    const ch = message.channel;
+    const meta = {};
+    if (typeof ch.type === "number") {
+      meta.channelType = ch.type;
+    }
+    if ("parentId" in ch && typeof ch.parentId === "string") {
+      meta.parentChannelId = ch.parentId;
+    }
+    return meta;
+  })();
   return {
     id: message.id,
     channelId: message.channelId,
     ...message.guildId ? { guildId: message.guildId } : {},
-    deletedAt: (/* @__PURE__ */ new Date()).toISOString()
+    deletedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    ...channelMeta
   };
 }
 function serializeReactionEmoji(reaction) {
@@ -266,83 +330,124 @@ function serializeInteraction(interaction) {
     ...interaction.member && "guild" in interaction.member ? { member: serializeGuildMember(interaction.member) } : {}
   };
   if (interaction.isChatInputCommand()) {
-    return {
-      ...base,
-      kind: "chatInput",
-      commandName: interaction.commandName,
-      options: serializeChatInputOptions(interaction)
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "chatInput",
+        commandName: interaction.commandName,
+        options: serializeChatInputOptions(interaction)
+      },
+      interaction
+    );
   }
   if (interaction.isContextMenuCommand()) {
-    return {
-      ...base,
-      kind: "contextMenu",
-      commandName: interaction.commandName
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "contextMenu",
+        commandName: interaction.commandName
+      },
+      interaction
+    );
   }
   if (interaction.isButton()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "button",
-      customId: interaction.customId,
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "button",
+        customId: interaction.customId,
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isStringSelectMenu()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "stringSelect",
-      ...serializeSelectMenu(interaction),
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "stringSelect",
+        ...serializeSelectMenu(interaction),
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isUserSelectMenu()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "userSelect",
-      ...serializeSelectMenu(interaction),
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "userSelect",
+        ...serializeSelectMenu(interaction),
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isRoleSelectMenu()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "roleSelect",
-      ...serializeSelectMenu(interaction),
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "roleSelect",
+        ...serializeSelectMenu(interaction),
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isMentionableSelectMenu()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "mentionableSelect",
-      ...serializeSelectMenu(interaction),
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "mentionableSelect",
+        ...serializeSelectMenu(interaction),
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isChannelSelectMenu()) {
     const message = serializeInteractionMessage(interaction);
-    return {
-      ...base,
-      kind: "channelSelect",
-      ...serializeSelectMenu(interaction),
-      ...message ? { message } : {}
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "channelSelect",
+        ...serializeSelectMenu(interaction),
+        ...message ? { message } : {}
+      },
+      interaction
+    );
   }
   if (interaction.isModalSubmit()) {
-    return {
-      ...base,
-      kind: "modalSubmit",
-      customId: interaction.customId,
-      fields: serializeModalFields(interaction)
-    };
+    return enrichInteractionChannel(
+      {
+        ...base,
+        kind: "modalSubmit",
+        customId: interaction.customId,
+        fields: serializeModalFields(interaction)
+      },
+      interaction
+    );
   }
-  return base;
+  return enrichInteractionChannel(base, interaction);
+}
+function enrichInteractionChannel(base, interaction) {
+  if (!("channel" in interaction) || !interaction.channel || interaction.channel.isDMBased()) {
+    return base;
+  }
+  const ch = interaction.channel;
+  const out = { ...base };
+  if (typeof ch.type === "number") {
+    out.channelType = ch.type;
+  }
+  if ("parentId" in ch && typeof ch.parentId === "string") {
+    out.parentChannelId = ch.parentId;
+  }
+  return out;
 }
 
 // src/discord/runtime/discordjs-adapter.ts
@@ -405,15 +510,24 @@ function mapDiscordErrorToActionExecutionError(error) {
     return new ActionExecutionError("INVALID_REQUEST", message, detailPayload);
   }
   if (details.status === 429) {
+    let retryAfterMs;
+    if (error instanceof DiscordAPIError) {
+      const raw = error.rawError;
+      const retryAfter = raw?.retry_after;
+      if (typeof retryAfter === "number" && Number.isFinite(retryAfter)) {
+        retryAfterMs = Math.max(0, Math.ceil(retryAfter * 1e3));
+      }
+    }
     return new ActionExecutionError("SERVICE_UNAVAILABLE", message, {
       discordStatus: 429,
       retryable: true,
-      ...details.code !== void 0 ? { discordCode: details.code } : {}
+      ...details.code !== void 0 ? { discordCode: details.code } : {},
+      ...retryAfterMs !== void 0 ? { retryAfterMs } : {}
     });
   }
   return null;
 }
-var DiscordJsRuntimeAdapter = class {
+var DiscordJsRuntimeAdapter = class _DiscordJsRuntimeAdapter {
   constructor(options) {
     this.options = options;
     const intentBits = options.intents.map((intent) => BOT_INTENT_BITS[intent]);
@@ -443,7 +557,14 @@ var DiscordJsRuntimeAdapter = class {
       addMemberRole: (payload) => this.addMemberRole(payload),
       removeMemberRole: (payload) => this.removeMemberRole(payload),
       addMessageReaction: (payload) => this.addMessageReaction(payload),
-      removeOwnMessageReaction: (payload) => this.removeOwnMessageReaction(payload)
+      removeOwnMessageReaction: (payload) => this.removeOwnMessageReaction(payload),
+      timeoutMember: (payload) => this.timeoutMember(payload),
+      removeMemberTimeout: (payload) => this.removeMemberTimeout(payload),
+      createChannel: (payload) => this.createChannel(payload),
+      editChannel: (payload) => this.editChannel(payload),
+      deleteChannel: (payload) => this.deleteChannel(payload),
+      createThread: (payload) => this.createThread(payload),
+      archiveThread: (payload) => this.archiveThread(payload)
     };
   }
   options;
@@ -571,6 +692,23 @@ var DiscordJsRuntimeAdapter = class {
           this.client.off(Events.MessageDelete, listener);
         };
       }
+      case "messageBulkDelete": {
+        const listener = (messages, channel) => {
+          handler({
+            receivedAt: Date.now(),
+            ...this.shardEnvelope(),
+            channelId: channel.id,
+            guildId: channel.guildId,
+            messageIds: [...messages.keys()],
+            channelType: channel.type,
+            ..."parentId" in channel && typeof channel.parentId === "string" ? { parentChannelId: channel.parentId } : {}
+          });
+        };
+        this.client.on(Events.MessageBulkDelete, listener);
+        return () => {
+          this.client.off(Events.MessageBulkDelete, listener);
+        };
+      }
       case "messageReactionAdd": {
         const listener = (reaction, user) => {
           handler({
@@ -708,6 +846,46 @@ var DiscordJsRuntimeAdapter = class {
           this.client.off(Events.ThreadDelete, listener);
         };
       }
+      case "channelCreate": {
+        const listener = (channel) => {
+          handler({
+            receivedAt: Date.now(),
+            ...this.shardEnvelope(),
+            channel: serializeChannel(channel)
+          });
+        };
+        this.client.on(Events.ChannelCreate, listener);
+        return () => {
+          this.client.off(Events.ChannelCreate, listener);
+        };
+      }
+      case "channelUpdate": {
+        const listener = (oldChannel, newChannel) => {
+          handler({
+            receivedAt: Date.now(),
+            ...this.shardEnvelope(),
+            oldChannel: serializeChannel(oldChannel),
+            channel: serializeChannel(newChannel)
+          });
+        };
+        this.client.on(Events.ChannelUpdate, listener);
+        return () => {
+          this.client.off(Events.ChannelUpdate, listener);
+        };
+      }
+      case "channelDelete": {
+        const listener = (channel) => {
+          handler({
+            receivedAt: Date.now(),
+            ...this.shardEnvelope(),
+            channel: serializeChannel(channel)
+          });
+        };
+        this.client.on(Events.ChannelDelete, listener);
+        return () => {
+          this.client.off(Events.ChannelDelete, listener);
+        };
+      }
       default:
         return () => void 0;
     }
@@ -726,7 +904,10 @@ var DiscordJsRuntimeAdapter = class {
         throw mappedError;
       }
       this.logger.error("Discord action execution failed.", { action: name, error: String(error) });
-      throw new ActionExecutionError("INTERNAL_ERROR", error instanceof Error ? error.message : "Discord action failed.");
+      throw new ActionExecutionError(
+        "INTERNAL_ERROR",
+        error instanceof Error ? error.message : "Discord action failed."
+      );
     }
   }
   async fetchSendableChannel(channelId) {
@@ -794,7 +975,10 @@ var DiscordJsRuntimeAdapter = class {
   async replyToInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (interaction.replied || interaction.deferred) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has already been acknowledged.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has already been acknowledged.`
+      );
     }
     const reply = await interaction.reply({
       ...toSendOptions(payload),
@@ -806,7 +990,10 @@ var DiscordJsRuntimeAdapter = class {
   async deferInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (interaction.replied) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has already been replied to.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has already been replied to.`
+      );
     }
     if (!interaction.deferred) {
       await interaction.deferReply({
@@ -829,7 +1016,10 @@ var DiscordJsRuntimeAdapter = class {
   async followUpInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (!interaction.replied && !interaction.deferred) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has not been acknowledged yet.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has not been acknowledged yet.`
+      );
     }
     const followUp = await interaction.followUp({
       ...toSendOptions(payload),
@@ -938,7 +1128,10 @@ var DiscordJsRuntimeAdapter = class {
       return candidate.emoji.identifier === payload.emoji || candidate.emoji.name === payload.emoji || candidate.emoji.toString() === payload.emoji;
     });
     if (!reaction) {
-      throw new ActionExecutionError("NOT_FOUND", `Reaction "${payload.emoji}" was not found on message "${payload.messageId}".`);
+      throw new ActionExecutionError(
+        "NOT_FOUND",
+        `Reaction "${payload.emoji}" was not found on message "${payload.messageId}".`
+      );
     }
     await reaction.users.remove(ownUserId);
     return {
@@ -947,6 +1140,112 @@ var DiscordJsRuntimeAdapter = class {
       emoji: payload.emoji
     };
   }
+  static maxTimeoutMs = 28 * 24 * 60 * 60 * 1e3;
+  async timeoutMember(payload) {
+    if (typeof payload.durationMs !== "number" || !Number.isFinite(payload.durationMs) || payload.durationMs < 1 || payload.durationMs > _DiscordJsRuntimeAdapter.maxTimeoutMs) {
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `durationMs must be between 1 and ${_DiscordJsRuntimeAdapter.maxTimeoutMs} (28 days).`
+      );
+    }
+    const guild = await this.client.guilds.fetch(payload.guildId);
+    const member = await guild.members.fetch(payload.userId);
+    await member.timeout(payload.durationMs, payload.reason);
+    return {
+      guildId: payload.guildId,
+      userId: payload.userId
+    };
+  }
+  async removeMemberTimeout(payload) {
+    const guild = await this.client.guilds.fetch(payload.guildId);
+    const member = await guild.members.fetch(payload.userId);
+    await member.timeout(null, payload.reason);
+    return serializeGuildMember(await member.fetch());
+  }
+  async createChannel(payload) {
+    const guild = await this.client.guilds.fetch(payload.guildId);
+    const created = await guild.channels.create({
+      name: payload.name,
+      type: payload.type ?? ChannelType.GuildText,
+      ...payload.parentId ? { parent: payload.parentId } : {},
+      ...payload.topic !== void 0 ? { topic: payload.topic } : {},
+      ...payload.reason ? { reason: payload.reason } : {}
+    });
+    return serializeChannel(created);
+  }
+  async editChannel(payload) {
+    const raw = await this.client.channels.fetch(payload.channelId);
+    if (!raw) {
+      throw new ActionExecutionError("NOT_FOUND", `Channel "${payload.channelId}" was not found.`);
+    }
+    if (!("edit" in raw) || typeof raw.edit !== "function") {
+      throw new ActionExecutionError("INVALID_REQUEST", `Channel "${payload.channelId}" cannot be edited.`);
+    }
+    const edited = await raw.edit({
+      ...payload.name !== void 0 ? { name: payload.name ?? void 0 } : {},
+      ...payload.parentId !== void 0 ? { parent: payload.parentId } : {},
+      ...payload.topic !== void 0 ? { topic: payload.topic } : {},
+      ...payload.reason ? { reason: payload.reason } : {}
+    });
+    return serializeChannel(edited);
+  }
+  async deleteChannel(payload) {
+    const raw = await this.client.channels.fetch(payload.channelId);
+    if (!raw) {
+      throw new ActionExecutionError("NOT_FOUND", `Channel "${payload.channelId}" was not found.`);
+    }
+    if (!("delete" in raw) || typeof raw.delete !== "function") {
+      throw new ActionExecutionError("INVALID_REQUEST", `Channel "${payload.channelId}" cannot be deleted.`);
+    }
+    await raw.delete(payload.reason);
+    return {
+      deleted: true,
+      channelId: payload.channelId
+    };
+  }
+  async createThread(payload) {
+    const parent = await this.client.channels.fetch(payload.parentChannelId);
+    if (!parent || !parent.isTextBased()) {
+      throw new ActionExecutionError(
+        "NOT_FOUND",
+        `Parent channel "${payload.parentChannelId}" was not found or is not text-based.`
+      );
+    }
+    if (payload.messageId) {
+      if (!("messages" in parent) || !parent.messages) {
+        throw new ActionExecutionError(
+          "INVALID_REQUEST",
+          `Channel "${payload.parentChannelId}" does not support fetching messages.`
+        );
+      }
+      const msg = await parent.messages.fetch(payload.messageId);
+      const thread2 = await msg.startThread({
+        name: payload.name,
+        ...payload.reason ? { reason: payload.reason } : {},
+        ...payload.autoArchiveDuration ? { autoArchiveDuration: payload.autoArchiveDuration } : {}
+      });
+      return serializeThread(thread2);
+    }
+    if (!("threads" in parent) || !parent.threads || typeof parent.threads.create !== "function") {
+      throw new ActionExecutionError("INVALID_REQUEST", `Channel "${payload.parentChannelId}" cannot create threads.`);
+    }
+    const threadOptions = Object.assign(
+      { name: payload.name },
+      payload.type === "private" ? { type: ChannelType.PrivateThread } : {},
+      payload.reason ? { reason: payload.reason } : {},
+      payload.autoArchiveDuration ? { autoArchiveDuration: payload.autoArchiveDuration } : {}
+    );
+    const thread = await parent.threads.create(threadOptions);
+    return serializeThread(thread);
+  }
+  async archiveThread(payload) {
+    const raw = await this.client.channels.fetch(payload.threadId);
+    if (!raw || !raw.isThread()) {
+      throw new ActionExecutionError("NOT_FOUND", `Thread "${payload.threadId}" was not found.`);
+    }
+    await raw.setArchived(payload.archived ?? true, payload.reason);
+    return serializeThread(raw);
+  }
 };
 function createDiscordJsRuntimeAdapter(options) {
   return new DiscordJsRuntimeAdapter(options);
@@ -968,6 +1267,7 @@ function createConnectionId() {
 }
 
 // src/bridge/subscriptions.ts
+var THREAD_CHANNEL_TYPES = /* @__PURE__ */ new Set([10, 11, 12]);
 function normalizeStringList(value) {
   if (value === void 0) {
     return void 0;
@@ -976,12 +1276,24 @@ function normalizeStringList(value) {
   const normalized = [...new Set(rawValues.filter((entry) => typeof entry === "string" && entry.length > 0))].sort();
   return normalized.length > 0 ? normalized : void 0;
 }
+function normalizeNumberList(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  const rawValues = Array.isArray(value) ? value : [value];
+  const normalized = [
+    ...new Set(rawValues.filter((entry) => typeof entry === "number" && Number.isFinite(entry)))
+  ].sort((a, b) => a - b);
+  return normalized.length > 0 ? normalized : void 0;
+}
 function normalizeKindList(value) {
   if (value === void 0) {
     return void 0;
   }
   const rawValues = Array.isArray(value) ? value : [value];
-  const normalized = [...new Set(rawValues.filter((entry) => typeof entry === "string"))].sort();
+  const normalized = [
+    ...new Set(rawValues.filter((entry) => typeof entry === "string"))
+  ].sort();
   return normalized.length > 0 ? normalized : void 0;
 }
 function normalizeEventSubscriptionFilter(filter) {
@@ -995,6 +1307,9 @@ function normalizeEventSubscriptionFilter(filter) {
   const commandNames = normalizeStringList(filter.commandName);
   const customIds = normalizeStringList(filter.customId);
   const interactionKinds = normalizeKindList(filter.interactionKind);
+  const channelTypes = normalizeNumberList(filter.channelType);
+  const parentChannelIds = normalizeStringList(filter.parentChannelId);
+  const threadIds = normalizeStringList(filter.threadId);
   if (guildIds) {
     normalized.guildId = guildIds;
   }
@@ -1013,6 +1328,15 @@ function normalizeEventSubscriptionFilter(filter) {
   if (interactionKinds) {
     normalized.interactionKind = interactionKinds;
   }
+  if (channelTypes) {
+    normalized.channelType = channelTypes;
+  }
+  if (parentChannelIds) {
+    normalized.parentChannelId = parentChannelIds;
+  }
+  if (threadIds) {
+    normalized.threadId = threadIds;
+  }
   return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
 function normalizeEventSubscription(subscription) {
@@ -1043,6 +1367,24 @@ function matchesKind(value, allowed) {
   }
   return allowed.includes(value);
 }
+function matchesNumberField(value, allowed) {
+  if (!allowed) {
+    return true;
+  }
+  if (value === void 0) {
+    return false;
+  }
+  return allowed.includes(value);
+}
+function threadIdFromMessageLike(message) {
+  if (message.channelType === void 0) {
+    return void 0;
+  }
+  if (THREAD_CHANNEL_TYPES.has(message.channelType)) {
+    return message.channelId;
+  }
+  return void 0;
+}
 function eventMetadata(name, payload) {
   switch (name) {
     case "ready":
@@ -1050,36 +1392,66 @@ function eventMetadata(name, payload) {
     case "interactionCreate": {
       const interactionPayload = payload;
       const ix = interactionPayload.interaction;
+      const threadId = ix.channelId && ix.channelType !== void 0 && THREAD_CHANNEL_TYPES.has(ix.channelType) ? ix.channelId : void 0;
       return {
         ...ix.guildId ? { guildId: ix.guildId } : {},
         ...ix.channelId ? { channelId: ix.channelId } : {},
         userId: ix.user.id,
         ...ix.commandName ? { commandName: ix.commandName } : {},
         ...ix.customId ? { customId: ix.customId } : {},
-        interactionKind: ix.kind
+        interactionKind: ix.kind,
+        ...ix.channelType !== void 0 ? { channelType: ix.channelType } : {},
+        ...ix.parentChannelId ? { parentChannelId: ix.parentChannelId } : {},
+        ...threadId ? { threadId } : {}
       };
     }
     case "messageCreate": {
       const messagePayload = payload;
+      const msg = messagePayload.message;
+      const threadId = threadIdFromMessageLike(msg);
       return {
-        ...messagePayload.message.guildId ? { guildId: messagePayload.message.guildId } : {},
-        channelId: messagePayload.message.channelId,
-        ...messagePayload.message.author ? { userId: messagePayload.message.author.id } : {}
+        ...msg.guildId ? { guildId: msg.guildId } : {},
+        channelId: msg.channelId,
+        ...msg.author ? { userId: msg.author.id } : {},
+        ...msg.channelType !== void 0 ? { channelType: msg.channelType } : {},
+        ...msg.parentChannelId ? { parentChannelId: msg.parentChannelId } : {},
+        ...threadId ? { threadId } : {}
       };
     }
     case "messageUpdate": {
       const messagePayload = payload;
+      const msg = messagePayload.message;
+      const threadId = threadIdFromMessageLike(msg);
       return {
-        ...messagePayload.message.guildId ? { guildId: messagePayload.message.guildId } : {},
-        channelId: messagePayload.message.channelId,
-        ...messagePayload.message.author ? { userId: messagePayload.message.author.id } : {}
+        ...msg.guildId ? { guildId: msg.guildId } : {},
+        channelId: msg.channelId,
+        ...msg.author ? { userId: msg.author.id } : {},
+        ...msg.channelType !== void 0 ? { channelType: msg.channelType } : {},
+        ...msg.parentChannelId ? { parentChannelId: msg.parentChannelId } : {},
+        ...threadId ? { threadId } : {}
       };
     }
     case "messageDelete": {
       const messagePayload = payload;
+      const msg = messagePayload.message;
+      const threadId = threadIdFromMessageLike(msg);
       return {
-        ...messagePayload.message.guildId ? { guildId: messagePayload.message.guildId } : {},
-        channelId: messagePayload.message.channelId
+        ...msg.guildId ? { guildId: msg.guildId } : {},
+        channelId: msg.channelId,
+        ...msg.channelType !== void 0 ? { channelType: msg.channelType } : {},
+        ...msg.parentChannelId ? { parentChannelId: msg.parentChannelId } : {},
+        ...threadId ? { threadId } : {}
+      };
+    }
+    case "messageBulkDelete": {
+      const bulkPayload = payload;
+      const threadId = bulkPayload.channelType !== void 0 && THREAD_CHANNEL_TYPES.has(bulkPayload.channelType) ? bulkPayload.channelId : void 0;
+      return {
+        guildId: bulkPayload.guildId,
+        channelId: bulkPayload.channelId,
+        ...bulkPayload.channelType !== void 0 ? { channelType: bulkPayload.channelType } : {},
+        ...bulkPayload.parentChannelId ? { parentChannelId: bulkPayload.parentChannelId } : {},
+        ...threadId ? { threadId } : {}
       };
     }
     case "messageReactionAdd": {
@@ -1132,7 +1504,22 @@ function eventMetadata(name, payload) {
       const threadPayload = payload;
       return {
         guildId: threadPayload.thread.guildId,
-        ...threadPayload.thread.parentId ? { channelId: threadPayload.thread.parentId } : { channelId: threadPayload.thread.id }
+        ...threadPayload.thread.parentId ? { channelId: threadPayload.thread.parentId } : { channelId: threadPayload.thread.id },
+        channelType: threadPayload.thread.type,
+        ...threadPayload.thread.parentId ? { parentChannelId: threadPayload.thread.parentId } : {},
+        threadId: threadPayload.thread.id
+      };
+    }
+    case "channelCreate":
+    case "channelUpdate":
+    case "channelDelete": {
+      const channelPayload = payload;
+      const ch = channelPayload.channel;
+      return {
+        ...ch.guildId ? { guildId: ch.guildId } : {},
+        channelId: ch.id,
+        channelType: ch.type,
+        ...ch.parentId ? { parentChannelId: ch.parentId } : {}
       };
     }
     default:
@@ -1145,7 +1532,7 @@ function matchesEventSubscription(subscription, payload) {
     return true;
   }
   const metadata = eventMetadata(normalized.name, payload);
-  return matchesField(metadata.guildId, normalized.filter.guildId) && matchesField(metadata.channelId, normalized.filter.channelId) && matchesField(metadata.userId, normalized.filter.userId) && matchesField(metadata.commandName, normalized.filter.commandName) && matchesField(metadata.customId, normalized.filter.customId) && matchesKind(metadata.interactionKind, normalized.filter.interactionKind);
+  return matchesField(metadata.guildId, normalized.filter.guildId) && matchesField(metadata.channelId, normalized.filter.channelId) && matchesField(metadata.userId, normalized.filter.userId) && matchesField(metadata.commandName, normalized.filter.commandName) && matchesField(metadata.customId, normalized.filter.customId) && matchesKind(metadata.interactionKind, normalized.filter.interactionKind) && matchesNumberField(metadata.channelType, normalized.filter.channelType) && matchesField(metadata.parentChannelId, normalized.filter.parentChannelId) && matchesField(metadata.threadId, normalized.filter.threadId);
 }
 
 // src/bridge/transport/security.ts
@@ -1247,6 +1634,8 @@ var BridgeTransportServer = class {
     const maxConcurrent = config.options.server.maxConcurrentActions ?? 32;
     const queueTimeout = config.options.server.actionQueueTimeoutMs ?? 5e3;
     this.actionSemaphore = new AsyncSemaphore(maxConcurrent, queueTimeout);
+    this.idempotencyTtlMs = config.options.server.idempotencyTtlMs ?? 12e4;
+    this.idempotencyScope = config.options.server.idempotencyScope ?? "connection";
     this.wss = new WebSocketServer({
       host: config.options.server.host,
       port: config.options.server.port,
@@ -1269,7 +1658,8 @@ var BridgeTransportServer = class {
   stickyEvents = /* @__PURE__ */ new Map();
   actionSemaphore;
   idempotencyCache = /* @__PURE__ */ new Map();
-  idempotencyTtlMs = 12e4;
+  idempotencyTtlMs;
+  idempotencyScope;
   authBuckets = /* @__PURE__ */ new Map();
   connectionCount() {
     let count = 0;
@@ -1499,7 +1889,7 @@ var BridgeTransportServer = class {
         }
         const idempotencyRaw = payload.idempotencyKey;
         const idempotencyKey = typeof idempotencyRaw === "string" && idempotencyRaw.length > 0 && idempotencyRaw.length <= 256 ? idempotencyRaw : void 0;
-        const idempotencyCacheKey = idempotencyKey ? `${state.id}:${idempotencyKey}` : void 0;
+        const idempotencyCacheKey = idempotencyKey ? this.idempotencyScope === "secret" && activeSecret ? `secret:${activeSecret.id}:${idempotencyKey}` : `conn:${state.id}:${idempotencyKey}` : void 0;
         if (idempotencyCacheKey) {
           this.pruneIdempotencyCache(Date.now());
           const cached = this.idempotencyCache.get(idempotencyCacheKey);
@@ -1512,9 +1902,7 @@ var BridgeTransportServer = class {
             });
             this.safeSend(
               state.socket,
-              stringifyEnvelope(
-                makeEnvelope(replay.ok ? "action.result" : "action.error", replay, { requestId })
-              )
+              stringifyEnvelope(makeEnvelope(replay.ok ? "action.result" : "action.error", replay, { requestId }))
             );
             return;
           }
@@ -1705,11 +2093,7 @@ function normalizeSecretEntry(secret, index) {
     value: scoped.value,
     scope: {
       events: normalizeScopeList(scoped.allow?.events, BOT_EVENT_NAMES, `server.secrets[${index}].allow.events`),
-      actions: normalizeScopeList(
-        scoped.allow?.actions,
-        BOT_ACTION_NAMES,
-        `server.secrets[${index}].allow.actions`
-      )
+      actions: normalizeScopeList(scoped.allow?.actions, BOT_ACTION_NAMES, `server.secrets[${index}].allow.actions`)
     }
   };
 }
@@ -1736,6 +2120,14 @@ function assertBotBridgeOptions(options) {
   if (options.server.actionQueueTimeoutMs !== void 0) {
     assertPositiveNumber("server.actionQueueTimeoutMs", options.server.actionQueueTimeoutMs);
   }
+  if (options.server.idempotencyScope !== void 0) {
+    if (options.server.idempotencyScope !== "connection" && options.server.idempotencyScope !== "secret") {
+      throw new Error('server.idempotencyScope must be "connection" or "secret".');
+    }
+  }
+  if (options.server.idempotencyTtlMs !== void 0) {
+    assertPositiveNumber("server.idempotencyTtlMs", options.server.idempotencyTtlMs);
+  }
   if (!Array.isArray(options.server.secrets) || options.server.secrets.length === 0) {
     throw new Error("server.secrets must contain at least one secret.");
   }
@@ -1935,6 +2327,24 @@ var AppRequestError = class extends Error {
   code;
 };
 var DEFAULT_REQUEST_TIMEOUT_MS = 1e4;
+function metricsExtrasFromActionError(error) {
+  const details = error.details;
+  if (!details || typeof details !== "object" || Array.isArray(details)) {
+    return {};
+  }
+  const obj = details;
+  const extras = {};
+  if (typeof obj.retryAfterMs === "number" && Number.isFinite(obj.retryAfterMs)) {
+    extras.retryAfterMs = obj.retryAfterMs;
+  }
+  if (typeof obj.discordStatus === "number" && Number.isFinite(obj.discordStatus)) {
+    extras.discordStatus = obj.discordStatus;
+  }
+  if (typeof obj.discordCode === "number" && Number.isFinite(obj.discordCode)) {
+    extras.discordCode = obj.discordCode;
+  }
+  return extras;
+}
 function connectBotBridge(options) {
   assertAppBridgeOptions(options);
   const logger = withLogger(options.logger);
@@ -2243,7 +2653,7 @@ function connectBotBridge(options) {
         requestId,
         durationMs: Date.now() - started,
         ok: result.ok,
-        ...!result.ok ? { errorCode: result.error.code } : {}
+        ...!result.ok ? { errorCode: result.error.code, ...metricsExtrasFromActionError(result.error) } : {}
       });
       return result;
     } catch (error) {
@@ -2285,7 +2695,14 @@ function connectBotBridge(options) {
     addMemberRole: (payload, sendOptions) => invokeAction("addMemberRole", payload, sendOptions),
     removeMemberRole: (payload, sendOptions) => invokeAction("removeMemberRole", payload, sendOptions),
     addMessageReaction: (payload, sendOptions) => invokeAction("addMessageReaction", payload, sendOptions),
-    removeOwnMessageReaction: (payload, sendOptions) => invokeAction("removeOwnMessageReaction", payload, sendOptions)
+    removeOwnMessageReaction: (payload, sendOptions) => invokeAction("removeOwnMessageReaction", payload, sendOptions),
+    timeoutMember: (payload, sendOptions) => invokeAction("timeoutMember", payload, sendOptions),
+    removeMemberTimeout: (payload, sendOptions) => invokeAction("removeMemberTimeout", payload, sendOptions),
+    createChannel: (payload, sendOptions) => invokeAction("createChannel", payload, sendOptions),
+    editChannel: (payload, sendOptions) => invokeAction("editChannel", payload, sendOptions),
+    deleteChannel: (payload, sendOptions) => invokeAction("deleteChannel", payload, sendOptions),
+    createThread: (payload, sendOptions) => invokeAction("createThread", payload, sendOptions),
+    archiveThread: (payload, sendOptions) => invokeAction("archiveThread", payload, sendOptions)
   };
   return {
     actions,