@zhin.js/adapter-discord 1.1.18 → 1.1.20

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @zhin.js/adapter-discord
 
+## 1.1.20
+
+### Patch Changes
+
+- Updated dependencies [5e878ba]
+  - @zhin.js/page@1.1.12
+
+## 1.1.19
+
+### Patch Changes
+
+- 2c3610a: Move account lifecycle ownership into the generic Adapter base and let native Endpoints retain their SDK Client inheritance. Infer platform-specific operation Sessions from a single adapter registry while preserving command parameter, option, configuration and factory inference.
+
+  Bind message replies, management ports, login challenges and Agent cancellation to the captured account incarnation. Persist runtime account intent with encrypted, revision-checked Host storage; keep account management independent of Root process restarts. Require explicit operator confirmation before importing existing accounts, and give replacement accounts a new identity without inheriting previous Sessions.
+
+  Expose account save, start, stop, update and replacement through the existing adapter Console, with exact account ownership, truthful pending/unknown outcomes and no startup configuration or environment-file rewrites.
+
+  Complete the target migration across every adapter, the public authoring API, generators, examples and Console. This intentionally removes the old create factory, inheritable Endpoint/ClientEndpoint classes, Client descriptors and file-rewrite account management; plugin authors must use createAdapter, native Client inheritance and the single AdapterRegistry. Satori and OneBot12 require explicit platform/userId selection, and WeCom requires a separate agentId.
+
+  Verify opaque credential changes before the same configuration snapshot is committed. Drain admitted native callbacks across close/rollback, cancel target work on stop, and keep raw transport parsing, platform ACK timing and SDK native methods under their existing owners. Account metadata conceals credentials carried in URLs.
+
+- a9f4e48: PATCH COMPATIBILITY CUTOVER: this batch intentionally changes plugin APIs. The maintainer explicitly chose patch releases with declared version boundaries. Upgrade the complete tested dependency set; patch numbering does not promise compatibility with the removed interfaces.
+
+  The first planned floors are zhin.js 1.1.19, Core 1.1.54, Adapter 1.1.26, FeatureKit 1.1.10, Plugin Runtime 1.1.18, Runtime/Isolate 1.1.16 and Agent 1.1.45. Keep old-interface plugins with the earlier locked stack until they are migrated. Adapter's independent Feature API changes from 1.0.0 to 2.0.0; official consumers declare ^2.0.0. Existing Feature API admission rejects explicitly incompatible ranges; omitted API metadata keeps its existing behavior and does not certify compatibility. Runtime engine and patch-only release gates remain unchanged.
+
+  Use the native-Client Adapter target contract, canonical FeatureKit AdapterRegistry augmentation and named Endpoint control/management requests. Route message controls from canonical message/conversation refs; retain exact source authority and propagate caller/account/explicit-Root-stop cancellation. Replace removed Agent activity feedback exports with source-bound feedback. HMR pause/resume belongs to concrete plugin instances; plugins choose accepted-work policy without changing Controller commit/rollback authority. Cooperative worker/process control cancellation does not kill an isolate or reopen retired business admission.
+
+  Provide authenticated historical-data preview, exact selected binding, transactional application, authoritative inspection and explicit resumption, including active games. Preserve before-images and journals; never replay an unconfirmed effect, infer an account from an alias, or reuse historical permission grants. Owner V2 approvals remain inactive legacy data, while new writes use V3. Rollback requires matching software, lockfile and verified data; installing old code alone cannot read a new V3 approval file. Conflicting after-images are never overwritten.
+
+  See docs/plans/adapter-operation-version-boundaries.md and the Chinese/English upgrade guide for the complete version inventory, custom-plugin changes, acceptance and recovery sequence. These code and metadata changes do not authorize merging, publication, deployment, login, production migration or removal of installed workspace patches.
+
+- Updated dependencies [2c3610a]
+- Updated dependencies [a9f4e48]
+- Updated dependencies [f8505b0]
+- Updated dependencies [2c3610a]
+  - @zhin.js/adapter@1.1.26
+  - @zhin.js/feature-kit@1.1.10
+  - @zhin.js/core@1.1.54
+  - @zhin.js/host-http@1.1.12
+  - @zhin.js/client@1.1.22
+  - @zhin.js/page@1.1.11
+  - @zhin.js/agent-feature@1.1.11
+  - @zhin.js/skill@1.1.11
+  - @zhin.js/tool@1.1.13
+  - @zhin.js/permission@1.1.10
+
 ## 1.1.18
 
 ### Patch Changes

package/README.md

@@ -20,12 +20,13 @@ pnpm add @zhin.js/adapter-discord discord.js
 ## Plugin Runtime
 
 - `@zhin.js/adapter` — 约定式 `adapters/discord/index.ts`（`defineAdapter`）
-- `@zhin.js/core` — `Endpoint.emit(...)` 入站、`outboundMessageToken` 出站
+- `@zhin.js/core` — `endpoint[endpointSpec].events` 入站、`outboundMessageToken` 出站
 - `zhin.js` — `plugin.ts`（`definePlugin`）
 - 配置经插件 `schema.json` 落到顶层 `<instanceKey>`
 - **无需** `@zhin.js/host-http` / `@zhin.js/host-router`（Gateway 路径）
 
-入站：`gateway.receive({ conversation, message, content: text, sender, metadata })`（`conversation` 为 `ConversationRef`，guild 频道带 `parent` guild 容器）  
+入站：`endpoint[endpointSpec].events.emit('message.receive', { conversation, message, content: text, sender, metadata })`（`conversation` 为 `ConversationRef`，guild 频道带 `parent` guild 容器）
+
 出站：`send({ conversation, payload })` → discord.js channel.send
 
 ### 平台权限（platform permit）
@@ -92,11 +93,17 @@ discord:
 启动后打开 Console 的「Discord」页（地址 `/discord`），可以：
 
 - 查看运行中的连接、点「测试连接」做连通性诊断；
-- 增删 `plugins.discord.endpoints`（凭据写入 `.env`，配置里只保留 `${ENV}` 引用）；
+- 在账号库保存、修改、启动、停止、替换或删除该 Adapter 的账号；新增仅保存，不创建 SDK Client，需手动启动；
 - 如果适配器要求登录，页面会显示 LoginAssist 的扫码 / 滑块 / 设备确认待办；
 
 读取需要 `discord:read`，写操作需要 `discord:write`；管理员 full token 不受限。页面里的「添加 endpoint」等价于原来的 `discord endpoint add`。
 
+首次修改启动配置里的既有账号前，管理员必须核对清单并确认一次迁移。原 canonical 身份与历史保留，完整账号配置加密进入 Host 数据库；此后账号管理只写数据库，不修改启动文件或 `.env`，不重启进程。没有持久化账号端口的环境可使用静态配置连接，动态写操作明确不可用。
+
+启停意图在进程重启后恢复。停止或删除会取消并关闭目标账号的在途操作，其他账号继续运行；删除保留历史。已启动账号的连接配置更新先关闭旧 incarnation，再仅重连该账号；平台身份变化按替换处理，分配新内部身份、保留旧历史，新账号不继承旧 Session、个人设置或启动意图。提交结果未知时先刷新核实，不自动重复 CAS 或平台操作。
+
+Discord 的 token / publicKey 更新通过只读 GET `/applications/@me` 核验真实应用 ID 与 `verify_key`；Interactions 模式必须与配置的 applicationId / publicKey 一致。HTTP 入站先验签，再核对必填 application_id，错误应用、缺失身份或验证失败都不能进入任何平台或业务事件。
+
 ## 故障排查
 
 | 现象 | 排查 |

package/adapters/discord/index.js

@@ -3,10 +3,8 @@
  * Convention entry: discover `adapters/discord/index.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { httpHostToken } from '@zhin.js/host-http';
-import { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, } from "../../lib/endpoint.js";
-import { resolveDiscordConfig, } from "../../lib/protocol.js";
-import { discordRuntimeStateToken } from "../../lib/discord-runtime-state.js";
+import { DiscordAdapter } from "../../lib/adapter.js";
+import {} from "../../lib/protocol.js";
 export { DiscordGatewayEndpoint, DiscordInteractionsEndpoint, } from "../../lib/endpoint.js";
 export default defineAdapter({
     capabilities: ['inbound', 'outbound'],
@@ -19,23 +17,5 @@ export default defineAdapter({
         interactive: 'native',
         markdown: 'native',
     },
-    create(context) {
-        const config = resolveDiscordConfig(context.config);
-        // 注册到插件运行时状态（discord endpoint list 的"运行中"数据源）
-        context.use(discordRuntimeStateToken).endpoints.set(config.id, {
-            id: config.id,
-            mode: config.connection,
-        });
-        if (config.connection === 'interactions') {
-            return new DiscordInteractionsEndpoint({
-                id: context.id,
-                http: context.use(httpHostToken),
-                config,
-            });
-        }
-        return new DiscordGatewayEndpoint({
-            id: context.id,
-            config,
-        });
-    },
+    createAdapter: context => new DiscordAdapter(context),
 });

package/adapters/discord/index.ts

@@ -2,23 +2,16 @@
  * Convention entry: discover `adapters/discord/index.ts` → defineAdapter.
  */
 import { defineAdapter } from 'zhin.js/adapter';
-import { httpHostToken } from '@zhin.js/host-http';
+import { DiscordAdapter } from '../../src/adapter.js';
 import {
-  DiscordGatewayEndpoint,
-  DiscordInteractionsEndpoint,
-} from '../../src/endpoint.js';
-import {
-  resolveDiscordConfig,
   type DiscordEndpointConfig,
 } from '../../src/protocol.js';
-import { discordRuntimeStateToken } from '../../src/discord-runtime-state.js';
 
 export {
   DiscordGatewayEndpoint,
   DiscordInteractionsEndpoint,
 } from '../../src/endpoint.js';
 export type {
-  CreateDiscordClient,
   DiscordClientTransport,
   DiscordEndpointOptions,
   DiscordInteractionsEndpointOptions,
@@ -35,23 +28,5 @@ export default defineAdapter<DiscordEndpointConfig>({
     interactive: 'native',
     markdown: 'native',
   },
-  create(context) {
-    const config = resolveDiscordConfig(context.config);
-    // 注册到插件运行时状态（discord endpoint list 的"运行中"数据源）
-    context.use(discordRuntimeStateToken).endpoints.set(config.id, {
-      id: config.id,
-      mode: config.connection,
-    });
-    if (config.connection === 'interactions') {
-      return new DiscordInteractionsEndpoint({
-        id: context.id,
-        http: context.use(httpHostToken),
-        config,
-      });
-    }
-    return new DiscordGatewayEndpoint({
-      id: context.id,
-      config,
-    });
-  },
+  createAdapter: context => new DiscordAdapter(context),
 });

package/agents/discord/skills/discord/tools/send_embed/index.js

@@ -35,7 +35,7 @@ export default defineAgentTool({
             }
         }
         const channel = await client.channels.fetch(channel_id);
-        if (!channel?.isTextBased() || !channel.send) {
+        if (!channel?.isSendable()) {
             throw new Error(t(context.locale, 'notTextChannel', { p0: channel_id }));
         }
         const msg = await channel.send({ embeds: [embedData] });

package/agents/discord/skills/discord/tools/send_embed/index.ts

@@ -30,7 +30,7 @@ export default defineAgentTool<{ channel_id: string; title?: string; description
       }
     }
     const channel = await client.channels.fetch(channel_id);
-    if (!channel?.isTextBased() || !channel.send) {
+    if (!channel?.isSendable()) {
       throw new Error(t(context.locale, 'notTextChannel', { p0: channel_id }));
     }
     const msg = await channel.send({ embeds: [embedData] } as never);

package/agents/discord/skills/discord-guild/tools/create_thread/index.js

@@ -4,6 +4,7 @@ import { defineAgentTool } from '@zhin.js/tool';
 import { z } from 'zod';
 import { requireDiscordGatewayClient } from '@zhin.js/adapter-discord';
 import { platformPermission } from '@zhin.js/permission';
+import { ThreadAutoArchiveDuration } from 'discord.js';
 export default defineAgentTool({
     description: '在 Discord 频道中创建帖子/子线程',
     inputSchema: z.object({
@@ -19,11 +20,14 @@ export default defineAgentTool({
     async execute({ channel_id, name, message_id, auto_archive_duration }, context) {
         const client = requireDiscordGatewayClient(context.$client);
         const channel = await client.channels.fetch(channel_id);
-        if (!channel?.threads)
+        if (!channel || !('threads' in channel) || channel.isThreadOnly())
             throw new Error(t(context.locale, 'threadsUnsupported', { p0: channel_id }));
+        const duration = auto_archive_duration || 1440;
+        if (!Object.values(ThreadAutoArchiveDuration).includes(duration))
+            throw new Error('Unsupported Discord thread auto archive duration');
         const thread = await channel.threads.create({
             name,
-            autoArchiveDuration: auto_archive_duration || 1440,
+            autoArchiveDuration: duration,
             ...(message_id ? { startMessage: message_id } : {}),
         });
         return { success: true, thread_id: thread.id, message: t(context.locale, 'threadCreated', { p0: name }) };

package/agents/discord/skills/discord-guild/tools/create_thread/index.ts

@@ -3,6 +3,7 @@ import { defineAgentTool } from '@zhin.js/tool';
 import { z } from 'zod';
 import { requireDiscordGatewayClient } from '@zhin.js/adapter-discord';
 import { platformPermission } from '@zhin.js/permission';
+import { ThreadAutoArchiveDuration } from 'discord.js';
 
 export default defineAgentTool<{ channel_id: string; name: string; message_id?: string; auto_archive_duration?: number }>({
   description: '在 Discord 频道中创建帖子/子线程',
@@ -19,10 +20,12 @@ export default defineAgentTool<{ channel_id: string; name: string; message_id?:
   async execute({ channel_id, name, message_id, auto_archive_duration  }: { channel_id: string; name: string; message_id?: string; auto_archive_duration?: number }, context) {
     const client = requireDiscordGatewayClient(context.$client);
     const channel = await client.channels.fetch(channel_id);
-    if (!channel?.threads) throw new Error(t(context.locale, 'threadsUnsupported', { p0: channel_id }));
+    if (!channel || !('threads' in channel) || channel.isThreadOnly()) throw new Error(t(context.locale, 'threadsUnsupported', { p0: channel_id }));
+    const duration = auto_archive_duration || 1440;
+    if (!Object.values(ThreadAutoArchiveDuration).includes(duration)) throw new Error('Unsupported Discord thread auto archive duration');
     const thread = await channel.threads.create({
       name,
-      autoArchiveDuration: auto_archive_duration || 1440,
+      autoArchiveDuration: duration,
       ...(message_id ? { startMessage: message_id } : {}),
     });
     return { success: true, thread_id: thread.id, message: t(context.locale, 'threadCreated', { p0: name }) };

package/agents/discord/skills/discord-guild/tools/forum_post/index.js

@@ -19,7 +19,7 @@ export default defineAgentTool({
         const client = requireDiscordGatewayClient(context.$client);
         const tagList = tags ? tags.split(',').map((t) => t.trim()) : undefined;
         const channel = await client.channels.fetch(channel_id);
-        if (!channel?.threads || channel.type !== ChannelType.GuildForum) {
+        if (!channel || channel.type !== ChannelType.GuildForum) {
             throw new Error(t(context.locale, 'notForumChannel', { p0: channel_id }));
         }
         const tagIds = tagList?.length

package/agents/discord/skills/discord-guild/tools/forum_post/index.ts

@@ -19,7 +19,7 @@ export default defineAgentTool<{ channel_id: string; name: string; content: stri
     const client = requireDiscordGatewayClient(context.$client);
     const tagList = tags ? tags.split(',').map((t: string) => t.trim()) : undefined;
     const channel = await client.channels.fetch(channel_id);
-    if (!channel?.threads || channel.type !== ChannelType.GuildForum) {
+    if (!channel || channel.type !== ChannelType.GuildForum) {
       throw new Error(t(context.locale, 'notForumChannel', { p0: channel_id }));
     }
     const tagIds = tagList?.length

package/commands/discord/endpoint/definition.js

@@ -7,13 +7,11 @@
  */
 import { createEndpointCommands } from 'zhin.js/adapter';
 import { defineCommand } from 'zhin.js/command';
-import { discordRuntimeStateToken } from "../../../lib/discord-runtime-state.js";
 export const discordEndpointCommands = createEndpointCommands({
     adapterKey: 'discord',
     adapterDisplayName: 'Discord',
     fields: [
         { key: 'token', required: true, env: true, description: 'Discord bot token' },
     ],
-    running: (use) => use(discordRuntimeStateToken).endpoints.values(),
     describeEntry: (entry) => `token: ${String(entry.token)}`,
 }, defineCommand);

package/commands/discord/endpoint/definition.ts

@@ -6,7 +6,6 @@
  */
 import { createEndpointCommands } from 'zhin.js/adapter';
 import { defineCommand } from 'zhin.js/command';
-import { discordRuntimeStateToken } from '../../../src/discord-runtime-state.js';
 
 export const discordEndpointCommands = createEndpointCommands({
   adapterKey: 'discord',
@@ -14,6 +13,5 @@ export const discordEndpointCommands = createEndpointCommands({
   fields: [
     { key: 'token', required: true, env: true, description: 'Discord bot token' },
   ],
-  running: (use) => use(discordRuntimeStateToken).endpoints.values(),
   describeEntry: (entry) => `token: ${String(entry.token)}`,
 }, defineCommand);

package/lib/adapter.d.ts

@@ -0,0 +1,14 @@
+import { Adapter, type AdapterContext, type EndpointCreationContext } from 'zhin.js/adapter';
+import { DiscordGatewayEndpoint, DiscordInteractionsEndpoint } from './endpoint.js';
+import { type DiscordEndpointConfig } from './protocol.js';
+import type { DiscordClientEventMap } from './client.js';
+export declare class DiscordAdapter extends Adapter<DiscordGatewayEndpoint | DiscordInteractionsEndpoint, DiscordEndpointConfig, DiscordClientEventMap> {
+    private readonly context;
+    constructor(context: AdapterContext<DiscordEndpointConfig>);
+    get configurationIdentityFields(): readonly string[];
+    get configurationIdentityProbeFields(): readonly string[];
+    get configurationUpdateFields(): readonly string[];
+    protected validateConfiguration(input: DiscordEndpointConfig): void;
+    protected identifyConfiguration(input: DiscordEndpointConfig, signal: AbortSignal): Promise<string>;
+    protected createEndpoint(input: DiscordEndpointConfig, execution: EndpointCreationContext): Promise<DiscordGatewayEndpoint | DiscordInteractionsEndpoint>;
+}

package/lib/adapter.js

@@ -0,0 +1,55 @@
+import { Adapter } from 'zhin.js/adapter';
+import { httpHostToken } from '@zhin.js/host-http';
+import { REST, Routes } from 'discord.js';
+import { DiscordGatewayEndpoint, DiscordInteractionsEndpoint } from './endpoint.js';
+import { createDiscordRestApiAgent } from './rest-api-proxy.js';
+import { resolveDiscordConfig } from './protocol.js';
+export class DiscordAdapter extends Adapter {
+    context;
+    constructor(context) {
+        super();
+        this.context = context;
+    }
+    get configurationIdentityFields() { return ['id', 'applicationId']; }
+    get configurationIdentityProbeFields() { return ['token', 'publicKey']; }
+    get configurationUpdateFields() {
+        return ['token', 'connection', 'restApiProxy', 'restApiProxy.port',
+            'gatewayFaultProxyUrl', 'intents', 'defaultActivity', 'defaultActivity.name', 'defaultActivity.type', 'defaultActivity.url', 'publicKey', 'interactionsPath'];
+    }
+    validateConfiguration(input) { resolveDiscordConfig(input); }
+    async identifyConfiguration(input, signal) {
+        const config = resolveDiscordConfig(input);
+        const agent = config.connection === 'gateway' && config.restApiProxy ? createDiscordRestApiAgent(config.restApiProxy) : undefined;
+        const rest = new REST({ version: '10', retries: 0, rejectOnRateLimit: () => true, ...(agent ? { agent } : {}) }).setToken(config.token);
+        try {
+            const application = await rest.get(Routes.currentApplication(), { signal });
+            if (typeof application?.id !== 'string' || !application.id.trim())
+                throw new Error('Discord identity response is incomplete');
+            if (config.connection === 'interactions' && application.id !== config.applicationId)
+                throw new Error('Discord application identity configuration does not match');
+            if (config.connection === 'interactions' && (typeof application.verify_key !== 'string'
+                || application.verify_key.toLowerCase() !== config.publicKey.toLowerCase())) {
+                throw new Error('Discord verification key does not match the application identity');
+            }
+            return JSON.stringify(['discord', application.id]);
+        }
+        finally {
+            rest.clearHashSweeper();
+            rest.clearHandlerSweeper();
+            await agent?.destroyProxy();
+        }
+    }
+    async createEndpoint(input, execution) {
+        const config = resolveDiscordConfig(input);
+        if (config.connection === 'interactions')
+            return new DiscordInteractionsEndpoint({ id: execution.canonicalId, config, http: this.context.use(httpHostToken) });
+        const restApiAgent = config.restApiProxy ? createDiscordRestApiAgent(config.restApiProxy) : undefined;
+        try {
+            return new DiscordGatewayEndpoint({ id: execution.canonicalId, config, restApiAgent });
+        }
+        catch (error) {
+            await restApiAgent?.destroyProxy();
+            throw error;
+        }
+    }
+}

package/lib/client.d.ts

@@ -1,16 +1,16 @@
-import type { DiscordRestClient } from './endpoint.js';
+import type { ClientEvents } from 'discord.js';
+import type { DiscordAdapter } from './adapter.js';
+import type { DiscordGatewayEndpoint, DiscordInteractionsEndpoint } from './endpoint.js';
 import type { DiscordClientTransport } from './gateway.js';
 /** Exact Client variants produced by the Gateway and Interactions Endpoints. */
-export type DiscordClient = DiscordClientTransport | DiscordRestClient;
-export type DiscordClientEventMap = Record<string, unknown>;
+export type DiscordClient = DiscordGatewayEndpoint | DiscordInteractionsEndpoint;
+export type DiscordClientEventMap = {
+    readonly [K in keyof ClientEvents]: ClientEvents[K][0];
+} & Record<string, unknown>;
 /** Narrow an adapter Client for Gateway-only SDK operations. */
 export declare function requireDiscordGatewayClient(client: DiscordClient): DiscordClientTransport;
 declare module '@zhin.js/feature-kit' {
-    interface AdapterClientRegistry {
-        readonly discord: {
-            readonly client: DiscordClient;
-            readonly events: DiscordClientEventMap;
-        };
+    interface AdapterRegistry {
+        readonly discord: DiscordAdapter;
     }
 }
-export declare const discordClient: import("@zhin.js/adapter").EndpointClientToken<DiscordClient, DiscordClientEventMap>;

package/lib/client.js

@@ -1,8 +1,6 @@
-import { defineEndpointClient } from 'zhin.js/adapter';
 /** Narrow an adapter Client for Gateway-only SDK operations. */
 export function requireDiscordGatewayClient(client) {
     if ('guilds' in client && 'channels' in client)
         return client;
     throw new Error('This Discord tool requires a Gateway Endpoint Client');
 }
-export const discordClient = defineEndpointClient('discord');

package/lib/console-spec.js

@@ -3,6 +3,15 @@ export const discordConsoleSpec = {
     adapterDisplayName: 'Discord',
     fields: [
         { key: 'token', required: true, env: true, description: 'Discord bot token' },
+        { key: 'connection', description: 'gateway or interactions' },
+        { key: 'applicationId', description: 'Application ID for Interactions; identity changes replace the account' },
+        { key: 'publicKey', description: 'Application Ed25519 public key' },
+        { key: 'interactionsPath', description: 'Local Interactions route' },
+        { key: 'restApiProxy.port', type: 'number', description: 'Configured REST loopback proxy port' },
+        { key: 'gatewayFaultProxyUrl', description: 'Configured local Gateway fault proxy URL' },
+        { key: 'defaultActivity.name', description: 'SDK activity name' },
+        { key: 'defaultActivity.type', description: 'PLAYING, STREAMING, LISTENING, WATCHING or COMPETING' },
+        { key: 'defaultActivity.url', description: 'SDK activity URL' },
     ],
     docsUrl: 'https://zhin.js.org/adapters/discord',
     readPermission: 'discord:read',

package/lib/console.d.ts

@@ -1,8 +1,2 @@
-/**
- * Discord Console RPC：运行状态 + endpoint 增删（原 `discord endpoint` 聊天命令）。
- *
- * 页面绑定 `pages/index`，读取 / 写入分别要求 `<adapter>:read` / `<adapter>:write`。
- */
-import { type AdapterConsoleResources } from 'zhin.js/adapter';
 import type { PluginConsoleRpc } from 'zhin.js';
-export declare function createDiscordConsoleRpc(resources: AdapterConsoleResources, getConfig: () => unknown): PluginConsoleRpc;
+export declare function createDiscordConsoleRpc(getConfig: () => unknown): PluginConsoleRpc;

package/lib/console.js

@@ -4,13 +4,10 @@
  * 页面绑定 `pages/index`，读取 / 写入分别要求 `<adapter>:read` / `<adapter>:write`。
  */
 import { createAdapterConsoleRpc } from 'zhin.js/adapter';
-import { discordRuntimeStateToken } from './discord-runtime-state.js';
 import { discordConsoleSpec } from './console-spec.js';
-export function createDiscordConsoleRpc(resources, getConfig) {
-    const state = resources.use(discordRuntimeStateToken);
+export function createDiscordConsoleRpc(getConfig) {
     return createAdapterConsoleRpc({
         ...discordConsoleSpec,
-        running: () => state.endpoints.values(),
         getConfig,
-    }, resources);
+    });
 }

package/lib/endpoint.d.ts

@@ -1,31 +1,24 @@
-import { Endpoint, type EndpointContentPort, type EndpointControl, type EndpointManagement, type EndpointSendRequest, type EndpointTransportState } from 'zhin.js/adapter';
+import { createDiscordRestApiAgent } from './rest-api-proxy.js';
+/**
+ * DiscordEndpoint — lifecycle, outbound, admit, gateway / interactions modes, agent tool surface.
+ */
+import { Client } from 'discord.js';
+import { endpointSpec, type Endpoint, type EndpointSpecification, type EndpointManagement } from 'zhin.js/adapter';
 import type { HttpHost } from '@zhin.js/host-http';
-import { type MessageRef } from '@zhin.js/im-contract';
 import type { CapabilityId } from 'zhin.js';
-import { type CreateDiscordClient, type DiscordClientTransport } from './gateway.js';
-import { type DiscordButtonInbound, type DiscordInboundMessage, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig } from './protocol.js';
-export type { CreateDiscordClient, DiscordClientTransport, } from './gateway.js';
+import { type DiscordClientTransport } from './gateway.js';
+import { type DiscordButtonInbound, type DiscordInboundMessage, type DiscordOutboundBody, type ResolvedDiscordGatewayConfig, type ResolvedDiscordInteractionsConfig } from './protocol.js';
+export type { DiscordClientTransport, } from './gateway.js';
 export interface DiscordEndpointOptions {
     readonly id: CapabilityId;
     readonly config: ResolvedDiscordGatewayConfig;
-    readonly createClient?: CreateDiscordClient;
+    readonly restApiAgent?: ReturnType<typeof createDiscordRestApiAgent>;
     readonly fetch?: typeof globalThis.fetch;
 }
-export declare class DiscordGatewayEndpoint extends Endpoint<DiscordClientTransport> {
+export declare class DiscordGatewayEndpoint extends Client implements Endpoint {
     #private;
-    readonly management: EndpointManagement;
-    readonly control: EndpointControl;
-    readonly content: EndpointContentPort;
+    readonly [endpointSpec]: EndpointSpecification;
     constructor(options: DiscordEndpointOptions);
-    /** The actual discord.js-compatible client used by this connection. */
-    get client(): DiscordClientTransport;
-    get transportState(): EndpointTransportState | undefined;
-    start(): Promise<void>;
-    open(): void;
-    close(): void;
-    stop(): Promise<void>;
-    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
-    recallMessage(message: MessageRef): Promise<void>;
     /** Test / internal: admit a message when open. */
     admit(msg: DiscordInboundMessage): void;
     /** Test / internal: admit a button interaction when open. */
@@ -37,31 +30,42 @@ export interface DiscordInteractionsEndpointOptions {
     readonly config: ResolvedDiscordInteractionsConfig;
     readonly fetch?: typeof globalThis.fetch;
 }
+/** One Discord REST request retains the caller lifetime through response-body consumption. */
+export interface DiscordRestRequest {
+    readonly method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
+    readonly path: string;
+    readonly body?: unknown;
+    readonly signal?: AbortSignal;
+}
+/** Protocol target and payload for a single message publication. */
+export interface DiscordCreateMessageRequest {
+    readonly channelId: string;
+    readonly body: DiscordOutboundBody;
+    readonly signal?: AbortSignal;
+}
+/** Protocol target for a single existing-message deletion. */
+export interface DiscordDeleteMessageRequest {
+    readonly channelId: string;
+    readonly messageId: string;
+    readonly signal?: AbortSignal;
+}
 /** Minimal Discord REST client used when Gateway is intentionally disabled. */
 export declare class DiscordRestClient {
     readonly token: string;
     readonly fetch: typeof globalThis.fetch;
     constructor(token: string, fetch?: typeof globalThis.fetch);
-    request<T = unknown>(method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE', path: string, body?: unknown): Promise<T>;
-    createMessage(channelId: string, body: unknown): Promise<{
+    request<T = unknown>({ method, path, body, signal }: DiscordRestRequest): Promise<T>;
+    createMessage({ channelId, body, signal }: DiscordCreateMessageRequest): Promise<{
         id?: string;
     }>;
-    deleteMessage(channelId: string, messageId: string): Promise<void>;
+    deleteMessage({ channelId, messageId, signal }: DiscordDeleteMessageRequest): Promise<void>;
 }
-export declare class DiscordInteractionsEndpoint extends Endpoint<DiscordRestClient> {
+export declare class DiscordInteractionsEndpoint extends DiscordRestClient implements Endpoint {
     #private;
-    readonly client: DiscordRestClient;
-    readonly control: EndpointControl;
-    readonly content: EndpointContentPort;
+    readonly [endpointSpec]: EndpointSpecification;
     constructor(options: DiscordInteractionsEndpointOptions);
     get isOpen(): boolean;
     get config(): ResolvedDiscordInteractionsConfig;
-    start(): Promise<void>;
-    open(): void;
-    close(): void;
-    stop(): Promise<void>;
-    send({ conversation, payload }: EndpointSendRequest): Promise<string>;
-    recallMessage(message: MessageRef): Promise<void>;
     admit(msg: DiscordInboundMessage): void;
     /** Test / internal: admit a button interaction when open. */
     admitButton(interaction: DiscordButtonInbound): void;