@shgroup/dsh-serenity-hooks 1.16.4 → 1.16.6

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.16.4",
+  "version": "1.16.6",
   "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": {
@@ -16,7 +16,8 @@
       "eap",
       "neat",
       "cce",
-      "loop"
+      "loop",
+      "localstore"
     ],
     "skills": []
   }

package/lib/index.js

@@ -1,13 +1,13 @@
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { appendFileSync, chmodSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
-import { execFile, execFileSync, spawnSync } from "node:child_process";
+import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
 import { homedir, platform } from "node:os";
 import { promisify } from "node:util";
 import { fileURLToPath } from "node:url";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { randomBytes } from "node:crypto";
+import { randomBytes, randomUUID } from "node:crypto";
 //#region src/ccc.ts
 /**
 * ccc.ts — CCC 纯逻辑层（零 DSH 依赖，可独立单测）
@@ -37,11 +37,29 @@ function findGitRoot(cwd) {
 		current = parent;
 	}
 }
+/**
+* 前缀判定：abs 是否位于 rootAbs 之内。
+* caseInsensitive（Windows 盘符/路径大小写不敏感）由调用方按平台传入；
+* 边界必须是路径分隔符（`\` 或 `/` 任一）——不依赖平台 sep，跨平台语义一致：
+*   - 跨盘符绝对路径（root 在 D:\、target 在 C:\）前缀不匹配 → outside
+*   - 兄弟目录前缀陷阱（home vs home2）边界非分隔符 → outside
+* （旧实现用 path.relative().startsWith('..')——跨盘时 relative 返回绝对路径原文，
+*   不以 `..` 开头 → 漏判放行，见 Windows 兼容审计问题 1。）
+*/
+function pathInside(rootAbs, abs, caseInsensitive = process.platform === "win32") {
+	const r = caseInsensitive ? rootAbs.toLowerCase() : rootAbs;
+	const a = caseInsensitive ? abs.toLowerCase() : abs;
+	if (a === r) return true;
+	if (!a.startsWith(r)) return false;
+	const next = a[r.length];
+	return next === "\\" || next === "/";
+}
 function classifyPath(p, root) {
-	const rel = relative(resolve(root), resolve(p));
-	if (rel === "") return "same";
-	if (rel.startsWith("..")) return "outside";
-	return "inside";
+	const rootAbs = resolve(root);
+	const abs = resolve(p);
+	const ci = process.platform === "win32";
+	if (ci ? abs.toLowerCase() === rootAbs.toLowerCase() : abs === rootAbs) return "same";
+	return pathInside(rootAbs, abs, ci) ? "inside" : "outside";
 }
 function resolveInside(root, p) {
 	const abs = resolve(root, p);
@@ -221,8 +239,16 @@ function runCcFs(root, args) {
 				else if (os === "linux") {
 					const revealPath = statSync(abs).isDirectory() ? abs : dirname(abs);
 					execFileSync("xdg-open", [revealPath], { timeout: 1e4 });
-				} else if (os === "win32") execFileSync("explorer", ["/select,", abs], { timeout: 1e4 });
-				else throw new Error(`unsupported platform: ${os}`);
+				} else if (os === "win32") {
+					const args = statSync(abs).isDirectory() ? [abs] : ["/select,", abs];
+					const child = spawn("explorer", args, {
+						detached: true,
+						stdio: "ignore",
+						windowsHide: false
+					});
+					child.on("error", () => {});
+					child.unref();
+				} else throw new Error(`unsupported platform: ${os}`);
 				return {
 					ok: true,
 					revealed: safeRel(root, abs)
@@ -278,7 +304,7 @@ function runCcFs(root, args) {
 function agentCwd$6(exec) {
 	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
-function renderText$8(value) {
+function renderText$9(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -330,7 +356,7 @@ const ccFsTool = defineTool({
 	},
 	output: {
 		schema: { type: "json" },
-		render: (args, value) => renderText$8(value)
+		render: (args, value) => renderText$9(value)
 	},
 	async execute(args, exec) {
 		const root = findSerenityRoot(agentCwd$6(exec));
@@ -348,6 +374,12 @@ const ccFsTool = defineTool({
 */
 const execFileAsync = promisify(execFile);
 const MSM_TIMEOUT_MS = 6e5;
+/**
+* Windows 兼容（审计观察点 A）：`.cmd` 不能直接被 CreateProcess 解析——
+* `execFile('npx')` / `spawnSync('npx')` 在 Windows 必 ENOENT（需 shell 或显式 .cmd）。
+* bun 无扩展名（bun.exe 可被 libuv 按 PATHEXT 解析），保持 'bun'。
+*/
+const NPX_BIN = process.platform === "win32" ? "npx.cmd" : "npx";
 const MSM_ACTIONS = [
 	"list",
 	"exec",
@@ -435,7 +467,7 @@ function runMsm(root, args) {
 					"pipe"
 				]
 			});
-			if (r.error && r.error.code === "ENOENT") r = spawnSync("npx", [
+			if (r.error && r.error.code === "ENOENT") r = spawnSync(NPX_BIN, [
 				"tsx",
 				entry.path,
 				...businessArgs
@@ -653,7 +685,7 @@ async function runMsmAsync(root, args) {
 	} catch (e) {
 		const err = e;
 		if (err.code === "ENOENT") try {
-			const r = await execFileAsync("npx", [
+			const r = await execFileAsync(NPX_BIN, [
 				"tsx",
 				entry.path,
 				...businessArgs
@@ -825,6 +857,55 @@ function readActiveSessionMd(root, scope = DEFAULT_SESSION_SCOPE) {
 	if (!abs.startsWith(resolve(root))) return null;
 	return abs;
 }
+/** 列出全部 scope 的活动标记（含 scope / mdRel / mtime）；目录不存在返回空 */
+function listActiveMarkers(root) {
+	const dir = resolve(root, ACTIVE_SESSIONS_DIR);
+	if (!existsSync(dir)) return [];
+	const out = [];
+	for (const entry of readdirSync(dir)) {
+		const full = join(dir, entry);
+		if (!statSync(full).isFile()) continue;
+		try {
+			const rel = readFileSync(full, "utf-8").trim();
+			if (!rel) continue;
+			out.push({
+				scope: entry,
+				mdRel: rel,
+				mtime: statSync(full).mtimeMs
+			});
+		} catch {}
+	}
+	return out;
+}
+/**
+* 重启恢复：当前 scope 无标记时，把"最近激活"（mtime 最新）且根内有效的标记
+* 复制为当前 scope 标记（激活语义延续：use = 激活，重启自动恢复 = 重新激活）。
+* 返回恢复的会话信息；已有标记 / 无候选 / 全部越界 → null。
+* 调用方负责根会话判定（subagent / loop 牛马不恢复——见 context.ts shouldAutoRestore）。
+*/
+function restoreActiveSession(root, scope = DEFAULT_SESSION_SCOPE) {
+	const marker = activeSessionMarker(root, scope);
+	if (existsSync(marker)) return null;
+	const scopeName = sanitizeScope(scope);
+	const candidates = listActiveMarkers(root).filter((m) => m.scope !== scopeName);
+	if (candidates.length === 0) return null;
+	const rootAbs = resolve(root);
+	const valid = candidates.filter((m) => pathInside(rootAbs, resolve(rootAbs, m.mdRel)));
+	if (valid.length === 0) return null;
+	const best = valid.sort((a, b) => b.mtime - a.mtime)[0];
+	mkdirSync(resolve(rootAbs, ACTIVE_SESSIONS_DIR), { recursive: true });
+	writeFileSync(marker, best.mdRel, "utf-8");
+	const mdPath = resolve(rootAbs, best.mdRel);
+	const dirName = basename(dirname(mdPath));
+	const idMatch = dirName.match(/S(\d{3,})/);
+	return {
+		dir: dirName,
+		id: idMatch ? `S${idMatch[1]}` : null,
+		mdPath,
+		restored: true,
+		from: best.scope
+	};
+}
 function archiveSession(root, key) {
 	const target = findSession(root, key);
 	if (!target) throw new Error(`未找到会话: ${key}`);
@@ -909,7 +990,7 @@ function agentCwd$5(exec) {
 function agentScope$2(exec) {
 	return exec.agent?.session?.id ?? "default";
 }
-function renderText$7(value) {
+function renderText$8(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -940,7 +1021,7 @@ const sessionTool = defineTool({
 	},
 	output: {
 		schema: { type: "json" },
-		render: (args, value) => renderText$7(value)
+		render: (args, value) => renderText$8(value)
 	},
 	async execute(args, exec) {
 		const root = findSerenityRoot(agentCwd$5(exec));
@@ -1211,14 +1292,15 @@ function setSafeMode(root, on) {
 *
 * health: CCC 三原则检查（P1 .serenity / P2 git / 配置）
 * time: ISO 8601 时间戳
-* wait: 同步等待 N 秒
+* wait: 等待 N 秒（纯 Node setTimeout——不依赖外部 sleep 可执行文件，
+*       Windows 无 GNU coreutils sleep，spawn 必 ENOENT，见 Windows 兼容审计问题 3）
 */
 const KIT_ACTIONS = [
 	"health",
 	"time",
 	"wait"
 ];
-function runKit(root, args) {
+async function runKit(root, args) {
 	switch (args.action) {
 		case "health": {
 			const gitRoot = findGitRoot(root);
@@ -1253,7 +1335,7 @@ function runKit(root, args) {
 		case "wait": {
 			const n = args.seconds ?? 0;
 			if (!Number.isFinite(n) || n < 0) throw new Error("wait 需要非负秒数");
-			execFileSync("sleep", [String(n)], { stdio: "ignore" });
+			await new Promise((r) => setTimeout(r, Math.round(n * 1e3)));
 			return { waited: n };
 		}
 		default: throw new Error(`未知 action: ${args.action}`);
@@ -1267,7 +1349,7 @@ function runKit(root, args) {
 function agentCwd$4(exec) {
 	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
-function renderText$6(value) {
+function renderText$7(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1290,12 +1372,12 @@ const kitTool = defineTool({
 	},
 	output: {
 		schema: { type: "json" },
-		render: (args, value) => renderText$6(value)
+		render: (args, value) => renderText$7(value)
 	},
 	async execute(args, exec) {
 		const root = findSerenityRoot(agentCwd$4(exec));
 		if (!root) throw new Error("No CCC found: no .serenity file from agent cwd");
-		return runKit(root, args);
+		return await runKit(root, args);
 	}
 });
 //#endregion
@@ -1337,7 +1419,12 @@ function git(root, args) {
 function runGit(root, args) {
 	switch (args.action) {
 		case "status": {
-			const r = git(root, ["status", "--porcelain"]);
+			const r = git(root, [
+				"-c",
+				"core.quotepath=false",
+				"status",
+				"--porcelain"
+			]);
 			if (!r.ok) throw new Error(`status 失败：${r.stderr.trim()}`);
 			return {
 				clean: r.stdout.trim() === "",
@@ -1384,6 +1471,8 @@ function runGit(root, args) {
 		case "log": {
 			const n = args.count ?? 10;
 			const r = git(root, [
+				"-c",
+				"core.quotepath=false",
 				"log",
 				"--oneline",
 				"-n",
@@ -1403,7 +1492,7 @@ function runGit(root, args) {
 function agentCwd$3(exec) {
 	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
-function renderText$5(value) {
+function renderText$6(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1430,7 +1519,7 @@ const gitTool = defineTool({
 	},
 	output: {
 		schema: { type: "json" },
-		render: (args, value) => renderText$5(value)
+		render: (args, value) => renderText$6(value)
 	},
 	async execute(args, exec) {
 		const root = findSerenityRoot(agentCwd$3(exec));
@@ -1446,7 +1535,7 @@ const gitTool = defineTool({
 function agentCwd$2(exec) {
 	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
-function renderText$4(value) {
+function renderText$5(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1490,7 +1579,7 @@ const msmTool = defineTool({
 	},
 	output: {
 		schema: { type: "json" },
-		render: (args, value) => renderText$4(value)
+		render: (args, value) => renderText$5(value)
 	},
 	async execute(args, exec) {
 		const root = findSerenityRoot(agentCwd$2(exec));
@@ -1531,7 +1620,7 @@ CCC（home-serenity 等）认知内容编码为 skill/SESSION/设计文档。产
 
 ## 参考
 https://github.com/tellmewhattodo/theory-eap`;
-function renderText$3(value) {
+function renderText$4(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1551,7 +1640,7 @@ const eapTool = defineTool({
 	} },
 	output: {
 		schema: { type: "string" },
-		render: (_args, value) => renderText$3(value)
+		render: (_args, value) => renderText$4(value)
 	},
 	async execute(args) {
 		if (args.section === "variables") return EAP_CONTENT.split("## 输出前自检清单")[0];
@@ -1592,7 +1681,7 @@ const NEAT_CONTENT = `# Neat 设计协作协议
 2. 等待确认或修正（小步）
 3. 确认后记录决策（写入会话 SESSION.md 或设计文档）
 4. 推进到下一决策点`;
-function renderText$2(value) {
+function renderText$3(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1608,7 +1697,7 @@ const neatTool = defineTool({
 	} },
 	output: {
 		schema: { type: "string" },
-		render: (_args, value) => renderText$2(value)
+		render: (_args, value) => renderText$3(value)
 	},
 	async execute(args) {
 		if (args.section === "rules") return NEAT_CONTENT.match(/## 四条铁律[\s\S]*?(?=## )/)?.[0] ?? NEAT_CONTENT;
@@ -1671,7 +1760,7 @@ CCE 回答"有结构的知识应如何跨时间持续演化而不丧失连贯性
 ## 与 Serenity 的关系
 Serenity 的会话系统、会话追踪、熵管理机制（SQC 品质循环）都是 CCE 的工程实现；
 CCC 系统提示词中嵌入的行为约束即来自 CCE。`;
-function renderText$1(value) {
+function renderText$2(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1692,7 +1781,7 @@ const cceTool = defineTool({
 	} },
 	output: {
 		schema: { type: "string" },
-		render: (_args, value) => renderText$1(value)
+		render: (_args, value) => renderText$2(value)
 	},
 	async execute(args) {
 		const section = args.section;
@@ -1798,9 +1887,9 @@ function splitModel(model) {
 }
 /** 轮次 prompt（对齐老 loop 结构：回顾进度 → 自由工作 → 汇报） */
 function buildRoundPrompt(opts) {
-	const { root, session, label, round, maxRounds, stopToken, progress, task } = opts;
+	const { root, session, label, round, stopToken, progress, task } = opts;
 	const resumeNote = progress && progress.round > 0 ? `上一轮（round ${progress.round}）已完成：${progress.lastResponse.slice(0, 300)}\n永远从上次停止处继续，绝不重做已完成工作。` : "这是第一轮。";
-	return `# ${label} — 牛马循环 round ${round}/${maxRounds}
+	return `# ${label} — 牛马循环 round ${round}
 
 CCC 根：${root}
 ${session ? `工作会话：${session}（AGENT_SESSIONS/${session}/SESSION.md 记录进度）` : ""}
@@ -1824,11 +1913,14 @@ ${resumeNote}
 *   label（必）任务标签 → 进度文件 loop-<label>.md/.json
 *   session（选）工作会话 S###（上下文提示）
 *   model（选）provider/model（如 minimax-cn-coding-plan/MiniMax-M3）；缺省读 loop.defaultModel
-*   maxRounds（默认 100）轮次上限；每轮等待 agent **无超时**（loop 可永续，agent 工作多久等多久）
+*   （S134 修正：轮次不需要调用者指定——内部 while 驱动 agent 逐轮推进，
+*    对话轮次**无上限**（不完成不返回）；agent 非正常停止时自动重启，
+*    重启次数上限 LOOP_MAX_RESTARTS=100（防死循环保险阀））
 *
 * 机制：ctx.agents.create()（带 setup 钩子）创建专用 agent（进程内），
-* 每轮 followup → agent/status idle → 读 session.events 响应 → 写进度 → stop token 检查 → 续跑。
-* 工厂模式：apply 时闭包捕获插件 ctx（工具 execute 无 ctx 参数）。
+* 每轮 followup → agent/status idle → 读 session.events 响应 → 写进度 → stop token 检查 →
+* 未完成继续下一轮；followup/waitIdle 抛错（非正常停止）→ dispose 并重新 create agent
+* （重启计数，≤100），同一轮重试。工厂模式：apply 时闭包捕获插件 ctx（工具 execute 无 ctx 参数）。
 *
 * preset 继承：setup 钩子里对子 agent 执行 agentPresets.composeFrom（对齐 subagent 先例），
 * 使 loop agent 继承发起方会话的 agent preset 工具（read/write/edit 等 preset 层工具）。
@@ -1837,7 +1929,7 @@ ${resumeNote}
 function agentCwd$1(exec) {
 	return (exec.agent?.session)?.header?.cwd ?? process.cwd();
 }
-function renderText(value) {
+function renderText$1(value) {
 	return [{
 		type: "text",
 		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
@@ -1876,7 +1968,7 @@ function lastAssistantText(agent) {
 function createLoopTool(ctx) {
 	return defineTool({
 		name: "loop",
-		description: "牛马循环（老 loop 等效）：用指定模型创建专用 agent 反复执行任务直到完成或达轮次上限。\n用法：loop 接受 task（要完成的目标）或依赖 session 上下文；模型缺省读 .dsh/serenity.json 的 loop.defaultModel（当前 minimax-cn-coding-plan/MiniMax-M3，廉价牛马）。\n行为：每轮创建全新 agent 工作（读文件/改代码/执行命令），汇报进度后进入下一轮；完成时输出停止标记即终止。**每轮等待无超时**（loop 永续：agent 工作多久等多久，不被超时打断）。\n进度：写入 AGENT_SESSIONS/loop-<label>.md/.json；同 label 再次调用从上次轮次续跑（不重做）。\n约束：loop agent 受完整 Serenity 约束（ACC 身份/入口技能系统提示词/守卫/session-keeper）。\n示例：loop 执行「扫描 SQC 并修复 DC 问题」，label: sqc-scan，maxRounds: 5",
+		description: "牛马循环（老 loop 等效）：用指定模型创建专用 agent 反复执行任务直到完成。\n用法：loop 接受 task（要完成的目标）或依赖 session 上下文；模型缺省读 .dsh/serenity.json 的 loop.defaultModel（当前 minimax-cn-coding-plan/MiniMax-M3，廉价牛马）。\n行为：内部硬性 while 循环驱动 agent 逐轮推进任务，每轮等待无超时（agent 工作多久等多久）。唯一完成条件 = agent 精确回显本轮随机完成码（stop token），防止低智能模型提前结束。轮次不需要调用者指定——对话轮次**无上限**（不完成不返回），agent 非正常停止时自动重启（重启 ≤100 次，防死循环保险阀）。\n进度：写入 AGENT_SESSIONS/loop-<label>.md/.json；同 label 再次调用从上次轮次续跑（不重做）。\n约束：loop agent 受完整 Serenity 约束（ACC 身份/入口技能系统提示词/守卫/session-keeper）。\n示例：loop 执行「扫描 SQC 并修复 DC 问题」，label: sqc-scan",
 		parameters: {
 			task: {
 				type: "string",
@@ -1894,15 +1986,11 @@ function createLoopTool(ctx) {
 			model: {
 				type: "string",
 				description: "provider/model（如 minimax-cn-coding-plan/MiniMax-M3）；缺省读 loop.defaultModel"
-			},
-			maxRounds: {
-				type: "integer",
-				description: "轮次上限（默认 100）"
 			}
 		},
 		output: {
 			schema: { type: "json" },
-			render: (_args, value) => renderText(value)
+			render: (_args, value) => renderText$1(value)
 		},
 		async execute(args, exec) {
 			const root = findSerenityRoot(agentCwd$1(exec));
@@ -1910,58 +1998,71 @@ function createLoopTool(ctx) {
 			const cfg = loadSerenityConfig(root, DEFAULT_SERENITY_CONFIG_PATHS);
 			const model = args.model ?? cfg.loop?.defaultModel;
 			if (!model) throw new Error("loop 需要 model：传参或配置 .dsh/serenity.json loop.defaultModel");
-			const maxRounds = args.maxRounds ?? 100;
 			const label = args.label;
 			if (!ctx.agentLoop) throw new Error("loop: ctx.agentLoop 不可用");
 			const { provider, model: modelName } = splitModel(model);
 			const stopToken = newStopToken();
 			let progress = readProgress(root, label);
-			const startRound = progress ? Math.min(progress.round + 1, maxRounds) : 1;
+			const startRound = progress ? progress.round + 1 : 1;
 			const parentCtx = exec.agent?.ctx;
 			const inherited = loopPresetInheritance(parentCtx);
 			if (!ctx.agents) throw new Error("loop: ctx.agents 不可用");
-			const sessionId = `loop-${label}`;
-			const handle = await ctx.agents.create({
-				sessionId,
-				meta: {
-					cwd: root,
-					...inherited.agentPreset === void 0 ? {} : { agentPreset: inherited.agentPreset }
-				},
-				agentOptions: {
-					provider,
-					model: modelName
-				},
-				...inherited.setup === void 0 ? {} : { setup: inherited.setup }
-			});
-			const loopAgent = handle.agent;
+			let handle;
+			let loopAgent;
+			const spawnAgent = async () => {
+				const sessionId = `loop-${label}-${randomUUID()}`;
+				handle = await ctx.agents.create({
+					sessionId,
+					meta: {
+						cwd: root,
+						...inherited.agentPreset === void 0 ? {} : { agentPreset: inherited.agentPreset }
+					},
+					agentOptions: {
+						provider,
+						model: modelName
+					},
+					...inherited.setup === void 0 ? {} : { setup: inherited.setup }
+				});
+				loopAgent = handle.agent;
+			};
+			await spawnAgent();
 			let done = false;
 			let lastResponse = progress?.lastResponse ?? "";
 			let finalRound = startRound - 1;
+			let restarts = 0;
 			try {
-				for (let round = startRound; round <= maxRounds; round++) {
+				let round = startRound;
+				while (true) {
 					finalRound = round;
 					const prompt = buildRoundPrompt({
 						root,
 						session: args.session,
 						label,
 						round,
-						maxRounds,
 						stopToken,
 						progress,
 						task: args.task
 					});
-					loopAgent.followup(createUserMessage({
-						content: [{
-							type: "text",
-							text: prompt
-						}],
-						source: {
-							kind: "plugin",
-							plugin: "dsh-serenity-hooks"
-						}
-					}));
-					await waitIdle(ctx, loopAgent);
-					lastResponse = lastAssistantText(loopAgent);
+					try {
+						loopAgent.followup(createUserMessage({
+							content: [{
+								type: "text",
+								text: prompt
+							}],
+							source: {
+								kind: "plugin",
+								plugin: "dsh-serenity-hooks"
+							}
+						}));
+						await waitIdle(ctx, loopAgent);
+						lastResponse = lastAssistantText(loopAgent);
+					} catch {
+						restarts++;
+						if (restarts > 100) break;
+						await handle.dispose().catch(() => {});
+						await spawnAgent();
+						continue;
+					}
 					progress = {
 						round,
 						done: false,
@@ -1975,6 +2076,7 @@ function createLoopTool(ctx) {
 						done = true;
 						break;
 					}
+					round++;
 				}
 				writeProgress(root, label, {
 					round: finalRound,
@@ -1991,21 +2093,371 @@ function createLoopTool(ctx) {
 			return {
 				done,
 				rounds: finalRound,
+				restarts,
 				model,
 				label,
 				progressFile: json,
 				lastResponse: lastResponse.slice(0, 2e3),
 				usage: {
-					how: "loop 用指定模型（默认 M3）创建专用 agent 每轮独立执行任务，完成时输出停止标记即终止",
+					how: "loop 内部硬性 while 驱动 agent 逐轮推进，agent 精确回显随机完成码即终止；对话轮次无上限（不完成不返回），agent 非正常停止时自动重启（≤100 次）",
 					progress: `进度在 AGENT_SESSIONS/loop-${label}.md 与 .json；同 label 再调 loop 会从下一轮续跑（不重做）`,
 					constraints: "loop agent 受完整 Serenity 约束（ACC 身份/入口技能系统提示词/守卫）",
-					next: done ? "任务已完成；可查看进度文件收尾" : `任务未完成（${finalRound}/${maxRounds} 轮）；可同 label 续跑或调整 maxRounds`
+					next: done ? "任务已完成；可查看进度文件收尾" : `任务未完成（已达内部 100 次重启保险阀）；可同 label 续跑`
 				}
 			};
 		}
 	});
 }
 //#endregion
+//#region src/localstore-ops.ts
+/**
+* localstore-ops.ts — localstore 纯逻辑层（零 DSH 依赖，可独立单测）
+*
+* ACC 标准本地凭据/配置存储（S133 设计）：
+*   - 一个工具管理两个命名空间：credential（凭据，0600）+ config（偏好，0644）
+*   - 存储于 ~/.serenity/（平台感知：win %USERPROFILE%\.serenity\）
+*   - 两个 YAML 文件：credentials.yaml（扁平 REF→value）+ settings.yaml（命名空间分节）
+*   - 目录 0700
+*
+* YAML 用轻量自实现子集（零依赖）：扁平 `KEY: value` 映射 + `#` 注释。
+* 凭据/配置本质是给 MSM/agent 用的普通 YAML 文件——agent 可按 doc 子命令
+* 说明直接用 fs 工具（read/write）操作；本工具是管理入口 + 规范文档。
+*/
+const LOCALSTORE_SCOPES = ["credential", "config"];
+/** 根目录名（~/.serenity） */
+const STORE_DIR_NAME = ".serenity";
+/** 凭据文件（0600） */
+const CREDENTIALS_FILENAME = "credentials.yaml";
+/** 配置文件（0644） */
+const SETTINGS_FILENAME = "settings.yaml";
+/** 凭据 key 规范：大写蛇形（命名空间前缀），如 HOME_GITLAB_TOKEN */
+const CREDENTIAL_KEY_RE = /^[A-Z][A-Z0-9_]*$/;
+/** 配置节名规范：小写字母数字连字符 */
+const CONFIG_SECTION_RE = /^[a-z][a-z0-9-]*$/;
+/** 配置 key 规范（节内）：小驼峰（首字母小写，可含大写），如 defaultModel */
+const CONFIG_KEY_RE = /^[a-z][a-zA-Z0-9_]*$/;
+/** 解析 ~/.serenity 根（平台感知：os.homedir() 三平台统一） */
+function serenityDir() {
+	return join(homedir(), STORE_DIR_NAME);
+}
+/** 各命名空间的文件绝对路径 */
+function storeFilePath(scope) {
+	return scope === "credential" ? join(serenityDir(), CREDENTIALS_FILENAME) : join(serenityDir(), SETTINGS_FILENAME);
+}
+/** 确保目录存在并设 0700 */
+function ensureDir(dir) {
+	mkdirSync(dir, { recursive: true });
+	try {
+		chmodSync(dir, 448);
+	} catch {}
+}
+/** 设置文件权限：credential 0600 / config 0644 */
+function applyFileMode(scope, path) {
+	try {
+		chmodSync(path, scope === "credential" ? 384 : 420);
+	} catch {}
+}
+/** 解析扁平映射 YAML → Record<string,string>（忽略 # 注释与空行；值去引号） */
+function parseFlatYaml(text) {
+	const out = {};
+	for (const rawLine of text.split("\n")) {
+		const line = rawLine.trim();
+		if (line === "" || line.startsWith("#")) continue;
+		const idx = line.indexOf(":");
+		if (idx <= 0) continue;
+		const key = line.slice(0, idx).trim();
+		let value = line.slice(idx + 1).trim();
+		if (value.startsWith("\"") && value.endsWith("\"") || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+		out[key] = value;
+	}
+	return out;
+}
+/** 序列化扁平映射 YAML（保持 key 顺序，值引号包裹含特殊字符的） */
+function renderFlatYaml(entries) {
+	const lines = [];
+	for (const [key, value] of Object.entries(entries)) {
+		const rendered = /[:#\n]/.test(value) || value === "" || /^\s/.test(value) || /\s$/.test(value) ? JSON.stringify(value) : value;
+		lines.push(`${key}: ${rendered}`);
+	}
+	return lines.join("\n") + (lines.length > 0 ? "\n" : "");
+}
+/** 解析分节 YAML（config）：节 → key → value */
+function parseSectionedYaml(text) {
+	const out = {};
+	let section = "";
+	for (const rawLine of text.split("\n")) {
+		const line = rawLine.trim();
+		if (line === "" || line.startsWith("#")) continue;
+		if (rawLine.length - rawLine.trimStart().length === 0 && line.endsWith(":")) {
+			section = line.slice(0, -1).trim();
+			if (!out[section]) out[section] = {};
+			continue;
+		}
+		if (section === "") continue;
+		const idx = line.indexOf(":");
+		if (idx <= 0) continue;
+		const key = line.slice(0, idx).trim();
+		let value = line.slice(idx + 1).trim();
+		if (value.startsWith("\"") && value.endsWith("\"") || value.startsWith("'") && value.endsWith("'")) value = value.slice(1, -1);
+		const sectionMap = out[section] ??= {};
+		sectionMap[key] = value;
+	}
+	return out;
+}
+/** 序列化分节 YAML（config）：节 → key → value */
+function renderSectionedYaml(sections) {
+	const lines = [];
+	for (const [section, entries] of Object.entries(sections)) {
+		lines.push(`${section}:`);
+		for (const [key, value] of Object.entries(entries)) {
+			const rendered = /[:#\n]/.test(value) || value === "" || /^\s/.test(value) || /\s$/.test(value) ? JSON.stringify(value) : value;
+			lines.push(`  ${key}: ${rendered}`);
+		}
+	}
+	return lines.join("\n") + (lines.length > 0 ? "\n" : "");
+}
+/** 读取命名空间全部条目（文件不存在返回空） */
+function readStore(scope) {
+	const path = storeFilePath(scope);
+	if (!existsSync(path)) return scope === "credential" ? {} : {};
+	const text = readFileSync(path, "utf-8");
+	return scope === "credential" ? parseFlatYaml(text) : parseSectionedYaml(text);
+}
+/** 校验凭据 key 合法（大写蛇形）；不合法抛错 */
+function assertCredentialKey(key) {
+	if (!CREDENTIAL_KEY_RE.test(key)) throw new Error(`credential key "${key}" 必须匹配大写蛇形 ^[A-Z][A-Z0-9_]*$（如 HOME_GITLAB_TOKEN）`);
+}
+/** 校验 config 路径（节.key）；不合法抛错 */
+function assertConfigPath(path) {
+	const idx = path.indexOf(".");
+	if (idx <= 0 || idx === path.length - 1) throw new Error(`config path "${path}" 必须为 section.key（如 loop.defaultModel）`);
+	const section = path.slice(0, idx);
+	const key = path.slice(idx + 1);
+	if (!CONFIG_SECTION_RE.test(section)) throw new Error(`config 节 "${section}" 必须匹配 ^[a-z][a-z0-9-]*$`);
+	if (!CONFIG_KEY_RE.test(key)) throw new Error(`config key "${key}" 必须匹配小驼峰 ^[a-z][a-zA-Z0-9_]*$（如 defaultModel）`);
+	return {
+		section,
+		key
+	};
+}
+/** 写入单个条目（自动建目录/设权限；保留其他条目与注释行外内容） */
+function writeEntry(scope, name, value) {
+	const path = storeFilePath(scope);
+	ensureDir(serenityDir());
+	if (scope === "credential") {
+		assertCredentialKey(name);
+		const entries = parseFlatYaml(existsSync(path) ? readFileSync(path, "utf-8") : "");
+		entries[name] = value;
+		writeFileSync(path, renderFlatYaml(entries), "utf-8");
+	} else {
+		const { section, key } = assertConfigPath(name);
+		const sections = parseSectionedYaml(existsSync(path) ? readFileSync(path, "utf-8") : "");
+		if (!sections[section]) sections[section] = {};
+		sections[section][key] = value;
+		writeFileSync(path, renderSectionedYaml(sections), "utf-8");
+	}
+	applyFileMode(scope, path);
+}
+/** 删除单个条目（不存在返回 false） */
+function unsetEntry(scope, name) {
+	const path = storeFilePath(scope);
+	if (!existsSync(path)) return false;
+	if (scope === "credential") {
+		assertCredentialKey(name);
+		const entries = parseFlatYaml(readFileSync(path, "utf-8"));
+		if (!(name in entries)) return false;
+		delete entries[name];
+		writeFileSync(path, renderFlatYaml(entries), "utf-8");
+		return true;
+	}
+	const { section, key } = assertConfigPath(name);
+	const sections = parseSectionedYaml(readFileSync(path, "utf-8"));
+	const sectionMap = sections[section];
+	if (!sectionMap || !(key in sectionMap)) return false;
+	delete sectionMap[key];
+	if (Object.keys(sectionMap).length === 0) delete sections[section];
+	writeFileSync(path, renderSectionedYaml(sections), "utf-8");
+	return true;
+}
+/** 读取单个条目值；不存在返回 null */
+function getEntry(scope, name) {
+	const path = storeFilePath(scope);
+	if (!existsSync(path)) return null;
+	if (scope === "credential") {
+		assertCredentialKey(name);
+		return parseFlatYaml(readFileSync(path, "utf-8"))[name] ?? null;
+	}
+	const { section, key } = assertConfigPath(name);
+	return parseSectionedYaml(readFileSync(path, "utf-8"))[section]?.[key] ?? null;
+}
+/** 列出 key（凭据只返回 key 名，不返回值） */
+function listKeys(scope) {
+	const data = readStore(scope);
+	if (scope === "credential") return Object.keys(data);
+	return Object.entries(data).flatMap(([section, entries]) => Object.keys(entries).map((key) => `${section}.${key}`));
+}
+/**
+* doc 说明文本：输出存储位置/格式/key 规范/权限/读写方法/安全边界。
+* agent 据此可直接用 fs 工具（read/write）自己读写凭据/配置。
+*/
+function docText() {
+	const dir = serenityDir();
+	const credPath = storeFilePath("credential");
+	const cfgPath = storeFilePath("config");
+	return [
+		"# localstore — ACC 本地凭据/配置存储（标准）",
+		"",
+		"一个工具管理两个命名空间：credential（凭据，0600）+ config（偏好，0644）。",
+		"存储于用户主目录，不在任何 CCC git 仓库内。",
+		"",
+		"## 存储位置（平台感知）",
+		`- 根目录: ${dir}  (0700)`,
+		`- 凭据:   ${credPath}  (0600)`,
+		`- 配置:   ${cfgPath}  (0644)`,
+		"- Windows: %USERPROFILE%\\.serenity\\...（与 Linux/macOS 的 $HOME/.serenity 同构）",
+		"",
+		"## 格式",
+		"credentials.yaml（扁平映射，key = 大写蛇形命名空间前缀）：",
+		"```yaml",
+		"HOME_GITLAB_TOKEN: xxx",
+		"SSH_UBUNTU_PASSWORD: xxx",
+		"ANYSEARCH_API_KEY: xxx",
+		"```",
+		"settings.yaml（命名空间分节）：",
+		"```yaml",
+		"loop:",
+		"  defaultModel: minimax-cn-coding-plan/MiniMax-M3",
+		"ui:",
+		"  theme: dark",
+		"```",
+		"",
+		"## key 规范",
+		"- credential key: ^[A-Z][A-Z0-9_]*$（如 HOME_GITLAB_TOKEN）",
+		"- config path: section.key（节 ^[a-z][a-z0-9-]*$，key 小驼峰 ^[a-z][a-zA-Z0-9_]*$，如 loop.defaultModel）",
+		"",
+		"## 读取方法（agent 可直接用 fs 工具）",
+		"- 用 read 工具读对应文件 → 按上面格式解析 YAML",
+		"- 或用 localstore get <name> [--scope credential|config]",
+		"",
+		"## 写入方法",
+		"- 推荐：localstore set <name> <value> [--scope ...]（自动建目录/设权限/保留其他条目）",
+		"- 或直接用 write/edit 工具修改文件，保持 YAML 合法（键值冒号分隔）",
+		"",
+		"## 安全边界",
+		"- list/show 对 credential 只返回 key 名，不返回值",
+		"- 凭据值应在 agent 内部使用，不要写入对话/日志",
+		"- 文件权限不符（非 0600/0644）时 get/set 会提示 chmod 修复",
+		"- 文件在用户主目录，天然不进入任何 git 仓库",
+		""
+	].join("\n");
+}
+/** 运行 localstore 操作（纯逻辑；返回 JSON 值供工具 render） */
+function runLocalStore(args) {
+	const scope = args.scope === "config" ? "config" : "credential";
+	switch (args.action) {
+		case "list": return {
+			scope,
+			keys: listKeys(scope)
+		};
+		case "get": {
+			if (!args.name) throw new Error("get 需要 name");
+			const value = getEntry(scope, args.name);
+			if (value === null) throw new Error(`not found: ${args.name}（scope=${scope}）`);
+			return {
+				scope,
+				name: args.name,
+				value,
+				source: scope
+			};
+		}
+		case "set":
+			if (!args.name) throw new Error("set 需要 name");
+			if (args.value === void 0) throw new Error("set 需要 value");
+			writeEntry(scope, args.name, args.value);
+			return {
+				scope,
+				name: args.name,
+				set: true
+			};
+		case "unset": {
+			if (!args.name) throw new Error("unset 需要 name");
+			const removed = unsetEntry(scope, args.name);
+			return {
+				scope,
+				name: args.name,
+				removed
+			};
+		}
+		case "show": {
+			if (!args.name) throw new Error("show 需要 name");
+			const exists = getEntry(scope, args.name) !== null;
+			return {
+				scope,
+				name: args.name,
+				exists,
+				path: storeFilePath(scope)
+			};
+		}
+		case "doc": return { doc: docText() };
+		default: throw new Error(`未知子命令: ${args.action}（可用 list/get/set/unset/show/doc）`);
+	}
+}
+//#endregion
+//#region src/tools/localstore.ts
+/**
+* localstore.ts — localstore 真实 DSH 工具定义（defineTool）
+*
+* ACC 标准本地凭据/配置存储（S133 设计）。进程内注册，零 DSH 依赖逻辑在
+* localstore-ops.ts（可单测）。doc 子命令输出存储规范，agent 可直接用 fs
+* 工具（read/write）自己读写。
+*/
+const ACTIONS = [
+	"list",
+	"get",
+	"set",
+	"unset",
+	"show",
+	"doc"
+];
+function renderText(value) {
+	return [{
+		type: "text",
+		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
+	}];
+}
+const localstoreTool = defineTool({
+	name: "localstore",
+	description: "ACC 标准本地凭据/配置存储：一个工具管理两个命名空间 credential（凭据，0600）与 config（本地偏好，0644）。存储于用户主目录 ~/.serenity/（平台感知，不在任何 git 仓库内）。子命令：list（列 key，凭据不返回值）/ get <name>（读值）/ set <name> <value>（写）/ unset <name>（删）/ show <name>（元数据，凭据不打印值）/ doc（输出存储规范——路径/格式/key 规范/权限，agent 可按说明直接用 read/write 操作文件）。默认 scope=credential；config 需传 --scope config（路径为 section.key，如 loop.defaultModel）。",
+	parameters: {
+		action: {
+			type: "string",
+			enum: [...ACTIONS],
+			required: true,
+			description: "子命令：list/get/set/unset/show/doc"
+		},
+		name: {
+			type: "string",
+			description: "条目名（credential 用大写蛇形；config 用 section.key）"
+		},
+		value: {
+			type: "string",
+			description: "set 的值"
+		},
+		scope: {
+			type: "string",
+			enum: [...LOCALSTORE_SCOPES],
+			description: "命名空间 credential|config（默认 credential）"
+		}
+	},
+	output: {
+		schema: { type: "json" },
+		render: (args, value) => renderText(value)
+	},
+	async execute(args) {
+		return runLocalStore(args);
+	}
+});
+//#endregion
 //#region src/seams/loop.ts
 /** 解析当前 dsh 会话 scope 的活跃会话 SESSION.md 绝对路径；无标记/越界返回 null */
 function resolveActiveSession(root, scope = DEFAULT_SESSION_SCOPE) {
@@ -2209,13 +2661,14 @@ function accBlock(root) {
 		"",
 		"  cc_fs    — CCC 内文件系统操作（root/resolve/exists/list/tree/relative/mkdir/rm/mv/cp/touch/append/reveal/info/find）",
 		"  session  — session lifecycle（list/show/create/health/qa/archive/summary）",
-		"  acc_kit  — ACC utility kit（health: CCC three principles / time: now / wait: sleep N seconds）",
+		"  acc_kit  — ACC utility kit（health: CCC three principles / time: now / wait: wait N seconds）",
 		"  cc_git   — git operations（status/commit/push/log）",
 		"  acc_msm  — MSM framework（list/exec/register/deregister/check/guide）",
 		"  eap      — return the full EAP cognitive quality framework",
 		"  neat     — return the full Neat design collaboration protocol",
 		"  cce      — return the full Cognitive Continuity Engineering framework",
 		"  loop     — 牛马循环：指定模型专用 agent 反复执行",
+		"  localstore — ACC 本地凭据/配置存储（credential 0600 + config 0644，~/.serenity/）；doc 子命令输出规范",
 		"",
 		"The DSH platform tools remain available too (read/write/edit/glob/grep/web_search/ask_user_question/subagent/workflow/goal and more) — the ACC tools above are the serenity-native layer, not the only tools.",
 		"",
@@ -2508,6 +2961,22 @@ function agentKey(agent) {
 function agentScope(agent) {
 	return agent.session.id ?? "default";
 }
+/**
+* 重启恢复的根会话判定（S134 需求）：
+* 只有"conversation 根会话"才自动恢复最近激活的宁静号会话——
+* - subagent：session header `origin === 'subagent'`（DSH 路由语义，agent-lookup.ts）
+* - 派生会话：`parentSession` 存在（任何子会话）
+* - loop 牛马：sessionId 固定 `loop-` 前缀（tools/loop.ts 生成）
+* 三者都不恢复（避免把主会话激活注入子上下文，违背 v1.16.2 scope 隔离）。
+*/
+function shouldAutoRestore(agent) {
+	const session = agent.session;
+	if (!session) return false;
+	if (session.header?.origin === "subagent") return false;
+	if (session.header?.parentSession) return false;
+	if (session.id?.startsWith("loop-")) return false;
+	return true;
+}
 function registerContext(ctx, opts = {}) {
 	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
 	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
@@ -2516,6 +2985,12 @@ function registerContext(ctx, opts = {}) {
 		if (!root) return;
 		const key = agentKey(agent);
 		registerEntrySkillSection(agent, root);
+		if (shouldAutoRestore(agent)) try {
+			if (loadSerenityConfig(root, configPaths).hooks?.autoRestoreSession ?? true) {
+				const restored = restoreActiveSession(root, agentScope(agent));
+				if (restored) console.log(`[serenity-hooks] ↻ 自动恢复激活会话: ${restored.dir}（from scope ${restored.from}）`);
+			}
+		} catch {}
 		if (injected.has(key)) return;
 		injected.add(key);
 		agent.inject(accMessage(root, configPaths, entrySkillMaxChars, agentScope(agent)));
@@ -2833,6 +3308,7 @@ function apply(ctx, config) {
 		ctx.tools.register(neatTool);
 		ctx.tools.register(cceTool);
 		ctx.tools.register(createLoopTool(ctx));
+		ctx.tools.register(localstoreTool);
 	}
 	if (config.guards) registerGuards(ctx, { configPaths: config.serenityConfigPaths });
 	if (config.turnFlush) registerTurnFlush(ctx);

package/package.json

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