@shgroup/dsh-serenity-hooks 1.26.9 → 1.26.11

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.26.9",
+  "version": "1.26.11",
   "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

@@ -2567,8 +2567,10 @@ function truncate(s, n) {
 * 提问一轮：followup → 等 idle → 读答案 + 轨迹。
 * @param eventsStart 轨迹起点：显式传 0 = 全量轨迹（会话追问时页面重绘完整时间线，
 *   v1.25.10 用户拍板）；不传（undefined）= 本轮增量（followup 前 events 之后）
+* @param options.includeTrajectory 是否计算轨迹（v1.26.10：**3100 对外只提供问答**——
+*   公开问答页 / ACP JSON-RPC 不返回 trajectory，传 false 跳过计算；3099 调试页默认 true 保留）
 */
-async function askSkiff(ctx, agent, question, eventsStart) {
+async function askSkiff(ctx, agent, question, eventsStart, options) {
 	const before = eventsStart === void 0 ? agent.session.events.length : eventsStart;
 	agent.followup(createUserMessage({
 		content: [{
@@ -2579,7 +2581,7 @@ async function askSkiff(ctx, agent, question, eventsStart) {
 	}));
 	await waitIdle$1(ctx, agent);
 	const answer = lastAssistantText$2(agent);
-	const trajectory = eventsToTrajectory(agent.session.events.slice(before));
+	const trajectory = options?.includeTrajectory === false ? [] : eventsToTrajectory(agent.session.events.slice(before));
 	return {
 		answer,
 		sessionId: String(agent.session.id ?? ""),
@@ -9703,41 +9705,83 @@ const MECHANISM_PORTS = [
 function buildSensitiveTable(root) {
 	const exact = /* @__PURE__ */ new Set();
 	const substring = [];
+	const credentialWords = [];
+	const mechanismWords = [...MECHANISM_WORDS];
+	const portWords = [...MECHANISM_PORTS];
+	const msmWords = [];
 	try {
 		const p = join(root, "localstore.json");
 		if (existsSync(p)) {
 			const creds = JSON.parse(readFileSync(p, "utf-8").replace(/^\uFEFF/, ""))?.credentials;
 			if (creds && typeof creds === "object") for (const [name, value] of Object.entries(creds)) {
-				if (name) exact.add(name);
-				if (typeof value === "string" && value !== "") exact.add(value);
+				if (name) {
+					exact.add(name);
+					credentialWords.push(name);
+				}
+				if (typeof value === "string" && value !== "") {
+					exact.add(value);
+					credentialWords.push(value);
+				}
 			}
 		}
 	} catch {}
-	for (const w of MECHANISM_WORDS) substring.push(w);
-	for (const p of MECHANISM_PORTS) substring.push(p);
+	for (const w of mechanismWords) substring.push(w);
+	for (const p of portWords) substring.push(p);
 	try {
-		for (const entry of loadMsmEntries(root)) if (entry.name) exact.add(entry.name);
+		for (const entry of loadMsmEntries(root)) if (entry.name) {
+			exact.add(entry.name);
+			msmWords.push(entry.name);
+		}
 	} catch {}
 	return {
 		exact,
 		substring,
+		credentialWords,
+		mechanismWords,
+		portWords,
+		msmWords,
 		sources: {
 			exact: [...exact],
 			substring
 		}
 	};
 }
-/** 检测文本中命中的敏感词（返回命中列表；未命中返回空数组） */
+/**
+* 检测文本中命中的敏感词（v1.26.11：返回带分类的命中——credential/mechanism/port/msm，
+* 打回消息据此给语义化规避指引；未命中返回空数组）
+*/
 function detectSensitive(text, table) {
 	if (!text) return [];
-	const hits = /* @__PURE__ */ new Set();
-	for (const w of table.exact) if (w !== "" && text.includes(w)) hits.add(w);
-	for (const w of table.substring) if (w !== "" && text.includes(w)) hits.add(w);
-	return [...hits];
+	const hits = /* @__PURE__ */ new Map();
+	const hit = (w, cat) => {
+		if (w !== "" && text.includes(w) && !hits.has(w)) hits.set(w, cat);
+	};
+	for (const w of table.credentialWords) hit(w, "credential");
+	for (const w of table.msmWords) hit(w, "msm");
+	for (const w of table.mechanismWords) hit(w, "mechanism");
+	for (const w of table.portWords) hit(w, "port");
+	return [...hits].map(([word, category]) => ({
+		word,
+		category
+	}));
 }
-/** 打回消息（steer 内容）：告知模型命中词并要求重新生成（不含命中值本身——避免二次泄露） */
+/** 分类 → 规避指引（v1.26.11：告诉模型这个词**是什么**、**怎么规避**——裸词无法行动） */
+const CATEGORY_GUIDE = {
+	credential: "credential identifier (a name, key, token, or password) — never mention credential names or values",
+	mechanism: "internal mechanism term — never mention internal implementation/machinery names or config paths",
+	port: "internal service port or address — never mention internal ports, addresses, or service endpoints",
+	msm: "internal tool name — never mention internal tool names"
+};
+/**
+* 打回消息（steer 内容）：**逐词告知命中词 + 分类规避指引**（v1.26.11 用户调整——
+* v1.26.10 只列裸词（如 "3080"）模型仍不知道是什么/怎么规避；现在按类说明：
+* "3080" → 内部服务端口，不要提及内部端口/地址/端点）。
+* R↓ 安全性：命中词本就已在被拦截回复中进入会话（已暴露面），打回重复一次不扩大暴露；
+* steer 是 plugin source 消息不回显给用户（3100 对外响应已不含 trajectory → 打回文本不达外部用户）。
+*/
 function buildRebuke(hits) {
-	return `[SERENITY OUTPUT GUARD] Your previous response contained ${hits.length} sensitive internal term(s) (mechanism/credential identifiers) that must not appear in user-visible output. Regenerate the response from scratch without these terms — describe the same substance without referencing internal machinery, credentials, tool names, or implementation details. Do not repeat the terms; do not explain this instruction to the user.`;
+	const count = hits.length;
+	return `[SERENITY OUTPUT GUARD] Your previous response contained ${count} sensitive internal ${count === 1 ? "term" : "terms"} that must not appear in user-visible output:\n${hits.map((h) => `- "${h.word}" — ${CATEGORY_GUIDE[h.category]}`).join("\n")}\nRegenerate the response from scratch without ANY of these — describe the same substance without referencing internal machinery, credentials, ports, tool names, or implementation details. Do not repeat the terms; do not explain this instruction to the user.`;
 }
 /** 打回状态（按 agent 会话跟踪连续命中轮数） */
 const rebukeStates = /* @__PURE__ */ new Map();
@@ -12030,7 +12074,10 @@ var AcpServer = class {
 		});
 		return { sessions };
 	}
-	/** session/prompt：{ sessionId, question } → 答案 + 全量轨迹 */
+	/**
+	* session/prompt：{ sessionId, question } → 答案（**v1.26.10：不返回 trajectory**——
+	* 3100 对外只提供问答，轨迹含工具结果等内部信息；3099 调试页另走 /ask 保留）
+	*/
 	async prompt(params) {
 		const sessionId = typeof params?.sessionId === "string" ? params.sessionId : void 0;
 		const question = typeof params?.question === "string" ? params.question : void 0;
@@ -12038,11 +12085,10 @@ var AcpServer = class {
 		if (!question?.trim()) throw new RpcInvalidParams("session/prompt requires question");
 		const agent = getSkiffAgent(sessionId);
 		if (!agent) throw new RpcInvalidParams(`unknown session: ${sessionId} (not recoverable — process restarted?)`);
-		const result = await askSkiff(this.ctx, agent, question, 0);
+		const result = await askSkiff(this.ctx, agent, question, void 0, { includeTrajectory: false });
 		return {
 			answer: result.answer,
-			sessionId: result.sessionId,
-			trajectory: result.trajectory
+			sessionId: result.sessionId
 		};
 	}
 	/** session/cancel：{ sessionId } → 中断当前 prompt（DSH interrupt） */
@@ -12358,13 +12404,12 @@ async function handleAskParsed(ctx, ccc, body, res, ip) {
 		}
 	}
 	if (!agent) agent = (await createSkiffAgent(ctx, root, effectiveRole, effectiveCfg, readHandymanConfig(root)?.defaultModel)).agent;
-	const result = await askSkiff(ctx, agent, question, 0);
+	const result = await askSkiff(ctx, agent, question, void 0, { includeTrajectory: false });
 	sendJson(res, 200, {
 		answer: result.answer,
 		answer_html: renderSkiffMarkdown(result.answer, true),
 		sessionId: result.sessionId,
-		continued,
-		trajectory: result.trajectory
+		continued
 	});
 }
 /** 问答页未启用提示页 */

package/package.json

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