@xmanrui/dsh-im 0.7.1 → 0.8.0

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

@@ -1,5 +1,6 @@
 import { runWorkspaceCommand } from './workspace-command.mjs';
 import { askInWorkspaceSession } from './workspace-session.mjs';
+import { HarnessApprovalQueue } from './harness-approval.mjs';
 import {
   harnessAnswerForQuestion,
   harnessQuestionText,
@@ -43,6 +44,8 @@ export class TextHarnessBridge {
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #acceptedMessageIds = new Set();
+  #approvalTasks = new Set();
+  #approvals;
 
   constructor({
     descriptor,
@@ -65,6 +68,10 @@ export class TextHarnessBridge {
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
+    this.#approvals = new HarnessApprovalQueue({
+      label: descriptor.key,
+      logger,
+    });
   }
 
   get status() {
@@ -86,6 +93,35 @@ export class TextHarnessBridge {
 
     const key = `${kind}:${conversationId}`;
     const pending = this.#pendingInteractions.get(key);
+    const approval = this.#approvals.claimReply({
+      key,
+      actor: senderId,
+      messageId,
+      text: normalized.content,
+      addressed: normalized.kind !== 'group' || normalized.addressed === true,
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: (text) => this.#bot.sendText(normalized.replyTarget, text),
+    });
+    if (approval) {
+      let task;
+      task = approval.process(async () => {
+          if (this.#state.hasSeen(messageId)) return false;
+          await this.#state.markSeen(messageId);
+          this.#status.messagesReceived += 1;
+          this.#status.lastMessageAt = new Date().toISOString();
+          return true;
+        })
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#approvalTasks.delete(task);
+        });
+      this.#approvalTasks.add(task);
+      return task;
+    }
     if (pending && pending.actor !== senderId) {
       return this.#enqueueMessage(normalized, messageId, senderId, key);
     }
@@ -147,6 +183,7 @@ export class TextHarnessBridge {
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
         pending.queue ? [pending.queue] : []
       )),
+      ...this.#approvalTasks,
     ]);
   }
 
@@ -184,7 +221,7 @@ export class TextHarnessBridge {
           '/workspace 工作区绝对路径  切换工作区',
           '/workspacelist  列出工作区绝对路径',
           '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-          '/session Session ID  将当前聊天绑定到指定会话',
+          '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
           '/status  检查连接状态',
           '/help  显示本帮助',
         ].join('\n'));
@@ -276,7 +313,10 @@ export class TextHarnessBridge {
         );
       }
     } finally {
-      await this.#cancelPendingInteraction(conversationKey);
+      await Promise.allSettled([
+        this.#cancelPendingInteraction(conversationKey),
+        this.#approvals.closeRoute(conversationKey),
+      ]);
     }
   }
 
@@ -434,8 +474,14 @@ export class TextHarnessBridge {
     target,
     requiresMention,
   }) {
-    // Approval remains deliberately unanswered until #5 supplies a policy that
-    // can prove both the actor and the conversation allowed to decide it.
+    if (interaction?.kind === 'approval') {
+      return this.#approvals.handleRequested(interaction, {
+        key,
+        actor,
+        requiresMention,
+        send: (text) => this.#bot.sendText(target, text),
+      });
+    }
     if (interaction?.kind !== 'question') return;
     const questions = interaction?.payload?.questions;
     const interactionId = cleanText(interaction?.interactionId) || cleanText(interaction?.rpcId);
@@ -510,7 +556,11 @@ export class TextHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  async #handleInteractionResolved(resolution) {
+    if (resolution?.kind === 'approval') {
+      await this.#approvals.handleResolved(resolution);
+      return;
+    }
     const interactionId = cleanText(resolution?.interactionId);
     if (resolution?.kind !== 'question' || !interactionId) return;
     const key = this.#interactionKeys.get(interactionId);

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

@@ -13,7 +13,7 @@ const MAX_COMMAND_MESSAGE_LENGTH = 1_800;
 const MAX_SESSION_ID_LENGTH = 256;
 const UNSAFE_DISPLAY_TEXT = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u;
 const UNSAFE_DISPLAY_TEXT_GLOBAL = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
-const SESSION_BIND_USAGE = '用法：/session Session ID';
+const SESSION_BIND_USAGE = '用法：/session Session ID 或当前工作区序号（/session N）';
 const SESSION_LIST_USAGE = [
   '用法：',
   '/sessionlist  列出当前工作区会话',
@@ -175,14 +175,35 @@ async function resolveSessionListWorkspace(selector, harness) {
   return selected;
 }
 
-function sessionListMessage(workspace, sessions) {
+function formatSessionRelativeTime(value) {
+  const ms = typeof value === 'number' && Number.isFinite(value) ? value : null;
+  if (ms === null) return '';
+  const date = new Date(ms);
+  if (Number.isNaN(date.getTime())) return '';
+  const pad = (n) => String(n).padStart(2, '0');
+  const hm = `${pad(date.getHours())}:${pad(date.getMinutes())}`;
+  const startOfDay = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+  const now = new Date();
+  const dayDiff = Math.round((startOfDay(now) - startOfDay(date)) / 86_400_000);
+  if (dayDiff === 0) return `今天 ${hm}`;
+  if (dayDiff === 1) return `昨天 ${hm}`;
+  if (dayDiff === 2) return `前天 ${hm}`;
+  if (date.getFullYear() === now.getFullYear()) {
+    return `${date.getMonth() + 1}月${date.getDate()}日 ${hm}`;
+  }
+  return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
+}
+
+function sessionListMessage(workspace, sessions, { currentWorkspace = false } = {}) {
   const rows = sessions.map((session) => {
     const sessionId = safeDisplayText(session?.sessionId);
     if (!sessionId) throw new TypeError('Harness returned an invalid session id');
     const title = session?.summaryAvailable === false
       ? '标题暂不可用'
       : safeDisplayText(session?.title) || '暂无标题';
-    return `${title}${session?.archived === true ? '（已归档）' : ''}\n   ID: ${sessionId}`;
+    const timeText = formatSessionRelativeTime(session?.time);
+    const annotation = `${timeText ? ` · ${timeText}` : ''}${session?.archived === true ? '（已归档）' : ''}`;
+    return `${title}${annotation}\n   ID: ${sessionId}`;
   });
   if (rows.length === 0) return `工作区：${workspace}\n该工作区暂无会话。`;
   return [
@@ -191,10 +212,19 @@ function sessionListMessage(workspace, sessions) {
     '',
     ...rows.map((row, index) => `${index + 1}. ${row}`),
     '',
-    '绑定用法：/session Session ID',
+    currentWorkspace
+      ? '绑定用法：/session Session ID 或当前工作区序号（/session N）'
+      : '绑定用法：/session Session ID\n提示：/session N 只按机器人当前工作区的序号绑定。',
   ].join('\n');
 }
 
+async function currentSessionListWorkspace(harness) {
+  if (typeof harness?.currentWorkspace !== 'function') return null;
+  const [current] = await existingWorkspacePaths([harness.currentWorkspace()]);
+  harness.assertWorkspaceScope?.();
+  return current ?? null;
+}
+
 async function runSessionListCommand(match, harness) {
   if (typeof harness?.listWorkspaceSessions !== 'function') {
     return commandResult('当前机器人暂不支持列出工作区会话。');
@@ -209,7 +239,10 @@ async function runSessionListCommand(match, harness) {
     }
     harness.assertWorkspaceScope?.();
     const workspace = normalizedWorkspacePath(listed.workspace) ?? resolved.workspace;
-    const message = sessionListMessage(workspace, listed.sessions);
+    const currentWorkspace = await currentSessionListWorkspace(harness);
+    const message = sessionListMessage(workspace, listed.sessions, {
+      currentWorkspace: workspace === currentWorkspace,
+    });
     return commandResult(message, splitWorkspaceCommandMessage(message));
   } catch (error) {
     if (error?.code === 'workspace-bot-not-found') {
@@ -247,7 +280,38 @@ function sessionBindErrorMessage(error) {
 
 async function runSessionBindCommand(command, harness, conversationKey) {
   const match = SESSION_BIND_COMMAND.exec(command);
-  const sessionId = match?.[1];
+  let sessionId = match?.[1];
+  if (typeof sessionId === 'string' && /^\d+$/u.test(sessionId)) {
+    // 序号模式：把 /session N 解析成当前工作区会话列表中的第 N 个会话
+    if (typeof harness?.listWorkspaceSessions !== 'function'
+      || typeof harness?.currentWorkspace !== 'function') {
+      return commandResult('当前机器人暂不支持按序号绑定，请使用 /session Session ID。');
+    }
+    try {
+      const selected = await selectedWorkspacePath(harness.currentWorkspace());
+      if (selected.error) return commandResult(selected.error);
+      const listed = await harness.listWorkspaceSessions(selected.workspace);
+      if (!listed || !Array.isArray(listed.sessions)) {
+        throw new TypeError('Harness returned an invalid workspace session list');
+      }
+      harness.assertWorkspaceScope?.();
+      const position = Number(sessionId);
+      if (!Number.isSafeInteger(position) || position < 1
+        || position > listed.sessions.length) {
+        return commandResult('会话序号不存在，请先执行 /sessionlist 查看序号。');
+      }
+      const selectedSessionId = listed.sessions[position - 1]?.sessionId;
+      if (!validSessionId(selectedSessionId)) {
+        throw new TypeError('Harness returned an invalid session id');
+      }
+      sessionId = selectedSessionId;
+    } catch (error) {
+      if (error?.code === 'workspace-bot-not-found') {
+        return commandResult(sessionBindErrorMessage(error));
+      }
+      return commandResult('暂时无法获取会话列表，请稍后重试。');
+    }
+  }
   if (!validSessionId(sessionId)) return commandResult(SESSION_BIND_USAGE);
   if (typeof harness?.bindWorkspaceSession !== 'function') {
     return commandResult('当前机器人暂不支持绑定已有会话。');

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

@@ -4,6 +4,7 @@ import {
   harnessQuestionText,
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
+import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -15,7 +16,7 @@ const HELP_TEXT = [
   '/workspace 工作区绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-  '/session Session ID  将当前聊天绑定到指定会话',
+  '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -114,6 +115,8 @@ export class WecomHarnessBridge {
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #acceptedMessageIds = new Set();
+  #approvalTasks = new Set();
+  #approvals;
 
   constructor({
     client,
@@ -137,6 +140,7 @@ export class WecomHarnessBridge {
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#generateReqId = generateStreamId;
     this.#signal = signal;
+    this.#approvals = new HarnessApprovalQueue({ label: 'wecom', logger });
   }
 
   get status() {
@@ -159,6 +163,35 @@ export class WecomHarnessBridge {
     const key = conversationKey(frame);
     this.#acceptedMessageIds.add(messageId);
     const pending = this.#pendingInteractions.get(key);
+    const approval = this.#approvals.claimReply({
+      key,
+      actor: senderId,
+      messageId,
+      text: messageText(frame),
+      addressed: true,
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: (text) => this.#sendImmediate(frame, chatId, text),
+    });
+    if (approval) {
+      let task;
+      task = approval.process(async () => {
+          if (this.#state.hasSeen(messageId)) return false;
+          await this.#state.markSeen(messageId);
+          this.#status.messagesReceived += 1;
+          this.#status.lastMessageAt = new Date().toISOString();
+          return true;
+        })
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#approvalTasks.delete(task);
+        });
+      this.#approvalTasks.add(task);
+      return task;
+    }
     if (pending && pending.actor !== senderId) {
       return this.#enqueueMessage(frame, messageId, key);
     }
@@ -215,6 +248,7 @@ export class WecomHarnessBridge {
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
         pending.queue ? [pending.queue] : []
       )),
+      ...this.#approvalTasks,
     ]);
   }
 
@@ -355,7 +389,10 @@ export class WecomHarnessBridge {
         this.#logger.error?.('[dsh-im:wecom] failed to send the safe error reply');
       }
     } finally {
-      await this.#cancelPendingInteraction(key);
+      await Promise.allSettled([
+        this.#cancelPendingInteraction(key),
+        this.#approvals.closeRoute(key),
+      ]);
     }
   }
 
@@ -481,7 +518,14 @@ export class WecomHarnessBridge {
     chatId,
     requiresMention,
   }) {
-    // Approval remains unanswered until #5 supplies an authenticated policy.
+    if (interaction?.kind === 'approval') {
+      return this.#approvals.handleRequested(interaction, {
+        key,
+        actor,
+        requiresMention,
+        send: (text) => this.#sendActive(chatId, text),
+      });
+    }
     if (interaction?.kind !== 'question') return;
     const questions = interaction?.payload?.questions;
     const interactionId = typeof interaction?.interactionId === 'string'
@@ -555,7 +599,11 @@ export class WecomHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  async #handleInteractionResolved(resolution) {
+    if (resolution?.kind === 'approval') {
+      await this.#approvals.handleResolved(resolution);
+      return;
+    }
     const interactionId = resolution?.interactionId;
     if (resolution?.kind !== 'question' || typeof interactionId !== 'string') return;
     const key = this.#interactionKeys.get(interactionId);

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

@@ -92,7 +92,7 @@ function authenticatedHeaders(token) {
 function baseInfo() {
   return {
     channel_version: WEIXIN_PROTOCOL_VERSION,
-    bot_agent: 'DeepSeekHarness/0.7.1',
+    bot_agent: 'DeepSeekHarness/0.8.0',
   };
 }
 

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

@@ -8,6 +8,7 @@ import {
   harnessQuestionText,
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
+import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -21,7 +22,7 @@ const HELP_TEXT = [
   '/workspace 工作区绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
-  '/session Session ID  将当前聊天绑定到指定会话',
+  '/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话',
   '/status  检查连接状态',
   '/help  显示本帮助',
 ].join('\n');
@@ -68,6 +69,8 @@ export class WeixinHarnessBridge {
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #acceptedMessageIds = new Set();
+  #approvalTasks = new Set();
+  #approvals;
 
   constructor({
     api,
@@ -96,6 +99,7 @@ export class WeixinHarnessBridge {
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#maxMessageChars = maxMessageChars;
     this.#signal = signal;
+    this.#approvals = new HarnessApprovalQueue({ label: 'weixin', logger });
   }
 
   get status() {
@@ -111,7 +115,38 @@ export class WeixinHarnessBridge {
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
     this.#acceptedMessageIds.add(messageId);
     const key = conversationKey(sender);
+    const contextToken = nonEmptyString(message?.context_token) ?? undefined;
+    const runId = nonEmptyString(message?.run_id) ?? undefined;
     const pending = this.#pendingInteractions.get(key);
+    const approval = this.#approvals.claimReply({
+      key,
+      actor: sender,
+      messageId,
+      text: extractWeixinText(message),
+      addressed: true,
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: (text) => this.#send(sender, text, contextToken, runId),
+    });
+    if (approval) {
+      let task;
+      task = approval.process(async () => {
+          if (this.#state.hasSeen(messageId)) return false;
+          await this.#state.markSeen(messageId);
+          this.#status.messagesReceived += 1;
+          this.#status.lastMessageAt = new Date().toISOString();
+          return true;
+        })
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#approvalTasks.delete(task);
+        });
+      this.#approvalTasks.add(task);
+      return task;
+    }
     if (pending?.submitting || pending?.claimedReplyMessageId) {
       return this.#enqueueMessage(message, messageId, key);
     }
@@ -157,6 +192,7 @@ export class WeixinHarnessBridge {
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
         pending.queue ? [pending.queue] : []
       )),
+      ...this.#approvalTasks,
     ]);
   }
 
@@ -235,7 +271,10 @@ export class WeixinHarnessBridge {
           },
         }));
       } finally {
-        await this.#cancelPendingInteraction(key);
+        await Promise.allSettled([
+          this.#cancelPendingInteraction(key),
+          this.#approvals.closeRoute(key),
+        ]);
       }
       await this.#send(sender, answer, contextToken, runId);
       await this.#state.markSeen(messageId);
@@ -391,7 +430,13 @@ export class WeixinHarnessBridge {
     contextToken,
     runId,
   }) {
-    // Approval remains fail-closed until #5 adds an authenticated policy.
+    if (interaction?.kind === 'approval') {
+      return this.#approvals.handleRequested(interaction, {
+        key,
+        actor,
+        send: (text) => this.#send(actor, text, contextToken, runId),
+      });
+    }
     if (interaction?.kind !== 'question') return;
     const questions = interaction?.payload?.questions;
     const interactionId = typeof interaction?.interactionId === 'string'
@@ -466,7 +511,11 @@ export class WeixinHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  async #handleInteractionResolved(resolution) {
+    if (resolution?.kind === 'approval') {
+      await this.#approvals.handleResolved(resolution);
+      return;
+    }
     const interactionId = resolution?.interactionId;
     if (resolution?.kind !== 'question' || typeof interactionId !== 'string') return;
     const key = this.#interactionKeys.get(interactionId);