@xmanrui/dsh-im 0.8.0 → 0.10.0

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

@@ -1,4 +1,5 @@
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
+import { runCompactCommand } from '../shared/compact-command.mjs';
 import {
   harnessAnswerForQuestion,
   harnessQuestionText,
@@ -6,14 +7,32 @@ import {
 } from '../shared/harness-question.mjs';
 import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
+import {
+  fetchImageBuffer,
+  hasInboundImages,
+  imagePromptUserMessage,
+  promptContentForMessage,
+} from '../shared/image-prompt.mjs';
 
 const INTERACTION_RESOLVED_TEXT = '这个问题已在其他客户端处理，无需再次回答。';
 
+export const QQ_IMAGE_HOSTS = Object.freeze([
+  '.myqcloud.com',
+  '.qpic.cn',
+  '.qq.com',
+  '.qq.com.cn',
+  '.tencentcos.com',
+  '.ugcimg.cn',
+]);
+
+const QQ_IMAGE_FILENAME = /\.(?:gif|jpe?g|png|webp)$/i;
+
 const HELP_TEXT = [
   'QQ 机器人已连接 DeepSeek Harness。',
   '',
-  '直接发送文字即可继续当前会话。',
+  '直接发送文字或图片即可继续当前会话。',
   '/new  开启一个全新会话',
+  '/compact  压缩当前会话的较早上下文',
   '/workspace 工作区绝对路径  切换工作区',
   '/workspacelist  列出工作区绝对路径',
   '/sessionlist [工作区序号或绝对路径]  列出会话 ID 和标题',
@@ -30,6 +49,51 @@ function safeText(message) {
   return typeof message?.content === 'string' ? message.content.trim() : '';
 }
 
+function attachmentMediaType(attachment) {
+  const value = nonEmptyString(attachment?.content_type ?? attachment?.contentType);
+  if (!value) return null;
+  return value.split(';', 1)[0].trim().toLowerCase();
+}
+
+function isQqImageAttachment(attachment) {
+  const mediaType = attachmentMediaType(attachment);
+  return mediaType?.startsWith('image/') === true
+    || QQ_IMAGE_FILENAME.test(nonEmptyString(attachment?.filename) ?? '');
+}
+
+function hasQqImageAttachments(message) {
+  return Array.isArray(message?.attachments)
+    && message.attachments.some(isQqImageAttachment);
+}
+
+/** Convert QQ's attachment metadata into lazily downloaded image references. */
+export function qqInboundMessage(message, { fetchImpl = fetch } = {}) {
+  if (typeof fetchImpl !== 'function') throw new TypeError('fetchImpl must be a function');
+  const images = [];
+  for (const attachment of message?.attachments ?? []) {
+    if (!isQqImageAttachment(attachment)) continue;
+    const url = nonEmptyString(attachment?.url);
+    const name = nonEmptyString(attachment?.filename) ?? undefined;
+    const mediaType = attachmentMediaType(attachment);
+    const declaredSize = Number(attachment?.size);
+    images.push({
+      ...(name ? { name } : {}),
+      ...(mediaType?.startsWith('image/') ? { mediaType } : {}),
+      ...(Number.isFinite(declaredSize) && declaredSize >= 0 ? { size: declaredSize } : {}),
+      load: ({ signal, maxBytes }) => {
+        if (!url) throw new Error('QQ image attachment has no download URL');
+        return fetchImageBuffer(url, {
+          fetchImpl,
+          signal,
+          maxBytes,
+          allowedHosts: QQ_IMAGE_HOSTS,
+        });
+      },
+    });
+  }
+  return { content: safeText(message), images };
+}
+
 function nonEmptyString(value) {
   return typeof value === 'string' && value.trim() ? value.trim() : null;
 }
@@ -38,6 +102,7 @@ function canClaimInteractionReply(message, pending) {
   return pending.questions[pending.index]
     && nonEmptyString(message?.senderId) === pending.actor
     && (message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE')
+    && !hasQqImageAttachments(message)
     && nonEmptyString(safeText(message));
 }
 
@@ -62,6 +127,7 @@ export class QqHarnessBridge {
   #logger;
   #replyTimeoutMs;
   #signal;
+  #fetchImpl;
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
@@ -78,10 +144,12 @@ export class QqHarnessBridge {
     logger = console,
     replyTimeoutMs = 600_000,
     signal,
+    fetchImpl = fetch,
   }) {
     if (!bot || typeof bot.sendText !== 'function') throw new TypeError('QQ bot client is required');
     if (!ownerUserOpenid) throw new TypeError('QQ scanner identity is required');
     if (!harness || !state) throw new TypeError('Harness client and state store are required');
+    if (typeof fetchImpl !== 'function') throw new TypeError('fetchImpl must be a function');
     this.#bot = bot;
     this.#ownerUserOpenid = ownerUserOpenid;
     this.#harness = harness;
@@ -90,6 +158,7 @@ export class QqHarnessBridge {
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
+    this.#fetchImpl = fetchImpl;
     this.#approvals = new HarnessApprovalQueue({ label: 'qq', logger });
   }
 
@@ -112,7 +181,7 @@ export class QqHarnessBridge {
       key,
       actor: sender,
       messageId,
-      text: safeText(message),
+      text: hasQqImageAttachments(message) ? '' : safeText(message),
       addressed: message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE',
       hasPendingQuestion: Boolean(pending),
       questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
@@ -208,32 +277,37 @@ export class QqHarnessBridge {
     if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
 
     const target = message.replyTarget;
-    const text = safeText(message);
+    const promptMessage = qqInboundMessage(message, { fetchImpl: this.#fetchImpl });
+    const text = promptMessage.content;
+    const hasImages = hasInboundImages(promptMessage);
+    let stream = null;
     try {
-      if (!text) {
-        await this.#bot.sendText(target, '目前仅支持文字消息。');
+      if (!text && !hasImages) {
+        await this.#bot.sendText(target, '目前支持文字和图片消息。');
         await this.#state.markSeen(messageId);
         return;
       }
       const command = text.toLowerCase();
-      if (command === '/help') {
+      if (!hasImages && command === '/help') {
         await this.#bot.sendText(target, HELP_TEXT);
         await this.#state.markSeen(messageId);
         return;
       }
-      if (command === '/status') {
+      if (!hasImages && command === '/status') {
         await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#bot.sendText(target, 'QQ 机器人与 DeepSeek Harness 连接正常。');
         await this.#state.markSeen(messageId);
         return;
       }
-      if (command === '/new') {
+      if (!hasImages && command === '/new') {
         await this.#state.clearSession(key);
         await this.#bot.sendText(target, '已开启新会话。请发送你的问题。');
         await this.#state.markSeen(messageId);
         return;
       }
-      const workspaceCommand = await runWorkspaceCommand(text, this.#harness, key);
+      const workspaceCommand = hasImages
+        ? null
+        : await runWorkspaceCommand(text, this.#harness, key);
       if (workspaceCommand) {
         for (const reply of workspaceCommand.messages ?? [workspaceCommand.message]) {
           await this.#bot.sendText(target, reply);
@@ -241,8 +315,24 @@ export class QqHarnessBridge {
         await this.#state.markSeen(messageId);
         return;
       }
+      const compactCommand = hasImages
+        ? null
+        : await runCompactCommand(
+            text,
+            this.#harness,
+            this.#state,
+            key,
+            { signal: this.#signal },
+          );
+      if (compactCommand) {
+        await this.#bot.sendText(target, compactCommand.message);
+        await this.#state.markSeen(messageId);
+        return;
+      }
 
-      let stream = null;
+      const content = hasImages
+        ? await promptContentForMessage(promptMessage, { signal: this.#signal })
+        : undefined;
       let streamFinished = false;
       if (message.kind === 'c2c' && target?.msgId && typeof this.#bot.openStream === 'function') {
         try {
@@ -257,7 +347,7 @@ export class QqHarnessBridge {
           harness: this.#harness,
           state: this.#state,
           key,
-          text,
+          ...(hasImages ? { content } : { text }),
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },
           askOptions: {
@@ -302,11 +392,15 @@ export class QqHarnessBridge {
       this.#status.lastReplyAt = new Date().toISOString();
       this.#status.lastError = null;
     } catch (error) {
+      stream?.cancel?.();
       if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
       this.#logger.error?.('[dsh-im:qq] failed to process an inbound message:', error);
       try {
-        await this.#bot.sendText(target, '消息处理失败，请稍后重试。');
+        await this.#bot.sendText(
+          target,
+          imagePromptUserMessage(error) ?? '消息处理失败，请稍后重试。',
+        );
         await this.#state.markSeen(messageId);
       } catch (sendError) {
         this.#logger.error?.('[dsh-im:qq] failed to send the safe error reply:', sendError);
@@ -331,7 +425,7 @@ export class QqHarnessBridge {
 
     if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
     const text = nonEmptyString(safeText(message));
-    if (!text) {
+    if (!text || hasQqImageAttachments(message)) {
       await this.#bot.sendText(message.replyTarget, '请用文字回答当前问题。');
       return;
     }

package/src/channels/shared/bot-workspace-store.mjs

@@ -668,6 +668,19 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
           return target.ask(sessionId, ...args);
         };
       }
+      if (property === 'executeCommand' && typeof target.executeCommand === 'function') {
+        return (sessionId, ...args) => {
+          const generation = sessionGenerations.get(sessionId);
+          sessionGenerations.delete(sessionId);
+          if (!isCurrentScope()
+            || (generation !== undefined && generation !== workspaces.generationFor(botId))) {
+            const error = new Error('The bot workspace changed before this command started.');
+            error.code = WORKSPACE_SESSION_STALE;
+            throw error;
+          }
+          return target.executeCommand(sessionId, ...args);
+        };
+      }
       const value = Reflect.get(target, property, target);
       return typeof value === 'function' ? value.bind(target) : value;
     },

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

@@ -0,0 +1,95 @@
+import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
+
+const COMPACT_COMMAND = /^\/compact(?=$|\s)([\s\S]*)$/i;
+const COMPACT_USAGE = '用法：/compact（不带参数）';
+
+const COMPACT_RESULT_TEXT = new Map([
+  ['No compactable history yet.', '暂无可压缩的历史记录。'],
+  [
+    'Compaction is unavailable because this process has an active compaction, or the agent is not idle.',
+    '当前会话正在生成回复或执行压缩，请稍后重试。',
+  ],
+  ['Compaction cancelled.', '上下文压缩已取消。'],
+  [
+    'The history selected for compaction changed before it could be replaced. The conversation is unchanged; the attempt is recorded in the session log.',
+    '压缩期间会话历史发生变化，本次未修改会话，请重试。',
+  ],
+  [
+    'Compaction could not produce a useful summary. The conversation is unchanged; the attempt is recorded in the session log.',
+    '未能生成有效的压缩摘要，本次未修改会话。',
+  ],
+  [
+    'Compaction did not finish cleanly; some session history may have changed. Inspect the current session state before retrying.',
+    '上下文压缩未正常完成，部分会话历史可能已变化，请检查会话后再重试。',
+  ],
+  [
+    'Compaction finished, but the session could not be saved.',
+    '上下文已压缩，但会话保存失败。',
+  ],
+]);
+
+function commandResult(message) {
+  return { handled: true, message, messages: [message] };
+}
+
+function compactResultText(result) {
+  if (!result || typeof result !== 'object'
+    || !['success', 'error'].includes(result.kind)
+    || (result.text !== undefined && typeof result.text !== 'string')) {
+    throw new TypeError('Harness returned an invalid /compact result');
+  }
+  const text = result.text?.trim() ?? '';
+  const compacted = /^Compacted (\d+) history items \(~(\d+) tokens\)\.$/u.exec(text);
+  if (compacted) {
+    return `已压缩 ${compacted[1]} 条历史记录（约 ${compacted[2]} 个 token）。`;
+  }
+  if (COMPACT_RESULT_TEXT.has(text)) return COMPACT_RESULT_TEXT.get(text);
+  if (text) return text;
+  return result.kind === 'success' ? '上下文压缩完成。' : '上下文压缩失败。';
+}
+
+function compactErrorMessage(error) {
+  const code = error?.code ?? error?.failure?.code;
+  if (code === 'session-not-found') {
+    return '当前聊天绑定的会话已不存在，请发送新消息开启会话。';
+  }
+  if (code === 'agent-busy') return '当前会话正在生成回复，请稍后重试。';
+  if (code === 'cancelled' || error?.name === 'AbortError') return '上下文压缩已取消。';
+  if (code === WORKSPACE_SESSION_STALE || code === 'workspace-bot-not-found') {
+    return '工作区或机器人状态已发生变化，请重试。';
+  }
+  if (code === 'commands-unavailable') {
+    return '当前 Harness 暂不支持从机器人执行上下文压缩。';
+  }
+  return '上下文压缩失败，请稍后重试。';
+}
+
+/**
+ * Execute the explicit Harness compaction command for an existing IM conversation Session.
+ * Unknown input returns null so the caller may continue ordinary message routing.
+ */
+export async function runCompactCommand(text, harness, state, conversationKey, options = {}) {
+  if (typeof text !== 'string') return null;
+  const match = COMPACT_COMMAND.exec(text.trim());
+  if (!match) return null;
+  if (match[1].trim()) return commandResult(COMPACT_USAGE);
+  if (typeof state?.sessionFor !== 'function') {
+    return commandResult('当前机器人没有可用的会话状态。');
+  }
+  const sessionId = state.sessionFor(conversationKey);
+  if (typeof sessionId !== 'string' || !sessionId) {
+    return commandResult('当前聊天还没有可压缩的会话，请先发送一条消息。');
+  }
+  if (typeof harness?.executeCommand !== 'function') {
+    return commandResult('当前机器人暂不支持上下文压缩。');
+  }
+  try {
+    const execution = await harness.executeCommand(sessionId, '/compact', options);
+    if (execution === undefined) {
+      return commandResult('当前 Harness 未注册 /compact 命令，请确认上下文压缩组件已启用。');
+    }
+    return commandResult(compactResultText(execution?.result));
+  } catch (error) {
+    return commandResult(compactErrorMessage(error));
+  }
+}

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

@@ -318,6 +318,7 @@ export class HarnessClient {
   #interactionReconnectDelayMs;
   #rpcIdPrefix;
   #logPrefix;
+  #commandExecutor;
   #managedProcess = null;
   #interactionRegistry;
   #interactionOwnerships;
@@ -334,6 +335,7 @@ export class HarnessClient {
     interactionReconnectDelayMs = 500,
     rpcIdPrefix = 'im',
     logPrefix = 'dsh-im',
+    commandExecutor,
   }) {
     if (typeof createWebSocket !== 'function') {
       throw new TypeError('createWebSocket must be a function');
@@ -347,6 +349,9 @@ export class HarnessClient {
     if (typeof logPrefix !== 'string' || !logPrefix.trim()) {
       throw new TypeError('logPrefix must be a non-empty string');
     }
+    if (commandExecutor !== undefined && typeof commandExecutor !== 'function') {
+      throw new TypeError('commandExecutor must be a function');
+    }
     this.#baseUrl = new URL(baseUrl);
     this.#workspace = workspace;
     this.#agentPreset = agentPreset;
@@ -357,6 +362,7 @@ export class HarnessClient {
     this.#interactionReconnectDelayMs = interactionReconnectDelayMs;
     this.#rpcIdPrefix = rpcIdPrefix.trim();
     this.#logPrefix = logPrefix.trim();
+    this.#commandExecutor = commandExecutor;
     this.#interactionRegistry = interactionRegistry(this.#baseUrl.origin);
     this.#interactionOwnerships = this.#interactionRegistry.ownerships;
     this.#interactionClaims = this.#interactionRegistry.claims;
@@ -459,6 +465,24 @@ export class HarnessClient {
     return created.sessionId;
   }
 
+  async executeCommand(sessionId, line, options = {}) {
+    if (typeof sessionId !== 'string' || !sessionId) throw new TypeError('sessionId is required');
+    if (typeof line !== 'string' || !line) throw new TypeError('command line is required');
+    if (!this.#commandExecutor) {
+      const error = new Error('Harness command execution is unavailable');
+      error.code = 'commands-unavailable';
+      throw error;
+    }
+    try {
+      return await this.#commandExecutor(sessionId, line, options);
+    } catch (error) {
+      if (error?.failure && typeof error.failure === 'object') {
+        throw new HarnessRpcError('commands.execute', error.failure);
+      }
+      throw error;
+    }
+  }
+
   async sessionExists(sessionId, options = {}) {
     try {
       await this.rpc('session.history', { sessionId, maxMessages: 1 }, 30_000, options);
@@ -599,7 +623,7 @@ export class HarnessClient {
     return ownership ? { ownership, recovered: true } : null;
   }
 
-  async ask(sessionId, text, options = {}) {
+  async ask(sessionId, prompt, options = {}) {
     if (typeof options === 'number') options = { timeoutMs: options };
     const timeoutMs = options.timeoutMs ?? 600_000;
     const signal = options.signal;
@@ -669,10 +693,16 @@ export class HarnessClient {
         ]);
       }
 
+      const content = typeof prompt === 'string'
+        ? [{ type: 'text', text: prompt }]
+        : prompt;
+      if (!Array.isArray(content) || content.length === 0) {
+        throw new TypeError('Harness prompt content is required');
+      }
       await this.rpc('session.prompt', {
         sessionId,
         mode: 'queue',
-        content: [{ type: 'text', text }],
+        content,
         clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       }, 30_000, { rpcId: promptRpcId, signal });