@shgroup/dsh-serenity-hooks 1.20.0 → 1.20.2

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 cc_fs/session/acc_msm/eap/neat/cce/loop + 拦截缝机械约束（safe-mode/路径守卫）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。私有（dsh-external 组织）。",
   "engines": {

package/lib/client.js

@@ -259,6 +259,7 @@ window.__ModuleLoader__.load({
 			const { uploadImage, getDraftFiles, resendText } = props;
 			const [state, setState] = (0, react.useState)("idle");
 			const [paths, setPaths] = (0, react.useState)([]);
+			const [errorText, setErrorText] = (0, react.useState)(null);
 			const handlingRef = (0, react.useRef)(false);
 			const promptError = session?.promptError?.error;
 			const imageIds = input?.imageIds ?? [];
@@ -273,7 +274,7 @@ window.__ModuleLoader__.load({
 						const files = await getDraftFiles(String(sessionId), imageIds);
 						if (files.length === 0) throw new Error("no draft image files");
 						const saved = [];
-						for (const file of files) saved.push(await uploadImage(file));
+						for (const file of files) saved.push(await uploadImage(file, String(sessionId)));
 						const note = saved.map((p) => `用户提供了图片在 ${p}`).join("\n");
 						const draft = input?.draft ?? "";
 						const text = draft === "" ? note : `${draft}\n${note}`;
@@ -281,7 +282,9 @@ window.__ModuleLoader__.load({
 						setPaths(saved);
 						setState("done");
 					} catch (err) {
-						console.warn(`[serenity] image fallback failed: ${String(err?.message ?? err)}`);
+						const message = String(err?.message ?? err);
+						console.warn(`[serenity] image fallback failed: ${message}`);
+						setErrorText(message);
 						setState("error");
 					} finally {
 						handlingRef.current = false;
@@ -310,10 +313,10 @@ window.__ModuleLoader__.load({
 				"data-state": "done",
 				children: paths.map((p) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: p }, p))
 			});
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 				className: "serenity-image-fallback",
 				"data-state": "error",
-				children: "图片保存失败，请重试"
+				children: ["图片保存失败：", errorText ?? "未知错误"]
 			});
 		}
 		//#endregion
@@ -330,8 +333,11 @@ window.__ModuleLoader__.load({
 				return btoa(binary);
 			});
 		}
-		/** 上传一张图片到 CCC _tmp/images_from_user/，返回相对路径（如 _tmp/images_from_user/xxx.png） */
-		async function uploadImage(file) {
+		/**
+		* 上传一张图片到 CCC _tmp/images_from_user/，返回相对路径（如 _tmp/images_from_user/xxx.png）。
+		* sessionId 必传：node half 经会话 header.cwd 解析 CCC 根（进程 cwd 不可靠）。
+		*/
+		async function uploadImage(file, sessionId) {
 			const data = await fileToBase64(file);
 			const res = await fetch(UPLOAD_PATH, {
 				method: "POST",
@@ -340,6 +346,7 @@ window.__ModuleLoader__.load({
 					"x-serenity-ui": "1"
 				},
 				body: JSON.stringify({
+					sessionId,
 					mediaType: file.type,
 					name: file.name,
 					data
@@ -349,11 +356,17 @@ window.__ModuleLoader__.load({
 			if (!res.ok || typeof body.path !== "string") throw new Error(`serenity image upload failed: ${body.error ?? res.status}`);
 			return body.path;
 		}
-		/** 取 rail 图片的浏览器 File（conversation.draftImages，session-scoped；类型宽松访问——IConversation 类型面未含 draftImages） */
-		async function getDraftFiles(ctx, sessionId, ids) {
-			const draftImages = (ctx.sessions.scope(sessionId)?.conversation)?.draftImages;
-			if (draftImages === void 0) return [];
-			return (draftImages(ids) ?? []).map((a) => a.file);
+		/**
+		* 取 rail 图片的浏览器 File。
+		* conversation.draftImages 是 root singleton 的公开方法（读 controller 的 draftAttachments Map，
+		* 与调用 ctx 的作用域无关）——直接 ctx.get('conversation')。
+		* ⚠️ 必须作为方法调用（conversation.draftImages(ids)）：解构取出再调会丢失 this
+		* （draftImages 内部读 this.draftAttachments → "Cannot read properties of undefined"）。
+		*/
+		async function getDraftFiles(ctx, _sessionId, ids) {
+			const conversation = ctx.get?.("conversation");
+			if (conversation?.draftImages === void 0) return [];
+			return (conversation.draftImages(ids) ?? []).map((a) => a.file);
 		}
 		/** 纯文本重发（绕过图片门禁——不含 image part，模型永不触发 MODEL_DOES_NOT_SUPPORT_IMAGES） */
 		async function resendText(ctx, sessionId, text) {
@@ -388,7 +401,7 @@ window.__ModuleLoader__.load({
 					id: "serenity-image-fallback",
 					order: 100,
 					inject: () => ({
-						uploadImage: (file) => uploadImage(file),
+						uploadImage: (file, sessionId) => uploadImage(file, sessionId),
 						getDraftFiles: (sessionId, ids) => getDraftFiles(scope, sessionId, ids),
 						resendText: (sessionId, text) => resendText(scope, sessionId, text)
 					})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.20.0",
+  "version": "1.20.2",
   "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": {