@xmanrui/dsh-im 4.3.0 → 4.5.0

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

@@ -1,4 +1,8 @@
 import { t } from './i18n.mjs';
+import {
+  COMMAND_PERMISSION_DENIED_MESSAGE,
+  evaluateInboundAccess,
+} from './inbound-access.mjs';
 import { captureContextEnhancement, enhanceContextContent } from './context-enhancement.mjs';
 import { runWorkspaceCommand } from './workspace-command.mjs';
 import { runCompactCommand } from './compact-command.mjs';
@@ -129,6 +133,7 @@ export class TextHarnessBridge {
   #harness;
   #state;
   #contextEnhancement;
+  #accessPolicy;
   #status;
   #logger;
   #replyTimeoutMs;
@@ -149,6 +154,7 @@ export class TextHarnessBridge {
     harness,
     state,
     contextEnhancement,
+    accessPolicy,
     status = createTextBridgeStatus(),
     logger = console,
     replyTimeoutMs = 600_000,
@@ -162,6 +168,7 @@ export class TextHarnessBridge {
     this.#harness = harness;
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
+    this.#accessPolicy = accessPolicy;
     this.#status = status;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
@@ -176,7 +183,7 @@ export class TextHarnessBridge {
     return structuredClone(this.#status);
   }
 
-  accept(message, { contextSnapshot } = {}) {
+  accept(message, { contextSnapshot, accessDecision } = {}) {
     if (this.#signal?.aborted) return Promise.resolve();
     const conversationId = cleanText(message?.conversationId);
     const kind = message?.kind === 'group' ? 'group' : 'direct';
@@ -187,6 +194,40 @@ export class TextHarnessBridge {
       || this.#state.hasSeen(messageId) || this.#acceptedMessageIds.has(messageId)) {
       return Promise.resolve();
     }
+    // Preserve the channel trigger boundary. Access policy never turns an
+    // unaddressed group message into a denial reply.
+    if (kind === 'group' && normalized.addressed !== true) {
+      this.#status.messagesRejected += 1;
+      this.#status.lastRejectedAt = new Date().toISOString();
+      this.#acceptedMessageIds.set(messageId, null);
+      return this.#finishLocalMessage(normalized, messageId, null);
+    }
+    if (this.#accessPolicy || accessDecision) {
+      const hasImages = hasInboundImages(normalized);
+      const hasFiles = hasInboundFiles(normalized);
+      const decision = accessDecision ?? evaluateInboundAccess(this.#accessPolicy, {
+        conversationType: kind,
+        senderIds: [senderId, cleanText(normalized.senderAlternateId)].filter(Boolean),
+        text: normalized.content,
+        hasImages,
+        hasFiles,
+      });
+      if (!decision.allowed) {
+        this.#status.messagesRejected += 1;
+        this.#status.lastRejectedAt = new Date().toISOString();
+        // Mark policy denials so a webhook replay cannot repeat local work or
+        // a command-permission notice.
+        this.#acceptedMessageIds.set(messageId, null);
+        return this.#finishLocalMessage(
+          normalized,
+          messageId,
+          decision.reason === 'command-not-allowed'
+            ? t(COMMAND_PERMISSION_DENIED_MESSAGE)
+            : null,
+          { recordReceived: decision.reason === 'command-not-allowed' },
+        );
+      }
+    }
     this.#acceptedMessageIds.set(messageId, contextSnapshot === undefined
       ? captureContextEnhancement(this.#contextEnhancement, message?.kind)
       : contextSnapshot);
@@ -350,13 +391,15 @@ export class TextHarnessBridge {
     return this.#enqueueMessage(normalized, messageId, senderId, key);
   }
 
-  #finishLocalMessage(message, messageId, reply) {
+  #finishLocalMessage(message, messageId, reply, { recordReceived = true } = {}) {
     let task;
     task = (async () => {
       if (this.#state.hasSeen(messageId)) return;
       await this.#state.markSeen(messageId);
-      this.#status.messagesReceived += 1;
-      this.#status.lastMessageAt = new Date().toISOString();
+      if (recordReceived) {
+        this.#status.messagesReceived += 1;
+        this.#status.lastMessageAt = new Date().toISOString();
+      }
       if (reply) await this.#bot.sendText(message.replyTarget, reply);
       this.#status.lastError = null;
     })().catch(async (error) => {
@@ -545,7 +588,7 @@ export class TextHarnessBridge {
           t('/new  开启一个全新会话'),
           t('/compact  压缩当前会话的较早上下文'),
           t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
-          t('/workspace 工作区绝对路径  切换工作区'),
+          t('/workspace 工作区序号或绝对路径  切换工作区'),
           t('/workspacelist  列出工作区绝对路径'),
           t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
           t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -630,12 +673,16 @@ export class TextHarnessBridge {
         ? await promptContentForMessage(message, { signal: this.#signal })
         : undefined;
       const snapshot = this.#acceptedMessageIds.get(messageId);
+      let contextEnhanced = false;
       if (snapshot) {
-        content = enhanceContextContent(content ?? text, snapshot, () => ({
+        const originalContent = content ?? text;
+        content = enhanceContextContent(originalContent, snapshot, () => ({
           channel: this.#descriptor.key,
           senderId,
           senderName: message.contextSource?.()?.senderName,
+          conversationTitle: message.contextSource?.()?.conversationTitle,
         }));
+        contextEnhanced = content !== originalContent;
       }
       const { answer, artifacts = [] } = await askInWorkspaceSession({
         harness: this.#harness,
@@ -643,6 +690,7 @@ export class TextHarnessBridge {
         key: conversationKey,
         text,
         content,
+        contextEnhanced,
         createOptions: this.#signal ? { signal: this.#signal } : undefined,
         existsOptions: this.#signal ? { signal: this.#signal } : undefined,
         askOptions: {

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

@@ -142,7 +142,7 @@ async function runWorkspaceListCommand(match, harness) {
         `${index + 1}. ${workspace}${workspace === current ? t('（当前）') : ''}`
       )),
       '',
-      t('切换用法：/workspace 工作区绝对路径'),
+      t('切换用法：/workspace 工作区序号或绝对路径'),
       t('查看会话：/sessionlist 工作区序号或绝对路径'),
     ];
     const message = lines.join('\n');
@@ -353,7 +353,7 @@ async function runSessionBindCommand(command, harness, conversationKey) {
 }
 
 export async function runWorkspaceCommand(text, harness, conversationKey) {
-  if (typeof text !== 'string') return null;
+  if (!isWorkspaceCommand(text)) return null;
   const command = text.trim();
   if (SESSION_BIND_PREFIX.test(command)) {
     return runSessionBindCommand(command, harness, conversationKey);
@@ -366,18 +366,30 @@ export async function runWorkspaceCommand(text, harness, conversationKey) {
   if (!match) return null;
   const workspace = match[1]?.trim();
   if (!workspace) {
-    return commandResult(t('用法：/workspace 工作区绝对路径'));
+    return commandResult(t('用法：/workspace 工作区序号或绝对路径'));
   }
   if (typeof harness?.switchWorkspace !== 'function') {
     return commandResult(t('当前机器人暂不支持切换工作区。'));
   }
   try {
-    const current = await harness.switchWorkspace(workspace);
+    let selected = workspace;
+    if (/^\d+$/u.test(workspace)) {
+      if (typeof harness?.listWorkspaces !== 'function') {
+        return commandResult(t('当前机器人暂不支持按序号选择工作区。'));
+      }
+      const { paths } = await workspacePathSnapshot(harness);
+      const position = Number(workspace);
+      if (!Number.isSafeInteger(position) || position < 1 || position > paths.length) {
+        return commandResult(t('工作区序号不存在，请先执行 /workspacelist。'));
+      }
+      selected = paths[position - 1];
+    }
+    const current = await harness.switchWorkspace(selected);
     return commandResult(t('工作区已切换为：{workspace}', { workspace: current }));
   } catch (error) {
     if (['workspace-not-absolute', 'workspace-not-found', 'workspace-not-directory'].includes(error?.code)) {
       return commandResult(t(`{message}
-用法：/workspace 工作区绝对路径`, { message: error.message }));
+用法：/workspace 工作区序号或绝对路径`, { message: error.message }));
     }
     if (error?.code === 'workspace-bot-not-found') {
       return commandResult(t('机器人正在移除或已重新接入，无法切换原会话的工作区。'));
@@ -385,3 +397,12 @@ export async function runWorkspaceCommand(text, harness, conversationKey) {
     throw error;
   }
 }
+
+export function isWorkspaceCommand(text) {
+  if (typeof text !== 'string') return false;
+  const command = text.trim();
+  return SESSION_BIND_PREFIX.test(command)
+    || SESSION_LIST_COMMAND.test(command)
+    || WORKSPACE_LIST_COMMAND.test(command)
+    || WORKSPACE_COMMAND.test(command);
+}

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

@@ -1,4 +1,5 @@
 import { withSessionBindingLock } from './session-binding-lock.mjs';
+import { initialSessionTitle } from './session-title.mjs';
 
 export const WORKSPACE_SESSION_STALE = 'workspace-session-stale';
 
@@ -6,7 +7,7 @@ function workspaceSession(harness, sessionId) {
   if (typeof harness.workspaceSession === 'function') {
     return harness.workspaceSession(sessionId);
   }
-  return Object.freeze({
+  const session = {
     sessionId,
     sessionExists: (...args) => harness.sessionExists(sessionId, ...args),
     models: (...args) => harness.getSessionModels(sessionId, ...args),
@@ -16,7 +17,11 @@ function workspaceSession(harness, sessionId) {
     stopActiveTurn: (...args) => harness.stopActiveTurn(sessionId, ...args),
     steerActiveTurn: (...args) => harness.steerActiveTurn(sessionId, ...args),
     ask: (...args) => harness.ask(sessionId, ...args),
-  });
+  };
+  if (typeof harness.renameSession === 'function') {
+    session.renameTitle = (...args) => harness.renameSession(sessionId, ...args);
+  }
+  return Object.freeze(session);
 }
 
 async function sessionExists(session, options) {
@@ -42,10 +47,21 @@ export async function askInWorkspaceSession({
   key,
   text,
   content,
+  contextEnhanced = false,
   createOptions,
   existsOptions,
   askOptions,
 }) {
+  const initialTitle = contextEnhanced
+    ? initialSessionTitle({
+        text,
+        content,
+        files: typeof askOptions === 'object' ? askOptions?.files : undefined,
+      })
+    : null;
+  const renameSignal = createOptions?.signal
+    ?? (typeof askOptions === 'object' ? askOptions?.signal : undefined);
+  const renameOptions = renameSignal ? { signal: renameSignal } : undefined;
   while (true) {
     try {
       const binding = await withSessionBindingLock(state, key, async () => {
@@ -55,6 +71,16 @@ export async function askInWorkspaceSession({
           sessionId = await createSession(harness, createOptions);
           if (await state.setSession(key, sessionId) === false) return null;
           session = workspaceSession(harness, sessionId);
+          if (initialTitle && typeof session.renameTitle === 'function') {
+            try {
+              await session.renameTitle(initialTitle, renameOptions);
+            } catch (error) {
+              if (error?.code === WORKSPACE_SESSION_STALE || renameOptions?.signal?.aborted) {
+                throw error;
+              }
+              console.warn('[dsh-im] unable to set the initial Session title:', error?.message ?? error);
+            }
+          }
         }
         return { sessionId, session };
       });

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

@@ -347,6 +347,7 @@ export class SlackRuntime {
   #harness;
   #state;
   #contextEnhancement;
+  #accessPolicy;
   #logger;
   #replyTimeoutMs;
   #connectTimeoutMs;
@@ -371,6 +372,7 @@ export class SlackRuntime {
     harness,
     state,
     contextEnhancement,
+    accessPolicy,
     logger = console,
     replyTimeoutMs = 600_000,
     connectTimeoutMs = 20_000,
@@ -387,6 +389,7 @@ export class SlackRuntime {
     this.#harness = harness;
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
+    this.#accessPolicy = accessPolicy;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
@@ -464,6 +467,7 @@ export class SlackRuntime {
         harness: this.#harness,
         state: this.#state,
         contextEnhancement: this.#contextEnhancement,
+        accessPolicy: this.#accessPolicy,
         status: this.#status,
         logger: this.#logger,
         replyTimeoutMs: this.#replyTimeoutMs,

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

@@ -14,7 +14,6 @@ import {
 } from './telegram-rich-message.mjs';
 import {
   TELEGRAM_ACCESS_MODES,
-  normalizeTelegramAccessPolicy,
 } from './config-store.mjs';
 
 export const TELEGRAM_COMMAND_MENU = Object.freeze([
@@ -167,6 +166,7 @@ export function normalizeTelegramUpdate(update, {
       senderName: [message.from?.first_name, message.from?.last_name]
         .filter((value) => typeof value === 'string' && value.trim())
         .map((value) => value.trim()).join(' ') || message.from?.username,
+      conversationTitle: direct ? undefined : message.chat?.title,
     }),
     senderIsBot: message.from?.is_bot === true,
     kind: direct ? 'direct' : 'group',
@@ -669,12 +669,11 @@ export class TelegramRuntime {
   #harness;
   #state;
   #contextEnhancement;
+  #accessPolicy;
   #logger;
   #replyTimeoutMs;
   #createApi;
   #createHttpTransport;
-  #accessMode;
-  #allowedPrivateUserIds;
   #status = createTelegramRuntimeStatus();
   #httpTransport = null;
   #api = null;
@@ -689,6 +688,7 @@ export class TelegramRuntime {
     harness,
     state,
     contextEnhancement,
+    accessPolicy,
     logger = console,
     replyTimeoutMs = 600_000,
     createApi = (options) => new TelegramApi(options),
@@ -702,13 +702,11 @@ export class TelegramRuntime {
     this.#harness = harness;
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
+    this.#accessPolicy = accessPolicy;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#createApi = createApi;
     this.#createHttpTransport = createHttpTransport;
-    const accessPolicy = normalizeTelegramAccessPolicy(config);
-    this.#accessMode = accessPolicy.accessMode;
-    this.#allowedPrivateUserIds = new Set(accessPolicy.allowedUsers);
   }
 
   get status() {
@@ -805,6 +803,7 @@ export class TelegramRuntime {
         harness: this.#harness,
         state: this.#state,
         contextEnhancement: this.#contextEnhancement,
+        accessPolicy: this.#accessPolicy,
         status: this.#status,
         logger: this.#logger,
         replyTimeoutMs: this.#replyTimeoutMs,
@@ -865,10 +864,7 @@ export class TelegramRuntime {
           loadFile: (fileId, options) => this.#api.downloadFile({ fileId, ...options }),
           loadFileStream: (fileId, options) => this.#api.downloadFileStream({ fileId, ...options }),
         });
-        if (message && telegramInboundAllowed(message, {
-          accessMode: this.#accessMode,
-          allowedPrivateUserIds: this.#allowedPrivateUserIds,
-        })) {
+        if (message) {
           void this.#bridge.accept(message, { contextSnapshot }).catch((error) => {
             if (signal.aborted) return;
             this.#logger.error?.(
@@ -876,9 +872,6 @@ export class TelegramRuntime {
               error,
             );
           });
-        } else if (message) {
-          this.#status.messagesRejected += 1;
-          this.#status.lastRejectedAt = new Date().toISOString();
         }
         cursor = update.update_id + 1;
         await this.#state.setCursor(cursor);

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

@@ -51,6 +51,10 @@ import {
   messageFailureText,
   setLastMessageFailure,
 } from '../shared/message-failure.mjs';
+import {
+  COMMAND_PERMISSION_DENIED_MESSAGE,
+  evaluateInboundAccess,
+} from '../shared/inbound-access.mjs';
 import { t } from '../shared/i18n.mjs';
 
 const DEFAULT_FILE_UPLOAD_TIMEOUT_MS = 120_000;
@@ -64,7 +68,7 @@ function helpText() {
     t('/new  开启一个全新会话'),
     t('/compact  压缩当前会话的较早上下文'),
     t('/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）'),
-    t('/workspace 工作区绝对路径  切换工作区'),
+    t('/workspace 工作区序号或绝对路径  切换工作区'),
     t('/workspacelist  列出工作区绝对路径'),
     t('/sessionlist 或 /sessions [工作区序号或绝对路径]  列出会话 ID 和标题'),
     t('/session Session ID 或当前工作区序号  将当前聊天绑定到指定会话'),
@@ -490,6 +494,7 @@ export class WecomHarnessBridge {
   #harness;
   #state;
   #contextEnhancement;
+  #accessPolicy;
   #status;
   #logger;
   #replyTimeoutMs;
@@ -512,6 +517,7 @@ export class WecomHarnessBridge {
     harness,
     state,
     contextEnhancement,
+    accessPolicy,
     status = createWecomBridgeStatus(),
     logger = console,
     replyTimeoutMs = 600_000,
@@ -530,6 +536,7 @@ export class WecomHarnessBridge {
     this.#harness = harness;
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
+    this.#accessPolicy = accessPolicy;
     this.#status = status;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
@@ -557,16 +564,28 @@ export class WecomHarnessBridge {
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
 
     const key = conversationKey(frame);
+    const pending = this.#pendingInteractions.get(key);
+    const commandMessage = wecomInboundMessage(frame, this.#client);
+    const commandText = nonEmptyString(commandMessage.content) ?? '';
+    const conversationType = body.chattype === 'single' ? 'direct' : 'group';
+    const access = evaluateInboundAccess(this.#accessPolicy, {
+      conversationType,
+      senderIds: senderId,
+      text: commandText,
+      hasImages: hasInboundImages(commandMessage),
+      hasFiles: hasInboundFiles(commandMessage),
+    });
+    if (!access.allowed) {
+      this.#acceptedMessageIds.set(messageId, null);
+      return this.#finishAccessDecision(frame, messageId, chatId, access);
+    }
     this.#acceptedMessageIds.set(messageId, captureContextEnhancement(
       this.#contextEnhancement,
-      body.chattype === 'single' ? 'direct' : 'group',
+      conversationType,
     ));
     if (body.chattype === 'single') {
       rememberConnectionTestTarget(this.#state, { chatId });
     }
-    const pending = this.#pendingInteractions.get(key);
-    const commandMessage = wecomInboundMessage(frame, this.#client);
-    const commandText = nonEmptyString(commandMessage.content) ?? '';
     const batchCommand = isBatchInputCommand(commandText);
     const batchStatus = this.#batchInputs.status(key);
     if (batchCommand && body.chattype === 'group') {
@@ -760,6 +779,34 @@ export class WecomHarnessBridge {
     return task;
   }
 
+  #finishAccessDecision(frame, messageId, chatId, access) {
+    let task;
+    task = Promise.resolve().then(async () => {
+      if (this.#state.hasSeen(messageId)) return;
+      await this.#state.markSeen(messageId);
+      if (access.reason === 'command-not-allowed') {
+        this.#status.messagesReceived += 1;
+        this.#status.lastMessageAt = new Date().toISOString();
+        await this.#sendImmediate(frame, chatId, t(COMMAND_PERMISSION_DENIED_MESSAGE));
+        this.#status.messagesReplied += 1;
+        this.#status.lastReplyAt = new Date().toISOString();
+      } else {
+        this.#status.messagesRejected += 1;
+        this.#status.lastRejectedAt = new Date().toISOString();
+      }
+      this.#status.lastError = null;
+    }).catch((error) => {
+      if (this.#signal?.aborted) return;
+      this.#status.lastError = error?.message ?? String(error);
+      this.#logger.error?.('[dsh-im:wecom] failed to apply inbound access policy', error);
+    }).finally(() => {
+      this.#acceptedMessageIds.delete(messageId);
+      this.#commandTasks.delete(task);
+    });
+    this.#commandTasks.add(task);
+    return task;
+  }
+
   async waitForIdle() {
     await Promise.allSettled([
       ...this.#queues.values(),
@@ -960,11 +1007,14 @@ export class WecomHarnessBridge {
         ? await promptContentForMessage(message, { signal: this.#signal })
         : undefined;
       const snapshot = this.#acceptedMessageIds.get(messageId);
+      let contextEnhanced = false;
       if (snapshot) {
-        content = enhanceContextContent(content ?? text, snapshot, () => ({
+        const originalContent = content ?? text;
+        content = enhanceContextContent(originalContent, snapshot, () => ({
           channel: 'wecom',
           senderId,
         }));
+        contextEnhanced = content !== originalContent;
       }
       await this.#state.markSeen(messageId);
       promptRecorded = true;
@@ -974,6 +1024,7 @@ export class WecomHarnessBridge {
         key,
         text,
         content,
+        contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
         askOptions: {

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

@@ -29,6 +29,7 @@ export class WecomRuntime {
   #harness;
   #state;
   #contextEnhancement;
+  #accessPolicy;
   #logger;
   #replyTimeoutMs;
   #connectTimeoutMs;
@@ -47,6 +48,7 @@ export class WecomRuntime {
     harness,
     state,
     contextEnhancement,
+    accessPolicy,
     logger = console,
     replyTimeoutMs = 600_000,
     connectTimeoutMs = 20_000,
@@ -61,6 +63,7 @@ export class WecomRuntime {
     this.#harness = harness;
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
+    this.#accessPolicy = accessPolicy;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
@@ -111,6 +114,7 @@ export class WecomRuntime {
       harness: this.#harness,
       state: this.#state,
       contextEnhancement: this.#contextEnhancement,
+      accessPolicy: this.#accessPolicy,
       status: this.#status,
       logger: this.#logger,
       replyTimeoutMs: this.#replyTimeoutMs,