@xmanrui/dsh-im 4.7.0 → 4.9.0

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

@@ -245,6 +245,10 @@ export class HarnessApprovalQueue {
       await this.#rejectInteraction(interaction, payload);
       return true;
     }
+    // Optional channel-provided renderer. When present, the approval is shown
+    // as an interactive card (e.g. Feishu approve/reject buttons) instead of
+    // plain text. Channels that don't provide one keep the text-reply path.
+    const render = typeof context?.render === 'function' ? context.render : null;
 
     const text = harnessApprovalText(payload, {
       toolCall: interaction.toolCall,
@@ -267,6 +271,7 @@ export class HarnessApprovalQueue {
       actor,
       requiresMention: context.requiresMention === true,
       send,
+      render,
       text,
       presented: false,
       presentationTask: null,
@@ -287,6 +292,20 @@ export class HarnessApprovalQueue {
     return true;
   }
 
+  /**
+   * Submit an approval decision by id, as triggered by a channel card button
+   * (e.g. Feishu approve/reject). Returns false when no matching pending
+   * approval is found. Callers may pass the acting user to enforce that only
+   * the originating actor can decide.
+   */
+  async submitByApprovalId(approvalId, outcome, { actor } = {}) {
+    const pending = this.#byId.get(cleanText(approvalId));
+    if (!pending || pending.inactive || pending.resolving || pending.submitting) return false;
+    if (actor !== undefined && pending.actor !== actor) return false;
+    await this.#submit(pending, outcome);
+    return true;
+  }
+
   async handleResolved(resolution) {
     if (resolution?.kind !== 'approval') return false;
     const pending = this.#byId.get(cleanText(resolution.interactionId));
@@ -353,7 +372,11 @@ export class HarnessApprovalQueue {
     if (this.#routes.get(pending.key)?.items[0] !== pending
       || pending.inactive || pending.resolving || pending.presented) return;
     if (pending.presentationTask) return pending.presentationTask;
-    const task = Promise.resolve().then(() => pending.send(pending.text));
+    // A channel-provided renderer shows the approval as an interactive card
+    // (e.g. approve/reject buttons); otherwise fall back to plain text.
+    const task = pending.render
+      ? Promise.resolve().then(() => pending.render(pending, pending.send))
+      : Promise.resolve().then(() => pending.send(pending.text));
     pending.presentationTask = task;
     try {
       await task;

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

@@ -434,6 +434,11 @@ export class HarnessReplyTracker {
     return this.#finished;
   }
 
+  /** The highest event seq consumed so far; advances as the turn produces events. */
+  get lastSeq() {
+    return this.#lastSeq;
+  }
+
   get answer() {
     return this.#latestText.trim();
   }
@@ -1435,8 +1440,14 @@ export class HarnessClient {
       promptAccepted = true;
 
       try {
-        const deadline = Date.now() + timeoutMs;
-        while (Date.now() < deadline) {
+        // Treat timeoutMs as a stall window rather than a hard runtime limit.
+        // Durable events are direct progress. Once a full quiet window elapses,
+        // confirm the Session is still running before renewing the wait.
+        // Interaction ownership is intentionally not a liveness signal: it stays
+        // active until turn/end and can therefore outlive a stalled turn.
+        let lastProgressAt = Date.now();
+        let lastPollSeq = tracker.lastSeq;
+        while (true) {
           await sleep(300, signal);
           const history = await this.rpc(
             'session.history',
@@ -1450,6 +1461,9 @@ export class HarnessClient {
             if (!wasActive && ownership.active) ownership.reconnect?.();
           }
           const updates = tracker.consumeAll(history.events ?? []);
+          const seqAdvanced = tracker.lastSeq > lastPollSeq;
+          lastPollSeq = tracker.lastSeq;
+          if (seqAdvanced) lastProgressAt = Date.now();
           if (onUpdate) {
             const visibleUpdates = progressMode === 'all' ? updates : updates.slice(-1);
             for (const update of visibleUpdates) {
@@ -1460,24 +1474,39 @@ export class HarnessClient {
               }
             }
           }
-          if (!tracker.finished) continue;
-          turnFinished = true;
-          if (!ownership?.stopRequested && !harnessTurnSucceeded(tracker.reason)) {
+          if (tracker.finished) {
+            turnFinished = true;
+            if (!ownership?.stopRequested && !harnessTurnSucceeded(tracker.reason)) {
+              throw harnessTurnError(tracker.reason);
+            }
+            // An accepted /stop revokes attachment delivery even when Harness
+            // preserved a useful partial text answer for the existing UX.
+            const artifactCount = ownership?.stopRequested
+              ? 0
+              : await deliverArtifacts();
+            if (tracker.answer) {
+              return tracker.answer;
+            }
+            if (artifactCount > 0) return '';
+            if (ownership?.stopRequested) throw turnStoppedError();
             throw harnessTurnError(tracker.reason);
           }
-          // An accepted /stop revokes attachment delivery even when Harness
-          // preserved a useful partial text answer for the existing UX.
-          const artifactCount = ownership?.stopRequested
-            ? 0
-            : await deliverArtifacts();
-          if (tracker.answer) {
-            return tracker.answer;
+
+          if (Date.now() - lastProgressAt < timeoutMs) continue;
+
+          let running = false;
+          try {
+            running = await this.isSessionRunning(sessionId, { signal });
+          } catch (error) {
+            if (signal?.aborted) throw signal.reason ?? error;
+            // A failed liveness probe is not evidence of progress.
+          }
+          if (running) {
+            lastProgressAt = Date.now();
+            continue;
           }
-          if (artifactCount > 0) return '';
-          if (ownership?.stopRequested) throw turnStoppedError();
-          throw harnessTurnError(tracker.reason);
+          throw new HarnessTurnError('harness-reply-timeout');
         }
-        throw new HarnessTurnError('harness-reply-timeout');
       } catch (error) {
         // Once cancellation was accepted, transport/poll failures and timeouts
         // describe the convergence of that stop, not an unrelated ask failure.

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

@@ -356,4 +356,15 @@ export default {
     '⚠️ Repair verification failed: the dedicated test card could not be sent, so card.action.trigger cannot be confirmed restored. Do not authorize again; check the bot message permission and connection status first.',
   '⚠️ 修复验证中断：Runtime 已停止，未完成 card.action.trigger 实测，不能确认修复成功。请不要重复授权；先等待机器人恢复连接。':
     '⚠️ Repair verification interrupted: the Runtime stopped before the card.action.trigger test completed, so the repair cannot be confirmed. Do not authorize again; wait for the bot to reconnect.',
+
+  // feishu/bridge.mjs — interaction cards (approve/reject / answer buttons)
+  '该审批已处理或不存在，无需重复操作。':
+    'This approval has already been processed or does not exist; no need to repeat the action.',
+  // feishu/feishu-cards.mjs — approval card
+  '操作参数：\n{operation}': 'Operation parameters:\n{operation}',
+  '✅ 批准': '✅ Approve',
+  '❌ 拒绝': '❌ Reject',
+  '🔐 工具审批': '🔐 Tool approval',
+  // feishu/feishu-cards.mjs — question card
+  '❓ 请补充信息{progress}': '❓ Please provide more information{progress}',
 };

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

@@ -123,6 +123,7 @@ export default {
   '/workspace 工作区序号或绝对路径  切换工作区':
     '/workspace <workspace index or absolute path>  Switch workspace',
   '/workspacelist  列出工作区绝对路径': '/workspacelist  List absolute workspace paths',
+  '/ws、/wsl、/workspaces  工作区命令别名': '/ws, /wsl, /workspaces  Workspace command aliases',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题':
     '/sessionlist [workspace index or absolute path]  List session IDs and titles',
   '/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题':

package/src/channels/shared/semantic/reply-reference.mjs

@@ -2,7 +2,6 @@ import { promptContentForMessage } from '../image-prompt.mjs';
 
 const REPLY_CONTENT_MAX_CODE_POINTS = 8_000;
 const REPLY_ATTACHMENTS_MAX = 20;
-const REPLY_ID_MAX_CODE_POINTS = 512;
 const REPLY_AUTHOR_NAME_MAX_CODE_POINTS = 256;
 const REPLY_ATTACHMENT_NAME_MAX_CODE_POINTS = 255;
 
@@ -105,8 +104,6 @@ async function resolveReference(reference, signal) {
 }
 
 function normalizeReference(reference) {
-  const messageId = cleanString(reference.messageId, REPLY_ID_MAX_CODE_POINTS);
-  const authorId = cleanString(reference.authorId, REPLY_ID_MAX_CODE_POINTS);
   const authorName = cleanString(reference.authorName, REPLY_AUTHOR_NAME_MAX_CODE_POINTS);
   const content = cleanString(reference.content, REPLY_CONTENT_MAX_CODE_POINTS, { multiline: true });
   const { attachments, truncated: attachmentsTruncated } = cleanAttachments(reference.attachments);
@@ -114,19 +111,16 @@ function normalizeReference(reference) {
   if (!content.value && attachments.length === 0 && !unavailableReason) {
     unavailableReason = 'not-delivered';
   }
+  const truncated = authorName.truncated
+    || content.truncated
+    || attachmentsTruncated;
   return {
     note: REPLY_NOTE,
-    ...(messageId.value ? { messageId: messageId.value } : {}),
-    ...(authorId.value ? { authorId: authorId.value } : {}),
     ...(authorName.value ? { authorName: authorName.value } : {}),
     ...(content.value ? { content: content.value } : {}),
-    attachments,
+    ...(attachments.length > 0 ? { attachments } : {}),
     ...(unavailableReason ? { unavailableReason } : {}),
-    truncated: messageId.truncated
-      || authorId.truncated
-      || authorName.truncated
-      || content.truncated
-      || attachmentsTruncated,
+    ...(truncated ? { truncated: true } : {}),
   };
 }
 

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

@@ -596,6 +596,7 @@ export class TextHarnessBridge {
           t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
           t('/workspace 工作区序号或绝对路径  切换工作区'),
           t('/workspacelist  列出工作区绝对路径'),
+          t('/ws、/wsl、/workspaces  工作区命令别名'),
           t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
           t('/sessionlist --limit N  仅列出当前工作区前 N 个会话'),
           t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -683,11 +684,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/shared/workspace-command.mjs

@@ -4,8 +4,8 @@ import { isAbsolute, resolve } from 'node:path';
 import { t } from './i18n.mjs';
 import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
 
-const WORKSPACE_COMMAND = /^\/workspace(?:\s+([\s\S]+))?$/i;
-const WORKSPACE_LIST_COMMAND = /^\/workspacelist(?:\s+([\s\S]+))?$/i;
+const WORKSPACE_COMMAND = /^\/(?:workspace|ws)(?:\s+([\s\S]+))?$/i;
+const WORKSPACE_LIST_COMMAND = /^\/(?:workspacelist|workspaces|wsl)(?:\s+([\s\S]+))?$/i;
 const SESSION_LIST_COMMAND = /^\/(?:sessionlist|sessions)(?:\s+([\s\S]+))?$/i;
 const SESSION_BIND_PREFIX = /^\/session(?=$|\s)/i;
 const SESSION_BIND_COMMAND = /^\/session[ \t]+([^\s]+)$/i;

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

@@ -21,7 +21,10 @@ export const TELEGRAM_COMMAND_MENU = Object.freeze([
   { command: 'new', description: '开启一个全新会话' },
   { command: 'compact', description: '压缩当前会话的较早上下文' },
   { command: 'workspace', description: '切换工作区' },
+  { command: 'ws', description: '切换工作区' },
   { command: 'workspacelist', description: '列出工作区绝对路径' },
+  { command: 'workspaces', description: '列出工作区绝对路径' },
+  { command: 'wsl', description: '列出工作区绝对路径' },
   { command: 'sessionlist', description: '列出会话 ID 和标题' },
   { command: 'sessions', description: '列出会话 ID 和标题' },
   { command: 'session', description: '将当前聊天绑定到指定会话' },
@@ -139,11 +142,10 @@ function telegramFileSource(message, loadFile) {
   };
 }
 
-function telegramReplyAttachment(kind, file, fallbackName) {
+function telegramReplyAttachment(kind, file) {
   if (!file || typeof file !== 'object') return null;
   const name = typeof file.file_name === 'string' && file.file_name
-    ? file.file_name : typeof fallbackName === 'string' && fallbackName
-      ? fallbackName : undefined;
+    ? file.file_name : undefined;
   return { kind, ...(name ? { name } : {}) };
 }
 
@@ -153,11 +155,7 @@ function telegramReplyAttachments(message) {
     const largest = message.photo.reduce((best, candidate) => (
       photoScore(candidate) > photoScore(best) ? candidate : best
     ));
-    attachments.push(telegramReplyAttachment(
-      'image',
-      largest,
-      `${largest.file_unique_id ?? largest.file_id ?? 'telegram-photo'}.jpg`,
-    ));
+    attachments.push(telegramReplyAttachment('image', largest));
   } else if (message?.document) {
     attachments.push(telegramReplyAttachment(
       imageTypeForDocument(message.document) ? 'image' : 'file',
@@ -177,7 +175,6 @@ function telegramReplyAttachments(message) {
     attachments.push(telegramReplyAttachment(
       message.sticker.is_video === true ? 'video' : 'image',
       message.sticker,
-      message.sticker.file_unique_id ?? message.sticker.file_id,
     ));
   }
   return attachments.filter(Boolean);
@@ -266,6 +263,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

@@ -73,6 +73,7 @@ function helpText() {
     t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
     t('/workspace 工作区序号或绝对路径  切换工作区'),
     t('/workspacelist  列出工作区绝对路径'),
+    t('/ws、/wsl、/workspaces  工作区命令别名'),
     t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
     t('/sessionlist --limit N  仅列出当前工作区前 N 个会话'),
     t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -1056,6 +1057,7 @@ export class WecomHarnessBridge {
         content = enhanceContextContent(originalContent, snapshot, () => ({
           channel: 'wecom',
           senderId,
+          chatId,
         }));
         contextEnhanced = content !== originalContent;
       }

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

@@ -87,6 +87,7 @@ const HELP_TEXT = () => [
   t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
   t('/workspace 工作区序号或绝对路径  切换工作区'),
   t('/workspacelist  列出工作区绝对路径'),
+  t('/ws、/wsl、/workspaces  工作区命令别名'),
   t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
   t('/sessionlist --limit N  仅列出当前工作区前 N 个会话'),
   t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -786,6 +787,7 @@ export class WeixinHarnessBridge {
           content = enhanceContextContent(originalContent, snapshot, () => ({
             channel: 'weixin',
             senderId: sender,
+            chatId: sender,
           }));
           contextEnhanced = content !== originalContent;
         }