@xmanrui/dsh-im 1.2.0 → 1.3.0

package/src/channels/shared/inbound-file.mjs

@@ -0,0 +1,206 @@
+import { createWriteStream } from 'node:fs';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { isAbsolute, join, relative, resolve } from 'node:path';
+import { pipeline } from 'node:stream/promises';
+
+const FILES_DIRECTORY = join('.dsh-im', 'inbound');
+
+export class InboundFileError extends Error {
+  constructor(code, message, userMessage = '文件接收失败，请重新发送后再试。', options = {}) {
+    super(message, options);
+    this.name = 'InboundFileError';
+    this.code = code;
+    this.userMessage = userMessage;
+  }
+}
+
+function fileSources(message) {
+  return Array.isArray(message?.files) ? message.files.filter(Boolean) : [];
+}
+
+function displayName(value, fallback) {
+  if (typeof value !== 'string') return fallback;
+  const cleaned = value
+    .replaceAll('\\', '/')
+    .split('/')
+    .at(-1)
+    ?.replace(/[\u0000-\u001f\u007f]/g, '')
+    .trim();
+  return cleaned || fallback;
+}
+
+function storageName(value, index) {
+  const cleaned = displayName(value, 'file')
+    .replace(/[^\p{L}\p{N}._ -]/gu, '_')
+    .replace(/^\.+/, '')
+    .slice(0, 160) || 'file';
+  return `${String(index + 1).padStart(2, '0')}-${cleaned}`;
+}
+
+function loadedFile(value) {
+  if (Buffer.isBuffer(value) || value instanceof Uint8Array) {
+    return { data: Buffer.from(value) };
+  }
+  const raw = value?.data ?? value?.buffer;
+  if (Buffer.isBuffer(raw) || raw instanceof Uint8Array) {
+    return {
+      data: Buffer.from(raw),
+      name: value?.name ?? value?.filename,
+      mediaType: value?.mediaType ?? value?.mimetype,
+    };
+  }
+  const stream = value?.stream ?? value;
+  if (stream && typeof stream[Symbol.asyncIterator] === 'function') {
+    return {
+      stream,
+      name: value?.name ?? value?.filename,
+      mediaType: value?.mediaType ?? value?.mimetype,
+    };
+  }
+  return null;
+}
+
+export function hasInboundFiles(message) {
+  return fileSources(message).length > 0;
+}
+
+/** Start provider downloads immediately while preserving the lazy file-source contract. */
+export function prefetchInboundFiles(message, { signal } = {}) {
+  const sources = fileSources(message);
+  if (sources.length === 0) return message;
+  return {
+    ...message,
+    files: sources.map((source) => {
+      if (source?.data !== undefined || typeof source?.load !== 'function') return source;
+      let download;
+      try {
+        download = Promise.resolve(source.load({ signal }));
+      } catch (error) {
+        download = Promise.reject(error);
+      }
+      download.catch(() => undefined);
+      return {
+        ...source,
+        async load({ signal: loadSignal } = {}) {
+          loadSignal?.throwIfAborted();
+          const result = await download;
+          loadSignal?.throwIfAborted();
+          return result;
+        },
+      };
+    }),
+  };
+}
+
+export async function stageInboundFiles(message, {
+  workspace,
+  signal,
+} = {}) {
+  const sources = fileSources(message);
+  if (sources.length === 0) return null;
+  if (typeof workspace !== 'string' || !isAbsolute(workspace)) {
+    throw new InboundFileError(
+      'inbound-file-workspace-unavailable',
+      'The Harness Session workspace is unavailable for inbound files.',
+    );
+  }
+
+  signal?.throwIfAborted();
+  const root = resolve(workspace, FILES_DIRECTORY);
+  await mkdir(root, { recursive: true, mode: 0o700 });
+  const directory = await mkdtemp(join(root, 'turn-'));
+  const files = [];
+
+  try {
+    for (const [index, source] of sources.entries()) {
+      signal?.throwIfAborted();
+      let value;
+      try {
+        value = source?.data === undefined
+          ? await source?.load?.({ signal })
+          : source.data;
+      } catch (error) {
+        if (signal?.aborted) throw error;
+        throw new InboundFileError(
+          'inbound-file-download-failed',
+          `Unable to download inbound file ${index + 1}: ${error?.message ?? String(error)}`,
+          '文件下载失败，请重新发送后再试。',
+          { cause: error },
+        );
+      }
+
+      const loaded = loadedFile(value);
+      if (!loaded) {
+        throw new InboundFileError(
+          'inbound-file-data-invalid',
+          `Inbound file ${index + 1} returned no readable data.`,
+        );
+      }
+      const name = displayName(loaded.name ?? source?.name, `file-${index + 1}`);
+      const path = join(directory, storageName(name, index));
+      if (loaded.data) {
+        await writeFile(path, loaded.data, { mode: 0o600, signal });
+      } else {
+        try {
+          await pipeline(
+            loaded.stream,
+            createWriteStream(path, { flags: 'wx', mode: 0o600 }),
+            { signal },
+          );
+        } catch (error) {
+          if (signal?.aborted) throw error;
+          throw new InboundFileError(
+            'inbound-file-download-failed',
+            `Unable to stream inbound file ${index + 1}: ${error?.message ?? String(error)}`,
+            '文件下载失败，请重新发送后再试。',
+            { cause: error },
+          );
+        }
+      }
+      const relativePath = relative(resolve(workspace), path);
+      if (!relativePath || relativePath.startsWith('..') || isAbsolute(relativePath)) {
+        throw new InboundFileError(
+          'inbound-file-path-invalid',
+          'The staged inbound file escaped the Harness Session workspace.',
+        );
+      }
+      files.push(Object.freeze({
+        name,
+        path: relativePath,
+        ...(typeof (loaded.mediaType ?? source?.mediaType) === 'string'
+          && (loaded.mediaType ?? source.mediaType).trim()
+          ? { mediaType: (loaded.mediaType ?? source.mediaType).trim() }
+          : {}),
+      }));
+    }
+    return Object.freeze({
+      files: Object.freeze(files),
+      async cleanup() {
+        await rm(directory, { recursive: true, force: true });
+      },
+    });
+  } catch (error) {
+    await rm(directory, { recursive: true, force: true }).catch(() => undefined);
+    throw error;
+  }
+}
+
+export function appendInboundFilesToPrompt(prompt, staged) {
+  if (!staged?.files?.length) return prompt;
+  const manifest = [
+    '<dsh_im_files>',
+    JSON.stringify({
+      description: 'Files uploaded with this user message. Paths are relative to the current Harness workspace.',
+      files: staged.files,
+    }),
+    '</dsh_im_files>',
+  ].join('\n');
+
+  if (Array.isArray(prompt)) return [...prompt, { type: 'text', text: manifest }];
+  const text = typeof prompt === 'string' ? prompt.trim() : '';
+  return text ? `${text}\n\n${manifest}` : manifest;
+}
+
+export function inboundFileUserMessage(error) {
+  return error instanceof InboundFileError ? error.userMessage : null;
+}

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

@@ -23,6 +23,10 @@ import {
   imagePromptUserMessage,
   promptContentForMessage,
 } from './image-prompt.mjs';
+import {
+  hasInboundFiles,
+  inboundFileUserMessage,
+} from './inbound-file.mjs';
 import {
   harnessAnswerForQuestion,
   harnessQuestionText,
@@ -50,6 +54,7 @@ function canClaimInteractionReply(message, pending, senderId) {
   return pending.actor === senderId
     && (message.kind !== 'group' || message.addressed === true)
     && !hasInboundImages(message)
+    && !hasInboundFiles(message)
     && Boolean(cleanText(message.content));
 }
 
@@ -171,7 +176,7 @@ export class TextHarnessBridge {
     const key = `${kind}:${conversationId}`;
     const pending = this.#pendingInteractions.get(key);
     const text = cleanText(normalized.content);
-    const commandRunner = isControlCommand(text)
+    const commandRunner = hasInboundFiles(normalized) ? null : isControlCommand(text)
       ? runControlCommand
       : (isModelCommand(text)
           ? runModelCommand
@@ -194,7 +199,7 @@ export class TextHarnessBridge {
       key,
       actor: senderId,
       messageId,
-      text: hasInboundImages(normalized) ? '' : normalized.content,
+      text: hasInboundImages(normalized) || hasInboundFiles(normalized) ? '' : normalized.content,
       addressed: normalized.kind !== 'group' || normalized.addressed === true,
       hasPendingQuestion: Boolean(pending),
       questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
@@ -300,6 +305,7 @@ export class TextHarnessBridge {
         {
           signal: this.#signal,
           hasImages: hasInboundImages(message),
+          hasFiles: hasInboundFiles(message),
           pendingInteraction: this.#pendingInteractions.has(key)
             || this.#approvals.hasPending(key),
           control: { owner: this, key },
@@ -423,16 +429,17 @@ export class TextHarnessBridge {
         return;
       }
       const hasImages = hasInboundImages(message);
-      if (!text && !hasImages) {
-        await this.#bot.sendText(target, '目前支持文字和图片消息。');
+      const hasFiles = hasInboundFiles(message);
+      if (!text && !hasImages && !hasFiles) {
+        await this.#bot.sendText(target, '目前支持文字、图片和文件消息。');
         return;
       }
       const command = text.toLowerCase();
-      if (!hasImages && command === '/help') {
+      if (!hasImages && !hasFiles && command === '/help') {
         await this.#bot.sendText(target, [
           `${this.#descriptor.label}机器人已连接 DeepSeek Harness。`,
           '',
-          '直接发送文字或图片即可继续当前会话。',
+          '直接发送文字、图片或文件即可继续当前会话。',
           '/new  开启一个全新会话',
           '/compact  压缩当前会话的较早上下文',
           '/workspace 工作区绝对路径  切换工作区',
@@ -453,12 +460,12 @@ export class TextHarnessBridge {
         ].join('\n'));
         return;
       }
-      if (!hasImages && command === '/status') {
+      if (!hasImages && !hasFiles && command === '/status') {
         await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#bot.sendText(target, `${this.#descriptor.label}机器人与 DeepSeek Harness 连接正常。`);
         return;
       }
-      const workspaceCommand = !hasImages
+      const workspaceCommand = !hasImages && !hasFiles
         ? await runWorkspaceCommand(text, this.#harness, conversationKey)
         : null;
       if (workspaceCommand) {
@@ -467,12 +474,12 @@ export class TextHarnessBridge {
         }
         return;
       }
-      if (!hasImages && command === '/new') {
+      if (!hasImages && !hasFiles && command === '/new') {
         await this.#state.clearSession(conversationKey);
         await this.#bot.sendText(target, '已开启新会话。请发送你的问题。');
         return;
       }
-      const compactCommand = !hasImages
+      const compactCommand = !hasImages && !hasFiles
         ? await runCompactCommand(
             text,
             this.#harness,
@@ -527,6 +534,7 @@ export class TextHarnessBridge {
             requiresMention: message.kind === 'group',
           }),
           onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
+          files: message.files,
         },
       });
       const visibleAnswer = !cleanText(answer) && artifacts.length > 0
@@ -600,6 +608,18 @@ export class TextHarnessBridge {
         }
         return;
       }
+      const fileErrorMessage = inboundFileUserMessage(error);
+      if (fileErrorMessage) {
+        try {
+          await this.#bot.sendText(target, fileErrorMessage);
+        } catch (sendError) {
+          this.#logger.error?.(
+            `[dsh-im:${this.#descriptor.key}] failed to send the file error reply:`,
+            sendError,
+          );
+        }
+        return;
+      }
       this.#logger.error?.(`[dsh-im:${this.#descriptor.key}] failed to process a message:`, error);
       try {
         await this.#bot.sendText(target, '消息处理失败，请稍后重试。');
@@ -642,7 +662,7 @@ export class TextHarnessBridge {
 
     const target = message.replyTarget;
     const text = cleanText(message.content);
-    if (!text || hasInboundImages(message)) {
+    if (!text || hasInboundImages(message) || hasInboundFiles(message)) {
       try {
         await this.#bot.sendText(target, '请用文字回答当前问题。');
       } catch (error) {

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

@@ -1,3 +1,4 @@
+import { fetchFileStream } from '../shared/file-download.mjs';
 import { fetchImageBuffer, ImagePromptError } from '../shared/image-prompt.mjs';
 
 const DEFAULT_BASE_URL = 'https://slack.com/api/';
@@ -232,6 +233,18 @@ export class SlackApi {
     });
   }
 
+  async fileInfo({ fileId, signal } = {}) {
+    const value = await this.#request('files.info', {
+      tokenKind: 'bot',
+      signal,
+      body: { file: slackId(fileId, 'file id') },
+    });
+    if (!value?.file || typeof value.file !== 'object' || Array.isArray(value.file)) {
+      throw new Error('Slack files.info returned no file object');
+    }
+    return value.file;
+  }
+
   postMessage({ channelId, text, threadTs, signal }) {
     return this.#request('chat.postMessage', {
       tokenKind: 'bot',
@@ -396,6 +409,14 @@ export class SlackApi {
   }
 
   async downloadFile({ url, signal, maxBytes }) {
+    return this.#downloadFile({ url, signal, maxBytes, stream: false });
+  }
+
+  async downloadFileStream({ url, signal }) {
+    return this.#downloadFile({ url, signal, stream: true });
+  }
+
+  async #downloadFile({ url, signal, maxBytes, stream }) {
     if (!this.#botToken) throw new TypeError('Slack bot token is required for file download');
     const target = secureSlackFileUrl(url);
     const fetchSlackFile = async (requestUrl, options) => {
@@ -414,13 +435,15 @@ export class SlackApi {
       }
       return response;
     };
-    return fetchImageBuffer(target, {
+    const options = {
       fetchImpl: fetchSlackFile,
       headers: { authorization: `Bearer ${this.#botToken}` },
       signal,
-      maxBytes,
       allowedHosts: SLACK_FILE_HOSTS,
-    });
+    };
+    return stream
+      ? fetchFileStream(target, options)
+      : fetchImageBuffer(target, { ...options, maxBytes });
   }
 
   async #request(method, {
@@ -432,7 +455,7 @@ export class SlackApi {
   }) {
     const token = tokenKind === 'app' ? this.#appToken : this.#botToken;
     if (!token) throw new TypeError(`Slack ${tokenKind} token is required for ${method}`);
-    const formEncoded = method === 'files.getUploadURLExternal';
+    const formEncoded = method === 'files.getUploadURLExternal' || method === 'files.info';
     let response;
     try {
       response = await this.#fetch(new URL(method, this.#baseUrl), {

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

@@ -43,10 +43,14 @@ function stripBotMention(value, botUserId) {
     .trim();
 }
 
+function slackFileUrl(file) {
+  return typeof file?.url_private_download === 'string' && file.url_private_download
+    ? file.url_private_download : file?.url_private;
+}
+
 function slackImageSource(file, loadFile) {
   const mediaType = typeof file?.mimetype === 'string' ? file.mimetype.toLowerCase() : '';
-  const url = typeof file?.url_private_download === 'string' && file.url_private_download
-    ? file.url_private_download : file?.url_private;
+  const url = slackFileUrl(file);
   if (!IMAGE_MEDIA_TYPES.has(mediaType) || typeof url !== 'string' || !url) return null;
   return {
     name: typeof file.name === 'string' ? file.name : undefined,
@@ -56,9 +60,50 @@ function slackImageSource(file, loadFile) {
   };
 }
 
-export function normalizeSlackEvent(payload, botUserId, { loadFile = async () => {
-  throw new Error('Slack file downloader is unavailable');
-} } = {}) {
+function slackFileSource(file, loadFile, loadFileInfo) {
+  const mediaType = typeof file?.mimetype === 'string' && file.mimetype
+    ? file.mimetype.toLowerCase() : undefined;
+  const url = slackFileUrl(file);
+  if (IMAGE_MEDIA_TYPES.has(mediaType)) return null;
+  const requiresInfo = file?.file_access === 'check_file_info'
+    && typeof file?.id === 'string' && file.id;
+  if ((typeof url !== 'string' || !url) && !requiresInfo) return null;
+  return {
+    name: typeof file?.name === 'string' && file.name
+      ? file.name : typeof file?.title === 'string' && file.title
+        ? file.title : requiresInfo ? file.id : 'slack-file',
+    ...(mediaType ? { mediaType } : {}),
+    size: Number.isSafeInteger(file?.size) && file.size >= 0 ? file.size : undefined,
+    load: async ({ signal } = {}) => {
+      if (!requiresInfo) return loadFile(url, { signal });
+      const resolved = await loadFileInfo(file.id, { signal });
+      const resolvedUrl = slackFileUrl(resolved);
+      if (typeof resolvedUrl !== 'string' || !resolvedUrl) {
+        throw new Error('Slack files.info returned no downloadable URL');
+      }
+      const loaded = await loadFile(resolvedUrl, { signal });
+      const name = typeof resolved?.name === 'string' && resolved.name
+        ? resolved.name : typeof resolved?.title === 'string' && resolved.title
+          ? resolved.title : file.id;
+      const resolvedMediaType = typeof resolved?.mimetype === 'string' && resolved.mimetype
+        ? resolved.mimetype.toLowerCase() : undefined;
+      if (Buffer.isBuffer(loaded) || loaded instanceof Uint8Array) {
+        return { data: loaded, name, ...(resolvedMediaType ? { mediaType: resolvedMediaType } : {}) };
+      }
+      return {
+        ...loaded,
+        name,
+        ...(resolvedMediaType ? { mediaType: resolvedMediaType } : {}),
+      };
+    },
+  };
+}
+
+export function normalizeSlackEvent(payload, botUserId, {
+  loadFile = async () => { throw new Error('Slack file downloader is unavailable'); },
+  loadFileStream = loadFile,
+  loadFileInfo = async () => { throw new Error('Slack file metadata loader is unavailable'); },
+} = {}) {
   const event = payload?.event;
   if (!event || !payload?.event_id || !event.channel || !event.user || !event.ts) return null;
   const direct = event.type === 'message' && event.channel_type === 'im';
@@ -76,6 +121,9 @@ export function normalizeSlackEvent(payload, botUserId, { loadFile = async () =>
     images: Array.isArray(event.files)
       ? event.files.map((file) => slackImageSource(file, loadFile)).filter(Boolean)
       : [],
+    files: Array.isArray(event.files)
+      ? event.files.map((file) => slackFileSource(file, loadFileStream, loadFileInfo)).filter(Boolean)
+      : [],
     addressed: direct || mentioned,
     replyTarget: {
       channelId: String(event.channel),
@@ -436,6 +484,8 @@ export class SlackRuntime {
           && packet.payload.api_app_id !== this.#appId) return;
         const message = normalizeSlackEvent(packet.payload, this.#config.platformId.split(':')[1], {
           loadFile: (url, options) => this.#api.downloadFile({ url, ...options }),
+          loadFileStream: (url, options) => this.#api.downloadFileStream({ url, ...options }),
+          loadFileInfo: (fileId, options) => this.#api.fileInfo({ fileId, ...options }),
         });
         const bridge = this.#bridge;
         if (message && bridge) {

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

@@ -1,3 +1,4 @@
+import { fetchFileStream } from '../shared/file-download.mjs';
 import { fetchImageBuffer } from '../shared/image-prompt.mjs';
 
 const DEFAULT_BASE_URL = 'https://api.telegram.org/';
@@ -131,6 +132,25 @@ export class TelegramApi {
   }
 
   async downloadFile({ fileId, signal, maxBytes } = {}) {
+    const url = await this.#downloadUrl(fileId, signal);
+    return fetchImageBuffer(url, {
+      fetchImpl: this.#fetch,
+      signal,
+      maxBytes,
+      allowedHosts: TELEGRAM_FILE_HOSTS,
+    });
+  }
+
+  async downloadFileStream({ fileId, signal } = {}) {
+    const url = await this.#downloadUrl(fileId, signal);
+    return fetchFileStream(url, {
+      fetchImpl: this.#fetch,
+      signal,
+      allowedHosts: TELEGRAM_FILE_HOSTS,
+    });
+  }
+
+  async #downloadUrl(fileId, signal) {
     const file = await this.getFile({ fileId, signal });
     const filePath = cleanString(file?.file_path);
     if (!filePath || filePath.startsWith('/') || filePath.includes('\\')
@@ -148,12 +168,7 @@ export class TelegramApi {
     }
     const url = new URL(this.#baseUrl);
     url.pathname = `/file/bot${this.#token}/${filePath}`;
-    return fetchImageBuffer(url, {
-      fetchImpl: this.#fetch,
-      signal,
-      maxBytes,
-      allowedHosts: TELEGRAM_FILE_HOSTS,
-    });
+    return url;
   }
 
   async sendMessage({ chatId, text, replyToMessageId, messageThreadId, signal }) {

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

@@ -100,9 +100,27 @@ function telegramImageSource(message, loadFile) {
   };
 }
 
-export function normalizeTelegramUpdate(update, { botId, username, loadFile = async () => {
-  throw new Error('Telegram file downloader is unavailable');
-} }) {
+function telegramFileSource(message, loadFile) {
+  const file = message?.document;
+  if (!file || imageTypeForDocument(file)
+    || typeof file.file_id !== 'string' || !file.file_id) return null;
+  const mediaType = typeof file.mime_type === 'string' && file.mime_type
+    ? file.mime_type.toLowerCase() : undefined;
+  return {
+    name: typeof file.file_name === 'string' && file.file_name
+      ? file.file_name : String(file.file_unique_id ?? file.file_id),
+    ...(mediaType ? { mediaType } : {}),
+    size: fileSize(file.file_size),
+    load: ({ signal } = {}) => loadFile(file.file_id, { signal }),
+  };
+}
+
+export function normalizeTelegramUpdate(update, {
+  botId,
+  username,
+  loadFile = async () => { throw new Error('Telegram file downloader is unavailable'); },
+  loadFileStream = loadFile,
+}) {
   const message = update?.message;
   const chatId = message?.chat?.id;
   const senderId = message?.from?.id;
@@ -117,6 +135,7 @@ export function normalizeTelegramUpdate(update, { botId, username, loadFile = as
   const messageThreadId = Number.isSafeInteger(message.message_thread_id)
     ? message.message_thread_id : undefined;
   const image = telegramImageSource(message, loadFile);
+  const file = telegramFileSource(message, loadFileStream);
   return {
     messageId: String(update.update_id),
     senderId: String(senderId),
@@ -126,6 +145,7 @@ export function normalizeTelegramUpdate(update, { botId, username, loadFile = as
       ? String(chatId) : `${chatId}:${messageThreadId}`,
     content: withoutBotMention(message.text ?? message.caption ?? '', username),
     images: image ? [image] : [],
+    files: file ? [file] : [],
     addressed,
     replyTarget: {
       chatId,
@@ -381,6 +401,7 @@ export class TelegramRuntime {
           botId: this.#config.platformId,
           username: this.#config.username,
           loadFile: (fileId, options) => this.#api.downloadFile({ fileId, ...options }),
+          loadFileStream: (fileId, options) => this.#api.downloadFileStream({ fileId, ...options }),
         });
         if (message && telegramInboundAllowed(message, {
           accessMode: this.#accessMode,