@xmanrui/dsh-im 1.2.0 → 1.4.0

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

@@ -3,6 +3,10 @@ import { randomUUID } from 'node:crypto';
 import { isAbsolute } from 'node:path';
 
 import { adoptRegisteredWorkspaceSession } from './harness-session-binding.mjs';
+import {
+  appendInboundFilesToPrompt,
+  InboundFileError,
+} from './inbound-file.mjs';
 import { outboundArtifactRegistry } from './semantic/artifact.mjs';
 
 // Every channel plugin runs in the same Host process. Sharing ownership by
@@ -251,6 +255,21 @@ function assistantMessageText(event) {
     .trim();
 }
 
+function nonEmptyText(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+/** Flatten a tool/result error payload into a displayable one-line reason. */
+function toolResultErrorText(error) {
+  if (!error || typeof error !== 'object') return null;
+  const message = nonEmptyText(error.message);
+  if (message) return message;
+  const name = nonEmptyText(error.name);
+  const code = nonEmptyText(error.code);
+  if (name || code) return [name ?? 'Error', code].filter(Boolean).join(': ');
+  return null;
+}
+
 function consumeInteractionOwnership(ownership, entries) {
   const ordered = [...entries]
     .map((entry) => entry?.event ?? entry)
@@ -321,6 +340,8 @@ export class HarnessReplyTracker {
   #latestText = '';
   #finished = false;
   #reason = null;
+  #toolNames = new Map();
+  #lastToolName = null;
 
   constructor({ promptRpcId, afterSeq = -1 }) {
     this.#promptRpcId = promptRpcId;
@@ -347,8 +368,20 @@ export class HarnessReplyTracker {
     return this.#targetTurn;
   }
 
-  consume(entries) {
-    let update = null;
+  consumeAll(entries) {
+    const updates = [];
+    // 同一批轮询内的 text 帧只保留最新累积，其余事件逐帧透出，
+    // 让消费方能按顺序看到每个工具调用与结果。
+    const pushUpdate = (update) => {
+      if (update.type === 'text' && updates.length > 0) {
+        const last = updates[updates.length - 1];
+        if (last.type === 'text') {
+          updates[updates.length - 1] = update;
+          return;
+        }
+      }
+      updates.push(update);
+    };
     const ordered = [...entries]
       .map((entry) => entry?.event ?? entry)
       .filter(Boolean)
@@ -390,7 +423,7 @@ export class HarnessReplyTracker {
           .trim();
         if (text && text !== this.#latestText) {
           this.#latestText = text;
-          update = { type: 'text', text };
+          pushUpdate({ type: 'text', text });
         }
         continue;
       }
@@ -399,18 +432,38 @@ export class HarnessReplyTracker {
         const text = assistantMessageText(event);
         if (text && text !== this.#latestText) {
           this.#latestText = text;
-          update = { type: 'text', text };
+          pushUpdate({ type: 'text', text });
         }
         continue;
       }
 
       if (event.type === 'tool/call') {
-        update = { type: 'tool', name: event.data?.name ?? '工具' };
+        const name = nonEmptyText(event.data?.name) ?? '工具';
+        const callId = nonEmptyText(event.data?.callId)
+          ?? nonEmptyText(event.data?.subCallId);
+        if (callId) this.#toolNames.set(callId, name);
+        this.#lastToolName = name;
+        pushUpdate({ type: 'tool', name, ...(callId ? { callId } : {}) });
       } else if (event.type === 'tool/result') {
-        update = { type: 'status', text: '正在整理结果…' };
+        const callId = nonEmptyText(event.data?.message?.source?.callId)
+          ?? nonEmptyText(event.data?.callId)
+          ?? nonEmptyText(event.data?.subCallId);
+        const toolName = (callId ? this.#toolNames.get(callId) : null)
+          ?? this.#lastToolName;
+        const error = toolResultErrorText(event.data?.error);
+        pushUpdate({
+          type: 'status',
+          text: '正在整理结果…',
+          ...(toolName ? { toolName } : {}),
+          ...(error ? { error } : {}),
+        });
       }
     }
-    return update;
+    return updates;
+  }
+
+  consume(entries) {
+    return this.consumeAll(entries).at(-1) ?? null;
   }
 }
 
@@ -466,6 +519,7 @@ export class HarnessClient {
   #commandExecutor;
   #controlExecutor;
   #sessionMaintenanceExecutor;
+  #fileIngressExecutor;
   #managedProcess = null;
   #interactionRegistry;
   #interactionOwnerships;
@@ -486,6 +540,7 @@ export class HarnessClient {
     commandExecutor,
     controlExecutor,
     sessionMaintenanceExecutor,
+    fileIngressExecutor,
   }) {
     if (typeof createWebSocket !== 'function') {
       throw new TypeError('createWebSocket must be a function');
@@ -509,6 +564,9 @@ export class HarnessClient {
       && typeof sessionMaintenanceExecutor !== 'function') {
       throw new TypeError('sessionMaintenanceExecutor must be a function');
     }
+    if (fileIngressExecutor !== undefined && typeof fileIngressExecutor !== 'function') {
+      throw new TypeError('fileIngressExecutor must be a function');
+    }
     this.#baseUrl = new URL(baseUrl);
     this.#workspace = workspace;
     // Keep an omitted preset absent so session.create resolves the Host's current default.
@@ -523,6 +581,7 @@ export class HarnessClient {
     this.#commandExecutor = commandExecutor;
     this.#controlExecutor = controlExecutor;
     this.#sessionMaintenanceExecutor = sessionMaintenanceExecutor;
+    this.#fileIngressExecutor = fileIngressExecutor;
     this.#interactionRegistry = interactionRegistry(this.#baseUrl.origin);
     this.#interactionOwnerships = this.#interactionRegistry.ownerships;
     this.#interactionClaims = this.#interactionRegistry.claims;
@@ -1026,6 +1085,7 @@ export class HarnessClient {
     const timeoutMs = options.timeoutMs ?? 600_000;
     const signal = options.signal;
     const onUpdate = typeof options.onUpdate === 'function' ? options.onUpdate : null;
+    const progressMode = options.progressMode === 'all' ? 'all' : 'latest';
     const onArtifact = typeof options.onArtifact === 'function' ? options.onArtifact : null;
     const onInteraction = typeof options.onInteraction === 'function'
       ? options.onInteraction
@@ -1034,6 +1094,7 @@ export class HarnessClient {
       ? options.onInteractionResolved
       : undefined;
     const control = normalizeControl(options.control);
+    const inboundFiles = Array.isArray(options.files) ? options.files.filter(Boolean) : [];
     await this.ensureRunning({ signal });
     const before = await this.rpc(
       'session.history',
@@ -1075,6 +1136,9 @@ export class HarnessClient {
     let interactionTask = null;
     let artifactsDelivered = false;
     let deliveredArtifactCount = 0;
+    let stagedInboundFiles = null;
+    let promptAccepted = false;
+    let turnFinished = false;
 
     const deliverArtifacts = async () => {
       if (!onArtifact || artifactsDelivered || tracker.turn === null) {
@@ -1103,6 +1167,30 @@ export class HarnessClient {
     const closeArtifactConsumer = outboundArtifactRegistry.openConsumer(sessionId, promptRpcId);
 
     try {
+      if (inboundFiles.length > 0) {
+        if (!this.#fileIngressExecutor) {
+          throw new InboundFileError(
+            'inbound-file-ingress-unavailable',
+            'Harness file ingress is unavailable in this Host process.',
+          );
+        }
+        const sessionList = await this.rpc(
+          'session.list',
+          {},
+          30_000,
+          { signal },
+        );
+        const sessionWorkspace = sessionList?.items?.find(
+          (item) => item?.sessionId === sessionId,
+        )?.cwd;
+        stagedInboundFiles = await this.#fileIngressExecutor({
+          sessionId,
+          workspace: sessionWorkspace,
+          files: inboundFiles,
+          signal,
+        });
+        prompt = appendInboundFilesToPrompt(prompt, stagedInboundFiles);
+      }
       if (interactionSignal) {
         let markOpen;
         const opened = new Promise((resolve) => { markOpen = resolve; });
@@ -1134,6 +1222,7 @@ export class HarnessClient {
         content,
         clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       }, 30_000, { rpcId: promptRpcId, signal });
+      promptAccepted = true;
 
       try {
         const deadline = Date.now() + timeoutMs;
@@ -1150,15 +1239,19 @@ export class HarnessClient {
             this.#consumeInteractionOwnerships(sessionId, history.events ?? []);
             if (!wasActive && ownership.active) ownership.reconnect?.();
           }
-          const update = tracker.consume(history.events ?? []);
-          if (update && onUpdate) {
-            try {
-              await onUpdate(update);
-            } catch (error) {
-              console.warn(`[${this.#logPrefix}] ignored a progress update failure:`, error.message);
+          const updates = tracker.consumeAll(history.events ?? []);
+          if (onUpdate) {
+            const visibleUpdates = progressMode === 'all' ? updates : updates.slice(-1);
+            for (const update of visibleUpdates) {
+              try {
+                await onUpdate(update);
+              } catch (error) {
+                console.warn(`[${this.#logPrefix}] ignored a progress update failure:`, error.message);
+              }
             }
           }
           if (!tracker.finished) continue;
+          turnFinished = true;
           // An accepted /stop revokes attachment delivery even when Harness
           // preserved a useful partial text answer for the existing UX.
           const artifactCount = ownership?.stopRequested
@@ -1185,6 +1278,11 @@ export class HarnessClient {
         throw turnStoppedError();
       }
     } finally {
+      if (stagedInboundFiles && (!promptAccepted || turnFinished)) {
+        await stagedInboundFiles.cleanup().catch((error) => {
+          console.warn(`[${this.#logPrefix}] unable to clean inbound files:`, error.message);
+        });
+      }
       closeArtifactConsumer();
       if (ownership) {
         this.#unregisterControlOwnership(ownership);

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), {