@xmanrui/dsh-im 3.1.0 → 3.2.0

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

@@ -3,6 +3,7 @@ import { randomInt } from 'node:crypto';
 import { createEditableMessageStream, splitMessageText } from '../shared/editable-message-stream.mjs';
 import { createTextDeliveryBlock } from '../shared/semantic/delivery.mjs';
 import { t } from '../shared/i18n.mjs';
+import { captureContextEnhancement } from '../shared/context-enhancement.mjs';
 import { COMMANDS_MENU_BUTTON, TelegramApi } from './telegram-api.mjs';
 import { createTelegramBridgeStatus, TelegramHarnessBridge } from './telegram-bridge.mjs';
 import {
@@ -159,6 +160,11 @@ export function normalizeTelegramUpdate(update, {
   return {
     messageId: String(update.update_id),
     senderId: String(senderId),
+    contextSource: () => ({
+      senderName: [message.from?.first_name, message.from?.last_name]
+        .filter((value) => typeof value === 'string' && value.trim())
+        .map((value) => value.trim()).join(' ') || message.from?.username,
+    }),
     senderIsBot: message.from?.is_bot === true,
     kind: direct ? 'direct' : 'group',
     conversationId: messageThreadId === undefined
@@ -659,6 +665,7 @@ export class TelegramRuntime {
   #token;
   #harness;
   #state;
+  #contextEnhancement;
   #logger;
   #replyTimeoutMs;
   #createApi;
@@ -676,6 +683,7 @@ export class TelegramRuntime {
     token,
     harness,
     state,
+    contextEnhancement,
     logger = console,
     replyTimeoutMs = 600_000,
     createApi = (options) => new TelegramApi(options),
@@ -687,6 +695,7 @@ export class TelegramRuntime {
     this.#token = token;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#createApi = createApi;
@@ -758,6 +767,7 @@ export class TelegramRuntime {
         bot: client,
         harness: this.#harness,
         state: this.#state,
+        contextEnhancement: this.#contextEnhancement,
         status: this.#status,
         logger: this.#logger,
         replyTimeoutMs: this.#replyTimeoutMs,
@@ -798,7 +808,19 @@ export class TelegramRuntime {
     while (!signal.aborted) {
       const updates = await this.#api.getUpdates({ offset: cursor, timeout: 25, signal });
       this.#status.lastCheckedAt = Date.now();
-      for (const update of updates) {
+      if (signal.aborted) return;
+      // All updates have arrived together; cursor persistence must not move the
+      // settings boundary for the later messages in this received batch.
+      const received = updates.map((update) => {
+        const chatType = update?.message?.chat?.type;
+        return {
+          update,
+          contextSnapshot: captureContextEnhancement(this.#contextEnhancement,
+            chatType === 'private' ? 'direct'
+              : chatType === 'group' || chatType === 'supergroup' ? 'group' : null),
+        };
+      });
+      for (const { update, contextSnapshot } of received) {
         if (signal.aborted) return;
         const message = normalizeTelegramUpdate(update, {
           botId: this.#config.platformId,
@@ -810,7 +832,7 @@ export class TelegramRuntime {
           accessMode: this.#accessMode,
           allowedPrivateUserIds: this.#allowedPrivateUserIds,
         })) {
-          void this.#bridge.accept(message).catch((error) => {
+          void this.#bridge.accept(message, { contextSnapshot }).catch((error) => {
             if (signal.aborted) return;
             this.#logger.error?.(
               `[dsh-im:telegram] bot ${this.#config.botId} message handling failed:`,

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

@@ -27,6 +27,7 @@ import {
 } from '../shared/preset-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
+import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
 import {
   hasInboundImages,
   ImagePromptError,
@@ -488,6 +489,7 @@ export class WecomHarnessBridge {
   #client;
   #harness;
   #state;
+  #contextEnhancement;
   #status;
   #logger;
   #replyTimeoutMs;
@@ -497,7 +499,8 @@ export class WecomHarnessBridge {
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
-  #acceptedMessageIds = new Set();
+  // Keep the accepted configuration through the existing queue/reply lifecycle.
+  #acceptedMessageIds = new Map();
   #approvalTasks = new Set();
   #commandTasks = new Set();
   #approvals;
@@ -508,6 +511,7 @@ export class WecomHarnessBridge {
     client,
     harness,
     state,
+    contextEnhancement,
     status = createWecomBridgeStatus(),
     logger = console,
     replyTimeoutMs = 600_000,
@@ -525,6 +529,7 @@ export class WecomHarnessBridge {
     this.#client = client;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#status = status;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
@@ -552,7 +557,10 @@ export class WecomHarnessBridge {
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
 
     const key = conversationKey(frame);
-    this.#acceptedMessageIds.add(messageId);
+    this.#acceptedMessageIds.set(messageId, captureContextEnhancement(
+      this.#contextEnhancement,
+      body.chattype === 'single' ? 'direct' : 'group',
+    ));
     if (body.chattype === 'single') {
       rememberConnectionTestTarget(this.#state, { chatId });
     }
@@ -948,9 +956,16 @@ export class WecomHarnessBridge {
         this.#logger.warn?.('[dsh-im:wecom] unable to start a stream; using an active reply:', error);
       }
 
-      const content = hasImages
+      let content = hasImages
         ? await promptContentForMessage(message, { signal: this.#signal })
         : undefined;
+      const snapshot = this.#acceptedMessageIds.get(messageId);
+      if (snapshot) {
+        content = enhanceContextContent(content ?? text, snapshot, () => ({
+          channel: 'wecom',
+          senderId,
+        }));
+      }
       await this.#state.markSeen(messageId);
       promptRecorded = true;
       const { answer, artifacts = [] } = await askInWorkspaceSession({

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

@@ -28,6 +28,7 @@ export class WecomRuntime {
   #secret;
   #harness;
   #state;
+  #contextEnhancement;
   #logger;
   #replyTimeoutMs;
   #connectTimeoutMs;
@@ -45,6 +46,7 @@ export class WecomRuntime {
     secret,
     harness,
     state,
+    contextEnhancement,
     logger = console,
     replyTimeoutMs = 600_000,
     connectTimeoutMs = 20_000,
@@ -58,6 +60,7 @@ export class WecomRuntime {
     this.#secret = secret;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
@@ -107,6 +110,7 @@ export class WecomRuntime {
       client,
       harness: this.#harness,
       state: this.#state,
+      contextEnhancement: this.#contextEnhancement,
       status: this.#status,
       logger: this.#logger,
       replyTimeoutMs: this.#replyTimeoutMs,

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

@@ -33,6 +33,7 @@ import {
 } from '../shared/preset-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
+import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
 import {
   hasInboundImages,
   imagePromptDiagnostic,
@@ -258,6 +259,7 @@ export class WeixinHarnessBridge {
   #ownerUserId;
   #harness;
   #state;
+  #contextEnhancement;
   #status;
   #logger;
   #replyTimeoutMs;
@@ -267,7 +269,8 @@ export class WeixinHarnessBridge {
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
-  #acceptedMessageIds = new Set();
+  // Keep the accepted configuration through the existing queue/reply lifecycle.
+  #acceptedMessageIds = new Map();
   #approvalTasks = new Set();
   #commandTasks = new Set();
   #approvals;
@@ -288,6 +291,7 @@ export class WeixinHarnessBridge {
     ownerUserId,
     harness,
     state,
+    contextEnhancement,
     status = createWeixinBridgeStatus(),
     logger = console,
     replyTimeoutMs = 600_000,
@@ -307,6 +311,7 @@ export class WeixinHarnessBridge {
     this.#ownerUserId = ownerUserId;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#status = status;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
@@ -327,7 +332,10 @@ export class WeixinHarnessBridge {
     const sender = nonEmptyString(message?.from_user_id);
     if (!messageId || !sender || this.#state.hasSeen(messageId)
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
-    this.#acceptedMessageIds.add(messageId);
+    this.#acceptedMessageIds.set(messageId, captureContextEnhancement(
+      this.#contextEnhancement,
+      'direct',
+    ));
     if (sender === this.#ownerUserId) {
       rememberConnectionTestTarget(this.#state, { toUserId: sender });
     }
@@ -650,16 +658,23 @@ export class WeixinHarnessBridge {
       let artifacts = [];
       await this.#startTyping(sender, contextToken);
       try {
-        const content = hasImages
+        let content = hasImages
           ? await promptContentForMessage(promptMessage, { signal: this.#signal })
           : undefined;
+        const snapshot = this.#acceptedMessageIds.get(messageId);
+        if (snapshot) {
+          content = enhanceContextContent(content ?? text, snapshot, () => ({
+            channel: 'weixin',
+            senderId: sender,
+          }));
+        }
         await this.#state.markSeen(messageId);
         promptRecorded = true;
         ({ answer, artifacts = [] } = await askInWorkspaceSession({
           harness: this.#harness,
           state: this.#state,
           key,
-          ...(hasImages ? { content } : { text }),
+          ...(content !== undefined ? { content } : { text }),
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },
           askOptions: {

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

@@ -108,6 +108,7 @@ export class WeixinRuntime {
   #token;
   #harness;
   #state;
+  #contextEnhancement;
   #logger;
   #replyTimeoutMs;
   #maxMessageChars;
@@ -124,6 +125,7 @@ export class WeixinRuntime {
     token,
     harness,
     state,
+    contextEnhancement,
     logger = console,
     replyTimeoutMs = 600_000,
     maxMessageChars = DEFAULT_WEIXIN_MAX_MESSAGE_CHARS,
@@ -137,6 +139,7 @@ export class WeixinRuntime {
     this.#token = token;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#maxMessageChars = maxMessageChars;
@@ -178,6 +181,7 @@ export class WeixinRuntime {
         ownerUserId: this.#config.ownerUserId,
         harness: this.#harness,
         state: this.#state,
+        contextEnhancement: this.#contextEnhancement,
         status: this.#status,
         logger: this.#logger,
         replyTimeoutMs: this.#replyTimeoutMs,

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

@@ -234,6 +234,7 @@ export function normalizeWhatsappMessage(message, accountJid, {
     messageId: `${remoteJid}:${messageId}`,
     providerMessageId: messageId,
     senderId: senderJid,
+    contextSource: () => ({ senderName: message.pushName }),
     senderAlternateId: typeof senderAlternateJid === 'string' ? senderAlternateJid : '',
     senderIsBot: false,
     kind: group ? 'group' : 'direct',
@@ -536,6 +537,7 @@ export class WhatsappRuntime {
   #authDir;
   #harness;
   #state;
+  #contextEnhancement;
   #logger;
   #replyTimeoutMs;
   #connectTimeoutMs;
@@ -555,6 +557,7 @@ export class WhatsappRuntime {
     authDir,
     harness,
     state,
+    contextEnhancement,
     logger = console,
     replyTimeoutMs = 600_000,
     connectTimeoutMs = 30_000,
@@ -568,6 +571,7 @@ export class WhatsappRuntime {
     this.#authDir = authDir;
     this.#harness = harness;
     this.#state = state;
+    this.#contextEnhancement = contextEnhancement;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
@@ -673,6 +677,7 @@ export class WhatsappRuntime {
         bot: client,
         harness: this.#harness,
         state: this.#state,
+        contextEnhancement: this.#contextEnhancement,
         status: this.#status,
         logger: this.#logger,
         replyTimeoutMs: this.#replyTimeoutMs,