@xmanrui/dsh-im 2.6.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "2.6.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/feishu/bridge.mjs

@@ -159,7 +159,7 @@ function artifactFailureText(fileName, error) {
   const name = String(fileName ?? t('结果文件')).replace(/[\r\n]+/g, ' ').trim() || t('结果文件');
   switch (error?.code) {
     case 'artifact-permission-required':
-      return t('结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。', { name });
+      return t('结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。', { name });
     case 'artifact-too-large':
       return t('结果文件「{name}」超过飞书 30 MB 上限，未发送。', { name });
     case 'artifact-empty':
@@ -945,7 +945,10 @@ export class FeishuHarnessBridge {
     const text = message.content;
     const hasImages = hasInboundImages(message);
     const hasFiles = hasInboundFiles(message);
-    const commandText = event.message.message_type === 'text' && !hasImages && !hasFiles ? text : null;
+    // 命令识别对 text 与纯文本 post 一视同仁：post 富文本若仅含单个
+    // 文本段落（如复制粘贴的 /new），同样按命令处理；带图片/文件不认。
+    // accept() 侧已用 nonEmptyString(content) 判定，两侧保持一致。
+    const commandText = !hasImages && !hasFiles && text ? text.trim() : null;
     if (!text && !hasImages && !hasFiles) {
       await this.#send(event.message.chat_id, t('目前支持文字、图片和文件消息。'));
       return;

package/src/channels/feishu/message-utils.mjs

@@ -5,7 +5,7 @@ const FEISHU_MISSING_MESSAGE_SCOPE_CODE = 99991672;
 const FEISHU_ERROR_BODY_LIMIT = 64 * 1024;
 const FEISHU_ERROR_BODY_TIMEOUT_MS = 1_000;
 const FEISHU_IMAGE_PERMISSION_MESSAGE =
-  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。';
+  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。';
 
 export function conversationKey(event) {
   const chatType = event?.message?.chat_type;

package/src/channels/shared/connection-test.mjs

@@ -29,7 +29,7 @@ export function connectionTestTarget(state) {
 
 export function connectionTestMessage(botName, channelLabel = t('机器人')) {
   const name = cleanText(botName) ?? channelLabel;
-  return `${t('✅ DeepSeek Harness 连接测试成功')}\n${t('这条消息由插件页面中的“{name}”机器人卡片发出。', { name })}`;
+  return `${t('✅ DeepSeek Harness 连接测试成功')}\n${t('这条消息由「IM机器人」设置页中的“{name}”机器人卡片发出。', { name })}`;
 }
 
 export function connectionTestTargetUnavailable(channelLabel = t('机器人')) {

package/src/channels/shared/i18n-en/feishu.mjs

@@ -18,8 +18,8 @@ export default {
   '机器人正在移除或已重新接入，无法操作原会话的工作区。':
     'The bot is being removed or has been reconnected; the original session’s workspace cannot be changed.',
   '操作失败，请稍后重试。': 'The operation failed. Please try again later.',
-  '结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。':
-    'The result file "{name}" was generated, but the bot lacks the Feishu file-upload scope im:resource. Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the plugin page and scan the QR code. Complete any publishing approval Feishu requires, then try again.',
+  '结果文件「{name}」已生成，但机器人缺少飞书文件上传权限 im:resource。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。完成飞书要求的发布审批后重试。':
+    'The result file "{name}" was generated, but the bot lacks the Feishu file-upload scope im:resource. Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the IM Bot settings page and scan the QR code. Complete any publishing approval Feishu requires, then try again.',
   '结果文件「{name}」超过飞书 30 MB 上限，未发送。':
     'The result file "{name}" exceeds the Feishu 30 MB limit and was not sent.',
   '结果文件「{name}」为空，飞书不允许发送空文件。':
@@ -28,8 +28,8 @@ export default {
     'The result file "{name}" was temporarily rate-limited by Feishu and could not be sent. Please try again later.',
   '结果文件「{name}」已生成，但暂时未能发送，请稍后重试。':
     'The result file "{name}" was generated but could not be sent right now. Please try again later.',
-  '处理失败，请稍后重试。如果问题持续，请在 DeepSeek Harness 的飞书插件页面检查连接状态。':
-    'Message processing failed. Please try again later. If the problem persists, check the connection status on the Feishu plugin page in DeepSeek Harness.',
+  '处理失败，请稍后重试。如果问题持续，请在 DeepSeek Harness 的「IM机器人」设置页检查飞书连接状态。':
+    'Message processing failed. Please try again later. If the problem persists, check the Feishu connection status on the IM Bot settings page in DeepSeek Harness.',
   '已开启全新 Harness 会话。': 'A brand-new Harness session has started.',
   '飞书机器人与 DeepSeek Harness 连接正常。':
     'The Feishu bot is connected to DeepSeek Harness and working normally.',
@@ -338,8 +338,8 @@ export default {
   '飞书机器人': 'Feishu bot',
 
   // feishu/message-utils.mjs
-  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在插件页面点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。':
-    'The Feishu bot is missing the image-read scope im:message:readonly, shown by Feishu as “Read direct and group messages.” Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the plugin page and scan the QR code. Publish a new version and complete any approval requested by Feishu, then resend the image.',
+  '飞书机器人缺少图片读取权限 im:message:readonly（飞书显示为“获取单聊、群组消息”）。请私聊机器人执行 /repair 命令，或者在「IM机器人」设置页点击“补全权限”按钮并扫码。按飞书提示发布新版本、完成必要审批后，再重新发送图片。':
+    'The Feishu bot is missing the image-read scope im:message:readonly, shown by Feishu as “Read direct and group messages.” Run /repair in a direct chat with the bot, or click the “Complete permissions” button on the IM Bot settings page and scan the QR code. Publish a new version and complete any approval requested by Feishu, then resend the image.',
 
   // feishu/feishu-runtime.mjs — callback probe notices
   '✅ 修复完成：已实测收到 card.action.trigger，菜单按钮现在可用。':

package/src/channels/shared/i18n-en/shared-c.mjs

@@ -73,8 +73,8 @@ export default {
   // connection-test.mjs
   '✅ DeepSeek Harness 连接测试成功':
     '✅ DeepSeek Harness connection test succeeded',
-  '这条消息由插件页面中的“{name}”机器人卡片发出。':
-    'This message was sent from the "{name}" bot card on the plugin page.',
+  '这条消息由「IM机器人」设置页中的“{name}”机器人卡片发出。':
+    'This message was sent from the "{name}" bot card on the IM Bot settings page.',
   '{channelLabel}尚未收到可用于测试的私聊消息。':
     'The {channelLabel} has not received a direct message that can be used for testing yet.',
   '机器人': 'bot',