@zhin.js/adapter-slack 7.0.0 → 7.0.1

package/lib/endpoint.js

@@ -1,3 +1,4 @@
+import { Endpoint } from 'zhin.js/adapter';
 /**
  * SlackEndpoint — lifecycle, outbound, admit, Socket Mode, agent tool surface.
  */
@@ -5,7 +6,6 @@ import { SocketModeClient } from '@slack/socket-mode';
 import { WebClient } from '@slack/web-api';
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { formatInboundContent, formatInteractionContent, formatSlashContent, resolveSlackChannelType, slackInboundConversation, } from './protocol.js';
-import { registerSlackAgentEndpoint } from './slack-agent-deps.js';
 import { createSlackInboundFilterState, shouldDropSlackInboundMessage, } from './slack-inbound-filter.js';
 import { formatSlackMessageRef, parseSlackMessageRef } from './slack-message-ref.js';
 import { normalizeSlackReactionName } from './slack-reaction.js';
@@ -13,7 +13,7 @@ import { postSlackEphemeral } from './slack-response-url.js';
 import { editSlackContent, sendSlackContent } from './slack-outbound.js';
 import { registerSlackWebhookRoutes } from './webhook.js';
 import { receiveSlackSideEvent } from './side-event-dispatch.js';
-export class SlackEndpoint {
+export class SlackEndpoint extends Endpoint {
     #logger;
     #options;
     #inboundFilter = createSlackInboundFilterState();
@@ -24,8 +24,7 @@ export class SlackEndpoint {
     #botUserId;
     #open = false;
     #started = false;
-    #unregisterAgent;
-    management = createSlackEndpointManagement(this);
+    management = createSlackEndpointManagement(() => this.client);
     control = Object.freeze({
         recall: async (message) => {
             const ref = this.resolveMessageRef(message.id, message.conversation.id);
@@ -37,7 +36,7 @@ export class SlackEndpoint {
             const ref = this.resolveMessageRef(message.id, message.conversation.id);
             if (!ref)
                 return null;
-            await this.editMessage(ref.channel, ref.ts, content);
+            await this.#editMessage(ref.channel, ref.ts, content);
             return message.id;
         },
         addReaction: async (message, emoji) => {
@@ -45,17 +44,18 @@ export class SlackEndpoint {
             if (!ref)
                 return null;
             const reaction = normalizeSlackReactionName(emoji);
-            await this.addReaction(ref.channel, ref.ts, reaction);
+            await this.#addReaction(ref.channel, ref.ts, reaction);
             return reaction;
         },
         removeReaction: async (message, reactionId) => {
             const ref = this.resolveMessageRef(message.id, message.conversation.id);
             if (!ref)
                 return;
-            await this.removeReaction(ref.channel, ref.ts, reactionId);
+            await this.#removeReaction(ref.channel, ref.ts, reactionId);
         },
     });
     constructor(options) {
+        super();
         this.#logger = getAdapterLogger('slack', options.config.id);
         this.#options = options;
     }
@@ -64,6 +64,8 @@ export class SlackEndpoint {
         return this.#options.config.id;
     }
     get client() {
+        if (!this.#client)
+            throw new Error('Slack client not connected');
         return this.#client;
     }
     get platformUserId() {
@@ -80,7 +82,6 @@ export class SlackEndpoint {
             const { config } = this.#options;
             this.#client = this.#options.createClient?.(config.token)
                 ?? new WebClient(config.token);
-            this.#unregisterAgent = registerSlackAgentEndpoint(config.id, this);
             if (config.mode === 'socket') {
                 await this.#startSocket();
             }
@@ -127,8 +128,6 @@ export class SlackEndpoint {
         }
         for (const release of this.#routeReleases.splice(0))
             release();
-        this.#unregisterAgent?.();
-        this.#unregisterAgent = undefined;
         this.#client = undefined;
         this.#started = false;
         this.#logger.debug(formatCompact({ op: 'disconnect' }));
@@ -147,6 +146,7 @@ export class SlackEndpoint {
     admit(event) {
         if (!this.#open)
             return;
+        void this.#emitPlatformEvent(event.type || 'event', event);
         if (event.type !== 'message' && event.type !== 'app_mention')
             return;
         const msg = event;
@@ -161,7 +161,7 @@ export class SlackEndpoint {
             channelType: msg.channel_type,
             threadId: threadTs,
         });
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: msg.ts },
             content: formatInboundContent(msg),
@@ -185,6 +185,7 @@ export class SlackEndpoint {
     admitInteraction(payload) {
         if (!this.#open)
             return;
+        void this.#emitPlatformEvent(`interaction.${payload.type}`, payload);
         if (payload.type !== 'block_actions' || !payload.actions?.length)
             return;
         const channelId = payload.channel?.id ?? '';
@@ -199,7 +200,7 @@ export class SlackEndpoint {
             // block_actions 无 channel_type；无 channel 时按与发起用户的 DM 处理
             channelType: channelId ? undefined : 'im',
         });
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: actionTs },
             content: formatInteractionContent(payload),
@@ -221,11 +222,12 @@ export class SlackEndpoint {
     admitSlashCommand(cmd) {
         if (!this.#open)
             return;
+        void this.#emitPlatformEvent(`slash.${cmd.command}`, cmd);
         postSlackEphemeral(cmd.response_url, '处理中…', this.#logger);
         const conversation = slackInboundConversation(String(this.#options.id), {
             channelId: cmd.channel_id,
         });
-        void this.#options.gateway.receive({
+        void this.emit('message.receive', {
             conversation,
             message: { conversation, id: cmd.trigger_id },
             content: formatSlashContent(cmd),
@@ -248,7 +250,8 @@ export class SlackEndpoint {
         if (envelope?.type === 'event_callback' && envelope.event) {
             const event = envelope.event;
             if (event.type !== 'message' && event.type !== 'app_mention') {
-                receiveSlackSideEvent(this.#options.sideEvents, String(this.#options.id), this.#options.config.id, event, this.#logger);
+                void this.#emitPlatformEvent(event.type || 'event', event);
+                receiveSlackSideEvent((name, payload) => this.emit(name, payload), String(this.#options.id), this.#options.config.id, event, this.#logger);
                 return;
             }
             this.admit(event);
@@ -286,85 +289,43 @@ export class SlackEndpoint {
             return;
         await this.#client.chat.delete({ channel: ref.channel, ts: ref.ts });
     }
-    async editMessage(channel, messageTs, content) {
+    async #editMessage(channel, messageTs, content) {
         if (!this.#client)
             throw new Error('Slack client not connected');
         await editSlackContent(this.#client, channel, messageTs, content);
     }
-    // ── Agent tool surface ──────────────────────────────────────────────
-    async inviteToChannel(channel, users) {
-        await this.#client.conversations.invite({ channel, users: users.join(',') });
-        return true;
-    }
-    async kickFromChannel(channel, user) {
-        await this.#client.conversations.kick({ channel, user });
-        return true;
-    }
-    async setChannelTopic(channel, topic) {
-        await this.#client.conversations.setTopic({ channel, topic });
-        return true;
-    }
-    async setChannelPurpose(channel, purpose) {
-        await this.#client.conversations.setPurpose({ channel, purpose });
-        return true;
-    }
-    async archiveChannel(channel) {
-        await this.#client.conversations.archive({ channel });
-        return true;
-    }
-    async unarchiveChannel(channel) {
-        await this.#client.conversations.unarchive({ channel });
-        return true;
-    }
-    async renameChannel(channel, name) {
-        await this.#client.conversations.rename({ channel, name });
-        return true;
-    }
-    async getChannelMembers(channel) {
-        const result = await this.#client.conversations.members({ channel });
-        return result.members || [];
-    }
-    async getChannelInfo(channel) {
-        const result = await this.#client.conversations.info({ channel });
-        return result.channel;
-    }
-    async getUserInfo(user) {
-        const result = await this.#client.users.info({ user });
-        return result.user;
-    }
-    async addReaction(channel, timestamp, name) {
+    async #addReaction(channel, timestamp, name) {
         const reaction = normalizeSlackReactionName(name);
         try {
             await this.#client.reactions.add({ channel, timestamp, name: reaction });
-            return true;
         }
         catch (error) {
             const code = error?.data?.error;
             if (code === 'already_reacted')
-                return true;
+                return;
             throw error;
         }
     }
-    async removeReaction(channel, timestamp, name) {
+    async #removeReaction(channel, timestamp, name) {
         const reaction = normalizeSlackReactionName(name);
         try {
             await this.#client.reactions.remove({ channel, timestamp, name: reaction });
-            return true;
         }
         catch (error) {
             const code = error?.data?.error;
             if (code === 'no_reaction')
-                return true;
+                return;
             throw error;
         }
     }
-    async pinMessage(channel, timestamp) {
-        await this.#client.pins.add({ channel, timestamp });
-        return true;
-    }
-    async unpinMessage(channel, timestamp) {
-        await this.#client.pins.remove({ channel, timestamp });
-        return true;
+    async #emitPlatformEvent(name, event) {
+        await this.emitPlatform(name, event).catch((error) => {
+            this.#logger.warn(formatCompact({
+                op: 'slack_platform_event_failed',
+                event: name,
+                error: error instanceof Error ? error.message : String(error),
+            }));
+        });
     }
     async #startSocket() {
         const { config } = this.#options;
@@ -398,13 +359,7 @@ export class SlackEndpoint {
 }
 /** Slack Web API 分页上限（每页 1000，cursor 翻页直到 next_cursor 为空）。 */
 const SLACK_LIST_PAGE_SIZE = 1000;
-function createSlackEndpointManagement(endpoint) {
-    const requireClient = () => {
-        const client = endpoint.client;
-        if (!client)
-            throw new Error('Slack client not connected');
-        return client;
-    };
+function createSlackEndpointManagement(requireClient) {
     return Object.freeze({
         // Slack 无"群"概念：public channel 归一为 group（channel 语义由 listChannels 之外省略，
         // Slack channel 本身就是会话载体，避免同一批数据在两个列表里重复）。

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 export { formatInboundContent, formatInteractionContent, formatOutboundWire, formatSlashContent, headerValue, keyboardToBlockKitBlocks, normalizeWebhookPath, readTextBody, resolveSlackChannelType, resolveSlackConfig, slackInboundConversation, verifySlackSignature, type ResolvedSlackConfig, type SlackAdapterConfig, type SlackBlockAction, type SlackEvent, type SlackEventEnvelope, type SlackInteractionPayload, type SlackMessageEvent, type SlackSlashCommand, type SlackUrlVerification, type SlackWireSegment, } from './protocol.js';
 export { SlackEndpoint, type SlackEndpointOptions, type SlackSocketLike, type SlackWebClientLike, } from './endpoint.js';
 export { registerSlackWebhookRoutes, handleSlackWebhookRequest, type SlackWebhookHandler, } from './webhook.js';
-export { getSlackAgentDeps, registerSlackAgentEndpoint, setSlackAgentDeps, type SlackAgentDeps, type SlackAgentEndpoint, } from './slack-agent-deps.js';
+export { slackClient, type SlackClientEventMap, type SlackUserInfo, } from './client.js';
 export { checkSlackPlatformPermit, normalizeSlackSenderForPermit, platformPermit, slackGroupPermitResolver, } from './platform-permit.js';
 export { normalizeSlackReactionName } from './slack-reaction.js';
 export { markdownToMrkdwn, mrkdwnToPlainFallback, splitMrkdwnText } from './markdown-to-mrkdwn.js';

package/lib/index.js

@@ -1,7 +1,7 @@
 export { formatInboundContent, formatInteractionContent, formatOutboundWire, formatSlashContent, headerValue, keyboardToBlockKitBlocks, normalizeWebhookPath, readTextBody, resolveSlackChannelType, resolveSlackConfig, slackInboundConversation, verifySlackSignature, } from './protocol.js';
 export { SlackEndpoint, } from './endpoint.js';
 export { registerSlackWebhookRoutes, handleSlackWebhookRequest, } from './webhook.js';
-export { getSlackAgentDeps, registerSlackAgentEndpoint, setSlackAgentDeps, } from './slack-agent-deps.js';
+export { slackClient, } from './client.js';
 export { checkSlackPlatformPermit, normalizeSlackSenderForPermit, platformPermit, slackGroupPermitResolver, } from './platform-permit.js';
 export { normalizeSlackReactionName } from './slack-reaction.js';
 export { markdownToMrkdwn, mrkdwnToPlainFallback, splitMrkdwnText } from './markdown-to-mrkdwn.js';

package/lib/protocol.d.ts

@@ -126,7 +126,7 @@ export declare function slackInboundConversation(endpointKey: string, opts: {
     readonly channelType?: string;
     readonly threadId?: string;
 }): ConversationRef;
-/** Build inbound text for MessageGateway.receive. */
+/** Build inbound text for OutboundMessageService.receive. */
 export declare function formatInboundContent(event: SlackMessageEvent | SlackEvent): string;
 export declare function formatInteractionContent(payload: SlackInteractionPayload): string;
 export declare function formatSlashContent(cmd: SlackSlashCommand): string;

package/lib/protocol.js

@@ -79,7 +79,7 @@ export function slackInboundConversation(endpointKey, opts) {
         ...(opts.threadId ? { threadId: opts.threadId } : {}),
     };
 }
-/** Build inbound text for MessageGateway.receive. */
+/** Build inbound text for OutboundMessageService.receive. */
 export function formatInboundContent(event) {
     const text = typeof event.text === 'string' ? event.text : '';
     if (text)

package/lib/side-event-dispatch.d.ts

@@ -1,4 +1,4 @@
-import type { SideEventGateway } from '@zhin.js/core/runtime';
+import type { EndpointEventEmitter } from 'zhin.js/adapter';
 import { type getAdapterLogger } from '@zhin.js/logger';
 import type { SlackEvent } from './protocol.js';
-export declare function receiveSlackSideEvent(sideEvents: SideEventGateway | undefined, endpointKey: string, configId: string, event: SlackEvent, logger: ReturnType<typeof getAdapterLogger>): void;
+export declare function receiveSlackSideEvent(emit: EndpointEventEmitter, endpointKey: string, configId: string, event: SlackEvent, logger: ReturnType<typeof getAdapterLogger>): void;

package/lib/side-event-dispatch.js

@@ -1,7 +1,7 @@
 import { buildNotice, mapNoticeParts, senderFromId, SLACK_NOTICE_PARTS_MAP } from '@zhin.js/core';
 import { formatCompact } from '@zhin.js/logger';
-export function receiveSlackSideEvent(sideEvents, endpointKey, configId, event, logger) {
-    if (!sideEvents)
+export function receiveSlackSideEvent(emit, endpointKey, configId, event, logger) {
+    if (!emit)
         return;
     const eventType = String(event.type ?? '');
     if (!Object.prototype.hasOwnProperty.call(SLACK_NOTICE_PARTS_MAP, eventType))
@@ -17,7 +17,7 @@ export function receiveSlackSideEvent(sideEvents, endpointKey, configId, event,
         user ?? '',
         String(record.ts ?? record.event_ts ?? ''),
     ].join(':');
-    void sideEvents.receiveNotice(buildNotice(record, {
+    void emit('notice.receive', buildNotice(record, {
         $id: `slack:${dedupeKey}`,
         $adapter: 'slack',
         $endpoint: configId,

package/lib/slack-endpoint-commands.d.ts

@@ -1 +1 @@
-export declare const slackEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage>>>;
+export declare const slackEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage, string | undefined>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-slack",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Zhin.js Slack adapter for Plugin Runtime (Socket Mode / HTTP Events)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,21 +34,22 @@
   "dependencies": {
     "@slack/socket-mode": "^2.0.7",
     "@slack/web-api": "^7.19.0",
-    "@zhin.js/adapter": "1.2.0",
-    "@zhin.js/core": "1.5.13",
-    "@zhin.js/host-http": "1.0.12",
+    "@zhin.js/adapter": "1.2.1",
+    "@zhin.js/core": "1.5.14",
+    "@zhin.js/feature-kit": "1.0.13",
+    "@zhin.js/host-http": "1.0.13",
     "@zhin.js/im-contract": "1.0.4",
-    "@zhin.js/logger": "1.0.76"
+    "@zhin.js/logger": "1.0.77"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.2.0",
-    "@zhin.js/agent": "1.1.15",
-    "@zhin.js/command": "1.0.15",
-    "@zhin.js/core": "1.5.13",
-    "@zhin.js/host-http": "1.0.12",
-    "@zhin.js/permission": "1.0.3",
-    "zhin.js": "6.0.13"
+    "@zhin.js/adapter": "1.2.1",
+    "@zhin.js/agent": "1.1.16",
+    "@zhin.js/command": "1.0.16",
+    "@zhin.js/core": "1.5.14",
+    "@zhin.js/host-http": "1.0.13",
+    "@zhin.js/permission": "1.0.4",
+    "zhin.js": "6.0.14"
   },
   "peerDependenciesMeta": {
     "@zhin.js/agent": {
@@ -69,8 +70,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.15",
-    "zhin.js": "6.0.13"
+    "@zhin.js/agent": "1.1.16",
+    "zhin.js": "6.0.14"
   },
   "files": [
     "adapters",

package/src/client.ts

@@ -0,0 +1,30 @@
+import { defineEndpointClient } from 'zhin.js/adapter';
+import type { SlackWebClientLike } from './endpoint.js';
+import type { SlackEvent } from './protocol.js';
+
+/** Slack users.info response fields projected by the bundled tools. */
+export interface SlackUserInfo {
+  id?: string;
+  name?: string;
+  real_name?: string;
+  is_admin?: boolean;
+  is_bot?: boolean;
+  profile?: {
+    display_name?: string;
+    email?: string;
+    status_text?: string;
+  };
+}
+
+export type SlackClientEventMap = Record<string, SlackEvent>;
+
+declare module '@zhin.js/feature-kit' {
+  interface AdapterClientRegistry {
+    readonly slack: {
+      readonly client: SlackWebClientLike;
+      readonly events: SlackClientEventMap;
+    };
+  }
+}
+
+export const slackClient = defineEndpointClient<SlackWebClientLike, SlackClientEventMap>('slack');