@xmanrui/dsh-im 2.5.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",
@@ -83,7 +83,7 @@
   "scripts": {
     "build": "node plugin-src/client/build.mjs && node plugin-src/host/build.mjs",
     "test": "node --test test/*.test.mjs test/channels/*/*.test.mjs",
-    "check": "npm test && npm run build && node scripts/verify-package.mjs"
+    "check": "npm run build && npm test && node scripts/verify-package.mjs"
   },
   "engines": {
     "node": ">=22.19"

package/plugin-src/client/channels/dingtalk/index.js

@@ -16,7 +16,6 @@ import {
 } from '../../channel-card-meta.js';
 import {
   DINGTALK_ENDPOINTS,
-  DINGTALK_RPC_CHANNEL,
   connectionTestFeedback,
   formatRemaining,
   normalizeProvisioning,
@@ -29,9 +28,6 @@ import { installDingtalkStyles } from './styles.js';
 
 const ACTIVE_PROVISION_STATES = new Set(['pending', 'scanned', 'authorizing', 'creating', 'connecting']);
 
-export const name = 'dingtalk-settings';
-export const inject = ['slots', 'connection'];
-
 function DingtalkIcon({ size = 28 }) {
   return h('svg', {
     width: size,
@@ -864,16 +860,3 @@ export function DingtalkSettingsTab({ rpcCall }) {
                 })
               : null)));
 }
-
-export function apply(ctx) {
-  ctx.effect(() => installDingtalkStyles(), 'dingtalk-settings: install client styles');
-  const rpcCall = (endpoint, payload, signal) =>
-    ctx.connection.rpc.call(DINGTALK_RPC_CHANNEL, endpoint, payload, signal);
-  ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
-    name: 'settings.plugins.tab',
-    id: 'dingtalk',
-    order: 40,
-    label: '钉钉',
-    inject: () => ({ rpcCall }),
-  }, DingtalkSettingsTab));
-}

package/plugin-src/client/channels/dingtalk/styles.js

@@ -1,4 +1,4 @@
-export const DINGTALK_STYLE_ID = 'xmanrui-dsh-dingtalk-settings';
+export const DINGTALK_STYLE_ID = 'xmanrui-dsh-im-dingtalk-settings';
 
 const CSS = String.raw`
 .ddt-page {
@@ -126,7 +126,7 @@ export function installDingtalkStyles() {
   const existing = document.querySelector(`style[data-plugin-css="${DINGTALK_STYLE_ID}"]`);
   if (existing) return () => {};
   const style = document.createElement('style');
-  style.dataset.plugin = '@xmanrui/dsh-dingtalk';
+  style.dataset.plugin = '@xmanrui/dsh-im';
   style.dataset.pluginCss = DINGTALK_STYLE_ID;
   style.textContent = CSS;
   document.head.appendChild(style);

package/plugin-src/client/channels/feishu/index.js

@@ -6,7 +6,6 @@ import { h } from "../../i18n.js";
 import {
   FEISHU_ENDPOINTS,
   FEISHU_REGISTRATION_OPERATIONS,
-  FEISHU_RPC_CHANNEL,
   formatRemaining,
   normalizeBotsSnapshot,
   normalizeGroupResponseMode,
@@ -28,11 +27,6 @@ import {
   ChannelListHeading,
   LastMessageErrorSummary,
 } from "../../channel-card-meta.js";
-import { installFeishuStyles } from "./styles.js";
-
-export const name = "feishu-settings";
-export const inject = ["slots", "connection"];
-
 const CALLBACK_REPAIR_OPERATION = FEISHU_REGISTRATION_OPERATIONS.CALLBACK_REPAIR;
 const GROUP_MESSAGE_PERMISSION_OPERATION = FEISHU_REGISTRATION_OPERATIONS.GROUP_MESSAGE_PERMISSION;
 
@@ -1540,26 +1534,3 @@ export function FeishuSettingsTab({ rpcCall }) {
           ),
   ));
 }
-
-export function apply(ctx) {
-  ctx.effect(
-    () => installFeishuStyles(),
-    "feishu-settings: install client styles",
-  );
-
-  const rpcCall = (endpoint, payload, signal) =>
-    ctx.connection.rpc.call(FEISHU_RPC_CHANNEL, endpoint, payload, signal);
-
-  ctx.slots.inject("settings.plugins.tab", () =>
-    ctx.slots.register(
-      {
-        name: "settings.plugins.tab",
-        id: "feishu",
-        order: 20,
-        label: "飞书",
-        inject: () => ({ rpcCall }),
-      },
-      FeishuSettingsTab,
-    ),
-  );
-}

package/plugin-src/client/channels/feishu/styles.js

@@ -1,4 +1,4 @@
-export const FEISHU_STYLE_ID = "beihuixinghe-dsh-feishu-settings";
+export const FEISHU_STYLE_ID = "xmanrui-dsh-im-feishu-settings";
 
 const CSS = String.raw`
 .bxf-page {
@@ -562,7 +562,7 @@ export function installFeishuStyles() {
   }
 
   const style = document.createElement("style");
-  style.dataset.plugin = "@xmanrui/dsh-feishu";
+  style.dataset.plugin = "@xmanrui/dsh-im";
   style.dataset.pluginCss = FEISHU_STYLE_ID;
   style.textContent = CSS;
   document.head.appendChild(style);

package/plugin-src/client/channels/qq/index.js

@@ -18,7 +18,6 @@ import {
 import { installDingtalkStyles } from '../dingtalk/styles.js';
 import {
   QQ_ENDPOINTS,
-  QQ_RPC_CHANNEL,
   connectionTestFeedback,
   formatRemaining,
   normalizeProvisioning,
@@ -514,11 +513,3 @@ export function QqSettingsTab({ rpcCall }) {
               ? h(EmptyView, { busy, onStart: () => void startProvisioning() }) : null,
             botList)));
 }
-
-export function apply(ctx) {
-  ctx.effect(() => installQqStyles(), 'qq-settings: install client styles');
-  const rpcCall = (endpoint, payload, signal) => ctx.connection.rpc.call(QQ_RPC_CHANNEL, endpoint, payload, signal);
-  ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
-    name: 'settings.plugins.tab', id: 'qq', order: 50, label: 'QQ', inject: () => ({ rpcCall }),
-  }, QqSettingsTab));
-}

package/plugin-src/client/channels/wecom/index.js

@@ -18,7 +18,6 @@ import {
 import { installDingtalkStyles } from '../dingtalk/styles.js';
 import {
   WECOM_ENDPOINTS,
-  WECOM_RPC_CHANNEL,
   formatRemaining,
   normalizeProvisioning,
   normalizeSnapshot,
@@ -546,11 +545,3 @@ export function WecomSettingsTab({ rpcCall }) {
               ? h(EmptyView, { busy, onStart: () => void startProvisioning() }) : null,
             botList)));
 }
-
-export function apply(ctx) {
-  ctx.effect(() => installWecomStyles(), 'wecom-settings: install client styles');
-  const rpcCall = (endpoint, payload, signal) => ctx.connection.rpc.call(WECOM_RPC_CHANNEL, endpoint, payload, signal);
-  ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
-    name: 'settings.plugins.tab', id: 'wecom', order: 45, label: '企业微信', inject: () => ({ rpcCall }),
-  }, WecomSettingsTab));
-}

package/plugin-src/client/channels/weixin/index.js

@@ -5,7 +5,6 @@ import { QrActionIcon } from '../../credential-binding.js';
 import { h } from '../../i18n.js';
 import {
   WEIXIN_ENDPOINTS,
-  WEIXIN_RPC_CHANNEL,
   formatRemaining,
   normalizeProvisioning,
   normalizeSnapshot,
@@ -27,11 +26,6 @@ import {
   ChannelListHeading,
   LastMessageErrorSummary,
 } from '../../channel-card-meta.js';
-import { installWeixinStyles } from './styles.js';
-
-export const name = 'weixin-settings';
-export const inject = ['slots', 'connection'];
-
 const Button = React.forwardRef(function Button(
   { children, kind = 'secondary', className = '', ...props },
   ref,
@@ -717,16 +711,3 @@ export function WeixinSettingsTab({ rpcCall }) {
               : null),
   ));
 }
-
-export function apply(ctx) {
-  ctx.effect(() => installWeixinStyles(), 'weixin-settings: install client styles');
-  const rpcCall = (endpoint, payload, signal) =>
-    ctx.connection.rpc.call(WEIXIN_RPC_CHANNEL, endpoint, payload, signal);
-  ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
-    name: 'settings.plugins.tab',
-    id: 'weixin',
-    order: 30,
-    label: '微信',
-    inject: () => ({ rpcCall }),
-  }, WeixinSettingsTab));
-}

package/plugin-src/client/channels/weixin/styles.js

@@ -1,4 +1,4 @@
-export const WEIXIN_STYLE_ID = 'xmanrui-dsh-weixin-settings';
+export const WEIXIN_STYLE_ID = 'xmanrui-dsh-im-weixin-settings';
 
 const CSS = String.raw`
 .dxw-page {
@@ -107,7 +107,7 @@ export function installWeixinStyles() {
   const existing = document.querySelector(`style[data-plugin-css="${WEIXIN_STYLE_ID}"]`);
   if (existing) return () => {};
   const style = document.createElement('style');
-  style.dataset.plugin = '@xmanrui/dsh-weixin';
+  style.dataset.plugin = '@xmanrui/dsh-im';
   style.dataset.pluginCss = WEIXIN_STYLE_ID;
   style.textContent = CSS;
   document.head.appendChild(style);

package/plugin-src/client/index.js

@@ -333,10 +333,10 @@ export function apply(ctx) {
     pickDirectory: () => ctx.workspaces.pickDirectory(),
   });
 
-  ctx.slots.inject('settings.plugins.tab', () => ctx.slots.register({
-    name: 'settings.plugins.tab',
-    id: 'im',
-    order: 20,
+  ctx.slots.inject('settings.section', () => ctx.slots.register({
+    name: 'settings.section',
+    id: 'xmanrui-dsh-im',
+    order: 21,
     label: () => t('IM机器人'),
     locale: IM_LOCALE_NAMESPACE,
     inject: () => ({

package/scripts/verify-package.mjs

@@ -1,8 +1,23 @@
-import { access, readFile, stat } from 'node:fs/promises';
+import { access, readFile, readdir, stat } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
 const root = resolve(import.meta.dirname, '..');
+
+async function readSourceTree(directory) {
+  const entries = await readdir(directory, { withFileTypes: true });
+  const chunks = [];
+  for (const entry of entries) {
+    const path = resolve(directory, entry.name);
+    if (entry.isDirectory()) {
+      chunks.push(await readSourceTree(path));
+    } else if (entry.isFile() && /\.m?js$/u.test(entry.name)) {
+      chunks.push(await readFile(path, 'utf8'));
+    }
+  }
+  return chunks.join('\n');
+}
+
 const required = [
   'lib/index.js',
   'lib/client.js',
@@ -35,7 +50,17 @@ const required = [
 ];
 await Promise.all(required.map((path) => access(resolve(root, path))));
 
-const [client, host, patch, manifestText, lockText, hostSource, clientSource, executable] = await Promise.all([
+const [
+  client,
+  host,
+  patch,
+  manifestText,
+  lockText,
+  hostSource,
+  clientEntrySource,
+  clientSources,
+  executable,
+] = await Promise.all([
   readFile(resolve(root, 'lib/client.js'), 'utf8'),
   readFile(resolve(root, 'lib/index.js'), 'utf8'),
   readFile(resolve(root, 'cordis.patch.yml'), 'utf8'),
@@ -43,6 +68,7 @@ const [client, host, patch, manifestText, lockText, hostSource, clientSource, ex
   readFile(resolve(root, 'package-lock.json'), 'utf8'),
   readFile(resolve(root, 'plugin-src/host/index.mjs'), 'utf8'),
   readFile(resolve(root, 'plugin-src/client/index.js'), 'utf8'),
+  readSourceTree(resolve(root, 'plugin-src/client')),
   stat(resolve(root, 'bin/dsh-im.mjs')),
 ]);
 const manifest = JSON.parse(manifestText);
@@ -82,17 +108,28 @@ if (forbiddenDshLockPaths.length > 0) {
   );
 }
 
-if (!client.includes('id: "@xmanrui/dsh-im"')) {
+if (!/\bid\s*:\s*["']@xmanrui\/dsh-im["']/u.test(client)) {
   throw new Error('client bundle does not register the dsh-im loader id');
 }
-if (!client.includes('id: "im"')
-  || !client.includes('label: () => t("IM\\u673A\\u5668\\u4EBA")')
-  || !client.includes('locale: IM_LOCALE_NAMESPACE')
-  || !client.includes('IM_LOCALE_NAMESPACE = "dsh-im"')) {
-  throw new Error('client bundle does not register the localized IM settings tab');
+const sourceSectionMarkers = [
+  /ctx\.slots\.inject\(\s*["']settings\.section["']/u,
+  /name\s*:\s*["']settings\.section["']/u,
+  /id\s*:\s*["']xmanrui-dsh-im["']/u,
+  /order\s*:\s*21\b/u,
+  /label\s*:\s*\(\)\s*=>\s*t\(\s*["']IM机器人["']\s*\)/u,
+  /locale\s*:\s*IM_LOCALE_NAMESPACE\b/u,
+];
+const bundleSectionPattern = /name\s*:\s*["']settings\.section["']\s*,\s*id\s*:\s*["']xmanrui-dsh-im["']\s*,\s*order\s*:\s*21\s*,\s*label\s*:\s*\(\)\s*=>\s*[$A-Z_a-z][$\w]*\(\s*["']IM(?:机器人|\\u673A\\u5668\\u4EBA)["']\s*\)\s*,\s*locale\s*:\s*(?:[$A-Z_a-z][$\w]*|["']dsh-im["'])/u;
+if (sourceSectionMarkers.some((pattern) => !pattern.test(clientEntrySource))
+  || !/IM_LOCALE_NAMESPACE\s*=\s*["']dsh-im["']/u.test(clientSources)
+  || !bundleSectionPattern.test(client)) {
+  throw new Error('client bundle does not register the localized top-level IM settings section');
+}
+if ((client.match(/\.slots\.inject\(\s*["']settings\.section["']/gu) ?? []).length !== 1) {
+  throw new Error('client bundle must register exactly one top-level settings section');
 }
-if ((client.match(/ctx\.slots\.inject\("settings\.plugins\.tab"/g) ?? []).length !== 1) {
-  throw new Error('client bundle must register exactly one settings tab');
+if (client.includes('settings.plugins.tab') || clientSources.includes('settings.plugins.tab')) {
+  throw new Error('client source or bundle still contains the legacy Plugins-tab settings entry');
 }
 if (/role:\s*["']switch|type:\s*["']checkbox/.test(client)) {
   throw new Error('client bundle contains a channel enable switch');
@@ -115,7 +152,7 @@ if (/@xmanrui\/dsh-(?:feishu|weixin|dingtalk)/.test(host)) {
   throw new Error('host bundle still imports an external channel plugin');
 }
 if (/@xmanrui\/dsh-(?:feishu|weixin|dingtalk)/.test(
-  manifestText + lockText + hostSource + clientSource,
+  manifestText + lockText + hostSource + clientSources,
 )) {
   throw new Error('source or package metadata still depends on an external channel plugin');
 }

package/src/channels/dingtalk/dingtalk-api.mjs

@@ -8,8 +8,14 @@ export const DINGTALK_REGISTRATION_BASE_URL = 'https://oapi.dingtalk.com/';
 export const DINGTALK_API_BASE_URL = 'https://api.dingtalk.com/';
 export const DINGTALK_REGISTRATION_SOURCE = 'DING_DWS_CLAW';
 export const DINGTALK_AI_CARD_TEMPLATE_ID = '02fcf2f4-5e02-4a85-b672-46d1f715543e.schema';
+export const DINGTALK_THINKING_REACTION_NAME = '🤔思考中';
+export const DINGTALK_DONE_REACTION_NAME = '✅已完成';
+export const DINGTALK_ERROR_REACTION_NAME = '❌处理失败';
 
 const DEFAULT_TIMEOUT_MS = 15_000;
+const REACTION_TIMEOUT_MS = 5_000;
+const TEXT_REACTION_ID = '2659900';
+const TEXT_REACTION_BACKGROUND_ID = 'im_bg_1';
 const REGISTRATION_STATUSES = new Set(['WAITING', 'SUCCESS', 'FAIL', 'EXPIRED']);
 
 export class DingtalkApiError extends Error {
@@ -406,18 +412,20 @@ export function createDingtalkApi({
   if (!source) throw new TypeError('registrationSource is required');
   const tokenCache = new Map();
   const tokenRequests = new Map();
+  const reactionTokenRequests = new Map();
   let cardSlotTail = Promise.resolve();
   let nextCardRequestAt = 0;
 
   const endpoint = (base, pathname) => new URL(pathname.replace(/^\//, ''), base);
 
-  async function accessToken({ clientId, clientSecret, signal }) {
+  async function accessToken({ clientId, clientSecret, signal, requestKind = 'normal' }) {
     const appKey = nonEmptyString(clientId);
     const appSecret = nonEmptyString(clientSecret);
     if (!appKey || !appSecret) throw new TypeError('clientId and clientSecret are required');
     const cached = tokenCache.get(appKey);
     if (cached && cached.expiresAt > now()) return cached.token;
-    if (tokenRequests.has(appKey)) return tokenRequests.get(appKey);
+    const requests = requestKind === 'reaction' ? reactionTokenRequests : tokenRequests;
+    if (requests.has(appKey)) return requests.get(appKey);
 
     const request = (async () => {
       const value = await requestJson(fetchImpl, endpoint(apiBase, 'v1.0/oauth2/accessToken'), {
@@ -431,9 +439,75 @@ export function createDingtalkApi({
       const refreshAfterMs = Math.max(1_000, (expiresInSeconds - 60) * 1_000);
       tokenCache.set(appKey, { token, expiresAt: now() + refreshAfterMs });
       return token;
-    })().finally(() => tokenRequests.delete(appKey));
-    tokenRequests.set(appKey, request);
-    return request;
+    })();
+    const shared = request.finally(() => requests.delete(appKey));
+    requests.set(appKey, shared);
+    return shared;
+  }
+
+  async function changeReaction({
+    clientId,
+    clientSecret,
+    robotCode,
+    messageId,
+    conversationId,
+    reactionName = DINGTALK_THINKING_REACTION_NAME,
+    signal,
+  }, action) {
+    const appKey = nonEmptyString(clientId);
+    const appSecret = nonEmptyString(clientSecret);
+    const botCode = nonEmptyString(robotCode) ?? appKey;
+    const openMsgId = nonEmptyString(messageId);
+    const openConversationId = nonEmptyString(conversationId);
+    const emotionName = nonEmptyString(reactionName);
+    if (!appKey || !appSecret) throw new TypeError('clientId and clientSecret are required');
+    if (!botCode) throw new TypeError('robotCode is required');
+    if (!openMsgId || !openConversationId) {
+      throw new TypeError('messageId and conversationId are required');
+    }
+    if (!emotionName) throw new TypeError('reactionName is required');
+    // Reactions deduplicate with each other but never own the normal reply's
+    // in-flight token request. Both paths may still reuse a cached token.
+    const token = await accessToken({
+      clientId: appKey,
+      clientSecret: appSecret,
+      signal,
+      requestKind: 'reaction',
+    });
+    const response = await requestJson(
+      fetchImpl,
+      endpoint(apiBase, `v1.0/robot/emotion/${action}`),
+      {
+        body: {
+          robotCode: botCode,
+          openMsgId,
+          openConversationId,
+          emotionType: 2,
+          emotionName,
+          textEmotion: {
+            emotionId: TEXT_REACTION_ID,
+            emotionName,
+            text: emotionName,
+            backgroundId: TEXT_REACTION_BACKGROUND_ID,
+          },
+        },
+        headers: { 'x-acs-dingtalk-access-token': token },
+        signal,
+        timeoutMs: REACTION_TIMEOUT_MS,
+        action: action === 'reply' ? '消息状态添加' : '消息状态撤回',
+      },
+    );
+    const rejection = response?.success === false
+      ? safeProviderCode(response?.code ?? response?.errcode) ?? 'rejected'
+      : rejectedProviderResponse(response);
+    if (rejection) {
+      throw new DingtalkApiError(
+        'reaction-rejected',
+        '钉钉服务拒绝了消息状态请求。',
+        { providerCode: rejection },
+      );
+    }
+    return true;
   }
 
   async function messageFileDownloadUrl({
@@ -690,6 +764,28 @@ export function createDingtalkApi({
 
     accessToken,
 
+    async addReaction(request) {
+      return changeReaction(request, 'reply');
+    },
+
+    async recallReaction(request) {
+      return changeReaction(request, 'recall');
+    },
+
+    async addThinkingReaction(request) {
+      return changeReaction({
+        ...request,
+        reactionName: DINGTALK_THINKING_REACTION_NAME,
+      }, 'reply');
+    },
+
+    async recallThinkingReaction(request) {
+      return changeReaction({
+        ...request,
+        reactionName: DINGTALK_THINKING_REACTION_NAME,
+      }, 'recall');
+    },
+
     async downloadImage({
       clientId,
       clientSecret,