@roaming-ai/dsh-group-chat 0.3.0 → 0.3.2

package/lib/index.js

@@ -4,7 +4,7 @@ import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, sep } from "node:path";
 import { DEFAULT_FILE_SEARCH_EXCLUDED_DIRECTORIES, DEFAULT_FILE_SEARCH_MAX_ENTRIES, DEFAULT_FILE_SEARCH_MAX_RESULTS, WorkspaceFileSearch } from "@deepseek-ai/dsh-file-reference-local";
-import { spawn } from "node:child_process";
+import { writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 //#region src/mount-once.ts
 /**
 * Host single-instance guard shared by the plugin family. The family bundle
@@ -46,6 +46,59 @@ function mountOnce(packageName, fn) {
 	});
 }
 //#endregion
+//#region src/core/json.ts
+/** 消息 → 落盘 JSON（可选字段无则省略；兼容保留 error）。 */
+function messageJson(m) {
+	if (!m || typeof m.id !== "string") return null;
+	const o = {
+		id: m.id,
+		speaker: m.speaker,
+		text: String(m.text || ""),
+		ts: typeof m.ts === "number" ? m.ts : Date.now(),
+		seq: typeof m.seq === "number" ? m.seq : 0
+	};
+	if (m.model !== void 0) o.model = m.model;
+	if (m.reasoning !== void 0) o.reasoning = m.reasoning;
+	if (m.reasoningFull !== void 0) o.reasoningFull = m.reasoningFull;
+	if (m.thinkingSummary !== void 0) o.thinkingSummary = m.thinkingSummary;
+	if (m.error !== void 0) o.error = m.error;
+	if (typeof m.failedRoleId === "string" && m.failedRoleId) o.failedRoleId = m.failedRoleId;
+	if (Array.isArray(m.toolCalls) && m.toolCalls.length > 0) o.toolCalls = m.toolCalls;
+	return o;
+}
+/** 角色 → 落盘 JSON（groupId 由目录归属，不再写入）。 */
+function roleJson(r) {
+	const o = {
+		id: r.id,
+		name: String(r.name || "成员"),
+		persona: String(r.persona || ""),
+		provider: String(r.provider || ""),
+		model: String(r.model || ""),
+		enabled: r.enabled !== false,
+		thinking: r.thinking === true
+	};
+	if (r.color) o.color = r.color;
+	if (typeof r.temperature === "number" && !Number.isNaN(r.temperature)) o.temperature = r.temperature;
+	if (typeof r.reasoningEffort === "string" && r.reasoningEffort && r.reasoningEffort !== "default") o.reasoningEffort = r.reasoningEffort;
+	return o;
+}
+/**
+* 宽容 JSON 提取（模型输出/供应商错误原文的统一解析入口）：
+* 取首个 { 至末个 } 的片段解析，仅接受普通对象；失败返回 null。
+* 代码围栏剥离由调用方按需先行处理（供应商错误原文不剥）。
+*/
+function looseJson(raw) {
+	const start = raw.indexOf("{");
+	const end = raw.lastIndexOf("}");
+	if (start < 0 || end <= start) return null;
+	try {
+		const parsed = JSON.parse(raw.slice(start, end + 1));
+		return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
+	} catch {
+		return null;
+	}
+}
+//#endregion
 //#region src/core/errors.ts
 const PREFIX = "模型输出异常终止: ";
 const LEGACY_ROLE = /^角色「([^」]+)」发言失败[:：]\s*/;
@@ -176,6 +229,7 @@ function createHostState(ctx) {
 		ctx,
 		llm: ctx.llm,
 		fs: ctx.fs,
+		shell: ctx.shell,
 		groups: /* @__PURE__ */ new Map(),
 		sessions: /* @__PURE__ */ new Map(),
 		roles: /* @__PURE__ */ new Map(),
@@ -190,7 +244,7 @@ function createHostState(ctx) {
 			queue: [],
 			pendingConfirm: null,
 			confirmSignal: null,
-			childProc: null,
+			commandAbort: null,
 			finished: null,
 			replaceMessageId: null
 		},
@@ -226,7 +280,7 @@ function createActions(core, deps) {
 	const { llm, groups, sessions, roles, messages, run } = core;
 	const { touch, snapshot, schedulePersist, dropDirty, appendMessage, runLoop, wakeConfirm, killChild, browse, fileSearch, disposeFileSearch } = deps;
 	const mutate = (args) => {
-		const op = args && args.op;
+		const op = args.op;
 		if (op === "createGroup") {
 			const g = {
 				id: core.nid("grp"),
@@ -1117,18 +1171,11 @@ function sanitizeConstraints(raw) {
 * 解析折叠模型输出。null = 解析失败（水位不推）；[] = 无新结论（水位推、备忘不动）。
 */
 function parseConstraints(raw) {
-	const body = raw.replace(/```(?:json)?/g, "");
-	const l = body.indexOf("{");
-	const r = body.lastIndexOf("}");
-	if (l < 0 || r <= l) return null;
-	try {
-		const o = JSON.parse(body.slice(l, r + 1));
-		if (!Object.prototype.hasOwnProperty.call(o, "constraints")) return null;
-		if (!Array.isArray(o.constraints)) return null;
-		return sanitizeConstraints(o.constraints);
-	} catch {
-		return null;
-	}
+	const o = looseJson(raw.replace(/```(?:json)?/g, ""));
+	if (o === null) return null;
+	if (!Object.prototype.hasOwnProperty.call(o, "constraints")) return null;
+	if (!Array.isArray(o.constraints)) return null;
+	return sanitizeConstraints(o.constraints);
 }
 /** 本批无用户消息时，新的已定/否决降为未决。 */
 function downgradeWithoutUser(list, hasUser) {
@@ -1144,9 +1191,13 @@ function constraintBlock(list) {
 	return "\n# 已确认约束\n" + list.map((c) => "- " + KIND_LABEL[c.kind] + "：" + c.text).join("\n");
 }
 //#endregion
-//#region src/host/engine/fold.ts
-/** DSH 默认模型（与 retitle 同一读取面；缺位返回 null）。 */
-const defaultModel$1 = (core) => {
+//#region src/host/engine/defaults.ts
+/**
+* 引擎共享小件：DSH 默认模型读取 + 发言人展示名（retitle / fold / conversation 共用）。
+* @module dsh-group-chat/host/engine/defaults
+*/
+/** DSH 默认模型（agentDefaultModel 服务缺位或未配置时返回 null，调用方静默跳过）。 */
+const defaultModel = (core) => {
 	try {
 		const svc = core.ctx.reflect.get("agentDefaultModel");
 		const sel = svc ? svc.currentSelection() : null;
@@ -1158,6 +1209,10 @@ const defaultModel$1 = (core) => {
 		return null;
 	}
 };
+/** 发言人展示名（roles 表内查角色名；user/system 固定文案，见 speakerLabel）。 */
+const speakerNameOf = (roles, speaker) => speakerLabel(speaker, roles.get(speaker)?.name);
+//#endregion
+//#region src/host/engine/fold.ts
 /**
 * 每轮 send 结束后折叠窗口外约束：fire-and-forget、不产生消息、静默失败。
 * 同会话去重；会话已清空则 abort。内存 {constraints, constraintsUpToSeq} 一次挂上。
@@ -1166,12 +1221,11 @@ function createFold(core, deps) {
 	const { llm, messages, roles } = core;
 	const { touch, schedulePersist } = deps;
 	const folding = /* @__PURE__ */ new Set();
-	const nameOf = (speaker) => speakerLabel(speaker, (roles.get(speaker) || { name: void 0 }).name);
 	return async (sess) => {
 		if (folding.has(sess.id)) return;
 		const squeezed = squeezedMessages(messages, sess);
 		if (!squeezed.length) return;
-		const input = takeFoldBatch(squeezed, (m) => nameOf(m.speaker));
+		const input = takeFoldBatch(squeezed, (m) => speakerNameOf(roles, m.speaker));
 		const watermark = squeezedMaxSeq(input.consumed);
 		if (watermark <= 0) return;
 		const commit = (next) => {
@@ -1186,7 +1240,7 @@ function createFold(core, deps) {
 			commit(void 0);
 			return;
 		}
-		const dm = defaultModel$1(core);
+		const dm = defaultModel(core);
 		if (!dm) return;
 		folding.add(sess.id);
 		try {
@@ -1240,47 +1294,26 @@ function createFold(core, deps) {
 //#region src/host/engine/retitle.ts
 /** 仍是新建占位名（含改名之前的「会话 N」存量），自动标题尚未落地。 */
 const isPlaceholderName = (name) => name === "新会话" || /^会话 \d+$/.test(name);
-/** DSH 默认模型（agentDefaultModel 服务缺位或未配置时返回 null，调用方静默跳过）。 */
-const defaultModel = (core) => {
-	try {
-		const svc = core.ctx.reflect.get("agentDefaultModel");
-		const sel = svc ? svc.currentSelection() : null;
-		return sel && typeof sel.provider === "string" && typeof sel.model === "string" && sel.provider && sel.model ? {
-			provider: sel.provider,
-			model: sel.model
-		} : null;
-	} catch {
-		return null;
-	}
-};
 /** 命名输入：最近 40 条非系统消息的紧凑转写（每条 500 字符封顶，命名不需要全文）。 */
 const titleTranscript = (core, sess) => {
 	const out = [];
 	for (const mid of sess.messageIds.slice(-40)) {
 		const m = core.messages.get(mid);
 		if (!m || m.speaker === "system" || m.error || !m.text) continue;
-		const name = m.speaker === "user" ? "用户" : (core.roles.get(m.speaker) || { name: void 0 }).name || "成员";
-		out.push("【" + name + "】" + m.text.replace(/\s+/g, " ").slice(0, 500));
+		out.push("【" + speakerNameOf(core.roles, m.speaker) + "】" + m.text.replace(/\s+/g, " ").slice(0, 500));
 	}
 	return out.join("\n");
 };
-/** 宽容解析模型输出：剥代码围栏 → 取首个 { 至末个 } 的 JSON → 校验并封顶字段。 */
+/** 宽容解析模型输出：剥代码围栏 → looseJson → 校验并封顶字段。 */
 const parseRetitle = (raw) => {
-	const body = raw.replace(/```(?:json)?/g, "");
-	const l = body.indexOf("{");
-	const r = body.lastIndexOf("}");
-	if (l < 0 || r <= l) return {};
-	try {
-		const o = JSON.parse(body.slice(l, r + 1));
-		const name = typeof o.name === "string" ? o.name.trim() : "";
-		const topic = typeof o.topic === "string" ? o.topic.trim() : "";
-		return {
-			name: name ? name.slice(0, 24) : void 0,
-			topic: topic ? topic.slice(0, 120) : void 0
-		};
-	} catch {
-		return {};
-	}
+	const o = looseJson(raw.replace(/```(?:json)?/g, ""));
+	if (!o) return {};
+	const name = typeof o.name === "string" ? o.name.trim() : "";
+	const topic = typeof o.topic === "string" ? o.topic.trim() : "";
+	return {
+		name: name ? name.slice(0, 24) : void 0,
+		topic: topic ? topic.slice(0, 120) : void 0
+	};
 };
 /**
 * 每轮结束后根据聊天内容整理会话名称与主题：后台 fire-and-forget、不产生
@@ -1382,7 +1415,6 @@ function createConversation(core, deps) {
 		touch,
 		schedulePersist
 	});
-	const nameOf = (speaker) => speakerLabel(speaker, (roles.get(speaker) || { name: void 0 }).name);
 	const appendMessage = (sess, speaker, text, extra) => {
 		const msg = {
 			id: core.nid("msg"),
@@ -1410,60 +1442,56 @@ function createConversation(core, deps) {
 		schedulePersist({ session: sess.id });
 		return msg;
 	};
+	/** 原地覆盖既有消息（重试槽位）；目标不存在或不属于本会话时返回 false，由调用方走追加。 */
+	const overwriteMessage = (sess, replaceId, patch) => {
+		if (!replaceId) return false;
+		const existing = messages.get(replaceId);
+		if (!existing || existing.sessionId !== sess.id) return false;
+		Object.assign(existing, patch, { ts: Date.now() });
+		touch();
+		schedulePersist({ session: sess.id });
+		return true;
+	};
 	/** 把失败回合写成该角色的消息（speaker = 角色 id），不再用系统胶囊顶替。 */
 	const writeFailure = (sess, role, err, replaceId) => {
 		const raw = unwrapSpeakFailure(String(err && err.message || err));
+		const model = role.provider + " / " + role.model;
 		const extra = {
 			error: true,
 			failedRoleId: role.id,
-			model: role.provider + " / " + role.model
+			model
 		};
-		if (replaceId) {
-			const existing = messages.get(replaceId);
-			if (existing && existing.sessionId === sess.id) {
-				existing.speaker = role.id;
-				existing.text = raw;
-				existing.error = true;
-				existing.failedRoleId = role.id;
-				existing.model = extra.model;
-				existing.reasoning = void 0;
-				existing.reasoningFull = void 0;
-				existing.thinkingSummary = void 0;
-				existing.toolCalls = void 0;
-				existing.ts = Date.now();
-				touch();
-				schedulePersist({ session: sess.id });
-				return;
-			}
-		}
+		if (overwriteMessage(sess, replaceId, {
+			speaker: role.id,
+			text: raw,
+			...extra,
+			reasoning: void 0,
+			reasoningFull: void 0,
+			thinkingSummary: void 0,
+			toolCalls: void 0
+		})) return;
 		appendMessage(sess, role.id, raw, extra);
 	};
 	/** 成功发言写入：replaceId 存在则原地覆盖失败卡。 */
 	const writeSuccess = (sess, role, out, replaceId) => {
-		const extra = {
-			model: role.provider + " / " + role.model,
+		const model = role.provider + " / " + role.model;
+		const toolCalls = Array.isArray(out.toolCalls) && out.toolCalls.length > 0 ? out.toolCalls : void 0;
+		if (overwriteMessage(sess, replaceId, {
+			speaker: role.id,
+			text: out.text,
+			error: void 0,
+			failedRoleId: void 0,
+			model,
+			reasoning: out.reasoning,
+			reasoningFull: void 0,
+			thinkingSummary: void 0,
+			toolCalls
+		})) return;
+		appendMessage(sess, role.id, out.text, {
+			model,
 			reasoning: out.reasoning,
 			toolCalls: out.toolCalls
-		};
-		if (replaceId) {
-			const existing = messages.get(replaceId);
-			if (existing && existing.sessionId === sess.id) {
-				existing.speaker = role.id;
-				existing.text = out.text;
-				existing.error = void 0;
-				existing.failedRoleId = void 0;
-				existing.model = extra.model;
-				existing.reasoning = out.reasoning;
-				existing.reasoningFull = void 0;
-				existing.thinkingSummary = void 0;
-				existing.toolCalls = Array.isArray(out.toolCalls) && out.toolCalls.length > 0 ? out.toolCalls : void 0;
-				existing.ts = Date.now();
-				touch();
-				schedulePersist({ session: sess.id });
-				return;
-			}
-		}
-		appendMessage(sess, role.id, out.text, extra);
+		});
 	};
 	/** 群聊记录 → 角色上下文块（最近 40 条 + 未折入临时原文）。失败卡不进上下文。重试截到该条之前。 */
 	const transcriptBlock = (sess, skipId) => {
@@ -1471,10 +1499,10 @@ function createConversation(core, deps) {
 		for (const mid of prefixIds(sess.messageIds, skipId).slice(-40)) {
 			const m = messages.get(mid);
 			if (!m || m.id === skipId || m.error) continue;
-			out.push(formatTranscriptLine(m, nameOf(m.speaker)));
+			out.push(formatTranscriptLine(m, speakerNameOf(roles, m.speaker)));
 		}
 		const live = out.join("\n\n");
-		const temp = tempTranscript(squeezedMessages(messages, sess, skipId), (m) => nameOf(m.speaker));
+		const temp = tempTranscript(squeezedMessages(messages, sess, skipId), (m) => speakerNameOf(roles, m.speaker));
 		if (!temp) return live;
 		if (!live) return temp;
 		return temp + "\n\n" + live;
@@ -1671,6 +1699,7 @@ function createConversation(core, deps) {
 			});
 			for (const tc of round.tcs) {
 				if (run.stopping) break;
+				if (wsRoot === null) break;
 				const res = await tools.executeTool(g, wsRoot, tc);
 				const output = String(res.output || "");
 				toolCalls.push({
@@ -1718,12 +1747,13 @@ function createConversation(core, deps) {
 		};
 	};
 	const runLoop = async (sess, opts) => {
-		const g = groups.get(sess.groupId);
+		const g = groups.get(sess.groupId) ?? null;
 		const startCount = sess.messageIds.length;
 		let failed = false;
 		let replaceId = opts && opts.replaceMessageId;
 		run.replaceMessageId = replaceId || null;
 		try {
+			if (!g) return;
 			while (run.queue.length > 0 && !run.stopping) {
 				const roleId = run.queue.shift();
 				const role = roles.get(roleId);
@@ -1770,7 +1800,7 @@ function createConversation(core, deps) {
 			run.queue = [];
 			run.pendingConfirm = null;
 			run.confirmSignal = null;
-			run.childProc = null;
+			run.commandAbort = null;
 			run.stopping = false;
 			run.replaceMessageId = null;
 			touch();
@@ -2049,43 +2079,6 @@ function createMaterials(core) {
 	};
 }
 //#endregion
-//#region src/core/json.ts
-/** 消息 → 落盘 JSON（可选字段无则省略；兼容保留 error）。 */
-function messageJson(m) {
-	if (!m || typeof m.id !== "string") return null;
-	const o = {
-		id: m.id,
-		speaker: m.speaker,
-		text: String(m.text || ""),
-		ts: typeof m.ts === "number" ? m.ts : Date.now(),
-		seq: typeof m.seq === "number" ? m.seq : 0
-	};
-	if (m.model !== void 0) o.model = m.model;
-	if (m.reasoning !== void 0) o.reasoning = m.reasoning;
-	if (m.reasoningFull !== void 0) o.reasoningFull = m.reasoningFull;
-	if (m.thinkingSummary !== void 0) o.thinkingSummary = m.thinkingSummary;
-	if (m.error !== void 0) o.error = m.error;
-	if (typeof m.failedRoleId === "string" && m.failedRoleId) o.failedRoleId = m.failedRoleId;
-	if (Array.isArray(m.toolCalls) && m.toolCalls.length > 0) o.toolCalls = m.toolCalls;
-	return o;
-}
-/** 角色 → 落盘 JSON（groupId 由目录归属，不再写入）。 */
-function roleJson(r) {
-	const o = {
-		id: r.id,
-		name: String(r.name || "成员"),
-		persona: String(r.persona || ""),
-		provider: String(r.provider || ""),
-		model: String(r.model || ""),
-		enabled: r.enabled !== false,
-		thinking: r.thinking === true
-	};
-	if (r.color) o.color = r.color;
-	if (typeof r.temperature === "number" && !Number.isNaN(r.temperature)) o.temperature = r.temperature;
-	if (typeof r.reasoningEffort === "string" && r.reasoningEffort && r.reasoningEffort !== "default") o.reasoningEffort = r.reasoningEffort;
-	return o;
-}
-//#endregion
 //#region src/host/persistence/store.ts
 /**
 * 持久化（PERSISTENCE.md v2.1：会话级文件隔离）。
@@ -2198,7 +2191,11 @@ var Store = class {
 			}
 		} catch {}
 	}
-	/** 原子写：tmp+fsync+rename；目录 fsync 由调用方按 flush 批量执行（每目录一次）。 */
+	/**
+	* 同步原子写（tmp+fsync+rename）：仅供构造期 v1 迁移（migrateV1）与测试
+	* 直用；运行时 flush 走 persistence.ts 的 writeFileAtomic（异步、wx 独占
+	* 创建 + 随机后缀 + 符号链接安全，无 per-file fsync，对齐 DSH 基座标准）。
+	*/
 	atomicWrite(file, text) {
 		mkdirSync(dirname(file), { recursive: true });
 		const tmp = `${file}.tmp-${process.pid}`;
@@ -2441,6 +2438,11 @@ function emptyGroup(id, name) {
 * 锁失败/写失败时降级为内存态运行（console 告警）。
 * @module dsh-group-chat/host/persistence
 */
+/** writeFileAtomic 权限位：私有数据 0o600、目录 0o700（对齐 Store.atomicWrite）。 */
+const WRITE_FILE_OPTS = {
+	mode: 384,
+	dirMode: 448
+};
 /**
 * 创建持久化面：构造即完成 store 初始化 + hydrate（v1 迁移 → 残留清理 →
 * 清单 → 群组数据 → 会话文件；缺文件空重建；补建默认会话/群组立即落盘）。
@@ -2453,11 +2455,15 @@ function createPersistence(core) {
 		core.store = null;
 	}
 	const store = () => core.store;
-	const dirtySessions = /* @__PURE__ */ new Set();
-	const dirtyRoles = /* @__PURE__ */ new Set();
-	const dirtyWorkspace = /* @__PURE__ */ new Set();
-	let ledgerDirty = false;
+	const dirtySessions = /* @__PURE__ */ new Map();
+	const dirtyRoles = /* @__PURE__ */ new Map();
+	const dirtyWorkspace = /* @__PURE__ */ new Map();
+	let ledgerDirty = 0;
 	let flushScheduled = false;
+	let flushChain = Promise.resolve();
+	const mark = (map, key) => {
+		map.set(key, (map.get(key) ?? 0) + 1);
+	};
 	const ledgerDocument = () => ({
 		schema: 3,
 		savedAt: Date.now(),
@@ -2490,74 +2496,85 @@ function createPersistence(core) {
 		savedAt: Date.now(),
 		roles: g.roleIds.map((rid) => core.roles.get(rid)).filter((r) => Boolean(r)).map((r) => roleJson(r))
 	});
-	/** 同步 flush：写全部脏文件；成功才清脏标记；每个实际发生 rename 的目录一次 fsync。 */
-	const flushNow = () => {
-		const s = store();
-		if (s === null) return;
+	/**
+	* 异步 flush（writeFileAtomic：wx 独占创建 + 随机后缀 tmp + rename，无
+	* per-file fsync——崩溃持久性对齐 DSH 基座标准）：写全部脏文件；写成功且
+	* 写入期间未被重新标脏（版本未变）才清脏标记；每个实际发生 rename 的
+	* 目录一次 fsync（调用侧批量执行）。
+	*/
+	const flushAll = async (s) => {
 		const fsyncDirs = /* @__PURE__ */ new Set();
-		for (const sid of [...dirtySessions]) {
+		for (const [sid, v] of [...dirtySessions]) {
 			const sess = core.sessions.get(sid);
 			if (!sess) {
 				dirtySessions.delete(sid);
 				continue;
 			}
 			try {
-				s.atomicWrite(s.sessionFile(sess.groupId, sess.id), JSON.stringify(sessionDocument(sess)));
-				dirtySessions.delete(sid);
+				await writeFileAtomic(s.sessionFile(sess.groupId, sess.id), JSON.stringify(sessionDocument(sess)), WRITE_FILE_OPTS);
+				if (dirtySessions.get(sid) === v) dirtySessions.delete(sid);
 				fsyncDirs.add(s.sessionsDir(sess.groupId));
 			} catch (e) {
 				console.error(`[dsh-group-chat] 会话 ${sid} 落盘失败（保留脏标记待重试）：`, e);
 			}
 		}
-		for (const gid of [...dirtyRoles]) {
+		for (const [gid, v] of [...dirtyRoles]) {
 			const g = core.groups.get(gid);
 			if (!g) {
 				dirtyRoles.delete(gid);
 				continue;
 			}
 			try {
-				s.atomicWrite(s.rolesFile(gid), JSON.stringify(rolesDocument(g)));
-				dirtyRoles.delete(gid);
+				await writeFileAtomic(s.rolesFile(gid), JSON.stringify(rolesDocument(g)), WRITE_FILE_OPTS);
+				if (dirtyRoles.get(gid) === v) dirtyRoles.delete(gid);
 				fsyncDirs.add(s.groupDir(gid));
 			} catch (e) {
 				console.error(`[dsh-group-chat] 群组 ${gid} roles.json 落盘失败（保留脏标记待重试）：`, e);
 			}
 		}
-		for (const gid of [...dirtyWorkspace]) {
+		for (const [gid, v] of [...dirtyWorkspace]) {
 			const g = core.groups.get(gid);
 			if (!g) {
 				dirtyWorkspace.delete(gid);
 				continue;
 			}
 			try {
-				s.atomicWrite(s.workspaceFile(gid), (g.workspaceDir || "") + "\n");
-				dirtyWorkspace.delete(gid);
+				await writeFileAtomic(s.workspaceFile(gid), (g.workspaceDir || "") + "\n", WRITE_FILE_OPTS);
+				if (dirtyWorkspace.get(gid) === v) dirtyWorkspace.delete(gid);
 				fsyncDirs.add(s.groupDir(gid));
 			} catch (e) {
 				console.error(`[dsh-group-chat] 群组 ${gid} workspaceDir 落盘失败（保留脏标记待重试）：`, e);
 			}
 		}
-		if (ledgerDirty) try {
-			s.atomicWrite(s.ledgerFile, JSON.stringify(ledgerDocument(), null, 2));
-			ledgerDirty = false;
-			fsyncDirs.add(s.dir);
-		} catch (e) {
-			console.error("[dsh-group-chat] ledger.json 落盘失败（保留脏标记待重试）：", e);
+		if (ledgerDirty > 0) {
+			const v = ledgerDirty;
+			try {
+				await writeFileAtomic(s.ledgerFile, JSON.stringify(ledgerDocument(), null, 2), WRITE_FILE_OPTS);
+				if (ledgerDirty === v) ledgerDirty = 0;
+				fsyncDirs.add(s.dir);
+			} catch (e) {
+				console.error("[dsh-group-chat] ledger.json 落盘失败（保留脏标记待重试）：", e);
+			}
 		}
 		for (const d of fsyncDirs) s.fsyncDir(d);
 	};
 	/** 事件驱动落盘；同一 tick 内多次变更合并为一次写。 */
 	const schedulePersist = ({ ledger = false, session = null, roles: roleGroup = null, workspace = null } = {}) => {
 		if (store() === null) return;
-		if (ledger) ledgerDirty = true;
-		if (session) dirtySessions.add(session);
-		if (roleGroup) dirtyRoles.add(roleGroup);
-		if (workspace) dirtyWorkspace.add(workspace);
+		if (ledger) ledgerDirty++;
+		if (session) mark(dirtySessions, session);
+		if (roleGroup) mark(dirtyRoles, roleGroup);
+		if (workspace) mark(dirtyWorkspace, workspace);
 		if (flushScheduled) return;
 		flushScheduled = true;
 		Promise.resolve().then(() => {
 			flushScheduled = false;
-			flushNow();
+			flushChain = flushChain.then(async () => {
+				const s = store();
+				if (s !== null) await flushAll(s);
+			}).catch((e) => {
+				console.error("[dsh-group-chat] 落盘 flush 异常（脏标记保留待重试）：", e);
+			});
 		});
 	};
 	const dropDirty = ({ session = null, roles: roleGroup = null, workspace = null }) => {
@@ -2717,18 +2734,18 @@ function createPersistence(core) {
 	hydrate();
 	return {
 		schedulePersist,
-		flushNow,
 		dropDirty,
-		release() {
+		async release() {
 			const s = store();
 			if (s === null) return;
+			core.store = null;
 			try {
-				flushNow();
+				await flushChain;
+				await flushAll(s);
 			} catch {}
 			try {
 				s.release();
 			} catch {}
-			core.store = null;
 		}
 	};
 }
@@ -2737,12 +2754,13 @@ function createPersistence(core) {
 /**
 * 工具执行（TOOLS.md §2：沙箱 / §3：确认闸门）：read_file / list_dir /
 * run_command 三件套；realpath 硬边界 + 分隔符比较；run_command 按群组
-* 权限档位走逐条确认或直接执行。
+* 权限档位走逐条确认或直接执行，经 `shell` 服务（ctx.shell 沙箱执行器）
+* 以 per-call sandboxPolicy 收紧到群工作区。
 * @module dsh-group-chat/host/tools
 */
 /** 创建工具面。 */
 function createTools(core, touch) {
-	const { run } = core;
+	const { run, shell } = core;
 	/** realpath 硬边界：目标必须在群组工作区内（带分隔符比较，防 /ws/foo 放行 /ws/foobar）。 */
 	const resolveInWorkspace = (root, rawPath) => {
 		const p = rawPath === void 0 || rawPath === null || String(rawPath).trim() === "" ? "." : String(rawPath);
@@ -2829,54 +2847,50 @@ function createTools(core, touch) {
 			};
 		}
 	};
-	const runCommandTool = (root, command) => new Promise((resolve) => {
-		let child;
+	/**
+	* 经 `shell` 服务执行命令（TOOLS.md §2）：cwd 与沙箱均收紧到群工作区根
+	* （workspace_write 档经 sandboxPolicy 强制；full_access 档对齐 DSH
+	* danger-full-access 语义免受限）。超时/中止由执行器 kill 进程并按首因
+	* 分类报告；runner 失效（如 SANDBOX_UNAVAILABLE）经 catch 报错不执行。
+	*/
+	const runCommandTool = async (g, root, command) => {
+		const abort = new AbortController();
+		run.commandAbort = abort;
 		try {
-			child = spawn("bash", ["-c", command], { cwd: root });
+			const spec = shell.resolve({
+				command,
+				workdir: root,
+				timeoutMs: RUN_CMD_TIMEOUT_MS,
+				stdoutMaxBytes: CMD_CAPTURE_MAX_BYTES,
+				sandboxPolicy: g.permissionTier === "full_access" ? {
+					mode: "danger-full-access",
+					workspaceRoot: root
+				} : {
+					mode: "workspace-write",
+					workspaceRoot: root
+				},
+				signal: abort.signal
+			});
+			const r = await shell.run(spec);
+			let text = r.stdout.text + r.stderr.text;
+			if (r.stdout.truncated || r.stderr.truncated) text += "\n[输出采集超限，已截断（保留末尾）]";
+			if (r.sandbox?.denied) text += "\n[沙箱拦截了越界的文件操作]";
+			if (r.timedOut) text += "\n[执行超时（" + Math.round(RUN_CMD_TIMEOUT_MS / 1e3) + "s），已强制终止]";
+			if (r.exitCode !== 0 && r.exitCode !== null && !r.timedOut) text += "\n[退出码 " + r.exitCode + "]";
+			if (text.length > 8e3) text = text.slice(0, CMD_OUTPUT_MAX_CHARS) + "\n…(输出超长，已截断)";
+			return {
+				status: r.exitCode === 0 ? "ok" : "error",
+				output: text || "（无输出）"
+			};
 		} catch (e) {
-			resolve({
+			return {
 				status: "error",
 				output: "无法启动命令：" + String(e && e.message || e)
-			});
-			return;
+			};
+		} finally {
+			if (run.commandAbort === abort) run.commandAbort = null;
 		}
-		run.childProc = child;
-		let out = "";
-		let dropped = 0;
-		let timedOut = false;
-		const onChunk = (chunk) => {
-			if (out.length < 1048576) out += chunk.toString("utf8");
-			else dropped += chunk.length;
-		};
-		child.stdout?.on("data", onChunk);
-		child.stderr?.on("data", onChunk);
-		const timer = setTimeout(() => {
-			timedOut = true;
-			try {
-				child.kill("SIGKILL");
-			} catch {}
-		}, RUN_CMD_TIMEOUT_MS);
-		const finish = (result) => {
-			clearTimeout(timer);
-			if (run.childProc === child) run.childProc = null;
-			resolve(result);
-		};
-		child.on("error", (e) => finish({
-			status: "error",
-			output: "执行失败：" + String(e && e.message || e)
-		}));
-		child.on("close", (code) => {
-			let text = out.length > 1048576 ? out.slice(0, CMD_CAPTURE_MAX_BYTES) : out;
-			if (dropped > 0) text += "\n[输出采集超限，已丢弃 " + dropped + " 字节]";
-			if (timedOut) text += "\n[执行超时（" + Math.round(RUN_CMD_TIMEOUT_MS / 1e3) + "s），已强制终止]";
-			if (code !== 0 && code !== null && !timedOut) text += "\n[退出码 " + code + "]";
-			if (text.length > 8e3) text = text.slice(0, CMD_OUTPUT_MAX_CHARS) + "\n…(输出超长，已截断)";
-			finish({
-				status: code === 0 ? "ok" : "error",
-				output: text || "（无输出）"
-			});
-		});
-	});
+	};
 	/** run_command 确认闸门：置 pendingConfirm 后无限等待，confirmCommand/stop/dispose 唤醒。 */
 	const requestConfirmation = (toolCallId, args) => new Promise((resolve) => {
 		run.pendingConfirm = {
@@ -2896,8 +2910,8 @@ function createTools(core, touch) {
 		} catch {}
 	};
 	const killChild = () => {
-		if (run.childProc) try {
-			run.childProc.kill("SIGKILL");
+		try {
+			run.commandAbort?.abort();
 		} catch {}
 	};
 	const executeTool = async (g, root, tc) => {
@@ -2925,8 +2939,8 @@ function createTools(core, touch) {
 					status: "denied",
 					output: "用户拒绝了这次命令执行"
 				};
-				else res = await runCommandTool(root, String(args.command || ""));
-			} else res = await runCommandTool(root, String(args.command || ""));
+				else res = await runCommandTool(g, root, String(args.command || ""));
+			} else res = await runCommandTool(g, root, String(args.command || ""));
 		} else res = {
 			status: "error",
 			output: "未知工具：" + tc.name
@@ -2996,7 +3010,7 @@ function createGroupChatService(ctx) {
 			tools.killChild();
 			materials.disposeFileSearch();
 			bus.dispose();
-			persist.release();
+			return persist.release();
 		}
 	};
 }
@@ -3006,6 +3020,7 @@ const name = "group-chat";
 const inject = [
 	"llm",
 	"fs",
+	"shell",
 	"webServer",
 	"workspaceRegistry"
 ];
@@ -3025,9 +3040,7 @@ const apply = mountOnce("dsh-group-chat", (ctx, config) => {
 			for (const dispose of disposers) dispose();
 		};
 	}, "group-chat: host API routes");
-	ctx.effect(() => () => {
-		service.dispose();
-	});
+	ctx.effect(() => () => service.dispose());
 	let current = () => config ?? {};
 	const sync = () => {
 		if (!(current().enabled ?? true)) service.stopAll();