@xmanrui/dsh-im 4.21.0 → 4.21.2

package/src/channels/feishu/bridge.mjs

@@ -60,7 +60,11 @@ import {
 } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
   createDeliveryReceipt,
@@ -1416,6 +1420,16 @@ export class FeishuHarnessBridge {
         hasFiles: hasInboundFiles(message),
         pendingInteraction: this.#hasPendingInteraction(key),
         control: { owner: this, key },
+        enhancement: captureContextEnhancementSource(
+          this.#contextEnhancement,
+          event.message.chat_type === 'p2p' ? 'direct' : 'group',
+          () => ({
+            channel: 'feishu',
+            senderId: senderOpenId(event),
+            chatId: event.message.chat_id,
+            threadId: event.message.thread_id,
+          }),
+        ),
       },
     );
     if (result?.stopped) {
@@ -2475,7 +2489,7 @@ export class FeishuHarnessBridge {
         await this.#sendCard(chatId, customSteerCard(), { key, updateMessageId: messageId, replyTo: messageId });
         return;
       }
-      await this.#sendSteer({ key, chatId, messageId }, raw);
+      await this.#sendSteer({ key, chatId, messageId, actor }, raw);
       return;
     }
     if (action === 'presets') {
@@ -3201,11 +3215,26 @@ export class FeishuHarnessBridge {
    */
   async #sendSteer(entry, text) {
     const { key, chatId } = entry;
+    // Card routes carry the conversation key, not the raw event, so the topic
+    // id is recovered from the key the channel itself minted.
+    const threadId = typeof key === 'string'
+      ? /(?:^|:)thread:(.+)$/u.exec(key)?.[1]
+      : undefined;
     const result = await runControlCommand(
       `/steer ${text}`, this.#harness, this.#state, key, {
         signal: this.#signal,
         pendingInteraction: this.#hasPendingInteraction(key),
         control: { owner: this, key },
+        enhancement: captureContextEnhancementSource(
+          this.#contextEnhancement,
+          typeof key === 'string' && key.startsWith('p2p:') ? 'direct' : 'group',
+          () => ({
+            channel: 'feishu',
+            senderId: entry.actor ?? entry.operatorOpenId,
+            chatId,
+            threadId,
+          }),
+        ),
       },
     );
     await this.#send(chatId, result?.message || t('已提交补充指令。'), { replyTo: entry.messageId ?? null });
@@ -4964,6 +4993,7 @@ export class FeishuHarnessBridge {
       text,
       content,
       titleText: event.batchSubmission?.title,
+      sourceGuidance: snapshot?.config?.guidance,
       contextEnhanced,
       createOptions: { signal: this.#signal },
       existsOptions: { signal: this.#signal },
@@ -5207,6 +5237,7 @@ export class FeishuHarnessBridge {
         text,
         content,
         titleText: event.batchSubmission?.title,
+        sourceGuidance: snapshot?.config?.guidance,
         contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
@@ -5287,6 +5318,7 @@ export class FeishuHarnessBridge {
             text,
             content,
             titleText: event.batchSubmission?.title,
+            sourceGuidance: snapshot?.config?.guidance,
             contextEnhanced,
             createOptions: { signal: this.#signal },
             existsOptions: { signal: this.#signal },
@@ -5358,6 +5390,7 @@ export class FeishuHarnessBridge {
         text,
         content,
         titleText: event.batchSubmission?.title,
+        sourceGuidance: snapshot?.config?.guidance,
         contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },

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

@@ -22,7 +22,11 @@ import {
   runPresetCommand,
 } from '../shared/preset-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import {
   BatchInputManager,
   batchInputBusyMessage,
@@ -759,7 +763,17 @@ export class QqHarnessBridge {
       return { message: t('当前任务仍在运行，请先停止任务或等待任务完成后再执行此操作。') };
     }
     const options = { signal: this.#signal, isDirect: message.kind === 'c2c', pendingInteraction,
-      control: { owner: this, key }, deferredDelivery: this.#deferred };
+      control: { owner: this, key }, deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        message.kind === 'c2c' ? 'direct' : 'group',
+        () => ({
+          channel: 'qq',
+          senderId: nonEmptyString(message.senderId),
+          senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : message.senderId,
+        }),
+      ) };
     // Existing runners own all Host mutations and control authorization.
     const execute = async () => {
       this.#signal?.throwIfAborted();
@@ -824,6 +838,16 @@ export class QqHarnessBridge {
         || this.#approvals.hasPending(key),
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        message.kind === 'c2c' ? 'direct' : 'group',
+        () => ({
+          channel: 'qq',
+          senderId: nonEmptyString(message.senderId),
+          senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : message.senderId,
+        }),
+      ),
     });
     if (result?.stopped) {
       await Promise.allSettled([
@@ -1046,6 +1070,7 @@ export class QqHarnessBridge {
           text,
           content,
           titleText: batchSubmission?.title,
+          sourceGuidance: snapshot?.config?.guidance,
           contextEnhanced,
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },

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

@@ -4,6 +4,23 @@ export const CONTEXT_ENHANCEMENT_FIELDS = Object.freeze([
   'chatId', 'threadId', 'botId',
 ]);
 
+/**
+ * Tag grammar of the injected context prefix. The producer here and the
+ * Host-side splitter in `injected-context.mjs` share these literals, so the
+ * prefix a channel writes can never drift from the parser that pairs it.
+ */
+export const INJECTED_CONTEXT_TAGS = Object.freeze({
+  sourceOpen: '<dsh_im_source>',
+  sourceClose: '</dsh_im_source>',
+  guidanceOpen: '<dsh_im_source_guidance>',
+  guidanceClose: '</dsh_im_source_guidance>',
+  replyOpen: '<dsh_im_reply_to>',
+  replyClose: '</dsh_im_reply_to>',
+});
+
+/** Separator the producer joins prefix blocks with, and the splitter consumes. */
+export const INJECTED_CONTEXT_SEPARATOR = '\n\n';
+
 export const CONTEXT_ENHANCEMENT_GUIDANCE_MAX_LENGTH = 8_000;
 export const CONTEXT_GROUP_GUIDANCE_EXAMPLE = `仅依据当前消息的 <dsh_im_source> 中实际提供的字段理解来源；没有提供的字段不要猜测或补全。
 当前消息来自群聊，请使用严肃、克制、简洁的表达方式。`;
@@ -138,6 +155,26 @@ export function captureContextEnhancement(provider, conversationType) {
   }
 }
 
+/**
+ * Capture the enhancement one prompt replays, together with the source factory
+ * that fills its selected fields.
+ *
+ * Ordinary messages snapshot this when they are accepted, so a queued message
+ * keeps the settings it arrived under. A control command is never queued, so it
+ * captures at the moment it runs -- and it must, because the source fields of a
+ * steering instruction belong to whoever issued it, not to the message that
+ * opened the turn.
+ *
+ * @param provider - the bot's enhancement provider.
+ * @param conversationType - the inbound message's scope.
+ * @param source - factory for the currently selected source fields.
+ * @returns the enhancement to apply, or null when the scope is off.
+ */
+export function captureContextEnhancementSource(provider, conversationType, source) {
+  const snapshot = captureContextEnhancement(provider, conversationType);
+  return snapshot === null ? null : Object.freeze({ snapshot, source });
+}
+
 function sourceString(value, field) {
   if (field === 'senderId' && (typeof value === 'bigint' || Number.isFinite(value))) {
     value = String(value);
@@ -165,7 +202,7 @@ function sourceBlock(snapshot, sourceFactory) {
   const json = JSON.stringify(projected).replace(/[<>&]/g, (character) => ({
     '<': '\\u003c', '>': '\\u003e', '&': '\\u0026',
   })[character]);
-  return `<dsh_im_source>${json}</dsh_im_source>`;
+  return `${INJECTED_CONTEXT_TAGS.sourceOpen}${json}${INJECTED_CONTEXT_TAGS.sourceClose}`;
 }
 
 function guidanceBlock(guidance) {
@@ -173,7 +210,7 @@ function guidanceBlock(guidance) {
   const body = guidance.replace(/<\/?dsh_im_source_guidance\b[^>]*(?:>|$)/gi, (tag) => (
     tag.replace(/</g, '&lt;').replace(/>/g, '&gt;')
   ));
-  return `<dsh_im_source_guidance>\n${body}\n</dsh_im_source_guidance>`;
+  return `${INJECTED_CONTEXT_TAGS.guidanceOpen}\n${body}\n${INJECTED_CONTEXT_TAGS.guidanceClose}`;
 }
 
 /** Add one text prefix; never inspect sources, format or copy content when off. */
@@ -183,7 +220,7 @@ export function enhanceContextContent(content, snapshot, sourceFactory) {
     const blocks = [sourceBlock(snapshot, sourceFactory), guidanceBlock(snapshot.config.guidance)]
       .filter(Boolean);
     if (blocks.length === 0) return content;
-    const prefix = blocks.join('\n\n');
+    const prefix = blocks.join(INJECTED_CONTEXT_SEPARATOR);
     if (typeof content === 'string') return `${prefix}\n\n${content}`;
     if (Array.isArray(content)) return [{ type: 'text', text: prefix }, ...content];
     return content;

package/src/channels/shared/control-command.mjs

@@ -1,3 +1,4 @@
+import { enhanceContextContent } from './context-enhancement.mjs';
 import { t } from './i18n.mjs';
 import manifest from '../../../package.json' with { type: 'json' };
 
@@ -41,6 +42,7 @@ export async function runControlCommand(text, harness, state, key, {
   pendingInteraction = false,
   control,
   deferredDelivery,
+  enhancement,
 } = {}) {
   if (!isControlCommand(text)) return null;
   const command = text.trim();
@@ -93,8 +95,13 @@ export async function runControlCommand(text, harness, state, key, {
   if (typeof session.steerActiveTurn !== 'function') {
     throw new TypeError('Harness session does not support steering active turns');
   }
+  // A mid-turn correction carries the same provenance as the message that
+  // opened the turn, so a group member who steers is identified too.
+  const steering = enhancement
+    ? enhanceContextContent(instruction, enhancement.snapshot, enhancement.source)
+    : instruction;
   const steered = await session.steerActiveTurn(
-    instruction,
+    steering,
     control,
     requestOptions(signal),
   );

package/src/channels/shared/harness-client.mjs

@@ -13,6 +13,7 @@ import {
   imageFileSourcesFromContent,
   isModelImageRejection,
 } from './image-prompt.mjs';
+import { imSourceGuidance } from './im-source-guidance.mjs';
 import { outboundArtifactRegistry } from './semantic/artifact.mjs';
 import { t } from './i18n.mjs';
 import { watchHarnessMux } from './harness-mux.mjs';
@@ -1508,6 +1509,12 @@ export class HarnessClient {
       if (!Array.isArray(content) || content.length === 0) {
         throw new TypeError('Harness prompt content is required');
       }
+      // Publish the guidance the channel's own captured settings produced, so
+      // the Host materializes it once per Session as prompt context instead of
+      // per user message. It is passed in and never parsed back out of
+      // `content`: the prompt also carries whatever the user typed, and a
+      // message that merely looks like a guidance block is not configuration.
+      imSourceGuidance.publish(sessionId, options.sourceGuidance);
       const clientTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
       const sendPrompt = (promptContent) => this.rpc('session.prompt', {
         sessionId,

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

@@ -16,6 +16,7 @@ export default {
 
   '钉钉未能换取图片下载地址，请重新发送；若持续失败，请检查机器人的“企业内机器人发送消息权限”。': 'DingTalk could not provide the image download address. Please resend; if it keeps failing, check the bot\'s "Send messages as an internal robot" permission.',
   '钉钉没有返回图片下载地址，请重新发送。': 'DingTalk did not return an image download address. Please resend.',
+  '钉钉未提供引用附件的下载信息，无法读取原附件。请直接重新发送附件后再提问。': 'DingTalk did not provide download information for the quoted attachment, so it cannot be read. Please resend the attachment directly with your question.',
   '钉钉返回的图片临时地址无法读取，请重新发送。': 'The temporary image address returned by DingTalk could not be read. Please resend.',
   '结果文件「{name}」发送结果未能确认，请先检查聊天内是否已收到，不要立即重试。': 'Delivery of the result file "{name}" could not be confirmed. Please check whether it already arrived in the chat before retrying.',
   '结果文件「{name}」已生成，但钉钉应用或机器人缺少文件消息权限。请开通应用 qyapi_base 权限，并确认机器人具备文件消息发送能力。': 'Result file "{name}" was generated, but the DingTalk app or bot lacks file message permission. Enable the app\'s qyapi_base permission and make sure the bot can send file messages.',

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

@@ -6,6 +6,7 @@ export default {
   '微信已连接 DeepSeek Harness。': 'WeChat is connected to DeepSeek Harness.',
   '结果文件「{name}」已生成，但微信机器人当前没有文件消息发送权限，请检查机器人文件消息能力。': 'The result file "{name}" was generated, but the WeChat bot currently has no permission to send file messages. Please check the bot\'s file messaging capability.',
   '结果文件「{name}」超过当前微信会话可发送的文件大小，未发送。': 'The result file "{name}" exceeds the file size limit of the current WeChat conversation and was not sent.',
+  '结果文件「{name}」上传微信时长时间没有进展，已超时，文件尚未发送。请检查网络后重试，或压缩、拆分文件后发送。': 'The upload of "{name}" to WeChat stalled and timed out. The file has not been sent. Check your network and retry, or compress or split the file before sending.',
   '结果文件「{name}」暂时被微信限流，未能发送，请稍后重试。': 'The result file "{name}" was temporarily rate-limited by WeChat and was not sent. Please try again later.',
   '结果文件「{name}」已生成，但微信拒绝了该文件消息。': 'The result file "{name}" was generated, but WeChat rejected the file message.',
   '结果文件「{name}」已生成，但暂时未能通过微信发送，请稍后重试。': 'The result file "{name}" was generated but could not be sent via WeChat right now. Please try again later.',
@@ -72,6 +73,7 @@ export default {
   '微信文件上传失败（HTTP {status}）。': 'The WeChat file upload failed (HTTP {status}).',
   '微信文件上传响应缺少下载参数。': 'The WeChat file upload response is missing the download parameter.',
   '微信文件上传失败。': 'The WeChat file upload failed.',
+  '微信文件上传长时间没有进展，已超时。': 'The WeChat file upload stalled and timed out.',
   '拒绝访问不受信任的微信服务地址。': 'Refusing to access an untrusted WeChat service URL.',
   '微信服务请求失败（HTTP {status}）。': 'The WeChat service request failed (HTTP {status}).',
   '微信服务返回了无法解析的响应。': 'The WeChat service returned an unparseable response.',

package/src/channels/shared/im-source-guidance.mjs

@@ -0,0 +1,65 @@
+// Session-keyed source guidance for the current conversation.
+//
+// The prompt RPC carries no message source, so a channel publishes the guidance
+// it would otherwise repeat inside every user message when it dispatches the
+// prompt. The Host materializes it once per session as dynamic prompt context
+// (`systemPrompt.context`), which appends a durable snapshot only when the
+// rendered text changes. The registry is module-level because one process owns
+// exactly one, the same shape `outboundArtifactRegistry` uses.
+
+/** Prompt-context name the Host materializes this guidance under. */
+export const IM_SOURCE_GUIDANCE_CONTEXT = 'dsh-im:source-guidance';
+
+/** Contexts are joined in ascending order; this one follows the policy facts. */
+export const IM_SOURCE_GUIDANCE_ORDER = 125;
+
+/** Bound for one session's guidance; the settings cap is the same size. */
+const GUIDANCE_MAX_LENGTH = 8_000;
+
+/** Bound on retained sessions, so an abandoned conversation cannot grow it. */
+const MAX_SESSIONS = 1_024;
+
+class ImSourceGuidanceRegistry {
+  #bySession = new Map();
+
+  /**
+   * Publish the guidance in force for one session. Empty guidance clears it, so
+   * a conversation that turns enhancement off stops contributing a snapshot.
+   * @param sessionId - the Session the prompt was dispatched to.
+   * @param guidance - the scope's guidance text, or empty when none applies.
+   */
+  publish(sessionId, guidance) {
+    if (typeof sessionId !== 'string' || !sessionId) return;
+    const text = typeof guidance === 'string' ? guidance.slice(0, GUIDANCE_MAX_LENGTH) : '';
+    // Delete first so the re-inserted key is the most recently used one.
+    this.#bySession.delete(sessionId);
+    if (!text.trim()) return;
+    this.#bySession.set(sessionId, text);
+    while (this.#bySession.size > MAX_SESSIONS) {
+      this.#bySession.delete(this.#bySession.keys().next().value);
+    }
+  }
+
+  /**
+   * @param sessionId - a Session id, or anything else.
+   * @returns the guidance in force for that session, or undefined.
+   */
+  get(sessionId) {
+    return typeof sessionId === 'string' ? this.#bySession.get(sessionId) : undefined;
+  }
+
+  /**
+   * Drop one session's guidance.
+   * @param sessionId - the Session leaving the registry.
+   */
+  forget(sessionId) {
+    if (typeof sessionId === 'string') this.#bySession.delete(sessionId);
+  }
+
+  /** @returns how many sessions currently carry guidance. */
+  get size() {
+    return this.#bySession.size;
+  }
+}
+
+export const imSourceGuidance = new ImSourceGuidanceRegistry();