@xmanrui/dsh-im 4.7.0 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",
@@ -34,6 +34,10 @@
     {
       "name": "divingleee",
       "url": "https://github.com/divingleee"
+    },
+    {
+      "name": "Chan-0312",
+      "url": "https://github.com/Chan-0312"
     }
   ],
   "license": "MIT",

package/plugin-src/client/context-enhancement.js

@@ -17,6 +17,8 @@ const FIELD_LABELS = Object.freeze({
   senderId: '发送者标识',
   senderName: '发送者昵称',
   conversationTitle: '会话标题',
+  chatId: '会话标识',
+  threadId: '话题标识',
   botId: '机器人标识',
 });
 
@@ -29,6 +31,14 @@ const FIELD_HELP = Object.freeze({
     labelKey: 'conversationTitleHelpLabel',
     text: '该字段不是每个渠道都能提供。钉钉群聊会带上群名。当前消息没有会话标题时，即使已选择该字段，<dsh_im_source> 中也会省略 conversationTitle。',
   }),
+  chatId: Object.freeze({
+    labelKey: 'chatIdHelpLabel',
+    text: '该字段不是每个渠道都能提供。会话标识用于区分不同的群组或私聊，飞书群聊会带上群 ID。当前消息没有会话标识时，即使已选择该字段，<dsh_im_source> 中也会省略 chatId。',
+  }),
+  threadId: Object.freeze({
+    labelKey: 'threadIdHelpLabel',
+    text: '该字段不是每个渠道都能提供。飞书话题群的消息会带上话题 ID，用于区分同一群组内的不同话题；当前消息不在话题中时，即使已选择该字段，<dsh_im_source> 中也会省略 threadId。',
+  }),
 });
 
 const SCOPE_COPY = Object.freeze({
@@ -38,6 +48,8 @@ const SCOPE_COPY = Object.freeze({
     fieldsHelpLabel: '查看群聊来源字段说明',
     senderNameHelpLabel: '查看群聊发送者昵称字段说明',
     conversationTitleHelpLabel: '查看群聊会话标题字段说明',
+    chatIdHelpLabel: '查看群聊会话标识字段说明',
+    threadIdHelpLabel: '查看群聊话题标识字段说明',
     guidanceLabel: '增强提示词',
     guidanceHelpLabel: '查看群聊增强提示词使用说明',
     guidanceUsage: '用于告诉模型如何使用当前群聊消息的 <dsh_im_source> 来源字段。只填写正文，插件会自动添加 <dsh_im_source_guidance> 成对标签。',
@@ -49,6 +61,8 @@ const SCOPE_COPY = Object.freeze({
     fieldsHelpLabel: '查看私聊来源字段说明',
     senderNameHelpLabel: '查看私聊发送者昵称字段说明',
     conversationTitleHelpLabel: '查看私聊会话标题字段说明',
+    chatIdHelpLabel: '查看私聊会话标识字段说明',
+    threadIdHelpLabel: '查看私聊话题标识字段说明',
     guidanceLabel: '增强提示词',
     guidanceHelpLabel: '查看私聊增强提示词使用说明',
     guidanceUsage: '用于告诉模型如何使用当前私聊消息的 <dsh_im_source> 来源字段。只填写正文，插件会自动添加 <dsh_im_source_guidance> 成对标签。',

package/plugin-src/client/i18n.js

@@ -292,6 +292,14 @@ const EN = Object.freeze({
   '查看群聊会话标题字段说明': 'View group conversation title field details',
   '查看私聊会话标题字段说明': 'View direct conversation title field details',
   '该字段不是每个渠道都能提供。钉钉群聊会带上群名。当前消息没有会话标题时，即使已选择该字段，<dsh_im_source> 中也会省略 conversationTitle。': 'This field is not available on every channel. DingTalk group chats include the group name. If the current message has no conversation title, <dsh_im_source> omits conversationTitle even when the field is selected.',
+  '会话标识': 'Chat ID',
+  '查看群聊会话标识字段说明': 'View group chat ID field details',
+  '查看私聊会话标识字段说明': 'View direct chat ID field details',
+  '该字段不是每个渠道都能提供。会话标识用于区分不同的群组或私聊，飞书群聊会带上群 ID。当前消息没有会话标识时，即使已选择该字段，<dsh_im_source> 中也会省略 chatId。': 'This field is not available on every channel. The chat ID distinguishes different groups or direct chats, and Feishu group chats include the group ID. If the current message has no chat ID, <dsh_im_source> omits chatId even when the field is selected.',
+  '话题标识': 'Topic ID',
+  '查看群聊话题标识字段说明': 'View group topic ID field details',
+  '查看私聊话题标识字段说明': 'View direct topic ID field details',
+  '该字段不是每个渠道都能提供。飞书话题群的消息会带上话题 ID，用于区分同一群组内的不同话题；当前消息不在话题中时，即使已选择该字段，<dsh_im_source> 中也会省略 threadId。': 'This field is not available on every channel. Messages in a Feishu topic chat carry the topic ID, which distinguishes different topics inside the same group. If the current message is not inside a topic, <dsh_im_source> omits threadId even when the field is selected.',
   '机器人标识': 'Bot ID',
   '增强提示词': 'Guidance',
   '查看增强提示词使用说明': 'View guidance instructions',
@@ -319,7 +327,7 @@ const EN = Object.freeze({
   '上下文增强保存失败，请重试。': 'Could not save context enhancement. Try again.',
   '请提交完整的上下文增强设置。': 'Submit the complete context enhancement settings.',
   '群聊和私聊开关必须是布尔值。': 'Group and direct switches must be booleans.',
-  '来源字段只能选择已定义的六个字段。': 'Source fields must be chosen from the six defined fields.',
+  '来源字段只能选择已定义的八个字段。': 'Source fields must be chosen from the eight defined fields.',
   '保存中…': 'Saving…',
   '未设置': 'Not set',
   '工作区修改失败，请重试。': 'Could not update the workspace. Try again.',

package/plugin-src/client/workspace-directory-picker.js

@@ -7,6 +7,17 @@ function pickerErrorCode(error) {
   return error?.rpcError?.code ?? error?.code;
 }
 
+const PICKER_ERROR_KINDS = new Map([
+  ['directory-picker/unavailable', 'unavailable'],
+  ['directory-picker-unavailable', 'unavailable'],
+  ['directory-picker/unreadable', 'unreadable'],
+  ['directory-unreadable', 'unreadable'],
+]);
+
+function pickerErrorKind(error) {
+  return PICKER_ERROR_KINDS.get(pickerErrorCode(error));
+}
+
 function pickerErrorDetails(error) {
   return error?.rpcError?.details ?? error?.details;
 }
@@ -110,9 +121,9 @@ export function WorkspaceDirectoryPicker({
       const initialPath = initialPathRef.current;
       const initial = await loadDirectory(initialPath || undefined, { reportError: false });
       if (!active || initial.aborted || initial.value) return;
-      const code = pickerErrorCode(initial.error);
+      const kind = pickerErrorKind(initial.error);
       const details = pickerErrorDetails(initial.error);
-      if (code === 'directory-picker-unavailable'
+      if (kind === 'unavailable'
         && details?.capability === 'native'
         && typeof picker.pickDirectory === 'function') {
         setLoading(true);
@@ -128,7 +139,7 @@ export function WorkspaceDirectoryPicker({
         }
         return;
       }
-      if (initialPath && code === 'directory-unreadable') {
+      if (initialPath && kind === 'unreadable') {
         const home = await loadDirectory(undefined, { reportError: false });
         if (!active || home.aborted || home.value) return;
         setError(pickerErrorMessage(home.error));

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

@@ -1136,6 +1136,7 @@ export class DingtalkHarnessBridge {
           senderId: sender,
           senderName: message.senderNick,
           conversationTitle: message.conversationTitle,
+          chatId: message.conversationId,
         }));
         contextEnhanced = content !== originalContent;
       }

package/src/channels/feishu/bridge.mjs

@@ -3330,6 +3330,8 @@ export class FeishuHarnessBridge {
       content = enhanceContextContent(originalContent, snapshot, () => ({
         channel: 'feishu',
         senderId: senderOpenId(event),
+        chatId: event.message.chat_id,
+        threadId: event.message.thread_id,
       }));
       contextEnhanced = content !== originalContent;
     }

package/src/channels/qq/qq-bridge.mjs

@@ -890,6 +890,7 @@ export class QqHarnessBridge {
           channel: 'qq',
           senderId: sender,
           senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : message.senderId,
         }));
         contextEnhanced = content !== originalContent;
       }

package/src/channels/shared/context-enhancement.mjs

@@ -1,6 +1,7 @@
 // Shared by the Host and settings UI; keep this module browser-compatible.
 export const CONTEXT_ENHANCEMENT_FIELDS = Object.freeze([
-  'channel', 'conversationType', 'senderId', 'senderName', 'conversationTitle', 'botId',
+  'channel', 'conversationType', 'senderId', 'senderName', 'conversationTitle',
+  'chatId', 'threadId', 'botId',
 ]);
 
 export const CONTEXT_ENHANCEMENT_GUIDANCE_MAX_LENGTH = 8_000;
@@ -38,7 +39,7 @@ const CHANNELS = new Set([
 ]);
 const SOURCE_LIMITS = {
   channel: 16, conversationType: 6, senderId: 256, senderName: 256,
-  conversationTitle: 256, botId: 128,
+  conversationTitle: 256, chatId: 256, threadId: 256, botId: 128,
 };
 const CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f\u202a-\u202e\u2066-\u2069]/g;
 
@@ -64,7 +65,7 @@ function validateContextEnhancementScope(input) {
     throw invalidConfig('群聊和私聊开关必须是布尔值。');
   }
   if (!Array.isArray(fields) || ![...fields].every((field) => CONTEXT_ENHANCEMENT_FIELDS.includes(field))) {
-    throw invalidConfig('来源字段只能选择已定义的六个字段。');
+    throw invalidConfig('来源字段只能选择已定义的八个字段。');
   }
   if (typeof guidance !== 'string' || guidance.length > CONTEXT_ENHANCEMENT_GUIDANCE_MAX_LENGTH) {
     throw invalidConfig(`增强提示词不得超过 ${CONTEXT_ENHANCEMENT_GUIDANCE_MAX_LENGTH} 个字符。`);
@@ -150,7 +151,7 @@ function sourceString(value, field) {
 function sourceBlock(snapshot, sourceFactory) {
   const { fields } = snapshot.config;
   const needsSource = fields.some((field) => [
-    'channel', 'senderId', 'senderName', 'conversationTitle',
+    'channel', 'senderId', 'senderName', 'conversationTitle', 'chatId', 'threadId',
   ].includes(field));
   const source = needsSource ? sourceFactory?.() : null;
   const projected = {};

package/src/channels/shared/text-harness-bridge.mjs

@@ -683,11 +683,14 @@ export class TextHarnessBridge {
       let contextEnhanced = false;
       if (snapshot) {
         const originalContent = content ?? text;
+        const contextSource = message.contextSource?.();
         content = enhanceContextContent(originalContent, snapshot, () => ({
           channel: this.#descriptor.key,
           senderId,
-          senderName: message.contextSource?.()?.senderName,
-          conversationTitle: message.contextSource?.()?.conversationTitle,
+          senderName: contextSource?.senderName,
+          conversationTitle: contextSource?.conversationTitle,
+          chatId: contextSource?.chatId ?? message.conversationId,
+          threadId: contextSource?.threadId,
         }));
         contextEnhanced = content !== originalContent;
       }

package/src/channels/slack/slack-runtime.mjs

@@ -172,6 +172,10 @@ export function normalizeSlackEvent(payload, botUserId, {
     senderIsBot: String(event.user) === String(botUserId),
     kind: direct ? 'direct' : 'group',
     conversationId: direct ? String(event.channel) : `${event.channel}:${threadTs}`,
+    contextSource: () => ({
+      chatId: String(event.channel),
+      threadId: event.thread_ts ? String(event.thread_ts) : undefined,
+    }),
     content: stripBotMention(event.text ?? '', botUserId),
     plainText: !Array.isArray(event.files) || event.files.length === 0,
     images: Array.isArray(event.files)

package/src/channels/telegram/telegram-runtime.mjs

@@ -266,6 +266,8 @@ export function normalizeTelegramUpdate(update, {
         .filter((value) => typeof value === 'string' && value.trim())
         .map((value) => value.trim()).join(' ') || message.from?.username,
       conversationTitle: direct ? undefined : message.chat?.title,
+      chatId: String(chatId),
+      threadId: messageThreadId === undefined ? undefined : String(messageThreadId),
     }),
     senderIsBot: message.from?.is_bot === true,
     kind: direct ? 'direct' : 'group',

package/src/channels/wecom/wecom-bridge.mjs

@@ -1056,6 +1056,7 @@ export class WecomHarnessBridge {
         content = enhanceContextContent(originalContent, snapshot, () => ({
           channel: 'wecom',
           senderId,
+          chatId,
         }));
         contextEnhanced = content !== originalContent;
       }

package/src/channels/weixin/weixin-bridge.mjs

@@ -786,6 +786,7 @@ export class WeixinHarnessBridge {
           content = enhanceContextContent(originalContent, snapshot, () => ({
             channel: 'weixin',
             senderId: sender,
+            chatId: sender,
           }));
           contextEnhanced = content !== originalContent;
         }