@khorsheed/dsh-local-agent-kimi 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 # 变更记录
+## 0.2.2（2026-10-27）
+
+- 成员的工具调用保留结构化参数，透镜和记录里能看到完整入参；用量记录不再重复计算。
+- **重启恢复后不再往已经结束的轮次里补写**：之前恢复时可能把旧内容写进中间的轮次，导致整份子会话日志读不出来。
+- **一轮中途插进来的消息不再另起一轮**；这一轮的最终回答始终是它的最后一步。
+- **工具调用不再 60 秒就超时**：常驻进程和成员桥接都放宽到和提问卡一样的 30 分钟。
+- 读图片等媒体返回的内容不再打断对话记录的整理。
+
 ## 0.2.1（2026-10-27）
 
 - **修复几个模式套件一起装时设置存不上**：卡片上的开关和设置改存在本 harness 自己的目录里，不再写进配置文件；原来配好的值照常生效。

package/lib/client.js

@@ -343,30 +343,30 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ProviderAuthBlock_module_css_default = {
-			"rowActions": "On5p7W_rowActions",
+			"retryButton": "On5p7W_retryButton",
 			"loginPrompt": "On5p7W_loginPrompt",
-			"rowCard": "On5p7W_rowCard",
-			"openPage": "On5p7W_openPage",
-			"loginButton": "On5p7W_loginButton",
-			"section": "On5p7W_section",
-			"promptText": "On5p7W_promptText",
+			"title": "On5p7W_title",
+			"rowActions": "On5p7W_rowActions",
 			"codeInput": "On5p7W_codeInput",
-			"retryButton": "On5p7W_retryButton",
-			"dotOn": "On5p7W_dotOn",
-			"dotPending": "On5p7W_dotPending",
 			"dotOff": "On5p7W_dotOff",
-			"rows": "On5p7W_rows",
-			"rowHead": "On5p7W_rowHead",
 			"status": "On5p7W_status",
+			"dotPending": "On5p7W_dotPending",
+			"rowName": "On5p7W_rowName",
+			"loginButton": "On5p7W_loginButton",
+			"rowIdentity": "On5p7W_rowIdentity",
 			"intro": "On5p7W_intro",
-			"rowTag": "On5p7W_rowTag",
-			"title": "On5p7W_title",
-			"logoutButton": "On5p7W_logoutButton",
-			"credentialDot": "On5p7W_credentialDot",
+			"dotOn": "On5p7W_dotOn",
 			"rosterError": "On5p7W_rosterError",
 			"rowPending": "On5p7W_rowPending",
-			"rowIdentity": "On5p7W_rowIdentity",
-			"rowName": "On5p7W_rowName"
+			"credentialDot": "On5p7W_credentialDot",
+			"promptText": "On5p7W_promptText",
+			"openPage": "On5p7W_openPage",
+			"rowTag": "On5p7W_rowTag",
+			"rows": "On5p7W_rows",
+			"rowHead": "On5p7W_rowHead",
+			"rowCard": "On5p7W_rowCard",
+			"section": "On5p7W_section",
+			"logoutButton": "On5p7W_logoutButton"
 		};
 		//#endregion
 		//#region ../local-agent/src/client/ProviderAuthBlock.tsx
@@ -645,10 +645,10 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var AuthStatusDot_module_css_default = {
-			"dotPending": "OFjNUG_dotPending",
 			"dotOff": "OFjNUG_dotOff",
 			"credentialDot": "OFjNUG_credentialDot",
-			"dotOn": "OFjNUG_dotOn"
+			"dotOn": "OFjNUG_dotOn",
+			"dotPending": "OFjNUG_dotPending"
 		};
 		//#endregion
 		//#region ../local-agent/src/client/AuthStatusDot.tsx
@@ -674,39 +674,39 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ModelListSection_module_css_default = {
-			"saved": "_4eeJ7W_saved",
-			"row": "_4eeJ7W_row",
-			"modelRowDragging": "_4eeJ7W_modelRowDragging",
-			"dialogItem": "_4eeJ7W_dialogItem",
-			"errorText": "_4eeJ7W_errorText",
-			"modelInput": "_4eeJ7W_modelInput",
-			"dialogHead": "_4eeJ7W_dialogHead",
-			"dialogTitle": "_4eeJ7W_dialogTitle",
 			"modelRowValue": "_4eeJ7W_modelRowValue",
-			"dialogClose": "_4eeJ7W_dialogClose",
-			"dialogItemAdded": "_4eeJ7W_dialogItemAdded",
-			"modelSave": "_4eeJ7W_modelSave",
-			"modelDelete": "_4eeJ7W_modelDelete",
 			"dialog": "_4eeJ7W_dialog",
-			"blockTitle": "_4eeJ7W_blockTitle",
-			"dialogConfirm": "_4eeJ7W_dialogConfirm",
-			"modelRow": "_4eeJ7W_modelRow",
-			"block": "_4eeJ7W_block",
-			"modelDrag": "_4eeJ7W_modelDrag",
+			"dialogTitle": "_4eeJ7W_dialogTitle",
+			"dialogBackdrop": "_4eeJ7W_dialogBackdrop",
 			"dialogHint": "_4eeJ7W_dialogHint",
-			"dialogToolbar": "_4eeJ7W_dialogToolbar",
-			"dialogSelectAll": "_4eeJ7W_dialogSelectAll",
+			"block": "_4eeJ7W_block",
+			"modelSave": "_4eeJ7W_modelSave",
 			"dialogActions": "_4eeJ7W_dialogActions",
-			"hint": "_4eeJ7W_hint",
-			"modelAdd": "_4eeJ7W_modelAdd",
+			"dialogSelectAll": "_4eeJ7W_dialogSelectAll",
+			"modelRowLabel": "_4eeJ7W_modelRowLabel",
+			"modelInput": "_4eeJ7W_modelInput",
+			"modelRowDragging": "_4eeJ7W_modelRowDragging",
 			"dialogItemValue": "_4eeJ7W_dialogItemValue",
-			"dialogBackdrop": "_4eeJ7W_dialogBackdrop",
-			"dialogList": "_4eeJ7W_dialogList",
 			"dialogItemLabel": "_4eeJ7W_dialogItemLabel",
-			"info": "_4eeJ7W_info",
+			"modelDrag": "_4eeJ7W_modelDrag",
+			"dialogItemAdded": "_4eeJ7W_dialogItemAdded",
+			"modelDefaultChip": "_4eeJ7W_modelDefaultChip",
+			"errorText": "_4eeJ7W_errorText",
+			"dialogConfirm": "_4eeJ7W_dialogConfirm",
+			"dialogItem": "_4eeJ7W_dialogItem",
+			"dialogList": "_4eeJ7W_dialogList",
+			"dialogHead": "_4eeJ7W_dialogHead",
+			"modelAdd": "_4eeJ7W_modelAdd",
+			"modelRow": "_4eeJ7W_modelRow",
 			"modelList": "_4eeJ7W_modelList",
-			"modelRowLabel": "_4eeJ7W_modelRowLabel",
-			"modelDefaultChip": "_4eeJ7W_modelDefaultChip"
+			"blockTitle": "_4eeJ7W_blockTitle",
+			"modelDelete": "_4eeJ7W_modelDelete",
+			"hint": "_4eeJ7W_hint",
+			"saved": "_4eeJ7W_saved",
+			"info": "_4eeJ7W_info",
+			"dialogClose": "_4eeJ7W_dialogClose",
+			"row": "_4eeJ7W_row",
+			"dialogToolbar": "_4eeJ7W_dialogToolbar"
 		};
 		//#endregion
 		//#region ../local-agent/src/client/ModelListSection.tsx
@@ -1078,33 +1078,33 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var SettingsCard_module_css_default = {
-			"info": "apHkUa_info",
+			"chevronOpen": "apHkUa_chevronOpen",
+			"saved": "apHkUa_saved",
 			"card": "apHkUa_card",
-			"header": "apHkUa_header",
+			"rowLabel": "apHkUa_rowLabel",
+			"name": "apHkUa_name",
 			"headText": "apHkUa_headText",
-			"chevron": "apHkUa_chevron",
-			"blockTitle": "apHkUa_blockTitle",
-			"description": "apHkUa_description",
-			"endpointField": "apHkUa_endpointField",
+			"endpointLabel": "apHkUa_endpointLabel",
+			"info": "apHkUa_info",
+			"row": "apHkUa_row",
 			"switchOn": "apHkUa_switchOn",
-			"errorText": "apHkUa_errorText",
-			"configuredChip": "apHkUa_configuredChip",
+			"cardOpen": "apHkUa_cardOpen",
+			"switch": "apHkUa_switch",
+			"knob": "apHkUa_knob",
 			"hint": "apHkUa_hint",
+			"chevron": "apHkUa_chevron",
 			"nameRow": "apHkUa_nameRow",
-			"row": "apHkUa_row",
+			"header": "apHkUa_header",
 			"body": "apHkUa_body",
-			"endpointFields": "apHkUa_endpointFields",
-			"endpointLabel": "apHkUa_endpointLabel",
-			"chevronOpen": "apHkUa_chevronOpen",
-			"saved": "apHkUa_saved",
-			"knob": "apHkUa_knob",
-			"modelSave": "apHkUa_modelSave",
+			"description": "apHkUa_description",
+			"endpointField": "apHkUa_endpointField",
+			"configuredChip": "apHkUa_configuredChip",
+			"blockTitle": "apHkUa_blockTitle",
 			"modelInput": "apHkUa_modelInput",
+			"errorText": "apHkUa_errorText",
+			"endpointFields": "apHkUa_endpointFields",
 			"block": "apHkUa_block",
-			"cardOpen": "apHkUa_cardOpen",
-			"name": "apHkUa_name",
-			"rowLabel": "apHkUa_rowLabel",
-			"switch": "apHkUa_switch"
+			"modelSave": "apHkUa_modelSave"
 		};
 		//#endregion
 		//#region src/client/SettingsCard.tsx

package/lib/index.js

@@ -1960,6 +1960,93 @@ async function ensureKimiPermissions(homeDir) {
 	await writeFile(file, `${content.trimEnd()}\n${KIMI_PERMISSION_BLOCK}`);
 }
 //#endregion
+//#region lib/types/member-bridge-config.js
+/**
+* Kimi scoped-home MCP config injection for the member bridge. Kimi declares
+* stdio MCP servers in `$KIMI_CODE_HOME/mcp.json` (`mcpServers` map); the file
+* is read once per CLI session start, and edits never interrupt an open
+* session — so the family writes one entry PER RUN (keyed by the run's token
+* suffix, keeping concurrent delegations of the same scoped home race-free),
+* prunes it when the run settles, and drops stale family entries (crashed
+* host) on every write. User-declared servers are preserved verbatim.
+* @module @khorsheed/dsh-local-agent-kimi/member-bridge-config
+*/
+/** Kimi's user-level MCP config filename inside the scoped home. */
+const MCP_CONFIG_FILENAME = "mcp.json";
+/** The member bridge's per-call bound: as long as a question card waits for the human (30 min). */
+const MEMBER_TOOL_TIMEOUT_MS = 18e5;
+/** Server-key prefix marking the family's per-run bridge entries. */
+const MEMBER_BRIDGE_SERVER_PREFIX = "dsh-member-";
+/**
+* The per-run MCP server key. The run's token suffix keeps concurrent runs
+* distinct; each `kimi -p` round is a fresh CLI session, so per-run (rather
+* than per-member) naming costs nothing.
+* @param token - the run's member-channel token.
+* @returns the mcp.json server key.
+*/
+function memberBridgeServerKey(token) {
+	return `${MEMBER_BRIDGE_SERVER_PREFIX}${token.slice(0, 8)}`;
+}
+/** Read the scoped mcp.json; a missing or malformed file reads as empty. */
+function readMcpConfig(file) {
+	let parsed;
+	try {
+		parsed = JSON.parse(readFileSync(file, "utf8"));
+	} catch {
+		return {};
+	}
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
+	return parsed;
+}
+/** Write the config back, preserving every non-family key. */
+function writeMcpConfig(file, config) {
+	writeFileSync(file, `${JSON.stringify(config, null, 2)}\n`);
+}
+/**
+* Declare the member bridge for one run: set the per-run server entry and
+* prune other family entries (settled or crashed runs — an open session's
+* already-registered server is unaffected, per kimi's mid-session semantics).
+* Synchronous read-modify-write: single-process callers race-free by event
+* loop; the file is small and written once per run.
+* @param homeDir - the kimi scoped home.
+* @param key - this run's server key ({@link memberBridgeServerKey}).
+* @param command - the bridge spawn command (`node` + entry path).
+* @param env - the bridge environment (socket path + per-run token).
+*/
+function injectMemberBridge(homeDir, key, command, env) {
+	const file = join(homeDir, MCP_CONFIG_FILENAME);
+	const config = readMcpConfig(file);
+	const servers = { ...config.mcpServers ?? {} };
+	for (const name of Object.keys(servers)) if (name.startsWith("dsh-member-") && name !== key) delete servers[name];
+	servers[key] = {
+		command: command.command,
+		args: command.args,
+		env,
+		toolTimeoutMs: MEMBER_TOOL_TIMEOUT_MS
+	};
+	writeMcpConfig(file, {
+		...config,
+		mcpServers: servers
+	});
+}
+/**
+* Remove one run's bridge entry (settle path). Absent entries and a missing
+* config are no-ops.
+* @param homeDir - the kimi scoped home.
+* @param key - the run's server key.
+*/
+function removeMemberBridge(homeDir, key) {
+	const file = join(homeDir, MCP_CONFIG_FILENAME);
+	const config = readMcpConfig(file);
+	if (config.mcpServers === void 0 || !(key in config.mcpServers)) return;
+	const servers = { ...config.mcpServers };
+	delete servers[key];
+	writeMcpConfig(file, {
+		...config,
+		mcpServers: servers
+	});
+}
+//#endregion
 //#region lib/types/session-view.js
 /**
 * Kimi session viewer: read a scoped-home session's `wire.jsonl` event log
@@ -2047,6 +2134,8 @@ function editArgsOf(name, record) {
 	const patch = record["patch"] ?? record["diff"];
 	if (typeof patch === "string" && patch.trim() !== "") return patch;
 }
+/** Cap on a structured tool call's mirrored JSON arguments. */
+const STRUCTURED_ARGS_MAX = 16e3;
 /** Render a tool call's arguments into a compact summary. */
 function argsOf(name, args) {
 	if (args === void 0) return void 0;
@@ -2055,6 +2144,10 @@ function argsOf(name, args) {
 	const record = args;
 	const edit = editArgsOf(name, record);
 	if (edit !== void 0) return edit;
+	if (Object.values(record).some((value) => typeof value === "object" && value !== null)) {
+		const json = JSON.stringify(record);
+		return json.length <= STRUCTURED_ARGS_MAX ? json : `${json.slice(0, STRUCTURED_ARGS_MAX)}…`;
+	}
 	for (const key of [
 		"query",
 		"url",
@@ -2094,6 +2187,8 @@ async function readKimiTranscript(sessionDir) {
 	};
 	let turn = 0;
 	let turnSeen = false;
+	/** The wire marks rounds with turn.prompt (current kimi): a user message it did not prompt is an injection. */
+	let promptsMarkTurns = false;
 	const callsByUuid = /* @__PURE__ */ new Map();
 	const callsByToolCallId = /* @__PURE__ */ new Map();
 	let text;
@@ -2147,6 +2242,7 @@ async function readKimiTranscript(sessionDir) {
 			continue;
 		}
 		if (event.type === "turn.prompt") {
+			promptsMarkTurns = true;
 			lineModel = void 0;
 			turnSeen = true;
 			turn += 1;
@@ -2165,6 +2261,7 @@ async function readKimiTranscript(sessionDir) {
 			if (role === "user" && textContent.trim() !== "" && !isSystemReminder(textContent)) {
 				const last = lines[lines.length - 1];
 				if (turnSeen && last?.kind === "user" && last.text === textContent) continue;
+				if (promptsMarkTurns) continue;
 				turnSeen = true;
 				turn += 1;
 				lineModel = void 0;
@@ -2221,7 +2318,7 @@ async function readKimiTranscript(sessionDir) {
 				if (typeof call.toolCallId === "string") callsByToolCallId.set(call.toolCallId, lineIndex);
 			} else if (loop.type === "tool.result") {
 				const result = loop;
-				const output = result.result?.output;
+				const output = toolOutputText(result.result?.output);
 				let target = typeof result.parentUuid === "string" ? callsByUuid.get(result.parentUuid) : void 0;
 				if (target === void 0 && typeof result.toolCallId === "string") target = callsByToolCallId.get(result.toolCallId);
 				if (target === void 0) {
@@ -2254,6 +2351,26 @@ async function readKimiTranscript(sessionDir) {
 	};
 }
 /**
+* A wire tool result's output as display text. Most tools report a string;
+* a media read (ReadMediaFile) reports content parts — text parts keep their
+* text, an image part becomes a short marker (its bytes stay in kimi's blob
+* store). Anything else reads as no output, never a parse failure: one
+* unreadable result must not stop the whole transcript (and the round's
+* usage) from folding.
+* @param raw - the result's `output` field.
+* @returns the text, or undefined when there is none.
+*/
+function toolOutputText(raw) {
+	if (typeof raw === "string") return raw;
+	if (!Array.isArray(raw)) return void 0;
+	return raw.map((part) => {
+		if (part === null || typeof part !== "object") return "";
+		const entry = part;
+		if (entry.type === "text" && typeof entry.text === "string") return entry.text;
+		return typeof entry.type === "string" && entry.type !== "" ? `[${entry.type}]` : "";
+	}).join("");
+}
+/**
 * Map a wire `usage.record` payload onto the shared usage contract. kimi
 * reports input (uncached), cache read, cache creation, and output; the
 * creation counter is its cache-write analog. Non-numeric or missing
@@ -2419,6 +2536,13 @@ function nextWrittenKimiStep(childSession, turn) {
 	}
 	return last + 1;
 }
+/** Wire usage records already counted, per child session (see mirrorKimiSessionDelta). */
+const countedUsage = /* @__PURE__ */ new WeakMap();
+const usageSeen = (childSession) => {
+	let seen = countedUsage.get(childSession);
+	if (seen === void 0) countedUsage.set(childSession, seen = /* @__PURE__ */ new Set());
+	return seen;
+};
 /** The run-progress delta text for one transcript line (any kind). */
 function kimiLineProgressText(line) {
 	if (line.kind !== "tool") return line.text;
@@ -2552,6 +2676,8 @@ async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSessionId,
 	}
 	const foldedUnits = holdAt < 0 ? units : units.slice(0, holdAt);
 	const consumedTotal = fromLines + foldedUnits.reduce((n, unit) => n + unit.length, 0);
+	const seen = usageSeen(childSession);
+	const usageRecords = transcript.usageRecords.filter((record) => !seen.has(record.line));
 	const unitUsage = [];
 	const claimed = [];
 	let unitStart = fromLines;
@@ -2564,11 +2690,13 @@ async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSessionId,
 				from: start,
 				to: unitStart
 			});
-			unitUsage.push(sumUsageRecords(transcript.usageRecords.filter((record) => record.line >= start && record.line < unitStart)));
+			unitUsage.push(sumUsageRecords(usageRecords.filter((record) => record.line >= start && record.line < unitStart)));
 		} else unitUsage.push(void 0);
 	}
-	const unclaimedUsage = sumUsageRecords(transcript.usageRecords.filter((record) => record.line >= fromLines && record.line <= consumedTotal && !claimed.some((span) => record.line >= span.from && record.line < span.to)));
-	const deltaUsage = sumUsageRecords(transcript.usageRecords.filter((record) => record.line >= fromLines && record.line <= consumedTotal));
+	const unclaimedUsage = sumUsageRecords(usageRecords.filter((record) => record.line >= fromLines && record.line <= consumedTotal && !claimed.some((span) => record.line >= span.from && record.line < span.to)));
+	const windowRecords = usageRecords.filter((record) => record.line >= fromLines && record.line <= consumedTotal);
+	const deltaUsage = sumUsageRecords(windowRecords);
+	for (const record of windowRecords) seen.add(record.line);
 	const takenSteps = /* @__PURE__ */ new Map();
 	for (const event of childSession.snapshotEvents()) {
 		const data = event.data;
@@ -2597,6 +2725,12 @@ async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSessionId,
 		written.add(step);
 		takenSteps.set(turn, written);
 	};
+	const closedTurns = /* @__PURE__ */ new Set();
+	for (const event of childSession.snapshotEvents()) {
+		if (event.type !== "turn/end") continue;
+		const closed = event.data.turn;
+		if (typeof closed === "number") closedTurns.add(closed);
+	}
 	/** The window's accounting that no fold carried (dropped units' sums). */
 	let carryUsage;
 	let lastContentUnit = -1;
@@ -2612,6 +2746,7 @@ async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSessionId,
 		carryUsage = void 0;
 		if (unitIndex === lastContentUnit) usage = addTokenUsage(usage, unclaimedUsage);
 		const turn = head.turn;
+		if (closedTurns.has(turn)) continue;
 		if (head.kind === "user") {
 			if (userAlreadyAppended(childSession, turn, head.text)) continue;
 			childSession.append("user/message", userEvent(head.text), { surfaceOp: "append" });
@@ -2808,7 +2943,6 @@ function userAlreadyAppended(childSession, turn, text) {
 * mode's auto-approve behavior; the proposal's default policy).
 * @module @khorsheed/dsh-local-agent-kimi/live-driver
 */
-/** Default idle lifetime of an unused resident runtime before reclaim. */
 const DEFAULT_LIVE_IDLE_MS = 18e5;
 /** Default timeout for a wire request acknowledgement (never for session/prompt). */
 const DEFAULT_LIVE_REQUEST_TIMEOUT_MS = 3e4;
@@ -3286,6 +3420,7 @@ var KimiAcpLiveDriver = class {
 			graceMs: DEFAULT_DISPOSE_GRACE_MS,
 			env: delegationEnv({
 				KIMI_CODE_HOME: spec.homeDir,
+				KIMI_MCP_TOOL_TIMEOUT_MS: String(MEMBER_TOOL_TIMEOUT_MS),
 				...endpointAuthEnv(endpoint)
 			})
 		};
@@ -3564,22 +3699,30 @@ var KimiAcpLiveDriver = class {
 		* think-style lines. Each update carries the WHOLE plan, so the fold
 		* replaces rather than appends.
 		*/
-		const renderPlan = (update) => {
-			return (Array.isArray(update["entries"]) ? update["entries"] : []).map((entry) => {
-				const content = typeof entry["content"] === "string" ? entry["content"] : "";
-				const status = entry["status"];
-				return `${status === "completed" ? "☑" : status === "in_progress" ? "▶" : "☐"} ${content}`;
-			}).filter((line) => line.trim() !== "☐" && line !== "").join("\n");
-		};
+		/**
+		* An ACP plan update is the member's todo list: written as the host's
+		* `todo/write` whole-list snapshot (log-only UI state, Claude's TodoWrite
+		* shape), only when it changed. Never a conversation step — a plan
+		* folded as a step landed after the round's answer (it finalized at
+		* settle) and the chat folded the answer into the process.
+		*/
 		const foldPlan = (update) => {
-			const plan = renderPlan(update);
-			if (plan === "") return;
-			reserveStream(planKey, "think");
-			const stream = streams.get(planKey);
-			if (stream !== void 0 && stream.text !== plan) {
-				stream.text = plan;
-				publishStreamSnapshot(stream, true);
+			const entries = Array.isArray(update["entries"]) ? update["entries"] : [];
+			const todos = [];
+			for (const entry of entries) {
+				const content = typeof entry["content"] === "string" ? entry["content"].trim() : "";
+				if (content === "") continue;
+				const status = entry["status"];
+				todos.push({
+					content,
+					status: status === "in_progress" || status === "completed" ? status : "pending"
+				});
 			}
+			if (todos.length === 0) return;
+			const last = childSession.snapshotEvents().filter((event) => event.type === "todo/write").at(-1);
+			if (last !== void 0 && JSON.stringify(last.data) === JSON.stringify({ todos })) return;
+			childSession.append("todo/write", { todos });
+			persist();
 		};
 		/**
 		* The live-output channel. Snapshots are browser-only previews (never
@@ -3919,7 +4062,7 @@ var KimiAcpLiveDriver = class {
 					}
 				}
 			} else if (kind === "tool_call") {
-				const id = typeof update["toolCallId"] === "string" ? update["toolCallId"] : void 0;
+				const id = typeof update["toolCallId"] === "string" ? update["toolCallId"].replace(/^\d+:/, "") : void 0;
 				if (id === void 0 || !seenToolCalls.has(id)) {
 					if (id !== void 0 && toolLogged(id)) seenToolCalls.add(id);
 					else if (id !== void 0) {
@@ -4122,90 +4265,6 @@ var KimiAcpLiveDriver = class {
 /** The member handle each runtime carries (for its session declarations). */
 const runtimeMember = /* @__PURE__ */ new WeakMap();
 //#endregion
-//#region lib/types/member-bridge-config.js
-/**
-* Kimi scoped-home MCP config injection for the member bridge. Kimi declares
-* stdio MCP servers in `$KIMI_CODE_HOME/mcp.json` (`mcpServers` map); the file
-* is read once per CLI session start, and edits never interrupt an open
-* session — so the family writes one entry PER RUN (keyed by the run's token
-* suffix, keeping concurrent delegations of the same scoped home race-free),
-* prunes it when the run settles, and drops stale family entries (crashed
-* host) on every write. User-declared servers are preserved verbatim.
-* @module @khorsheed/dsh-local-agent-kimi/member-bridge-config
-*/
-/** Kimi's user-level MCP config filename inside the scoped home. */
-const MCP_CONFIG_FILENAME = "mcp.json";
-/** Server-key prefix marking the family's per-run bridge entries. */
-const MEMBER_BRIDGE_SERVER_PREFIX = "dsh-member-";
-/**
-* The per-run MCP server key. The run's token suffix keeps concurrent runs
-* distinct; each `kimi -p` round is a fresh CLI session, so per-run (rather
-* than per-member) naming costs nothing.
-* @param token - the run's member-channel token.
-* @returns the mcp.json server key.
-*/
-function memberBridgeServerKey(token) {
-	return `${MEMBER_BRIDGE_SERVER_PREFIX}${token.slice(0, 8)}`;
-}
-/** Read the scoped mcp.json; a missing or malformed file reads as empty. */
-function readMcpConfig(file) {
-	let parsed;
-	try {
-		parsed = JSON.parse(readFileSync(file, "utf8"));
-	} catch {
-		return {};
-	}
-	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
-	return parsed;
-}
-/** Write the config back, preserving every non-family key. */
-function writeMcpConfig(file, config) {
-	writeFileSync(file, `${JSON.stringify(config, null, 2)}\n`);
-}
-/**
-* Declare the member bridge for one run: set the per-run server entry and
-* prune other family entries (settled or crashed runs — an open session's
-* already-registered server is unaffected, per kimi's mid-session semantics).
-* Synchronous read-modify-write: single-process callers race-free by event
-* loop; the file is small and written once per run.
-* @param homeDir - the kimi scoped home.
-* @param key - this run's server key ({@link memberBridgeServerKey}).
-* @param command - the bridge spawn command (`node` + entry path).
-* @param env - the bridge environment (socket path + per-run token).
-*/
-function injectMemberBridge(homeDir, key, command, env) {
-	const file = join(homeDir, MCP_CONFIG_FILENAME);
-	const config = readMcpConfig(file);
-	const servers = { ...config.mcpServers ?? {} };
-	for (const name of Object.keys(servers)) if (name.startsWith("dsh-member-") && name !== key) delete servers[name];
-	servers[key] = {
-		command: command.command,
-		args: command.args,
-		env
-	};
-	writeMcpConfig(file, {
-		...config,
-		mcpServers: servers
-	});
-}
-/**
-* Remove one run's bridge entry (settle path). Absent entries and a missing
-* config are no-ops.
-* @param homeDir - the kimi scoped home.
-* @param key - the run's server key.
-*/
-function removeMemberBridge(homeDir, key) {
-	const file = join(homeDir, MCP_CONFIG_FILENAME);
-	const config = readMcpConfig(file);
-	if (config.mcpServers === void 0 || !(key in config.mcpServers)) return;
-	const servers = { ...config.mcpServers };
-	delete servers[key];
-	writeMcpConfig(file, {
-		...config,
-		mcpServers: servers
-	});
-}
-//#endregion
 //#region lib/types/kimi-cli-provider.js
 /**
 * One-shot and resumable Kimi CLI subagent lifecycle: spawn `kimi -p "<task>"`

package/lib/types/live-driver.d.ts

@@ -42,7 +42,6 @@ import type { Context } from '@deepseek-ai/cordis';
 import type { Session } from '@deepseek-ai/dsh-session';
 import { type SubagentRun, type SubagentStartRequest, type SubagentStopReason } from '@deepseek-ai/dsh-subagent';
 import { type KimiEndpointAuth } from './endpoint-auth.ts';
-/** Default idle lifetime of an unused resident runtime before reclaim. */
 export declare const DEFAULT_LIVE_IDLE_MS: number;
 /** Default timeout for a wire request acknowledgement (never for session/prompt). */
 export declare const DEFAULT_LIVE_REQUEST_TIMEOUT_MS = 30000;

package/lib/types/live-driver.js

@@ -47,11 +47,11 @@ import { delegationEnv, persistChildSession, LiveStreamPublisher, LiveFlush, LIV
 import { endpointAuthEnv, hasEndpointCredential } from './endpoint-auth.js';
 import { ensureKimiEndpointProvider, KIMI_MANAGED_BASE_URL } from './provision.js';
 import { MEMBER_BRIDGE_SOCKET_ENV, MEMBER_BRIDGE_TOKEN_ENV } from '@khorsheed/dsh-local-agent/types';
+import { MEMBER_TOOL_TIMEOUT_MS } from './member-bridge-config.js';
 import { DEFAULT_DISPOSE_GRACE_MS, mirrorKimiDelta, textTask, } from './kimi-cli-provider.js';
 import { assistantEvent, KIMI_INTERRUPTED_TOOL_RESULT, nextKimiSessionStep, nextWrittenKimiStep } from './session-mirror.js';
 import { addTokenUsage } from './session-view.js';
 import { writeKimiDefaultModel } from './provision.js';
-/** Default idle lifetime of an unused resident runtime before reclaim. */
 export const DEFAULT_LIVE_IDLE_MS = 30 * 60_000;
 /** Default timeout for a wire request acknowledgement (never for session/prompt). */
 export const DEFAULT_LIVE_REQUEST_TIMEOUT_MS = 30_000;
@@ -559,7 +559,10 @@ export class KimiAcpLiveDriver {
             cwd: spec.cwd,
             stdio: { stdin: 'pipe', stdout: 'pipe', stderr: 'pipe' },
             graceMs: DEFAULT_DISPOSE_GRACE_MS,
-            env: delegationEnv({ KIMI_CODE_HOME: spec.homeDir, ...endpointAuthEnv(endpoint) }),
+            // The ACP session declares the member bridge inline, and ACP's MCP
+            // server shape carries no timeout: lift kimi's 60s MCP default for the
+            // whole process, or a question card dies before the human answers.
+            env: delegationEnv({ KIMI_CODE_HOME: spec.homeDir, KIMI_MCP_TOOL_TIMEOUT_MS: String(MEMBER_TOOL_TIMEOUT_MS), ...endpointAuthEnv(endpoint) }),
         };
         let child;
         try {
@@ -877,30 +880,30 @@ export class KimiAcpLiveDriver {
          * think-style lines. Each update carries the WHOLE plan, so the fold
          * replaces rather than appends.
          */
-        const renderPlan = (update) => {
+        /**
+         * An ACP plan update is the member's todo list: written as the host's
+         * `todo/write` whole-list snapshot (log-only UI state, Claude's TodoWrite
+         * shape), only when it changed. Never a conversation step — a plan
+         * folded as a step landed after the round's answer (it finalized at
+         * settle) and the chat folded the answer into the process.
+         */
+        const foldPlan = (update) => {
             const entries = Array.isArray(update['entries']) ? update['entries'] : [];
-            const lines = entries.map((entry) => {
-                const content = typeof entry['content'] === 'string' ? entry['content'] : '';
+            const todos = [];
+            for (const entry of entries) {
+                const content = typeof entry['content'] === 'string' ? entry['content'].trim() : '';
+                if (content === '')
+                    continue;
                 const status = entry['status'];
-                const mark = status === 'completed' ? '☑' : status === 'in_progress' ? '▶' : '☐';
-                return `${mark} ${content}`;
-            }).filter(line => line.trim() !== '☐' && line !== '');
-            return lines.join('\n');
-        };
-        const foldPlan = (update) => {
-            const plan = renderPlan(update);
-            if (plan === '')
-                return;
-            // The plan's own snapshot stream (think-styled): every update replaces
-            // the text and publishes at the reserved (turn, step); the stream
-            // finalizes at settle (the wire carries no plan line that could
-            // complete it) — or early, when a fold needs its step closed.
-            reserveStream(planKey, 'think');
-            const stream = streams.get(planKey);
-            if (stream !== undefined && stream.text !== plan) {
-                stream.text = plan;
-                publishStreamSnapshot(stream, true);
+                todos.push({ content, status: status === 'in_progress' || status === 'completed' ? status : 'pending' });
             }
+            if (todos.length === 0)
+                return;
+            const last = childSession.snapshotEvents().filter(event => event.type === 'todo/write').at(-1);
+            if (last !== undefined && JSON.stringify(last.data) === JSON.stringify({ todos }))
+                return;
+            childSession.append('todo/write', { todos });
+            persist();
         };
         /**
          * The live-output channel. Snapshots are browser-only previews (never
@@ -1265,7 +1268,12 @@ export class KimiAcpLiveDriver {
                 }
             }
             else if (kind === 'tool_call') {
-                const id = typeof update['toolCallId'] === 'string' ? update['toolCallId'] : undefined;
+                // ACP prefixes the call id with kimi's turn index ("1:tool_x") from the
+                // second round on; the wire records the bare id. Unprefixed, the two
+                // name one call — otherwise the fold never releases the reservation
+                // and settle re-writes the call as an interrupted orphan after the
+                // answer (the chat then folds the answer into the process).
+                const id = typeof update['toolCallId'] === 'string' ? update['toolCallId'].replace(/^\d+:/, '') : undefined;
                 if (id === undefined || !seenToolCalls.has(id)) {
                     // The wire flush can win the race: a call already folded into the
                     // log (its notification arriving late) needs no reservation — one

package/lib/types/member-bridge-config.d.ts

@@ -8,6 +8,8 @@
  * host) on every write. User-declared servers are preserved verbatim.
  * @module @khorsheed/dsh-local-agent-kimi/member-bridge-config
  */
+/** The member bridge's per-call bound: as long as a question card waits for the human (30 min). */
+export declare const MEMBER_TOOL_TIMEOUT_MS: number;
 /** Server-key prefix marking the family's per-run bridge entries. */
 export declare const MEMBER_BRIDGE_SERVER_PREFIX = "dsh-member-";
 /**

package/lib/types/member-bridge-config.js

@@ -12,6 +12,8 @@ import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 /** Kimi's user-level MCP config filename inside the scoped home. */
 const MCP_CONFIG_FILENAME = 'mcp.json';
+/** The member bridge's per-call bound: as long as a question card waits for the human (30 min). */
+export const MEMBER_TOOL_TIMEOUT_MS = 30 * 60_000;
 /** Server-key prefix marking the family's per-run bridge entries. */
 export const MEMBER_BRIDGE_SERVER_PREFIX = 'dsh-member-';
 /**
@@ -60,7 +62,9 @@ export function injectMemberBridge(homeDir, key, command, env) {
         if (name.startsWith(MEMBER_BRIDGE_SERVER_PREFIX) && name !== key)
             delete servers[name];
     }
-    servers[key] = { command: command.command, args: command.args, env };
+    // A bridge call may wait for the human (ask_user_question, a mode tool's
+    // approval): kimi's 60s MCP default fails it first and the answer is lost.
+    servers[key] = { command: command.command, args: command.args, env, toolTimeoutMs: MEMBER_TOOL_TIMEOUT_MS };
     writeMcpConfig(file, { ...config, mcpServers: servers });
 }
 /**

package/lib/types/session-mirror.js

@@ -71,6 +71,14 @@ export function nextWrittenKimiStep(childSession, turn) {
     }
     return last + 1;
 }
+/** Wire usage records already counted, per child session (see mirrorKimiSessionDelta). */
+const countedUsage = new WeakMap();
+const usageSeen = (childSession) => {
+    let seen = countedUsage.get(childSession);
+    if (seen === undefined)
+        countedUsage.set(childSession, seen = new Set());
+    return seen;
+};
 /** The run-progress delta text for one transcript line (any kind). */
 export function kimiLineProgressText(line) {
     if (line.kind !== 'tool')
@@ -245,6 +253,13 @@ export async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSes
     // step-tagged unit claims its own line span's records; records no tagged
     // unit claims (untagged spans on older wires, or the boundary) sum onto the
     // pass's last folded content unit — the pre-tagging shape.
+    // A record counts once per child session, ever: the boundary is inclusive, so
+    // a pass whose offset cannot advance (a held unit) re-reads the same boundary
+    // record on every poll — one 320k-token record was carried ten times onto a
+    // cancelled round's step (3.2M). Wire line numbers only grow, so the line
+    // identifies the record across passes and rounds.
+    const seen = usageSeen(childSession);
+    const usageRecords = transcript.usageRecords.filter(record => !seen.has(record.line));
     const unitUsage = [];
     const claimed = [];
     let unitStart = fromLines;
@@ -254,15 +269,18 @@ export async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSes
         const head = unit[0];
         if (head.kind !== 'user' && head.wireStep !== undefined) {
             claimed.push({ from: start, to: unitStart });
-            unitUsage.push(sumUsageRecords(transcript.usageRecords.filter(record => record.line >= start && record.line < unitStart)));
+            unitUsage.push(sumUsageRecords(usageRecords.filter(record => record.line >= start && record.line < unitStart)));
         }
         else {
             unitUsage.push(undefined);
         }
     }
-    const unclaimedUsage = sumUsageRecords(transcript.usageRecords.filter(record => record.line >= fromLines && record.line <= consumedTotal
+    const unclaimedUsage = sumUsageRecords(usageRecords.filter(record => record.line >= fromLines && record.line <= consumedTotal
         && !claimed.some(span => record.line >= span.from && record.line < span.to)));
-    const deltaUsage = sumUsageRecords(transcript.usageRecords.filter(record => record.line >= fromLines && record.line <= consumedTotal));
+    const windowRecords = usageRecords.filter(record => record.line >= fromLines && record.line <= consumedTotal);
+    const deltaUsage = sumUsageRecords(windowRecords);
+    for (const record of windowRecords)
+        seen.add(record.line);
     // The steps a fold may NOT take: every step already written (the session's
     // own event ledger), consulted per turn. A round mirrored across several
     // live polls keeps its earlier writes, so later polls never reuse them.
@@ -296,6 +314,20 @@ export async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSes
         written.add(step);
         takenSteps.set(turn, written);
     };
+    // Turns the log has already closed take no more writes: the released-log
+    // reader admits events only inside the open turn. A backlog the offset never
+    // covered (a fold that failed for rounds, then an offset lost on restart)
+    // would otherwise land old content inside a finished turn — or, after the
+    // next turn opened, corrupt the whole log. Those units are skipped; the
+    // offset still moves past them.
+    const closedTurns = new Set();
+    for (const event of childSession.snapshotEvents()) {
+        if (event.type !== 'turn/end')
+            continue;
+        const closed = event.data.turn;
+        if (typeof closed === 'number')
+            closedTurns.add(closed);
+    }
     /** The window's accounting that no fold carried (dropped units' sums). */
     let carryUsage;
     // The pass's last content unit carries the records no tagged unit claimed.
@@ -319,6 +351,8 @@ export async function mirrorKimiSessionDelta(ctx, childSession, homeDir, kimiSes
         // numbering) is the dsh round; no offset is needed because both count the
         // same rounds.
         const turn = head.turn;
+        if (closedTurns.has(turn))
+            continue;
         if (head.kind === 'user') {
             // The live driver appends the round's user/message at turn start (so the
             // question renders before the streamed think/text instead of after it).

package/lib/types/session-view.d.ts

@@ -104,6 +104,17 @@ export declare function findKimiSessionDir(homeDir: string, sessionId: string):
  * @returns the transcript.
  */
 export declare function readKimiTranscript(sessionDir: string): Promise<KimiSessionTranscript>;
+/**
+ * A wire tool result's output as display text. Most tools report a string;
+ * a media read (ReadMediaFile) reports content parts — text parts keep their
+ * text, an image part becomes a short marker (its bytes stay in kimi's blob
+ * store). Anything else reads as no output, never a parse failure: one
+ * unreadable result must not stop the whole transcript (and the round's
+ * usage) from folding.
+ * @param raw - the result's `output` field.
+ * @returns the text, or undefined when there is none.
+ */
+export declare function toolOutputText(raw: unknown): string | undefined;
 /**
  * Map a wire `usage.record` payload onto the shared usage contract. kimi
  * reports input (uncached), cache read, cache creation, and output; the

package/lib/types/session-view.js

@@ -105,6 +105,8 @@ function editArgsOf(name, record) {
         return patch;
     return undefined;
 }
+/** Cap on a structured tool call's mirrored JSON arguments. */
+const STRUCTURED_ARGS_MAX = 16_000;
 /** Render a tool call's arguments into a compact summary. */
 function argsOf(name, args) {
     if (args === undefined)
@@ -119,6 +121,13 @@ function argsOf(name, args) {
     const edit = editArgsOf(name, record);
     if (edit !== undefined)
         return edit;
+    // Structured arguments (an MCP tool's nested questions, options, lists)
+    // keep their full JSON: the one-line summary below keeps only scalars and
+    // dropped them, so the member's ask_user_question read as called with nothing.
+    if (Object.values(record).some(value => typeof value === 'object' && value !== null)) {
+        const json = JSON.stringify(record);
+        return json.length <= STRUCTURED_ARGS_MAX ? json : `${json.slice(0, STRUCTURED_ARGS_MAX)}…`;
+    }
     // WebSearch/FetchURL expose a query/url; prefer the most meaningful scalar.
     for (const key of ['query', 'url', 'path', 'command']) {
         const value = record[key];
@@ -168,6 +177,8 @@ export async function readKimiTranscript(sessionDir) {
     // turn/start numbering.
     let turn = 0;
     let turnSeen = false;
+    /** The wire marks rounds with turn.prompt (current kimi): a user message it did not prompt is an injection. */
+    let promptsMarkTurns = false;
     // Tool calls by uuid and toolCallId, so a result attaches to its own call
     // even when several calls run in parallel within one step.
     const callsByUuid = new Map();
@@ -228,6 +239,7 @@ export async function readKimiTranscript(sessionDir) {
             continue;
         }
         if (event.type === 'turn.prompt') {
+            promptsMarkTurns = true;
             lineModel = undefined;
             // Each round's user prompt opens the next turn; the matching
             // context.append_message below is deduped against this text.
@@ -254,6 +266,13 @@ export async function readKimiTranscript(sessionDir) {
                     // Duplicate of the prompt; skip.
                     continue;
                 }
+                // A wire that opens every round with turn.prompt: any other user
+                // message is kimi's own injection inside the round (a Skill's loaded
+                // instructions, a steer) — its loop events keep the same turnId. It
+                // opens no turn (the dsh round is still running: a turn here wrote
+                // steps into a turn the log never opened) and is not the human's.
+                if (promptsMarkTurns)
+                    continue;
                 turnSeen = true;
                 turn += 1;
                 lineModel = undefined;
@@ -309,7 +328,7 @@ export async function readKimiTranscript(sessionDir) {
             }
             else if (loop.type === 'tool.result') {
                 const result = loop;
-                const output = result.result?.output;
+                const output = toolOutputText(result.result?.output);
                 let target = typeof result.parentUuid === 'string'
                     ? callsByUuid.get(result.parentUuid)
                     : undefined;
@@ -346,6 +365,31 @@ export async function readKimiTranscript(sessionDir) {
     }
     return { sessionId, lines, usageRecords, closedSteps, ...model === undefined ? {} : { model }, ...modelTurn === undefined ? {} : { modelTurn } };
 }
+/**
+ * A wire tool result's output as display text. Most tools report a string;
+ * a media read (ReadMediaFile) reports content parts — text parts keep their
+ * text, an image part becomes a short marker (its bytes stay in kimi's blob
+ * store). Anything else reads as no output, never a parse failure: one
+ * unreadable result must not stop the whole transcript (and the round's
+ * usage) from folding.
+ * @param raw - the result's `output` field.
+ * @returns the text, or undefined when there is none.
+ */
+export function toolOutputText(raw) {
+    if (typeof raw === 'string')
+        return raw;
+    if (!Array.isArray(raw))
+        return undefined;
+    const parts = raw.map((part) => {
+        if (part === null || typeof part !== 'object')
+            return '';
+        const entry = part;
+        if (entry.type === 'text' && typeof entry.text === 'string')
+            return entry.text;
+        return typeof entry.type === 'string' && entry.type !== '' ? `[${entry.type}]` : '';
+    });
+    return parts.join('');
+}
 /**
  * Map a wire `usage.record` payload onto the shared usage contract. kimi
  * reports input (uncached), cache read, cache creation, and output; the

package/package.json

@@ -8,7 +8,7 @@
     "local-agent",
     "kimi"
   ],
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -69,7 +69,7 @@
     "dsh": ">=0.1.5-rc.1 <0.3.0-0"
   },
   "dependencies": {
-    "@khorsheed/dsh-local-agent": "^0.2.1"
+    "@khorsheed/dsh-local-agent": "^0.2.2"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",