@xmanrui/dsh-im 0.9.0 → 0.11.0

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

@@ -1,5 +1,6 @@
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { runCompactCommand } from '../shared/compact-command.mjs';
+import { rememberConnectionTestTarget } from '../shared/connection-test.mjs';
 import {
   harnessAnswerForQuestion,
   harnessQuestionText,
@@ -7,13 +8,30 @@ 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 工作区绝对路径  切换工作区',
@@ -32,6 +50,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;
 }
@@ -40,6 +103,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));
 }
 
@@ -64,6 +128,7 @@ export class QqHarnessBridge {
   #logger;
   #replyTimeoutMs;
   #signal;
+  #fetchImpl;
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
@@ -80,10 +145,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;
@@ -92,6 +159,7 @@ export class QqHarnessBridge {
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
+    this.#fetchImpl = fetchImpl;
     this.#approvals = new HarnessApprovalQueue({ label: 'qq', logger });
   }
 
@@ -109,12 +177,18 @@ export class QqHarnessBridge {
       || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
     const key = conversationKey(message);
     this.#acceptedMessageIds.add(messageId);
+    if (message.kind === 'c2c'
+      && (this.#ownerUserOpenid === '*' || sender === this.#ownerUserOpenid)
+      && message.replyTarget?.scope === 'c2c'
+      && nonEmptyString(message.replyTarget.targetId) === sender) {
+      rememberConnectionTestTarget(this.#state, message.replyTarget);
+    }
     const pending = this.#pendingInteractions.get(key);
     const approval = this.#approvals.claimReply({
       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
@@ -210,32 +284,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);
@@ -243,20 +322,24 @@ export class QqHarnessBridge {
         await this.#state.markSeen(messageId);
         return;
       }
-      const compactCommand = await runCompactCommand(
-        text,
-        this.#harness,
-        this.#state,
-        key,
-        { signal: this.#signal },
-      );
+      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 {
@@ -271,7 +354,7 @@ export class QqHarnessBridge {
           harness: this.#harness,
           state: this.#state,
           key,
-          text,
+          ...(hasImages ? { content } : { text }),
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },
           askOptions: {
@@ -316,11 +399,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);
@@ -345,7 +432,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/qq/qq-controller.mjs

@@ -1,5 +1,6 @@
 import { randomUUID } from 'node:crypto';
 
+import { connectionTestMessage } from '../shared/connection-test.mjs';
 import { deriveQqBotIdentity, maskQqAppId } from './config-store.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set(['starting', 'pending', 'refreshing', 'connecting']);
@@ -248,6 +249,23 @@ export class QqController {
     return this.status();
   }
 
+  async sendConnectionTest(botId) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown QQ bot');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.sendConnectionTest !== 'function') {
+        const error = new Error('QQ机器人尚未连接');
+        error.code = 'test-target-unavailable';
+        throw error;
+      }
+      await runtime.sendConnectionTest(connectionTestMessage(
+        `QQ 机器人（${maskQqAppId(config.appId)}）`,
+      ));
+      return { sent: true };
+    });
+  }
+
   async deleteBot(botId) {
     const config = this.#configStore.get(botId);
     if (!config) throw new Error('Unknown QQ bot');

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

@@ -1,5 +1,9 @@
 import { QQBot, typingIndicator } from '@tencent-connect/qqbot-nodejs';
 
+import {
+  connectionTestTarget,
+  connectionTestTargetUnavailable,
+} from '../shared/connection-test.mjs';
 import { createQqBridgeStatus, QqHarnessBridge } from './qq-bridge.mjs';
 
 function timeoutError() {
@@ -67,6 +71,28 @@ export class QqRuntime {
     return structuredClone(this.#status);
   }
 
+  async sendConnectionTest(text) {
+    if (!this.#status.ready || !this.#bot) {
+      throw connectionTestTargetUnavailable('QQ机器人');
+    }
+    const ownerUserOpenid = typeof this.#config.ownerUserOpenid === 'string'
+      ? this.#config.ownerUserOpenid.trim()
+      : '';
+    const remembered = connectionTestTarget(this.#state);
+    const rememberedUserOpenid = remembered?.scope === 'c2c'
+      && typeof remembered.targetId === 'string'
+      ? remembered.targetId.trim()
+      : '';
+    const target = rememberedUserOpenid
+      ? { scope: 'c2c', targetId: rememberedUserOpenid }
+      : (ownerUserOpenid && ownerUserOpenid !== '*'
+        ? { scope: 'c2c', targetId: ownerUserOpenid }
+        : null);
+    if (!target) throw connectionTestTargetUnavailable('QQ机器人');
+    await this.#bot.sendText(target, text);
+    return { sent: true };
+  }
+
   async start() {
     if (this.#status.ready && this.#bot) return this.status;
     if (this.#starting) return this.#starting;

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

@@ -9,6 +9,7 @@ import {
 } from 'node:fs/promises';
 import { dirname, isAbsolute, resolve } from 'node:path';
 
+import { CONNECTION_TEST_STATE_IDENTITY } from './connection-test.mjs';
 import { WORKSPACE_SESSION_STALE } from './workspace-session.mjs';
 
 const EMPTY_DOCUMENT = Object.freeze({ version: 1, workspaces: Object.freeze({}) });
@@ -687,6 +688,7 @@ export function createBotWorkspaceScope(harness, { botId, workspaces, state }) {
   });
   const scopedState = new Proxy(state, {
     get(target, property) {
+      if (property === CONNECTION_TEST_STATE_IDENTITY) return target;
       if (property === 'sessionFor') {
         return (key, ...args) => {
           if (!isCurrentScope()) return null;

package/src/channels/shared/connection-test.mjs

@@ -0,0 +1,54 @@
+const targets = new WeakMap();
+
+export const CONNECTION_TEST_STATE_IDENTITY = Symbol('dsh-im.connection-test-state-identity');
+
+function stateIdentity(state) {
+  return state?.[CONNECTION_TEST_STATE_IDENTITY] ?? state;
+}
+
+function cleanText(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+export function rememberConnectionTestTarget(state, target) {
+  if (!state || !target || typeof target !== 'object') return false;
+  try {
+    targets.set(stateIdentity(state), structuredClone(target));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function connectionTestTarget(state) {
+  const target = state ? targets.get(stateIdentity(state)) : null;
+  return target ? structuredClone(target) : null;
+}
+
+export function connectionTestMessage(botName, channelLabel = '机器人') {
+  const name = cleanText(botName) ?? channelLabel;
+  return `✅ DeepSeek Harness 连接测试成功\n这条消息由插件页面中的“${name}”机器人卡片发出。`;
+}
+
+export function connectionTestTargetUnavailable(channelLabel = '机器人') {
+  const error = new Error(`${channelLabel}尚未收到可用于测试的私聊消息。`);
+  error.code = 'test-target-unavailable';
+  return error;
+}
+
+export async function sendRememberedConnectionTest({ state, send, text, channelLabel }) {
+  const target = connectionTestTarget(state);
+  if (!target) throw connectionTestTargetUnavailable(channelLabel);
+  await send(target, text);
+  return { sent: true };
+}
+
+export function publicConnectionTestResult(error) {
+  if (!error) return Object.freeze({ sent: true });
+  return Object.freeze({
+    sent: false,
+    code: error?.code === 'test-target-unavailable'
+      ? 'test-target-unavailable'
+      : 'test-message-failed',
+  });
+}

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

@@ -327,7 +327,7 @@ export class HarnessClient {
   constructor({
     baseUrl,
     workspace,
-    agentPreset = 'standard',
+    agentPreset,
     autostart = false,
     dshBin = 'dsh',
     fetchImpl = fetch,
@@ -354,7 +354,8 @@ export class HarnessClient {
     }
     this.#baseUrl = new URL(baseUrl);
     this.#workspace = workspace;
-    this.#agentPreset = agentPreset;
+    // Keep an omitted preset absent so session.create resolves the Host's current default.
+    this.#agentPreset = agentPreset ?? undefined;
     this.#autostart = autostart;
     this.#dshBin = dshBin;
     this.#fetch = fetchImpl;
@@ -458,10 +459,9 @@ export class HarnessClient {
   async createSession(options = {}) {
     await this.ensureRunning(options);
     const workspaceId = await this.workspaceId(options);
-    const created = await this.rpc('session.create', {
-      workspaceId,
-      agentPreset: this.#agentPreset,
-    }, 30_000, options);
+    const payload = { workspaceId };
+    if (this.#agentPreset !== undefined) payload.agentPreset = this.#agentPreset;
+    const created = await this.rpc('session.create', payload, 30_000, options);
     return created.sessionId;
   }
 
@@ -623,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;
@@ -693,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 });