@xmanrui/dsh-im 4.22.0 → 4.24.0

package/src/channels/shared/i18n-en/image-input.mjs

@@ -0,0 +1,17 @@
+export default {
+  "图片原文件已保存到工作区，文件清单中的图片序号与本条消息一致。图片内容块可能经过缩放或压缩；需要查看细节时可用工具读取原文件。": "Original images are saved in the workspace. Image numbers in the file list match this message. Image blocks may be resized or compressed; use tools to read originals for details.",
+  "部分图片未直接提供给模型，图片序号：{indexes}。原文件已保存，请使用可用工具读取或分析；不要假设自己已看到这些图片。": "Some images were not provided directly to the model: {indexes}. Originals are saved; use available tools to read or analyze them. Do not assume you have seen these images.",
+  "宿主拒绝了本次图片输入。原图已保存到工作区，请根据文件清单使用可用工具读取或分析，不要假设自己已看到图片。": "The Host rejected the image input. Originals are saved in the workspace; use the file list and available tools to read or analyze them. Do not assume you have seen the images.",
+  "图片超过原图接收上限 {maxMb} MB，请压缩后重试，或在通用设置的附件中调整上限。": "The image exceeds the original-image receipt limit of {maxMb} MB. Compress it and retry, or adjust the limit in General settings > Attachments.",
+  "图片 {index}（原图文件：{name}）": "Image {index} (original file: {name})",
+  "图片限制无效：请输入正整数，原图接收上限和总量上限不能小于单图上限。": "Invalid image limits: enter positive integers. The receipt and total limits must be at least the per-image limit.",
+  "无法读取或保存图片设置，请稍后重试。": "Could not read or save image settings. Try again later.",
+  "原图接收上限 (MB)": "Original-image receipt limit (MB)",
+  "模型单图上限 (MB)": "Model per-image limit (MB)",
+  "模型图片总量上限 (MB)": "Model total image limit (MB)",
+  "每条消息最多图片数": "Maximum images per message",
+  "图片输入": "Image input",
+  "适用于支持图片的聊天渠道。原图按附件保留时长保存，发送给模型的副本会自动缩放或压缩；无法直接发送时交给模型按文件处理。": "Applies to chat channels that support images. Originals follow attachment retention settings. Model copies are resized or compressed automatically; images that cannot be sent directly are provided as files.",
+  "保存图片设置": "Save image settings",
+  "正在读取图片设置…": "Loading image settings…"
+};

package/src/channels/shared/i18n-en/shared-a.mjs

@@ -3,6 +3,7 @@ export default {
   '这个问题已在其他客户端处理，无需再次回答。':
     'This question has already been answered from another client; no further reply is needed.',
   '任务已完成。': 'Task completed.',
+  '本轮处理已结束，没有文本回复。': 'This turn has ended with no text reply.',
   '结果文件': 'result file',
   '结果文件「{name}」的发送结果未能确认，请先检查聊天内是否已收到，不要立即重试。':
     'The delivery result of the result file "{name}" could not be confirmed. Please check whether it already arrived in the chat before retrying.',

package/src/channels/shared/i18n-en/shared-c.mjs

@@ -8,7 +8,7 @@ export default {
   '{channel}配置格式错误。请检查其数据目录中的 config.json 和 workspaces.json，修复后重启 DSH。详细原因请查看启动日志。': 'The {channel} configuration is invalid. Check config.json and workspaces.json in its data directory, then restart DSH. See the startup log for details.',
   '{channel}配置格式错误。请检查其数据目录中的 config.json，修复后重启 DSH。详细原因请查看启动日志。': 'The {channel} configuration is invalid. Check config.json in its data directory, then restart DSH. See the startup log for details.',
   '无法读取或写入{channel}配置。请检查其数据目录的访问权限，修复后重启 DSH。详细原因请查看启动日志。': 'The {channel} configuration could not be read or written. Check access to its data directory, then restart DSH. See the startup log for details.',
-  '{channel}初始化失败。请查看 DSH 启动日志中 failed to activate {id} 后的错误，修复后重启 DSH。': '{channel} initialization failed. Check the error after "failed to activate {id}" in the DSH startup log, fix it, then restart DSH.',
+  '{channel}初始化失败。请展开诊断详情，并通过参考号查找 DSH 启动日志，修复后重启 DSH。': '{channel} initialization failed. Expand the diagnostic details and find the reference in the DSH startup log, fix the issue, then restart DSH.',
   // history-command.mjs / command help
   '/history [数量]  查看最近历史消息（默认 3 条，最多 5 条）':
     '/history [count]  Preview recent messages (default 3, maximum 5)',

package/src/channels/shared/i18n-en.mjs

@@ -1,3 +1,5 @@
+import imageInput from './i18n-en/image-input.mjs';
+import diagnostics from './i18n-en/diagnostics.mjs';
 // English translations for host-side user-facing text.
 // Keys are the exact Chinese literals passed to t() in src/channels/**.
 // Chinese output is the identity default and needs no entries here.
@@ -17,9 +19,12 @@ import telegram from './i18n-en/telegram.mjs';
 import discord from './i18n-en/discord.mjs';
 import whatsapp from './i18n-en/whatsapp.mjs';
 import office from './i18n-en/office.mjs';
+import email from './i18n-en/email.mjs';
 
 export const EN = Object.freeze(Object.assign(
   {},
+  diagnostics,
+  imageInput,
   sharedA,
   sharedB,
   sharedC,
@@ -34,4 +39,5 @@ export const EN = Object.freeze(Object.assign(
   discord,
   whatsapp,
   office,
+  email,
 ));

package/src/channels/shared/image-input-policy.mjs

@@ -0,0 +1,35 @@
+export const IMAGE_MEGABYTE = 1024 * 1024;
+
+export const DEFAULT_IMAGE_INPUT_SETTINGS = Object.freeze({
+  maxDownloadMb: 30,
+  maxImageMb: 5,
+  maxTotalMb: 20,
+  maxImages: 20,
+});
+
+/** Shared by the settings form and Host; reject incomplete or unsafe values. */
+export function normalizeImageInputSettings(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  const result = {};
+  for (const key of Object.keys(DEFAULT_IMAGE_INPUT_SETTINGS)) {
+    const input = value[key];
+    const number = typeof input === 'string' && /^\d+$/.test(input.trim())
+      ? Number(input.trim()) : input;
+    if (!Number.isSafeInteger(number) || number < 1
+      || !Number.isSafeInteger(number * IMAGE_MEGABYTE)) return null;
+    result[key] = number;
+  }
+  if (result.maxDownloadMb < result.maxImageMb || result.maxTotalMb < result.maxImageMb) return null;
+  return Object.freeze(result);
+}
+
+export function imageInputLimits(settings = DEFAULT_IMAGE_INPUT_SETTINGS) {
+  const normalized = normalizeImageInputSettings(settings);
+  if (!normalized) throw new TypeError('Invalid image input settings');
+  return Object.freeze({
+    maxDownloadBytes: normalized.maxDownloadMb * IMAGE_MEGABYTE,
+    maxImageBytes: normalized.maxImageMb * IMAGE_MEGABYTE,
+    maxTotalImageBytes: normalized.maxTotalMb * IMAGE_MEGABYTE,
+    maxImages: normalized.maxImages,
+  });
+}

package/src/channels/shared/image-input-settings-store.mjs

@@ -0,0 +1,60 @@
+import { randomUUID } from 'node:crypto';
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+
+import { DEFAULT_IMAGE_INPUT_SETTINGS, normalizeImageInputSettings } from './image-input-policy.mjs';
+
+const stores = new Map();
+
+export class ImageInputSettingsStore {
+  #path;
+  #settings = DEFAULT_IMAGE_INPUT_SETTINGS;
+  #ready;
+  #writes = Promise.resolve();
+
+  constructor(path) { this.#path = path; }
+
+  async get() {
+    this.#ready ??= this.#load().catch((error) => { this.#ready = null; throw error; });
+    await this.#ready;
+    return { ...this.#settings };
+  }
+
+  async #load() {
+    let raw;
+    try { raw = await readFile(this.#path, 'utf8'); }
+    catch (error) { if (error.code === 'ENOENT') return; throw error; }
+    const document = JSON.parse(raw);
+    const settings = document.version === 1 && normalizeImageInputSettings(document.imageInput);
+    if (!settings) throw new Error('Invalid image input settings document');
+    this.#settings = settings;
+  }
+
+  async set(value) {
+    const settings = normalizeImageInputSettings(value);
+    if (!settings) throw new TypeError('Invalid image input settings');
+    const operation = this.#writes.catch(() => {}).then(async () => {
+      await this.get();
+      await mkdir(dirname(this.#path), { recursive: true, mode: 0o700 });
+      const temporary = `${this.#path}.${randomUUID()}.tmp`;
+      try {
+        await writeFile(temporary, `${JSON.stringify({ version: 1, imageInput: settings }, null, 2)}\n`,
+          { mode: 0o600, flag: 'wx' });
+        await rename(temporary, this.#path);
+        this.#settings = settings;
+      } finally { await rm(temporary, { force: true }); }
+      return { ...settings };
+    });
+    this.#writes = operation;
+    return operation;
+  }
+}
+
+/** One settings owner per DSH home, shared by the UI and channel Harness clients. */
+export function getImageInputSettingsStore(config = {}) {
+  const root = resolve(config.dshHome ?? process.env.DSH_HOME ?? join(homedir(), '.dsh'));
+  const path = join(root, 'integrations', 'dsh-im', 'image-input-settings.json');
+  if (!stores.has(path)) stores.set(path, new ImageInputSettingsStore(path));
+  return stores.get(path);
+}

package/src/channels/shared/image-input.mjs

@@ -0,0 +1,124 @@
+import { readFile } from 'node:fs/promises';
+import { basename, join } from 'node:path';
+
+import {
+  detectedImageMediaType, ImagePromptError, imageStorageName, loadedImage, imageDownloadLimitMessage,
+} from './image-prompt.mjs';
+import { t } from './i18n.mjs';
+
+const MAX_INPUT_PIXELS = 64_000_000;
+const COMPRESSION_STEPS = [[2048, 80], [1536, 70], [1024, 60]];
+let sharpPromise;
+async function loadSharp() {
+  sharpPromise ??= import('sharp').then((module) => module.default).catch(() => null);
+  return sharpPromise;
+}
+
+export const IMAGE_ORIGINALS_PROMPT = '图片原文件已保存到工作区，文件清单中的图片序号与本条消息一致。图片内容块可能经过缩放或压缩；需要查看细节时可用工具读取原文件。';
+export const IMAGE_INPUT_FALLBACK_PROMPT = '部分图片未直接提供给模型，图片序号：{indexes}。原文件已保存，请使用可用工具读取或分析；不要假设自己已看到这些图片。';
+export const IMAGE_HOST_LIMIT_FALLBACK_PROMPT = '宿主拒绝了本次图片输入。原图已保存到工作区，请根据文件清单使用可用工具读取或分析，不要假设自己已看到图片。';
+
+/** Keep provider loaders intact; stage and validate each original once. */
+export function inboundImagesAsFiles(images, limits) {
+  if (images.length > limits.maxImages) {
+    throw new ImagePromptError('too-many-images', 'Too many inbound images',
+      t('一次最多只能处理 {maxImages} 张图片。', { maxImages: limits.maxImages }));
+  }
+  const tooLarge = () => new ImagePromptError('image-too-large',
+    `Image exceeds ${limits.maxDownloadBytes} bytes`, imageDownloadLimitMessage(limits.maxDownloadBytes));
+  // Check declared sizes before any download starts, including later images.
+  for (const source of images) {
+    if (Number.isFinite(source?.size) && source.size > limits.maxDownloadBytes) throw tooLarge();
+  }
+  return images.map((source, index) => ({
+    async load({ signal } = {}) {
+      signal?.throwIfAborted();
+      let value;
+      try {
+        value = source.data === undefined
+          ? await source.load?.({ signal, maxBytes: limits.maxDownloadBytes }) : source.data;
+      } catch (error) {
+        if (signal?.aborted) throw signal.reason ?? error;
+        if (error?.code === 'image-too-large') throw tooLarge();
+        if (error instanceof ImagePromptError || ['AbortError', 'TimeoutError'].includes(error?.name)) throw error;
+        throw new ImagePromptError('image-download-failed', 'Unable to download image',
+          t('图片下载失败，请重新发送后再试。'), { cause: error });
+      }
+      signal?.throwIfAborted();
+      const loaded = loadedImage(value);
+      if (!loaded?.data.length) throw new ImagePromptError('invalid-image-data', 'Empty image',
+        t('未能读取图片内容，请重新发送。'));
+      if (loaded.data.length > limits.maxDownloadBytes) throw tooLarge();
+      const mediaType = detectedImageMediaType(loaded.data);
+      if (!mediaType) throw new ImagePromptError('unsupported-image-type', 'Unsupported image',
+        t('暂不支持该图片格式，请发送 JPEG、PNG、WebP 或 GIF 图片。'));
+      return { data: loaded.data, mediaType,
+        name: `${index + 1}-${imageStorageName(loaded.name ?? source.name, mediaType, index)}` };
+    },
+  }));
+}
+
+/** A missing optional codec still permits small native images and file delivery. */
+export async function modelImageFromOriginal(data, mediaType, maxBytes, {
+  signal, sharpLoader = loadSharp,
+} = {}) {
+  signal?.throwIfAborted();
+  if (maxBytes <= 0) return null;
+  const sharp = await sharpLoader();
+  signal?.throwIfAborted();
+  if (!sharp) return data.length <= maxBytes ? { data, mediaType } : null;
+  try {
+    const metadata = await sharp(data, { limitInputPixels: MAX_INPUT_PIXELS }).metadata();
+    signal?.throwIfAborted();
+    if (metadata.width * metadata.height > MAX_INPUT_PIXELS) return null;
+    if ((metadata.pages ?? 1) > 1 || mediaType === 'image/gif') {
+      return data.length <= maxBytes ? { data, mediaType } : null;
+    }
+    if (data.length <= maxBytes && metadata.width <= 2048 && metadata.height <= 2048) {
+      return { data, mediaType };
+    }
+    for (const [side, quality] of COMPRESSION_STEPS) {
+      signal?.throwIfAborted();
+      const operation = sharp(data, { limitInputPixels: MAX_INPUT_PIXELS }).rotate()
+        .resize({ width: side, height: side, fit: 'inside', withoutEnlargement: true });
+      const output = metadata.hasAlpha
+        ? await operation.png({ compressionLevel: 9 }).toBuffer()
+        : await operation.jpeg({ quality }).toBuffer();
+      signal?.throwIfAborted();
+      if (output.length <= maxBytes) return { data: output,
+        mediaType: metadata.hasAlpha ? 'image/png' : 'image/jpeg' };
+    }
+  } catch (error) {
+    signal?.throwIfAborted();
+    // A codec failure cannot discard an original already saved for tools.
+  }
+  return null;
+}
+
+export async function imageContentFromStaged(staged, limits, { signal, sharpLoader } = {}) {
+  const content = [];
+  const fileOnly = [];
+  let remaining = limits.maxTotalImageBytes;
+  for (const [index, file] of staged.files.entries()) {
+    signal?.throwIfAborted();
+    // Staging owns both the directory and basename; never read a user-supplied path.
+    const data = await readFile(join(staged.directory, basename(file.path)), { signal });
+    const result = await modelImageFromOriginal(data, file.mediaType,
+      Math.min(limits.maxImageBytes, remaining), { signal, sharpLoader });
+    if (!result) { fileOnly.push(index + 1); continue; }
+    remaining -= result.data.length;
+    content.push({ type: 'text', text: t('图片 {index}（原图文件：{name}）', { index: index + 1, name: file.name }) },
+      { type: 'image', mediaType: result.mediaType, data: result.data.toString('base64'),
+        name: imageStorageName(file.name.replace(/\.[^.]+$/, ''), result.mediaType, index) });
+  }
+  content.push({ type: 'text', text: t(IMAGE_ORIGINALS_PROMPT) });
+  if (fileOnly.length) content.push({ type: 'text',
+    text: t(IMAGE_INPUT_FALLBACK_PROMPT, { indexes: fileOnly.join(', ') }) });
+  return content;
+}
+
+export function isImageAdmissionRejection(error) {
+  return ['attachment-error', 'session/attachment-invalid'].includes(error?.code)
+    && ['MODEL_DOES_NOT_SUPPORT_IMAGES', 'IMAGE_TOO_LARGE', 'IMAGES_TOO_LARGE',
+      'IMAGE_TOO_MANY_PIXELS', 'TOO_MANY_IMAGES'].includes(error?.details?.reason);
+}

package/src/channels/shared/image-prompt.mjs

@@ -12,6 +12,11 @@ export const DEFAULT_IMAGE_PROMPT = '请分析这张图片。';
  */
 export const IMAGE_FILE_FALLBACK_PROMPT = '当前会话模型不支持直接接收图片输入。用户发送的图片已作为文件保存到工作区（见下方文件清单）。请使用可用工具分析这些图片文件后回答，例如 run_code 或 pwsh 读取字节、解析元数据、调用图像处理或 OCR 库；不要假设自己能直接看到图片内容。';
 
+export function imageDownloadLimitMessage(maxBytes) {
+  return t('图片超过原图接收上限 {maxMb} MB，请压缩后重试，或在通用设置的附件中调整上限。',
+    { maxMb: Math.round(maxBytes / (1024 * 1024) * 100) / 100 });
+}
+
 export class ImagePromptError extends Error {
   constructor(code, message, userMessage, options = {}) {
     super(message, options);
@@ -92,7 +97,7 @@ export async function fetchImageBuffer(url, {
     throw new ImagePromptError(
       'image-too-large',
       `Image response declares ${declaredLength} bytes; the limit is ${maxBytes}`,
-      t('图片超过 5 MB，请压缩后重试。'),
+      imageDownloadLimitMessage(maxBytes),
     );
   }
 
@@ -107,7 +112,7 @@ export async function fetchImageBuffer(url, {
         throw new ImagePromptError(
           'image-too-large',
           `Image response exceeded ${maxBytes} bytes`,
-          t('图片超过 5 MB，请压缩后重试。'),
+          imageDownloadLimitMessage(maxBytes),
         );
       }
       chunks.push(data);
@@ -120,7 +125,7 @@ export async function fetchImageBuffer(url, {
     throw new ImagePromptError(
       'image-too-large',
       `Image response contains ${data.length} bytes; the limit is ${maxBytes}`,
-      t('图片超过 5 MB，请压缩后重试。'),
+      imageDownloadLimitMessage(maxBytes),
     );
   }
   return data;
@@ -146,7 +151,7 @@ function safeName(value) {
   return name || undefined;
 }
 
-function detectedImageMediaType(data) {
+export function detectedImageMediaType(data) {
   if (data.length >= 8
     && data[0] === 0x89 && data[1] === 0x50 && data[2] === 0x4e && data[3] === 0x47
     && data[4] === 0x0d && data[5] === 0x0a && data[6] === 0x1a && data[7] === 0x0a) {
@@ -167,7 +172,7 @@ function detectedImageMediaType(data) {
   return null;
 }
 
-function loadedImage(value) {
+export function loadedImage(value) {
   if (Buffer.isBuffer(value) || value instanceof Uint8Array) {
     return { data: Buffer.from(value) };
   }
@@ -191,12 +196,13 @@ export function hasInboundPrompt(message) {
 
 export async function promptContentForMessage(message, {
   signal,
+  deferImages = false,
   maxImageBytes = DEFAULT_MAX_IMAGE_BYTES,
   maxImages = DEFAULT_MAX_IMAGES,
   maxTotalImageBytes = DEFAULT_MAX_TOTAL_IMAGE_BYTES,
 } = {}) {
   const sources = imageSources(message);
-  if (sources.length > maxImages) {
+  if (!deferImages && sources.length > maxImages) {
     throw new ImagePromptError(
       'too-many-images',
       `Image message contains ${sources.length} images; the limit is ${maxImages}`,
@@ -210,6 +216,8 @@ export async function promptContentForMessage(message, {
   if (text) content.push({ type: 'text', text });
   else if (sources.length > 0) content.push({ type: 'text', text: t(DEFAULT_IMAGE_PROMPT) });
 
+  if (deferImages) return content;
+
   for (const [index, source] of sources.entries()) {
     signal?.throwIfAborted();
     if (Number.isFinite(source?.size) && source.size > maxImageBytes) {
@@ -315,7 +323,7 @@ const IMAGE_FILE_EXTENSIONS = new Map([
 
 const IMAGE_EXTENSION_PATTERN = /\.(?:png|jpe?g|gif|webp)$/i;
 
-function imageStorageName(name, mediaType, index) {
+export function imageStorageName(name, mediaType, index) {
   const extension = IMAGE_FILE_EXTENSIONS.get(mediaType) ?? '.img';
   const cleaned = safeName(name);
   if (cleaned && IMAGE_EXTENSION_PATTERN.test(cleaned)) return cleaned;

package/src/channels/shared/message-failure.mjs

@@ -1,3 +1,5 @@
+import { extractConnectionEvidence } from './connection-error.mjs';
+import { diagnosticFields } from './diagnostic-details.mjs';
 import { randomUUID } from 'node:crypto';
 
 import { t } from './i18n.mjs';
@@ -189,7 +191,9 @@ export function classifyMessageFailure(error, {
     && userMessage.trim()
     ? 'INPUT_INVALID'
     : classifiedCode;
+  const details = extractConnectionEvidence(error).details;
   return Object.freeze({
+    ...(code === 'INTERNAL_UNKNOWN' || details.reason !== 'unknown' || details.httpStatus || details.providerCode ? { details } : {}),
     code,
     reason: safeReason ?? safeFailureReason(error?.code) ?? code,
     message: typeof userMessage === 'string' && userMessage.trim()
@@ -204,9 +208,16 @@ export function messageFailureText(failure) {
   return `${failure.message}\n\n${t('错误码：{code}；参考号：{referenceId}', failure)}`;
 }
 
+export function messageFailureDiagnostic(error, failure) {
+  const evidence = extractConnectionEvidence(error);
+  return { code: failure.code, reason: failure.reason, referenceId: failure.referenceId,
+    details: evidence.details, errors: evidence.errors };
+}
+
 export function setLastMessageFailure(status, error, options) {
   const failure = classifyMessageFailure(error, options);
   status.lastMessageError = failure;
+  status.lastError = failure.message;
   return failure;
 }
 
@@ -241,5 +252,6 @@ export function publicMessageFailure(value) {
     message: value.message.slice(0, 500),
     referenceId: value.referenceId.slice(0, 40),
     at: value.at,
+    ...(value.details ? diagnosticFields(value) : {}),
   };
 }

package/src/channels/shared/semantic/reply-reference.mjs

@@ -138,11 +138,11 @@ export function hasReplyReference(message) {
   return objectReference(message?.replyTo);
 }
 
-export async function promptContentForInboundMessage(message, { signal } = {}) {
+export async function promptContentForInboundMessage(message, { signal, deferImages = false } = {}) {
   if (!hasReplyReference(message)) {
-    return promptContentForMessage(message, { signal });
+    return promptContentForMessage(message, { signal, deferImages });
   }
   const reference = normalizeReference(await resolveReference(message.replyTo, signal));
-  const currentContent = await promptContentForMessage(message, { signal });
+  const currentContent = await promptContentForMessage(message, { signal, deferImages });
   return [{ type: 'text', text: replyBlock(reference) }, ...currentContent];
 }