@shgroup/dsh-serenity-hooks 1.24.0 → 1.24.1

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 cc_fs/session/acc_msm/eap/neat/cce/handyman/session_rebuild + 拦截缝机械约束（safe-mode/路径守卫）+ 高级设定面板（双端口网关/账号管理）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/client.js

@@ -308,7 +308,7 @@ window.__ModuleLoader__.load({
 			return `The user provided ${paths.length} images:\n${paths.map((p) => `- ${p}`).join("\n")}`;
 		}
 		/** 浏览器 File → base64（与 ui-conversation serializeImages 等价的最小实现） */
-		function fileToBase64(file) {
+		function fileToBase64$1(file) {
 			return file.arrayBuffer().then((buffer) => {
 				const bytes = new Uint8Array(buffer);
 				let binary = "";
@@ -322,7 +322,7 @@ window.__ModuleLoader__.load({
 		* sessionId 必传：node half 经会话 header.cwd 解析 CCC 根（进程 cwd 不可靠）。
 		*/
 		async function uploadImage(file, sessionId) {
-			const data = await fileToBase64(file);
+			const data = await fileToBase64$1(file);
 			const res = await fetch(UPLOAD_PATH, {
 				method: "POST",
 				headers: {
@@ -417,6 +417,120 @@ window.__ModuleLoader__.load({
 			return null;
 		}
 		//#endregion
+		//#region src/client/file-fallback-api.ts
+		/**
+		* file-fallback-api.ts — 任意文件粘贴自动落盘的浏览器操作面（v1.24.1）
+		*
+		* 图片链路（v1.20）是「发送失败补救」被动式；任意文件 DSH 原生发不了
+		* （InputBar.onPaste 把所有文件交给 intakeImages → 非图片被 addImages 拒绝），
+		* 因此本模块提供**主动拦截**面：
+		*  - collectNonImageFiles(data) → 剪贴板中非图片 File（纯函数，可单测）
+		*  - uploadFile(file, sessionId) → POST /serenity/file-upload（node half 写 _tmp/files_from_user/）
+		*  - fileNoteTemplate(paths)     → 消息模板（draft 追加，随发送进消息——用户拍板）
+		*/
+		/** 文件落盘接口路径（node half api.ts，client 专属 x-serenity-ui 头） */
+		const FILE_UPLOAD_PATH = "/serenity/file-upload";
+		/**
+		* 从剪贴板收集非图片文件（图片交给 DSH 原生 rail 链路；仅非图片需要落盘）。
+		* 纯函数（items 可注入）——jsdom 环境下 DataTransfer 不可用，测试注入 items 数组。
+		*/
+		function collectNonImageFiles(items) {
+			const out = [];
+			for (const item of items) {
+				if (item?.kind !== "file") continue;
+				if (typeof item.type === "string" && item.type.startsWith("image/")) continue;
+				const file = typeof item.getAsFile === "function" ? item.getAsFile() : null;
+				if (file !== null) out.push(file);
+			}
+			return out;
+		}
+		/**
+		* 文件提示消息模板（协议固有，用户拍板：draft 追加 + 对话里写名具体路径，agent 直接可用）：
+		* 单文件：The user provided a file (path: ...)；多文件：每行一条路径
+		*/
+		function fileNoteTemplate(paths) {
+			if (paths.length === 1) return `The user provided a file (path: ${paths[0]})`;
+			return `The user provided ${paths.length} files:\n${paths.map((p) => `- ${p}`).join("\n")}`;
+		}
+		/** 浏览器 File → base64（与 image-fallback-api fileToBase64 等价的最小实现，保持模块独立） */
+		function fileToBase64(file) {
+			return file.arrayBuffer().then((buffer) => {
+				const bytes = new Uint8Array(buffer);
+				let binary = "";
+				const chunk = 32768;
+				for (let offset = 0; offset < bytes.length; offset += chunk) binary += String.fromCharCode(...bytes.subarray(offset, offset + chunk));
+				return btoa(binary);
+			});
+		}
+		/**
+		* 上传一个文件到 CCC _tmp/files_from_user/，返回相对路径（如 _tmp/files_from_user/<ts>-<rand>-x.pdf）。
+		* sessionId 必传：node half 经会话 header.cwd 解析 CCC 根（进程 cwd 不可靠）。
+		*/
+		async function uploadFile(file, sessionId) {
+			const data = await fileToBase64(file);
+			const res = await fetch(FILE_UPLOAD_PATH, {
+				method: "POST",
+				headers: {
+					"content-type": "application/json",
+					"x-serenity-ui": "1"
+				},
+				body: JSON.stringify({
+					sessionId,
+					name: file.name,
+					data
+				})
+			});
+			const body = await res.json();
+			if (!res.ok || typeof body.path !== "string") throw new Error(`serenity file upload failed: ${body.error ?? res.status}`);
+			return body.path;
+		}
+		//#endregion
+		//#region src/client/FileFallbackDock.tsx
+		/** input.dock 条目（静默）：非图片文件粘贴自动落盘 + draft 追加，无 UI */
+		function FileFallbackDock(props) {
+			const zone = props;
+			const sessionId = props.sessionId;
+			const { uploadFile } = props;
+			const inputActions = props.inputActions;
+			const inputRef = (0, react.useRef)(zone.input);
+			inputRef.current = zone.input;
+			const pendingRef = (0, react.useRef)([]);
+			(0, react.useEffect)(() => {
+				const handler = (e) => {
+					const data = e.clipboardData;
+					if (!data) return;
+					const items = Array.from(data.items);
+					const files = collectNonImageFiles(items);
+					if (files.length === 0) return;
+					const hasImage = items.some((item) => item.kind === "file" && typeof item.type === "string" && item.type.startsWith("image/"));
+					const hasText = data.getData("text/plain") !== "";
+					if (!hasImage && !hasText) e.preventDefault();
+					(async () => {
+						try {
+							const saved = [];
+							for (const file of files) saved.push(await uploadFile(file, String(sessionId)));
+							const note = fileNoteTemplate(saved);
+							const base = inputRef.current?.draft ?? "";
+							pendingRef.current.push(note);
+							const text = [base, ...pendingRef.current].filter(Boolean).join("\n");
+							pendingRef.current = [];
+							if (inputActions?.setDraft !== void 0) inputActions.setDraft(text);
+							else console.warn("[serenity] file fallback: inputActions.setDraft unavailable — file saved but draft not annotated");
+						} catch (err) {
+							console.warn(`[serenity] file fallback failed: ${String(err?.message ?? err)}`);
+						}
+					})();
+				};
+				document.addEventListener("paste", handler, true);
+				return () => document.removeEventListener("paste", handler, true);
+			}, [
+				sessionId,
+				uploadFile,
+				inputActions
+			]);
+			return null;
+		}
+		//#endregion
 		//#region src/client/accounts-api.ts
 		/** wire 账号 → 本地编辑行 */
 		function accountDraftFromWire(a) {
@@ -1301,6 +1415,12 @@ Instruction-following style:
 						resendText: (sessionId, text) => resendText(scope, sessionId, text)
 					})
 				}, ImageFallbackDock), "serenity: image fallback dock");
+				scope.effect(() => scope.slots.register({
+					name: "conversation.input.dock",
+					id: "serenity-file-fallback",
+					order: 110,
+					inject: () => ({ uploadFile: (file, sessionId) => uploadFile(file, sessionId) })
+				}, FileFallbackDock), "serenity: file fallback dock");
 				const serenityScope = scope.get("settingsScope").bind(SERENITY_SCOPE_SPEC);
 				scope.effect(() => scope.slots.register({
 					name: "settings.section",

package/lib/index.js

@@ -1,7 +1,7 @@
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { appendFileSync, chmodSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, utimesSync, writeFileSync } from "node:fs";
-import { basename, dirname, join, relative, resolve } from "node:path";
+import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
 import { homedir, platform } from "node:os";
 import { fileURLToPath } from "node:url";
@@ -7514,6 +7514,7 @@ function registerCompactRetention(ctx, opts = {}) {
 const ROUTE_PATH = "/serenity/status";
 const HANDYMEN_PATH = "/serenity/handymen";
 const UPLOAD_PATH = "/serenity/image-upload";
+const FILE_UPLOAD_PATH = "/serenity/file-upload";
 const CONFIG_PATH = "/serenity/config";
 /** 图片落盘目录（CCC 根相对；S142 图片自动识别基础设施——粘贴图片落盘供 agent 经 CCC vlm MSM 自主处理） */
 const IMAGE_UPLOAD_DIR = "_tmp/images_from_user";
@@ -7530,6 +7531,28 @@ const EXT_BY_MEDIA = {
 	"image/gif": "gif"
 };
 const MAX_IMAGE_BYTES = 10485760;
+/** 文件落盘目录（CCC 根相对；v1.24.1 粘贴任意文件自动落盘——agent 经 CCC 既有 MSM（pdf-extract/archive-extract 等）自主处理） */
+const FILE_UPLOAD_DIR = "_tmp/files_from_user";
+/** 拒绝的可执行/危险扩展名（安全边界：不落盘可执行文件，防 agent 被诱导执行） */
+const BLOCKED_FILE_EXTS = /* @__PURE__ */ new Set([
+	"exe",
+	"dll",
+	"msi",
+	"bat",
+	"cmd",
+	"ps1",
+	"com",
+	"scr",
+	"lnk",
+	"sh",
+	"vbs",
+	"bin",
+	"app",
+	"deb",
+	"rpm",
+	"jar"
+]);
+const MAX_FILE_BYTES = 10485760;
 /**
 * 图片落盘核心逻辑（可测）：校验 mediaType 白名单 + base64 解码 + 大小上限 →
 * 写 CCC 根 _tmp/images_from_user/<ts>-<rand>.<ext>，返回相对路径。
@@ -7547,6 +7570,34 @@ function saveImageToTmp(root, mediaType, data) {
 	writeFileSync(join(dir, filename), bytes);
 	return `${IMAGE_UPLOAD_DIR}/${filename}`;
 }
+/**
+* 文件名脱敏（路径逃逸 + 非法字符）：取 basename（去 / 与 \），剥离前导点/空，
+* 非法字符 → '-',限长。返回空则 'file'。
+*/
+function sanitizeFileName(name) {
+	const cleaned = (name.split(/[\\/]/).pop() ?? "").replace(/[<>:"|?*\u0000-\u001f]/g, "-").replace(/^\.+/, "").trim();
+	if (cleaned === "") return "file";
+	return cleaned.slice(0, 100);
+}
+/**
+* 任意文件落盘核心逻辑（可测）：文件名校验 + 可执行扩展名拒绝 + base64 解码 +
+* 大小上限（10MB）→ 写 CCC 根 _tmp/files_from_user/<ts>-<rand>-<safeName>，返回相对路径。
+* 校验失败抛 Error（handler 转 400）。
+*/
+function saveFileToTmp(root, fileName, data) {
+	if (typeof fileName !== "string" || fileName.length === 0) throw new Error("missing file name");
+	const ext = extname(fileName).slice(1).toLowerCase();
+	if (ext !== "" && BLOCKED_FILE_EXTS.has(ext)) throw new Error(`blocked executable file type: .${ext}`);
+	if (typeof data !== "string" || data.length === 0) throw new Error("missing file data");
+	const bytes = Buffer.from(data, "base64");
+	if (bytes.length === 0 || bytes.length > MAX_FILE_BYTES) throw new Error(`file size out of range: ${bytes.length} bytes (max ${MAX_FILE_BYTES})`);
+	const dir = join(root, FILE_UPLOAD_DIR);
+	mkdirSync(dir, { recursive: true });
+	const safeName = sanitizeFileName(fileName);
+	const filename = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}-${safeName}`;
+	writeFileSync(join(dir, filename), bytes);
+	return `${FILE_UPLOAD_DIR}/${filename}`;
+}
 function readBody$1(req, maxBytes) {
 	return new Promise((resolve, reject) => {
 		let data = "";
@@ -7647,6 +7698,36 @@ function registerStatusApi(ctx, opts = {}) {
 			}
 		}
 	});
+	ctx.webServer.register({
+		kind: "exact",
+		path: FILE_UPLOAD_PATH,
+		handler: async (req, res) => {
+			try {
+				if (req.method !== "POST") {
+					sendJson(res, 405, { error: "method not allowed" });
+					return;
+				}
+				if (req.headers["x-serenity-ui"] !== "1") {
+					sendJson(res, 403, { error: "文件落盘仅限 WebUI（client 专用）" });
+					return;
+				}
+				const raw = await readBody$1(req, 20971520);
+				const body = JSON.parse(raw);
+				const workspace = resolveWorkspace(ctx, {
+					sessionId: body.sessionId,
+					workspace: body.workspace
+				});
+				const root = findSerenityRoot(workspace);
+				if (!root) {
+					sendJson(res, 404, { error: `no CCC found from workspace: ${workspace}` });
+					return;
+				}
+				sendJson(res, 200, { path: saveFileToTmp(root, body.name ?? "", body.data ?? "") });
+			} catch (err) {
+				sendJson(res, 400, { error: err.message ?? String(err) });
+			}
+		}
+	});
 	ctx.webServer.register({
 		kind: "exact",
 		path: ROUTE_PATH,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "description": "宁静号 ACC harness — Native Cordis 插件（DeepSeek Harness 运行时）。真实 DSH 工具注册（cc_fs/session/acc_msm 等 9 工具）+ 拦截缝机械约束（safe-mode/路径守卫/会话落盘）+ 系统提示词注入（ACC/CCE/Constraints/SKILL/Session 五块）。适配 DSH 公开版（deepseek-ai/deepseek-harness 0.1.0-rc）。",
   "license": "MIT",
   "repository": {