@zhin.js/adapter-discord 1.1.0 → 1.1.2

package/{lib/discord-endpoint-commands.js → commands/discord/endpoint/definition.js}

@@ -1,12 +1,13 @@
+// Generated by build-plugin-runtime-entries.mjs. Do not edit.
 /**
- * `discord.endpoint` 命令族：由 @zhin.js/adapter 的 createEndpointCommands 套件生成。
- * commands/endpoint/ 下的 list / add / remove 直接默认导出这三项。
+ * `discord endpoint` 命令族：由 @zhin.js/adapter 的 createEndpointCommands 套件生成。
+ * commands/discord/endpoint/ 下的 list / add / remove 直接默认导出这三项。
  * 注：applicationId / publicKey 为顶层共享字段（slash commands / interactions 用），
- * endpoints[i] 仅需 name + token（见 schema.json），故 add 只录入 token。
+ * endpoints[i] 仅需 id + token（见 schema.json），故 add 只录入 token。
  */
 import { createEndpointCommands } from 'zhin.js/adapter';
 import { defineCommand } from 'zhin.js/command';
-import { discordRuntimeStateToken } from './discord-runtime-state.js';
+import { discordRuntimeStateToken } from "../../../lib/discord-runtime-state.js";
 export const discordEndpointCommands = createEndpointCommands({
     adapterKey: 'discord',
     adapterDisplayName: 'Discord',

package/{src/discord-endpoint-commands.ts → commands/discord/endpoint/definition.ts}

@@ -1,12 +1,12 @@
 /**
- * `discord.endpoint` 命令族：由 @zhin.js/adapter 的 createEndpointCommands 套件生成。
- * commands/endpoint/ 下的 list / add / remove 直接默认导出这三项。
+ * `discord endpoint` 命令族：由 @zhin.js/adapter 的 createEndpointCommands 套件生成。
+ * commands/discord/endpoint/ 下的 list / add / remove 直接默认导出这三项。
  * 注：applicationId / publicKey 为顶层共享字段（slash commands / interactions 用），
- * endpoints[i] 仅需 name + token（见 schema.json），故 add 只录入 token。
+ * endpoints[i] 仅需 id + token（见 schema.json），故 add 只录入 token。
  */
 import { createEndpointCommands } from 'zhin.js/adapter';
 import { defineCommand } from 'zhin.js/command';
-import { discordRuntimeStateToken } from './discord-runtime-state.js';
+import { discordRuntimeStateToken } from '../../../src/discord-runtime-state.js';
 
 export const discordEndpointCommands = createEndpointCommands({
   adapterKey: 'discord',

package/commands/{endpoint/list.js → discord/endpoint/list/index.js}

@@ -1,3 +1,3 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { discordEndpointCommands } from "../../lib/discord-endpoint-commands.js";
+import { discordEndpointCommands } from '../definition.js';
 export default discordEndpointCommands.list;

package/commands/discord/endpoint/list/index.ts

@@ -0,0 +1,3 @@
+import { discordEndpointCommands } from '../definition.js';
+
+export default discordEndpointCommands.list;

package/commands/{endpoint/remove/[id].js → discord/endpoint/remove/[id]/index.js}

@@ -1,3 +1,3 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { discordEndpointCommands } from "../../../lib/discord-endpoint-commands.js";
+import { discordEndpointCommands } from '../../definition.js';
 export default discordEndpointCommands.remove;

package/commands/discord/endpoint/remove/[id]/index.ts

@@ -0,0 +1,3 @@
+import { discordEndpointCommands } from '../../definition.js';
+
+export default discordEndpointCommands.remove;

package/lib/discord-runtime-state.js

@@ -1,6 +1,6 @@
 /**
  * Discord 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `discord.endpoint` 命令共享（同一 owner generation）。
+ * 由 plugin.ts setup() provide，adapter create 与 `discord endpoint` 命令共享（同一 owner generation）。
  */
 import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
 export const discordRuntimeStateToken = defineEndpointRuntimeStateToken('discord');

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-export { activityTypeCode, formatButtonContent, formatInboundContent, formatOutboundBody, resolveChannelKind, resolveDiscordConfig, senderDisplayName, type DiscordAdapterConfig, type DiscordButtonInbound, type DiscordInboundAttachment, type DiscordInboundMessage, type DiscordOutboundBody, type DiscordWireSegment, type ResolvedDiscordConfig, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig, } from './protocol.js';
-export { discordClient, type DiscordClient, type DiscordClientEventMap, } from './client.js';
+export { activityTypeCode, formatButtonContent, formatInboundContent, formatOutboundBody, resolveChannelKind, resolveDiscordConfig, senderDisplayName, type DiscordActivity, type DiscordEndpointConfig, type DiscordButtonInbound, type DiscordInboundAttachment, type DiscordInboundMessage, type DiscordOutboundBody, type DiscordWireSegment, type ResolvedDiscordConfig, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig, } from './protocol.js';
+export { discordClient, requireDiscordGatewayClient, type DiscordClient, type DiscordClientEventMap, } from './client.js';
 export { checkDiscordPlatformPermit, discordGroupPermitResolver, normalizeDiscordSenderForPermit, platformPermit, } from './platform-permit.js';
 export { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, type CreateDiscordClient, type DiscordClientTransport, type DiscordEndpointOptions, type DiscordInteractionsEndpointOptions, } from './endpoint.js';
 export { connectDiscordGatewayClient, defaultCreateClient, normalizeDiscordMessage, resolveSenderRole, toMessageCreateOptions, type DiscordGatewayConnectHandlers, } from './gateway.js';

package/lib/index.js

@@ -1,5 +1,5 @@
 export { activityTypeCode, formatButtonContent, formatInboundContent, formatOutboundBody, resolveChannelKind, resolveDiscordConfig, senderDisplayName, } from './protocol.js';
-export { discordClient, } from './client.js';
+export { discordClient, requireDiscordGatewayClient, } from './client.js';
 export { checkDiscordPlatformPermit, discordGroupPermitResolver, normalizeDiscordSenderForPermit, platformPermit, } from './platform-permit.js';
 export { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, } from './endpoint.js';
 export { connectDiscordGatewayClient, defaultCreateClient, normalizeDiscordMessage, resolveSenderRole, toMessageCreateOptions, } from './gateway.js';

package/lib/protocol.d.ts

@@ -1,43 +1,26 @@
-/**
- * Discord Gateway protocol helpers — no legacy Adapter/Endpoint / segment-mapper.
- * Canonicalization is owned by gateway/core before endpoint.send.
- */
+/** Discord Gateway protocol helpers. Canonicalization is owned by Core. */
+import { type ConversationRef } from '@zhin.js/im-contract';
 import type { Segment } from '@zhin.js/core/runtime';
-import type { ConversationRef } from '@zhin.js/im-contract';
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface DiscordAdapterConfig {
-    readonly id?: string;
-    readonly token?: string;
+export interface DiscordActivity {
+    readonly name: string;
+    readonly type: 'PLAYING' | 'STREAMING' | 'LISTENING' | 'WATCHING' | 'COMPETING';
+    readonly url?: string;
+}
+/** One endpoint config after AdapterIndex expands `plugins.<instanceKey>.endpoints`. */
+export interface DiscordEndpointConfig {
+    readonly id: string;
+    readonly token: string;
     /** Default `gateway`. `interactions` uses httpHostToken POST + Ed25519 verify. */
     readonly connection?: 'gateway' | 'interactions';
     readonly intents?: readonly number[];
     readonly enableSlashCommands?: boolean;
     readonly globalCommands?: boolean;
-    readonly defaultActivity?: {
-        readonly name: string;
-        readonly type: 'PLAYING' | 'STREAMING' | 'LISTENING' | 'WATCHING' | 'COMPETING';
-        readonly url?: string;
-    };
+    readonly defaultActivity?: DiscordActivity;
     readonly slashCommands?: readonly Record<string, unknown>[];
     /** Interactions-only fields. */
     readonly applicationId?: string;
     readonly publicKey?: string;
     readonly interactionsPath?: string;
-    /** Transitional: legacy root `endpoints[]` with `context: discord`. */
-    readonly endpoints?: ReadonlyArray<{
-        readonly context?: string;
-        readonly id?: string;
-        readonly token?: string;
-        readonly connection?: 'gateway' | 'interactions';
-        readonly intents?: readonly number[];
-        readonly enableSlashCommands?: boolean;
-        readonly globalCommands?: boolean;
-        readonly defaultActivity?: DiscordAdapterConfig['defaultActivity'];
-        readonly slashCommands?: readonly Record<string, unknown>[];
-        readonly applicationId?: string;
-        readonly publicKey?: string;
-        readonly interactionsPath?: string;
-    }>;
 }
 export interface ResolvedDiscordGatewayConfig {
     readonly context: 'discord';
@@ -47,7 +30,7 @@ export interface ResolvedDiscordGatewayConfig {
     readonly intents?: readonly number[];
     readonly enableSlashCommands: boolean;
     readonly globalCommands: boolean;
-    readonly defaultActivity?: DiscordAdapterConfig['defaultActivity'];
+    readonly defaultActivity?: DiscordActivity;
     readonly slashCommands?: readonly Record<string, unknown>[];
 }
 export interface ResolvedDiscordInteractionsConfig {
@@ -121,7 +104,7 @@ export interface DiscordOutboundBody {
     }>;
     readonly components?: ReadonlyArray<DiscordOutboundActionRow>;
 }
-export declare function resolveDiscordConfig(config?: DiscordAdapterConfig): ResolvedDiscordConfig;
+export declare function resolveDiscordConfig(config: DiscordEndpointConfig): ResolvedDiscordConfig;
 export declare function resolveChannelKind(channelType: number | string | undefined): 'private' | 'group' | 'channel';
 /**
  * 入站归一化 → ConversationRef：DM → 'private'；GroupDM → 'group'；
@@ -154,7 +137,7 @@ export declare function formatButtonSegments(interaction: DiscordButtonInbound):
  * Segment canonicalization is intentionally not done here.
  */
 export declare function formatOutboundBody(payload: unknown): DiscordOutboundBody;
-export declare function activityTypeCode(type: NonNullable<DiscordAdapterConfig['defaultActivity']>['type']): number;
+export declare function activityTypeCode(type: DiscordActivity['type']): number;
 /** interactions 验签时间戳时效窗口（防重放）。 */
 export declare const DISCORD_SIGNATURE_MAX_AGE_MS: number;
 export declare function verifyDiscordInteractionSignature(publicKeyHex: string, body: string, signature: string, timestamp: string, nowMs?: number): boolean;

package/lib/protocol.js

@@ -1,33 +1,15 @@
-/**
- * Discord Gateway protocol helpers — no legacy Adapter/Endpoint / segment-mapper.
- * Canonicalization is owned by gateway/core before endpoint.send.
- */
+/** Discord Gateway protocol helpers. Canonicalization is owned by Core. */
 import { createPublicKey, verify as cryptoVerify } from 'node:crypto';
-import { isMediaRef } from '@zhin.js/core';
+import { isMediaRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 const logger = getLogger('discord');
-export function resolveDiscordConfig(config = {}) {
-    const entry = config.endpoints?.find((item) => item.context === 'discord' || !item.context);
-    const token = (typeof config.token === 'string' && config.token)
-        || (typeof entry?.token === 'string' && entry.token)
-        || process.env.DISCORD_BOT_TOKEN
-        || '';
-    if (!token) {
-        throw new TypeError('Discord adapter requires token (plugins.<key>.token or endpoints with context: discord)');
-    }
-    const id = (typeof config.id === 'string' && config.id)
-        || (typeof entry?.id === 'string' && entry.id)
-        || process.env.DISCORD_BOT_NAME
-        || 'discord-bot';
-    const connection = config.connection
-        ?? entry?.connection
-        ?? 'gateway';
+export function resolveDiscordConfig(config) {
+    const id = requiredEndpointField(config.id, 'id');
+    const token = requiredEndpointField(config.token, 'token');
+    const connection = config.connection ?? 'gateway';
     if (connection === 'interactions') {
-        const applicationId = config.applicationId || entry?.applicationId || '';
-        const publicKey = config.publicKey || entry?.publicKey || '';
-        if (!applicationId || !publicKey) {
-            throw new TypeError('Discord connection:interactions requires applicationId and publicKey');
-        }
+        const applicationId = requiredEndpointField(config.applicationId, 'applicationId');
+        const publicKey = requiredEndpointField(config.publicKey, 'publicKey');
         return {
             context: 'discord',
             connection: 'interactions',
@@ -35,7 +17,7 @@ export function resolveDiscordConfig(config = {}) {
             token,
             applicationId,
             publicKey,
-            interactionsPath: config.interactionsPath || entry?.interactionsPath || '/discord/interactions',
+            interactionsPath: config.interactionsPath || '/discord/interactions',
         };
     }
     return {
@@ -43,14 +25,19 @@ export function resolveDiscordConfig(config = {}) {
         connection: 'gateway',
         id,
         token,
-        intents: config.intents ?? entry?.intents,
-        enableSlashCommands: config.enableSlashCommands === true
-            || entry?.enableSlashCommands === true,
-        globalCommands: config.globalCommands === true || entry?.globalCommands === true,
-        defaultActivity: config.defaultActivity ?? entry?.defaultActivity,
-        slashCommands: config.slashCommands ?? entry?.slashCommands,
+        intents: config.intents,
+        enableSlashCommands: config.enableSlashCommands === true,
+        globalCommands: config.globalCommands === true,
+        defaultActivity: config.defaultActivity,
+        slashCommands: config.slashCommands,
     };
 }
+function requiredEndpointField(value, field) {
+    if (typeof value !== 'string' || !value.trim()) {
+        throw new TypeError(`Discord endpoint requires a non-empty ${field}`);
+    }
+    return value.trim();
+}
 export function resolveChannelKind(channelType) {
     // discord.js ChannelType.DM = 1, GroupDM = 3
     if (channelType === 1 || channelType === 'DM' || channelType === 'private')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-discord",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Zhin.js Discord adapter for Plugin Runtime (Gateway WebSocket)",
   "type": "module",
   "main": "./lib/index.js",
@@ -33,26 +33,25 @@
   },
   "dependencies": {
     "discord.js": "^14.27.0",
-    "@zhin.js/adapter": "1.1.12",
-    "@zhin.js/core": "1.1.35",
-    "@zhin.js/feature-kit": "1.1.0",
-    "@zhin.js/host-http": "1.1.0",
-    "@zhin.js/im-contract": "1.1.0",
-    "@zhin.js/logger": "1.1.0",
-    "@zhin.js/permission": "1.1.0"
+    "@zhin.js/adapter": "1.1.14",
+    "@zhin.js/agent-feature": "1.1.1",
+    "@zhin.js/core": "1.1.37",
+    "@zhin.js/feature-kit": "1.1.1",
+    "@zhin.js/host-http": "1.1.1",
+    "@zhin.js/im-contract": "1.1.1",
+    "@zhin.js/logger": "1.1.1",
+    "@zhin.js/permission": "1.1.1",
+    "@zhin.js/skill": "1.1.1",
+    "@zhin.js/tool": "1.1.1"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.12",
-    "@zhin.js/agent": "^1.1.23",
-    "@zhin.js/command": "^1.1.0",
-    "@zhin.js/core": "^1.1.35",
-    "zhin.js": "^1.1.0"
+    "@zhin.js/adapter": "^1.1.14",
+    "@zhin.js/command": "^1.1.1",
+    "@zhin.js/core": "^1.1.37",
+    "zhin.js": "^1.1.2"
   },
   "peerDependenciesMeta": {
-    "@zhin.js/agent": {
-      "optional": true
-    },
     "@zhin.js/command": {
       "optional": true
     },
@@ -68,9 +67,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.23",
-    "@zhin.js/host-http": "1.1.0",
-    "zhin.js": "1.1.0"
+    "@zhin.js/host-http": "1.1.1",
+    "zhin.js": "1.1.2"
   },
   "files": [
     "adapters",
@@ -79,9 +77,10 @@
     "schema.json",
     "src",
     "lib",
-    "agent",
+    "agents",
     "README.md",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "PERMITS.md"
   ],
   "publishConfig": {
     "access": "public",
@@ -104,6 +103,18 @@
       {
         "package": "@zhin.js/command",
         "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/tool",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/skill",
+        "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/agent-feature",
+        "api": "^1.0.0"
       }
     ],
     "plugins": []

package/schema.json

@@ -91,10 +91,11 @@
     },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
+      "minItems": 1,
+      "description": "多账号：每项定义一个 endpoint，id/token 必填，其余字段覆盖实例默认值",
       "items": {
         "type": "object",
-        "additionalProperties": true,
+        "additionalProperties": false,
         "properties": {
           "master": {
             "type": [
@@ -118,6 +119,69 @@
             "type": "string",
             "description": "Discord bot token"
           },
+          "connection": {
+            "type": "string",
+            "enum": [
+              "gateway",
+              "interactions"
+            ]
+          },
+          "intents": {
+            "type": "array",
+            "items": {
+              "type": "number"
+            }
+          },
+          "enableSlashCommands": {
+            "type": "boolean"
+          },
+          "globalCommands": {
+            "type": "boolean"
+          },
+          "defaultActivity": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "PLAYING",
+                  "STREAMING",
+                  "LISTENING",
+                  "WATCHING",
+                  "COMPETING"
+                ]
+              },
+              "url": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "type"
+            ]
+          },
+          "slashCommands": {
+            "type": "array",
+            "items": {
+              "type": "object"
+            }
+          },
+          "applicationId": {
+            "type": "string"
+          },
+          "publicKey": {
+            "type": "string"
+          },
+          "interactionsPath": {
+            "type": "string"
+          },
+          "commandPrefix": {
+            "type": "string"
+          },
           "id": {
             "type": "string",
             "description": "Discord bot name"

package/src/discord-runtime-state.ts

@@ -1,6 +1,6 @@
 /**
  * Discord 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `discord.endpoint` 命令共享（同一 owner generation）。
+ * 由 plugin.ts setup() provide，adapter create 与 `discord endpoint` 命令共享（同一 owner generation）。
  */
 import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
 

package/src/index.ts

@@ -6,7 +6,8 @@ export {
   resolveChannelKind,
   resolveDiscordConfig,
   senderDisplayName,
-  type DiscordAdapterConfig,
+  type DiscordActivity,
+  type DiscordEndpointConfig,
   type DiscordButtonInbound,
   type DiscordInboundAttachment,
   type DiscordInboundMessage,
@@ -19,6 +20,7 @@ export {
 
 export {
   discordClient,
+  requireDiscordGatewayClient,
   type DiscordClient,
   type DiscordClientEventMap,
 } from './client.js';

package/src/protocol.ts

@@ -1,50 +1,33 @@
-/**
- * Discord Gateway protocol helpers — no legacy Adapter/Endpoint / segment-mapper.
- * Canonicalization is owned by gateway/core before endpoint.send.
- */
+/** Discord Gateway protocol helpers. Canonicalization is owned by Core. */
 
 import { createPublicKey, verify as cryptoVerify } from 'node:crypto';
-import { isMediaRef } from '@zhin.js/core';
+import { isMediaRef, type ConversationRef } from '@zhin.js/im-contract';
 import type { Segment } from '@zhin.js/core/runtime';
-import type { ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('discord');
 
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface DiscordAdapterConfig {
-  readonly id?: string;
-  readonly token?: string;
+export interface DiscordActivity {
+  readonly name: string;
+  readonly type: 'PLAYING' | 'STREAMING' | 'LISTENING' | 'WATCHING' | 'COMPETING';
+  readonly url?: string;
+}
+
+/** One endpoint config after AdapterIndex expands `plugins.<instanceKey>.endpoints`. */
+export interface DiscordEndpointConfig {
+  readonly id: string;
+  readonly token: string;
   /** Default `gateway`. `interactions` uses httpHostToken POST + Ed25519 verify. */
   readonly connection?: 'gateway' | 'interactions';
   readonly intents?: readonly number[];
   readonly enableSlashCommands?: boolean;
   readonly globalCommands?: boolean;
-  readonly defaultActivity?: {
-    readonly name: string;
-    readonly type: 'PLAYING' | 'STREAMING' | 'LISTENING' | 'WATCHING' | 'COMPETING';
-    readonly url?: string;
-  };
+  readonly defaultActivity?: DiscordActivity;
   readonly slashCommands?: readonly Record<string, unknown>[];
   /** Interactions-only fields. */
   readonly applicationId?: string;
   readonly publicKey?: string;
   readonly interactionsPath?: string;
-  /** Transitional: legacy root `endpoints[]` with `context: discord`. */
-  readonly endpoints?: ReadonlyArray<{
-    readonly context?: string;
-    readonly id?: string;
-    readonly token?: string;
-    readonly connection?: 'gateway' | 'interactions';
-    readonly intents?: readonly number[];
-    readonly enableSlashCommands?: boolean;
-    readonly globalCommands?: boolean;
-    readonly defaultActivity?: DiscordAdapterConfig['defaultActivity'];
-    readonly slashCommands?: readonly Record<string, unknown>[];
-    readonly applicationId?: string;
-    readonly publicKey?: string;
-    readonly interactionsPath?: string;
-  }>;
 }
 
 export interface ResolvedDiscordGatewayConfig {
@@ -55,7 +38,7 @@ export interface ResolvedDiscordGatewayConfig {
   readonly intents?: readonly number[];
   readonly enableSlashCommands: boolean;
   readonly globalCommands: boolean;
-  readonly defaultActivity?: DiscordAdapterConfig['defaultActivity'];
+  readonly defaultActivity?: DiscordActivity;
   readonly slashCommands?: readonly Record<string, unknown>[];
 }
 
@@ -141,33 +124,14 @@ export interface DiscordOutboundBody {
   readonly components?: ReadonlyArray<DiscordOutboundActionRow>;
 }
 
-export function resolveDiscordConfig(config: DiscordAdapterConfig = {}): ResolvedDiscordConfig {
-  const entry = config.endpoints?.find((item) => item.context === 'discord' || !item.context);
-  const token = (typeof config.token === 'string' && config.token)
-    || (typeof entry?.token === 'string' && entry.token)
-    || process.env.DISCORD_BOT_TOKEN
-    || '';
-  if (!token) {
-    throw new TypeError(
-      'Discord adapter requires token (plugins.<key>.token or endpoints with context: discord)',
-    );
-  }
-  const id = (typeof config.id === 'string' && config.id)
-    || (typeof entry?.id === 'string' && entry.id)
-    || process.env.DISCORD_BOT_NAME
-    || 'discord-bot';
-  const connection = config.connection
-    ?? entry?.connection
-    ?? 'gateway';
+export function resolveDiscordConfig(config: DiscordEndpointConfig): ResolvedDiscordConfig {
+  const id = requiredEndpointField(config.id, 'id');
+  const token = requiredEndpointField(config.token, 'token');
+  const connection = config.connection ?? 'gateway';
 
   if (connection === 'interactions') {
-    const applicationId = config.applicationId || entry?.applicationId || '';
-    const publicKey = config.publicKey || entry?.publicKey || '';
-    if (!applicationId || !publicKey) {
-      throw new TypeError(
-        'Discord connection:interactions requires applicationId and publicKey',
-      );
-    }
+    const applicationId = requiredEndpointField(config.applicationId, 'applicationId');
+    const publicKey = requiredEndpointField(config.publicKey, 'publicKey');
     return {
       context: 'discord',
       connection: 'interactions',
@@ -175,7 +139,7 @@ export function resolveDiscordConfig(config: DiscordAdapterConfig = {}): Resolve
       token,
       applicationId,
       publicKey,
-      interactionsPath: config.interactionsPath || entry?.interactionsPath || '/discord/interactions',
+      interactionsPath: config.interactionsPath || '/discord/interactions',
     };
   }
 
@@ -184,15 +148,24 @@ export function resolveDiscordConfig(config: DiscordAdapterConfig = {}): Resolve
     connection: 'gateway',
     id,
     token,
-    intents: config.intents ?? entry?.intents,
-    enableSlashCommands: config.enableSlashCommands === true
-      || entry?.enableSlashCommands === true,
-    globalCommands: config.globalCommands === true || entry?.globalCommands === true,
-    defaultActivity: config.defaultActivity ?? entry?.defaultActivity,
-    slashCommands: config.slashCommands ?? entry?.slashCommands,
+    intents: config.intents,
+    enableSlashCommands: config.enableSlashCommands === true,
+    globalCommands: config.globalCommands === true,
+    defaultActivity: config.defaultActivity,
+    slashCommands: config.slashCommands,
   };
 }
 
+function requiredEndpointField(
+  value: unknown,
+  field: 'id' | 'token' | 'applicationId' | 'publicKey',
+): string {
+  if (typeof value !== 'string' || !value.trim()) {
+    throw new TypeError(`Discord endpoint requires a non-empty ${field}`);
+  }
+  return value.trim();
+}
+
 export function resolveChannelKind(channelType: number | string | undefined): 'private' | 'group' | 'channel' {
   // discord.js ChannelType.DM = 1, GroupDM = 3
   if (channelType === 1 || channelType === 'DM' || channelType === 'private') return 'private';
@@ -431,7 +404,7 @@ export function formatOutboundBody(payload: unknown): DiscordOutboundBody {
 }
 
 export function activityTypeCode(
-  type: NonNullable<DiscordAdapterConfig['defaultActivity']>['type'],
+  type: DiscordActivity['type'],
 ): number {
   const map = {
     PLAYING: 0,