@xmanrui/dsh-im 4.33.0 → 4.34.1

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

@@ -0,0 +1,149 @@
+import { createCommandListSnapshots } from './command-list-snapshots.mjs';
+import { t } from './i18n.mjs';
+import { withSessionBindingLock } from './session-binding-lock.mjs';
+import { splitWorkspaceCommandMessage } from './workspace-command.mjs';
+import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
+
+const COMMAND = /^\/(?:permission|permissionlist)(?=$|\s)/iu;
+const SNAPSHOTS = createCommandListSnapshots();
+const USAGE = '用法：/permission 查看当前权限；/permissionlist 列出档位；/permission <序号或完整ID> 切换；纯数字 ID 使用 /permission id:<ID>。';
+const SCOPE = '仅影响当前会话；沙箱与审批策略会同时按 Host 的档位定义更新。';
+const REFRESH = '请先执行 /permissionlist，再按列表序号选择权限档位。';
+const validId = (id) => typeof id === 'string' && /^[^\s\p{Cc}\p{Cf}]+$/u.test(id);
+const display = (value) => typeof value === 'string'
+  ? value.replace(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu, ' ').trim() : '';
+
+function result(message) {
+  return { handled: true, message, messages: splitWorkspaceCommandMessage(message) };
+}
+
+function permissions(value) {
+  if (!value || !validId(value.currentValue) || !Array.isArray(value.options)
+    || value.options.some((item) => !item || !validId(item.value))) {
+    throw new TypeError('Harness returned invalid permissions');
+  }
+  const seen = new Set();
+  return {
+    currentValue: value.currentValue,
+    options: value.options.filter((item) => {
+      if (item.value === 'custom' || seen.has(item.value)) return false;
+      seen.add(item.value);
+      return true;
+    }),
+  };
+}
+
+function description(item) {
+  // Translate known Host copy, not an assumed ID -> policy mapping: presets are configurable.
+  const text = display(item.description);
+  if (text === 'Full file access without approval prompts.') {
+    return t('完全文件访问，不再请求审批。');
+  }
+  if (text === 'Write inside the workspace and permitted temporary directories; wider retries require approval.') {
+    return t('可写工作区和允许的临时目录；扩大访问范围需要审批。');
+  }
+  return text;
+}
+
+function errorMessage(error, writing) {
+  const code = error?.code ?? error?.failure?.code;
+  if (code === WORKSPACE_SESSION_STALE || code === 'workspace-bot-not-found') {
+    return t('工作区或机器人状态已发生变化，请重试。');
+  }
+  if (['session-not-found', 'session/not-found', 'agent-not-found'].includes(code)) {
+    return t('当前聊天绑定的会话已不存在，请先绑定或建立会话。');
+  }
+  if (['commands-unavailable', 'permissions-unavailable', 'harness-api-not-found',
+    'endpoint-not-found', 'gateway/endpoint-not-found'].includes(code)) {
+    return t('当前 Host 暂不支持从机器人查看或切换权限档位。');
+  }
+  return writing
+    ? t('未能确认权限切换结果，请执行 /permission 核对当前档位。')
+    : t('暂时无法获取权限档位，请稍后重试。');
+}
+
+export function isPermissionCommand(text) {
+  return typeof text === 'string' && COMMAND.test(text.trim());
+}
+
+export async function runPermissionCommand(text, harness, state, key, options = {}) {
+  if (!isPermissionCommand(text)) return null;
+  if (options.hasImages || options.hasFiles) {
+    return result(t('权限命令仅支持纯文字，请移除图片或文件后重试。'));
+  }
+  const match = /^\/(permission|permissionlist)(?:[ \t]+([^\s]+))?[ \t]*$/iu.exec(text.trim());
+  if (!match || (match[1].toLowerCase() === 'permissionlist' && match[2])) return result(t(USAGE));
+  const list = match[1].toLowerCase() === 'permissionlist';
+  const requested = match[2];
+  if (requested && (!validId(requested) || requested.startsWith('--'))) return result(t(USAGE));
+  const signal = options.signal
+    ? AbortSignal.any([options.signal, AbortSignal.timeout(30_000)]) : AbortSignal.timeout(30_000);
+  let writing = false;
+  try {
+    return await withSessionBindingLock(state, key, async () => {
+      signal.throwIfAborted();
+      const sessionId = state.sessionFor?.(key);
+      if (!sessionId) return result(t('当前聊天尚未绑定会话，请先发送普通消息建立会话，或使用 /session 绑定已有会话。'));
+      const session = typeof harness.workspaceSession === 'function'
+        ? harness.workspaceSession(sessionId, key)
+        : {
+            permissions: harness.getSessionPermissions && ((opts) => harness.getSessionPermissions(sessionId, opts)),
+            executeCommand: harness.executeCommand && ((line, opts) => harness.executeCommand(sessionId, line, opts)),
+          };
+      if (!requested) {
+        if (typeof session?.permissions !== 'function') return result(t('当前 Host 暂不支持从机器人查看或切换权限档位。'));
+        const current = permissions(await session.permissions({ signal }));
+        if (state.sessionFor(key) !== sessionId) return result(t('当前会话已变化，请重新执行 /permissionlist。'));
+        const lines = [t('当前会话权限：{id}', { id: current.currentValue }), ''];
+        if (list) {
+          SNAPSHOTS.save(state, key, { sessionId, ids: current.options.map((item) => item.value) });
+          for (const [index, item] of current.options.entries()) {
+            const label = display(item.name);
+            const detail = description(item);
+            lines.push(`${index + 1}. ${item.value}${label && label !== item.value ? `（${label}）` : ''}${item.value === current.currentValue ? t(' ✓ 当前') : ''}${detail ? ` — ${detail}` : ''}`);
+          }
+          if (!current.options.length) lines.push(t('当前没有可用权限档位。'));
+          lines.push('', t('切换：/permission <序号或完整ID>'));
+        } else {
+          lines.push(t('查看可用档位与序号：/permissionlist'));
+        }
+        lines.push(t(SCOPE));
+        return result(lines.join('\n'));
+      }
+
+      let selected = requested;
+      const numericId = /^id:(\d+)$/iu.exec(requested);
+      if (numericId) selected = numericId[1];
+      else if (/^\d+$/u.test(requested)) {
+        const snapshot = SNAPSHOTS.load(state, key);
+        if (!snapshot || snapshot.sessionId !== sessionId) return result(t(REFRESH));
+        const index = Number(requested);
+        if (!Number.isSafeInteger(index) || index < 1 || !snapshot.ids[index - 1]) {
+          return result(t('权限档位序号无效，请重新执行 /permissionlist。'));
+        }
+        selected = snapshot.ids[index - 1];
+      }
+      if (selected === 'custom' || /^id:/iu.test(selected)) return result(t(USAGE));
+      if (typeof session?.executeCommand !== 'function') return result(t('当前 Host 暂不支持从机器人查看或切换权限档位。'));
+      signal.throwIfAborted();
+      writing = true;
+      const execution = await session.executeCommand(`/permission ${selected}`, { signal });
+      if (execution === undefined) return result(t('当前 Host 未注册 /permission 命令，请确认权限预设组件已启用。'));
+      const outcome = execution?.result;
+      if (!outcome || !['success', 'error'].includes(outcome.kind)
+        || (outcome.text !== undefined && typeof outcome.text !== 'string')) throw new TypeError('Invalid permission command result');
+      if (outcome.kind === 'error') {
+        if (outcome.text?.startsWith('unknown preset ')) {
+          return result(t('该权限档位不存在或已不可用，请重新执行 /permissionlist。'));
+        }
+        return result([t('权限切换失败。'), display(outcome.text)].filter(Boolean).join('\n'));
+      }
+      return result([
+        t('当前会话权限已切换为：{id}', { id: selected }), '', t(SCOPE),
+        ...(selected === 'danger-full-access' ? [t('恢复工作区权限：/permission workspace-write（需 Host 支持该档位）')] : []),
+      ].join('\n'));
+    });
+  } catch (error) {
+    return result(errorMessage(error, writing));
+  }
+}

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

@@ -1,3 +1,4 @@
+import { createCommandListSnapshots, COMMAND_LIST_TTL_MS, COMMAND_LIST_MAX_ENTRIES } from './command-list-snapshots.mjs';
 import {
   normalizeAgentPresetCatalog,
   normalizeAgentPresetId,
@@ -19,9 +20,9 @@ const PRESET_USAGE = [
   '/preset --default  跟随 Host 默认',
 ].join('\n');
 const UNSAFE_DISPLAY_TEXT_GLOBAL = /[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]+/gu;
-const LIST_SNAPSHOTS = new WeakMap();
-export const PRESET_LIST_SNAPSHOT_TTL_MS = 15 * 60_000;
-export const PRESET_LIST_SNAPSHOT_MAX_ENTRIES = 256;
+const LIST_SNAPSHOTS = createCommandListSnapshots();
+export const PRESET_LIST_SNAPSHOT_TTL_MS = COMMAND_LIST_TTL_MS;
+export const PRESET_LIST_SNAPSHOT_MAX_ENTRIES = COMMAND_LIST_MAX_ENTRIES;
 
 function commandResult(message) {
   return {
@@ -140,59 +141,13 @@ function formatUpdated(settings) {
   ].join('\n');
 }
 
-function stateSnapshots(state, { create = false } = {}) {
-  if ((typeof state !== 'object' || state === null) && typeof state !== 'function') return null;
-  let snapshots = LIST_SNAPSHOTS.get(state);
-  if (!snapshots && create) {
-    snapshots = new Map();
-    LIST_SNAPSHOTS.set(state, snapshots);
-  }
-  return snapshots ?? null;
-}
-
-function pruneExpiredSnapshots(snapshots, now) {
-  for (const [snapshotKey, snapshot] of snapshots) {
-    if (snapshot.expiresAt <= now) snapshots.delete(snapshotKey);
-  }
-}
-
-function saveSnapshot(state, key, items) {
-  const snapshots = stateSnapshots(state, { create: true });
-  if (!snapshots) return;
-  const now = Date.now();
-  pruneExpiredSnapshots(snapshots, now);
-  snapshots.delete(key);
-  snapshots.set(key, {
-    expiresAt: now + PRESET_LIST_SNAPSHOT_TTL_MS,
-    ids: items.map((item) => item.id),
-  });
-  while (snapshots.size > PRESET_LIST_SNAPSHOT_MAX_ENTRIES) {
-    const oldest = snapshots.keys().next();
-    if (oldest.done) break;
-    snapshots.delete(oldest.value);
-  }
-}
-
-function loadSnapshot(state, key) {
-  const snapshots = stateSnapshots(state);
-  const snapshot = snapshots?.get(key);
-  if (!snapshots || !snapshot) return null;
-  if (snapshot.expiresAt <= Date.now()) {
-    snapshots.delete(key);
-    return null;
-  }
-  snapshots.delete(key);
-  snapshots.set(key, snapshot);
-  return snapshot.ids;
-}
-
 function presetFromSnapshot(state, key, requested) {
   if (!/^\d+$/u.test(requested)) return { numeric: false, id: null };
   const index = Number(requested);
   if (!Number.isSafeInteger(index) || index < 1) {
     return { numeric: true, error: t('Agent Preset 序号无效，请先执行 /presetlist。') };
   }
-  const snapshot = loadSnapshot(state, key);
+  const snapshot = LIST_SNAPSHOTS.load(state, key);
   if (!snapshot) {
     return { numeric: true, error: t('请先执行 /presetlist，再按列表序号选择 Agent Preset。') };
   }
@@ -260,7 +215,7 @@ export async function runPresetCommand(text, harness, state, key, options = {})
     if (!/^\/(?:presetlist|presets)[ \t]*$/iu.test(command)) return commandResult(t(PRESET_LIST_USAGE));
     try {
       const current = await settings(harness, requestOptions);
-      saveSnapshot(state, key, current.agentPresetCatalog.items);
+      LIST_SNAPSHOTS.save(state, key, current.agentPresetCatalog.items.map((item) => item.id));
       return commandResult(formatList(current));
     } catch (error) {
       return commandResult(presetErrorMessage(error, 'list'));

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

@@ -1,5 +1,4 @@
 import { extractConnectionEvidence, createConnectionDiagnostics, atConnectionStage } from '../shared/connection-error.mjs';
-import { randomInt } from 'node:crypto';
 
 import { createEditableMessageStream } from '../shared/editable-message-stream.mjs';
 import { createTextDeliveryBlock } from '../shared/semantic/delivery.mjs';
@@ -357,6 +356,11 @@ function telegramMessageId(value) {
   return Number.isSafeInteger(value?.message_id) ? String(value.message_id) : null;
 }
 
+function telegramMessageUnchanged(error) {
+  return error?.providerCode === 400
+    && /^(?:Bad Request: )?message is not modified(?::|$)/iu.test(error?.message ?? '');
+}
+
 function telegramFailure(error) {
   const providerCode = Number(error?.providerCode);
   const status = Number(error?.status);
@@ -687,6 +691,9 @@ export class TelegramBotClient {
           messageId: placeholderMessageId,
           text: chunks[0],
           signal: this.#signal,
+        }).catch((error) => {
+          // The final answer may already be visible from the last progress edit.
+          if (!telegramMessageUnchanged(error)) throw error;
         });
         firstUnsent = 1;
       } catch (error) {
@@ -814,6 +821,8 @@ export class TelegramBotClient {
         messageId,
         richMessage: { markdown: chunks[0].markdown },
         signal: this.#signal,
+      }).catch((error) => {
+        if (!telegramMessageUnchanged(error)) throw error;
       });
     } catch (error) {
       const failure = telegramFailure(error);
@@ -869,31 +878,8 @@ export class TelegramBotClient {
   }
 
   async openDeliveryStream(target) {
-    if (target.chatType === 'private') {
-      const draftId = randomInt(1, 2_147_483_647);
-      const updateDraft = async (block) => {
-        const richMessage = { markdown: toTelegramRichMarkdown(block.text) };
-        await this.#api.sendRichMessageDraft({
-          chatId: target.chatId,
-          draftId,
-          richMessage,
-          messageThreadId: target.messageThreadId,
-          signal: this.#signal,
-        });
-        return deliveryResult('telegram-rich-draft', []);
-      };
-      const stream = new TelegramDeliveryStream({
-        update: updateDraft,
-        finish: (block) => this.#sendRich(target, block),
-        fail: (block) => this.#sendPlain(target, block.text),
-        presentation: 'telegram-rich-draft',
-        keepalive: true,
-        logger: this.#logger,
-      });
-      await stream.update(createTextDeliveryBlock(t('正在处理…'), 'plain'));
-      return stream;
-    }
-
+    // Real messages keep the Android composer available for /stop and /steer;
+    // private-chat Rich Drafts can block sending for the whole turn (#276).
     const placeholder = await this.#api.sendMessage({
       chatId: target.chatId,
       text: t('正在处理…'),