@shgroup/dsh-serenity-hooks 1.26.7 → 1.26.8

package/dsh.plugin.json

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

package/lib/index.js

@@ -11724,8 +11724,84 @@ function escapeHtml(s) {
 	})[c] ?? c);
 }
 /**
+* 提取 `<think>…</think>` 块（v1.26.8：**状态机扫描，弃正则**——用户批评"老用正则不是个办法"）。
+*
+* 逐字符扫描识别开/闭标签（大小写不敏感；`<think ...>` 允许属性变体；`</think >` 允许尾随空格），
+* 不依赖正则回溯，天然处理：
+*  - **嵌套 `<think>`**（内层按内容处理，不递归——DeepSeek think 不会嵌套）
+*  - **未闭合 `<think>`**（优雅截断：剩余全部作为 think 内容，不泄漏标记）
+*  - **占位符冲突**（用 \u0001T<idx>\u0001——ASCII 控制字符，正文几乎不可能出现）
+*
+* @returns body（占位符替换后的正文）+ thinks（提取的 think 内容数组，保序）
+*/
+function extractThinkBlocks(raw) {
+	const thinks = [];
+	const parts = [];
+	let i = 0;
+	while (i < raw.length) {
+		const openTag = matchOpenThink(raw, i);
+		if (!openTag) break;
+		parts.push(raw.slice(i, openTag.tagStart));
+		const closeTag = matchCloseThink(raw, openTag.contentStart);
+		if (closeTag < 0) {
+			const inner = raw.slice(openTag.contentStart);
+			thinks.push(inner.trim());
+			parts.push(`\u0001T${thinks.length - 1}\u0001`);
+			i = raw.length;
+			break;
+		}
+		const inner = raw.slice(openTag.contentStart, closeTag);
+		thinks.push(inner.trim());
+		parts.push(`\u0001T${thinks.length - 1}\u0001`);
+		let j = closeTag + 7;
+		while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
+		i = raw[j] === ">" ? j + 1 : closeTag + 8;
+	}
+	if (i < raw.length) parts.push(raw.slice(i));
+	return {
+		body: parts.join(""),
+		thinks
+	};
+}
+/** 从 from 起找 `<think` 开标签（大小写不敏感，允许属性）；返回标签起点与内容起点，或 null */
+function matchOpenThink(s, from) {
+	for (let i = from; i <= s.length - 7; i++) {
+		if (s[i] !== "<" || s[i + 1] !== "t" && s[i + 1] !== "T") continue;
+		if (s.slice(i + 1, i + 6).toLowerCase() !== "think") continue;
+		const after = s[i + 6];
+		if (after === ">") return {
+			tagStart: i,
+			contentStart: i + 7
+		};
+		if (after === " " || after === "	" || after === "\n" || after === "\r") {
+			const gt = s.indexOf(">", i + 7);
+			if (gt < 0) return null;
+			return {
+				tagStart: i,
+				contentStart: gt + 1
+			};
+		}
+	}
+	return null;
+}
+/** 从 contentStart 起找 `</think>` 闭合标签（大小写不敏感，允许 `</think >` 尾随空格）；返回闭合标签起点或 -1 */
+function matchCloseThink(s, contentStart) {
+	for (let i = contentStart; i <= s.length - 8; i++) {
+		if (s[i] !== "<" || s[i + 1] !== "/") continue;
+		if (s.slice(i + 2, i + 7).toLowerCase() !== "think") continue;
+		const after = s[i + 7];
+		if (after === ">") return i;
+		if (after === " " || after === "	" || after === "\n" || after === "\r") {
+			let j = i + 8;
+			while (j < s.length && (s[j] === " " || s[j] === "	" || s[j] === "\n" || s[j] === "\r")) j++;
+			if (s[j] === ">") return i;
+		}
+	}
+	return -1;
+}
+/**
 * Markdown 渲染（v1.25.9，正经库 marked 服务端渲染——替代手写正则渲染器，S142 用户要求）：
-* ① 提取 `<think>…</think>` 块（占位符 \u0000T<idx>\u0000）
+* ① 提取 `<think>…</think>` 块（v1.26.8 状态机扫描，占位符 \u0001T<idx>\u0001）
 * ② 正文与 think 内容**先 escapeHtml 再 marked.parse**（GFM + breaks）——markdown 语法不受
 *    转义影响，原始 HTML 注入被消除（安全）；代码块内 `<` 显示为实体（可接受）
 * ③ think 占位符：默认还原为 `<details class="think">` 折叠卡（🧠 思考过程，默认收起）；
@@ -11733,17 +11809,12 @@ function escapeHtml(s) {
 * @param hideThink 为 true 时 `<think>` 内容完全不渲染（public 问答页体验）
 */
 function renderSkiffMarkdown(raw, hideThink = false) {
-	const thinks = [];
-	const body = raw.replace(/<think>([\s\S]*?)<\/think>/gi, (_m, inner) => {
-		const idx = thinks.length;
-		thinks.push(String(inner ?? "").trim());
-		return `\u0000T${idx}\u0000`;
-	});
+	const { body, thinks } = extractThinkBlocks(raw);
 	const parsed = f.parse(escapeHtml(body), {
 		breaks: true,
 		gfm: true
 	});
-	return (typeof parsed === "string" ? parsed : "").replace(/\u0000T(\d+)\u0000/g, (_m, idx) => {
+	return (typeof parsed === "string" ? parsed : "").replace(/\u0001T(\d+)\u0001/g, (_m, idx) => {
 		if (hideThink) return "";
 		const inner = thinks[Number(idx)] ?? "";
 		const innerHtml = inner === "" ? "" : f.parse(escapeHtml(inner), {

package/package.json

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