dsh-remote-bridge 2.2.3 → 2.2.4

package/lib/index.js

@@ -389,7 +389,7 @@ var DshChatAdapter = class {
 			payload
 		}));
 	}
-	async prompt(principal, sessionId, parts, mode, clientTimeZone) {
+	async prompt(principal, sessionId, parts, mode, clientTimeZone, locale) {
 		await this.requireSession(principal, sessionId);
 		const hasText = parts.some((part) => part.type === "text" && part.text.trim() !== "");
 		const hasAttachment = parts.some((part) => part.type !== "text");
@@ -400,7 +400,8 @@ var DshChatAdapter = class {
 				sessionId,
 				mode,
 				content: parts,
-				...clientTimeZone === void 0 ? {} : { clientTimeZone }
+				...clientTimeZone === void 0 ? {} : { clientTimeZone },
+				...locale === void 0 ? {} : { locale }
 			}
 		}));
 	}
@@ -1956,18 +1957,29 @@ async function modelIsConfirmedTextOnly(host, sessionId) {
 	if (!Array.isArray(modalities)) return false;
 	return !modalities.includes("image");
 }
+/** 从 `Accept-Language` 里挑一个我们支持的语种；认不出来就是中文。 */
+function handoffLocaleOf(acceptLanguage) {
+	if (acceptLanguage === void 0) return "zh";
+	for (const tag of acceptLanguage.split(",")) {
+		const language = (tag.split(";")[0] ?? "").trim().toLowerCase();
+		if (language.startsWith("zh")) return "zh";
+		if (language.startsWith("en")) return "en";
+	}
+	return "zh";
+}
 /**
-* 需要交接时，把每个 `image` 部件换成**两行文本**；否则原样返回。
-*
-* 同一行路径要同时伺候两类读者：
-* - **给人看**（第一行）：图片序号、原始文件名、工作目录里的短路径；
-* - **给机器看**（第二行 `[Image: source: <绝对路径>]`）：这是读图技能明确
-*   识别的占位形状之一（带图片扩展名的绝对路径同样触发），任何按路径读图的
-*   工具都能接手，不出现任何具体插件名。
+* 交接说明的第一行（给人看的那行）。
 *
-* 任何一步抛错都退回原内容：这个功能的失败**不该**把「发消息」本身弄坏。
+* 写的是**人话**，不是挂在用户眼前的祈使句 —— 早期版本写「请先用读图工具打开下面那行的
+* 绝对路径」，那是写给机器看的措辞，用户看了的反馈是看不懂。现在一句话说清两件事：
+* 模型看不到图、图存在哪；要看图该怎么办。语言跟随界面（见 [handoffLocaleOf]）。
+* 第二行的 `[Image: source: …]` 是机器契约，跨语言不变。
 */
-async function handoffImagesForTextOnlyModel(host, roots, fallbackDir, sessionId, content) {
+function handoffLine(index, name, relative, locale) {
+	if (locale === "en") return `🖼️ Image ${index} "${name}" (this model can't see images, saved to ${relative}; to view it, open the path below with an image-reading tool)`;
+	return `🖼️ 图片 ${index}「${name}」（当前模型看不到图，已存到 ${relative}；要看图，请用识图工具打开下面那行的路径）`;
+}
+async function handoffImagesForTextOnlyModel(host, roots, fallbackDir, locale, sessionId, content) {
 	if (!content.some((part) => part.type === "image")) return content;
 	try {
 		if (!await modelIsConfirmedTextOnly(host, sessionId)) return content;
@@ -1978,10 +1990,10 @@ async function handoffImagesForTextOnlyModel(host, roots, fallbackDir, sessionId
 			if (part.type !== "image") return part;
 			index += 1;
 			const { absolute, relative } = writeHandoffFile(dir, workspace, part.mediaType, part.data);
-			const name = typeof part.name === "string" && part.name.trim() !== "" ? part.name.trim() : `图片 ${index}`;
+			const name = typeof part.name === "string" && part.name.trim() !== "" ? part.name.trim() : locale === "en" ? `image ${index}` : `图片 ${index}`;
 			return {
 				type: "text",
-				text: [`🖼️ 图片 ${index}「${name}」（当前模型不支持图片输入，已保存到工作目录 ${relative}；请先用读图工具打开下面那行的绝对路径，看清内容再回答）`, `[Image: source: ${absolute}]`].join("\n")
+				text: [handoffLine(index, name, relative, locale), `[Image: source: ${absolute}]`].join("\n")
 			};
 		});
 	} catch {
@@ -2106,15 +2118,16 @@ function createDsh02ApiProxy(host, options = {}) {
 			}),
 			prompt: (request) => call(async () => {
 				const requestId = randomUUID();
+				const { locale, ...kernelPayload } = request.payload;
 				const receiptIds = request.payload.content.filter((part) => part.type === "file").map((part) => part.receiptId);
-				const content = imageHandoff ? await handoffImagesForTextOnlyModel(host, handoffRoots, imageHandoffDir, request.payload.sessionId, request.payload.content) : request.payload.content;
+				const content = imageHandoff ? await handoffImagesForTextOnlyModel(host, handoffRoots, imageHandoffDir, locale ?? "zh", request.payload.sessionId, request.payload.content) : request.payload.content;
 				const binding = receiptIds.length === 0 ? void 0 : await (async () => {
 					if (fileUploadService == null) throw new Error("FILE_UPLOADS_UNAVAILABLE: this DSH build provides no ctx.fileUploads service, so file attachments cannot be sent");
 					return fileUploadService.bindPrompt(await agentFor(request.payload.sessionId), receiptIds, requestId);
 				})();
 				await host.sessionController.prompt({
 					requestId,
-					...request.payload,
+					...kernelPayload,
 					content
 				}, new AbortController().signal);
 				binding?.commit();
@@ -3356,7 +3369,8 @@ var ApiRouter = class {
 				}
 				const parts = readPromptParts(body);
 				const mode = body.mode === "steer" ? "steer" : "queue";
-				const response = { message: await this.options.chat.prompt(principal, sessionId, parts, mode, typeof body.clientTimeZone === "string" ? body.clientTimeZone : void 0) };
+				const acceptLanguage = req.headers["accept-language"];
+				const response = { message: await this.options.chat.prompt(principal, sessionId, parts, mode, typeof body.clientTimeZone === "string" ? body.clientTimeZone : void 0, handoffLocaleOf(Array.isArray(acceptLanguage) ? acceptLanguage[0] : acceptLanguage)) };
 				this.saveIdempotent(principal, body.clientRequestId, 202, response);
 				this.audit(principal, "chat.message.submit", void 0, void 0, requestId, {
 					sessionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-bridge",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Versioned REST bridge for DeepSeek Harness: remote access for trusted clients (chat, files, devices) plus a Phone-settings panel inside the DSH WebUI.",
   "type": "module",
   "packageManager": "pnpm@11.19.0",