@huanlin/dsh-plugin-merge-tool-calls 0.2.2 → 0.3.0

package/lib/client.js

@@ -27,8 +27,6 @@ let react = require("react");
 react = __toESM(react);
 let __deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 __deepseek_ai_dsh_client_ui_primitives = __toESM(__deepseek_ai_dsh_client_ui_primitives);
-let __deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
-__deepseek_ai_dsh_client_runtime_client = __toESM(__deepseek_ai_dsh_client_runtime_client);
 let react_jsx_runtime = require("react/jsx-runtime");
 react_jsx_runtime = __toESM(react_jsx_runtime);
 
@@ -576,6 +574,8 @@ const zh = {
 	countCommands: "{n} 条命令",
 	countPrograms: "{n} 段代码",
 	countCalls: "{n} 次调用",
+	copy: "复制",
+	copied: "已复制",
 	"terminal.signal": "信号 {signal}",
 	"terminal.exitCode": "退出码 {code}",
 	"terminal.running": "运行中",
@@ -587,7 +587,28 @@ const zh = {
 	"terminal.collapseAria": "收起输出",
 	"terminal.collapse": "折叠",
 	"terminal.expandAria": "展开其余 {n} 行输出",
-	"terminal.expandRest": "… 其余 {n} 行"
+	"terminal.expandRest": "… 其余 {n} 行",
+	"read.window": "显示 {shown} / {total} 行",
+	"read.collapseAria": "收起内容",
+	"read.expandAria": "展开其余 {count} 行",
+	"read.expandRest": "… 其余 {count} 行",
+	"search.paths": "{shown} 个路径",
+	"search.paths.truncated": "显示 {shown} / 共 {total} 个路径",
+	"search.matches": "{shown} 处匹配 · {files} 个文件",
+	"search.matches.truncated": "显示 {shown} / 共 {total} 处匹配 · {files} 个文件",
+	"search.noResults": "无结果",
+	"search.collapseAria": "收起结果",
+	"search.expandAria": "展开其余 {count} 行结果",
+	"search.expandRest": "… 其余 {count} 行",
+	"diff.collapseAria": "收起差异",
+	"diff.expandAria": "展开其余 {count} 行差异",
+	"diff.expandRest": "… 其余 {count} 行",
+	"diff.files": "{count} 个文件",
+	"web.noResults": "未找到结果",
+	"web.sourcesTruncated": "来源列表已截断",
+	"web.http": "HTTP",
+	"web.contentTruncated": "内容已截断",
+	"markdown.footnotes": "脚注"
 };
 const en = {
 	running: "Running",
@@ -603,6 +624,8 @@ const en = {
 	countCommands: "{n} Commands",
 	countPrograms: "{n} Programs",
 	countCalls: "{n} Calls",
+	copy: "Copy",
+	copied: "Copied",
 	"terminal.signal": "signal {signal}",
 	"terminal.exitCode": "exit code {code}",
 	"terminal.running": "Running",
@@ -614,7 +637,28 @@ const en = {
 	"terminal.collapseAria": "Collapse output",
 	"terminal.collapse": "Collapse",
 	"terminal.expandAria": "Expand the remaining {n} output lines",
-	"terminal.expandRest": "… {n} more lines"
+	"terminal.expandRest": "… {n} more lines",
+	"read.window": "Showing {shown} of {total} lines",
+	"read.collapseAria": "Collapse content",
+	"read.expandAria": "Expand {count} more lines",
+	"read.expandRest": "… {count} more lines",
+	"search.paths": "{shown} paths",
+	"search.paths.truncated": "Showing {shown} of {total} paths",
+	"search.matches": "{shown} matches · {files} files",
+	"search.matches.truncated": "Showing {shown} of {total} matches · {files} files",
+	"search.noResults": "No results",
+	"search.collapseAria": "Collapse results",
+	"search.expandAria": "Expand {count} more result lines",
+	"search.expandRest": "… {count} more lines",
+	"diff.collapseAria": "Collapse diff",
+	"diff.expandAria": "Expand {count} more diff lines",
+	"diff.expandRest": "… {count} more lines",
+	"diff.files": "{count} files",
+	"web.noResults": "No results found",
+	"web.sourcesTruncated": "Source list truncated",
+	"web.http": "HTTP",
+	"web.contentTruncated": "Content truncated",
+	"markdown.footnotes": "Footnotes"
 };
 const NS = "merge-tool-calls";
 
@@ -694,6 +738,36 @@ function classifyTool(toolName) {
 
 //#endregion
 //#region src/client/card-model.ts
+/**
+* Parse the call head paired with one immutable Tool block.
+* @param block - running or settled Tool block.
+* @returns the Tool name and object arguments, or null when unavailable.
+*/
+function parsedArgsOf(block) {
+	const call = "kind" in block ? block.call : block;
+	if (call === null) return null;
+	let value;
+	try {
+		value = JSON.parse(call.argsRaw);
+	} catch {
+		return null;
+	}
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+	return {
+		name: call.name,
+		args: value
+	};
+}
+/**
+* Read the exact single text block consumed by first-party card derivations.
+* @param block - settled Tool result.
+* @returns its text, or undefined for any other content layout.
+*/
+function singleResultText(block) {
+	if (block.content.length !== 1) return void 0;
+	const only = block.content[0];
+	return only?.type === "text" ? only.text : void 0;
+}
 /** True when a settled terminal card reports a failing exit (mirrors ui-tool). */
 function terminalFailed(model) {
 	const { exitCode, signal, running } = model.card;
@@ -707,7 +781,7 @@ function terminalFailed(model) {
 function resultText(node) {
 	const parts = [];
 	for (const block of node.content) if (block.type === "text") parts.push(block.text);
-	else parts.push(JSON.stringify(block));
+	else parts.push(JSON.stringify(block, null, 2));
 	if (parts.length === 0 && node.error !== void 0) parts.push(`${node.error.name}: ${node.error.code}`);
 	return parts.join("\n");
 }
@@ -722,6 +796,36 @@ function relativizeToCwd(text, cwd) {
 	if (text.startsWith(`${root}/`) || text.startsWith(`${root}\\`)) return text.slice(root.length + 1);
 	return text;
 }
+/**
+* Resolve a Workspace-relative path into the Host-facing spelling (local
+* mirror of `@deepseek-ai/dsh-util-workspace-path`'s `resolveWorkspacePath`:
+* that static utility package is not a dynamic client bundle row, so the
+* browser half carries this one-function copy).
+* @param cwd - Session Workspace root, when known.
+* @param path - Absolute or Workspace-relative path.
+* @returns an absolute path when a Workspace root is available, otherwise the original path.
+*/
+function resolveWorkspacePath(cwd, path) {
+	if (path.startsWith("/") || /^[A-Za-z]:[/\\]/.test(path) || path.startsWith("\\\\")) return path;
+	if (cwd === void 0 || cwd === "") return path;
+	return `${cwd.replace(/[/\\]+$/, "")}/${path.replace(/^[/\\]+/, "")}`;
+}
+/**
+* Abbreviate a POSIX home directory for display (local mirror of
+* `@deepseek-ai/dsh-util-workspace-path`'s `abbreviateHomePath`).
+* @param path - Absolute or already-short display path.
+* @param home - Host account home; absent skips abbreviation.
+* @returns `~` or `~/…` for the POSIX home and its descendants, otherwise `path`.
+*/
+function abbreviateHomePath(path, home) {
+	if (home === void 0 || home === "") return path;
+	if (/^[A-Za-z]:[/\\]/.test(path) || path.startsWith("\\\\") || /^[A-Za-z]:[/\\]/.test(home) || home.startsWith("\\\\")) return path;
+	const root = home.replace(/\/+$/, "");
+	if (root === "" || root === "/") return path;
+	if (path.replace(/\/+$/, "") === root) return "~";
+	if (path.startsWith(`${root}/`)) return `~${path.slice(root.length)}`;
+	return path;
+}
 function parseArgs(argsRaw) {
 	try {
 		const parsed = JSON.parse(argsRaw);
@@ -757,6 +861,10 @@ const SUMMARY_KEYS = {
 function deriveSummary(variant, argsRaw) {
 	const parsed = parseArgs(argsRaw);
 	if (parsed === void 0) return firstLine(argsRaw);
+	if (variant === "search" && Array.isArray(parsed.queries)) {
+		const queries = parsed.queries.filter((query) => typeof query === "string" && query !== "");
+		if (queries.length > 0) return queries.map(firstLine).join(", ");
+	}
 	const picked = pickString(parsed, SUMMARY_KEYS[variant]);
 	if (picked !== void 0) return firstLine(picked);
 	for (const value of Object.values(parsed)) if (typeof value === "string" && value !== "") return firstLine(value);
@@ -787,23 +895,23 @@ function deriveBody(variant, argsRaw) {
 	return JSON.stringify(parsed, null, 2);
 }
 /** Derive the row model for one call of a grouped tool. */
-function callRowModel(toolName, block, cwd) {
+function callRowModel(toolName, block, cwd, home) {
 	const done = "kind" in block;
 	const argsRaw = (done ? block.call?.argsRaw : block.argsRaw) ?? "";
 	const state = !done ? "running" : block.error?.code === "interrupted" ? "stopped" : block.isError ? "error" : "ok";
 	const variant = classifyTool(toolName);
 	const terminal = terminalCardOf(block, cwd);
-	const read = readCardOf(block, cwd);
+	const read = readCardOf(block, cwd, home);
 	const diff = diffCardOf(block);
 	const search = searchCardOf(block);
 	const web = webCardOf(block);
-	const base = argsRaw === "" ? block.callId : relativizeToCwd(deriveSummary(variant, argsRaw), cwd);
+	const base = argsRaw === "" ? block.callId : abbreviateHomePath(relativizeToCwd(deriveSummary(variant, argsRaw), cwd), home);
 	const toolTitle = TOOL_TITLES[toolName];
 	const argsSummary = variant === "others" && toolName !== "" && toolTitle === void 0 ? `${toolName} · ${base}` : base;
 	const filePath = deriveFilePath(variant, argsRaw);
 	const output = done ? resultText(block) || null : null;
 	const errorSummary = state === "error" && output !== null ? firstLine(output) : null;
-	const summary = terminal?.description ?? search?.title ?? argsSummary;
+	const summary = terminal?.description ?? argsSummary;
 	const body = filePath !== void 0 ? null : deriveBody(variant, argsRaw);
 	const finalState = state === "ok" && terminal !== null && terminalFailed(terminal) ? "error" : state;
 	const expandable = terminal !== null || diff !== null || read !== null || search !== null || web !== null || body !== null || output !== null;
@@ -825,20 +933,50 @@ function callRowModel(toolName, block, cwd) {
 	};
 }
 /** Read-card derivation, or null when this call is not a read card (mirrors ui-tool). */
-function readCardOf(block, cwd) {
-	if (!("kind" in block)) return null;
-	const result = block.resultView?.card === "read" ? block.resultView : null;
-	if (result === null) return null;
-	if (!Array.isArray(result.lines)) return null;
-	const lines = result.lines.filter((line) => typeof line === "object" && line !== null && typeof line.number === "number" && typeof line.text === "string").map((line) => ({
-		number: line.number,
-		text: line.text
-	}));
+function readCardOf(block, cwd, home) {
+	if (block.parentCallId !== void 0 || !("kind" in block) || block.isError) return null;
+	const parsed = parsedArgsOf(block);
+	if (parsed?.name !== "read") return null;
+	const { file_path: path, offset, limit } = parsed.args;
+	if (typeof path !== "string" || path.trim() === "") return null;
+	if (offset !== void 0 && (typeof offset !== "number" || !Number.isInteger(offset) || offset < 1)) return null;
+	if (limit !== void 0 && (typeof limit !== "number" || !Number.isInteger(limit) || limit < 1)) return null;
+	const meta = readMeta(block.meta);
+	if (meta === null) return null;
+	const text = singleResultText(block);
+	if (text === void 0) return null;
+	if (/^<path>[^\n]*<\/path>\n<type>file<\/type>\n<content>\n([\s\S]*)\n<\/content>$/u.exec(text)?.[1] === void 0) return null;
+	return {
+		label: abbreviateHomePath(relativizeToCwd(meta.path, cwd), home),
+		lines: meta.lines,
+		totalLines: meta.totalLines,
+		lang: meta.lang
+	};
+}
+function readMeta(meta) {
+	if (typeof meta !== "object" || meta === null || Array.isArray(meta)) return null;
+	const { path, offset, lines, totalLines, lang } = meta;
+	if (typeof path !== "string" || typeof offset !== "number" || !Number.isInteger(offset) || offset < 1) return null;
+	if (typeof totalLines !== "number" || !Number.isInteger(totalLines) || totalLines < 0 || !Array.isArray(lines)) return null;
+	if (lang !== void 0 && typeof lang !== "string") return null;
+	const narrowed = [];
+	let previous = offset - 1;
+	for (const line of lines) {
+		if (typeof line !== "object" || line === null || Array.isArray(line)) return null;
+		const { number, text } = line;
+		if (typeof number !== "number" || !Number.isInteger(number) || number < 1 || number <= previous) return null;
+		if (number > totalLines || typeof text !== "string") return null;
+		previous = number;
+		narrowed.push({
+			number,
+			text
+		});
+	}
 	return {
-		label: result.title ?? relativizeToCwd(result.path, cwd),
-		lines,
-		totalLines: typeof result.totalLines === "number" ? result.totalLines : lines.length,
-		lang: typeof result.lang === "string" ? result.lang : void 0
+		path,
+		lines: narrowed,
+		totalLines,
+		...lang === void 0 ? {} : { lang }
 	};
 }
 function isValidFiles(files) {
@@ -850,39 +988,50 @@ function flattenContent(content) {
 }
 /** Search-card derivation, or null when this call is not a search card (mirrors ui-tool). */
 function searchCardOf(block) {
-	if (!("kind" in block)) return null;
-	const result = block.resultView?.card === "search" ? block.resultView : null;
-	if (result === null) return null;
+	if (block.parentCallId !== void 0 || !("kind" in block) || block.isError) return null;
+	const parsed = parsedArgsOf(block);
+	if (parsed === null || parsed.name !== "grep" && parsed.name !== "glob") return null;
+	const { pattern, path } = parsed.args;
+	if (typeof pattern !== "string") return null;
+	if (parsed.name === "grep" && pattern === "") return null;
+	if (parsed.name === "glob" && pattern.trim() === "") return null;
+	if (path !== void 0 && (typeof path !== "string" || path.trim() === "")) return null;
+	if (parsed.name === "grep") {
+		const include = parsed.args.include;
+		if (include !== void 0 && typeof include !== "string") return null;
+	}
+	if (typeof block.meta !== "object" || block.meta === null || Array.isArray(block.meta)) return null;
+	const meta = block.meta;
+	if (typeof meta.truncated !== "boolean") return null;
+	if (typeof meta.total !== "number" || !Number.isInteger(meta.total) || meta.total < 0) return null;
 	const common = {
-		truncated: result.truncated,
-		total: result.total
+		truncated: meta.truncated,
+		total: meta.total
 	};
-	const recovery = result.truncated ? flattenContent(block.content) : void 0;
-	if (result.shape === "matches") {
-		if (!isValidFiles(result.files)) return null;
+	const recovery = meta.truncated ? flattenContent(block.content) : void 0;
+	if (meta.shape === "matches") {
+		if (!isValidFiles(meta.files)) return null;
 		return {
-			title: result.title,
 			recovery,
 			card: {
 				kind: "matches",
-				files: result.files,
+				files: meta.files,
 				...common
 			}
 		};
 	}
-	if (result.shape !== "paths") return null;
-	if (!Array.isArray(result.paths) || !result.paths.every((path) => typeof path === "string")) return null;
+	if (meta.shape !== "paths") return null;
+	if (!Array.isArray(meta.paths) || !meta.paths.every((path$1) => typeof path$1 === "string")) return null;
 	return {
-		title: result.title,
 		recovery,
 		card: {
 			kind: "paths",
-			paths: result.paths,
+			paths: meta.paths,
 			...common
 		}
 	};
 }
-/** Narrow a wire `card:'diff'` view's `diffs` to well-formed hunks (mirrors ui-tool). */
+/** Narrow a result metadata `diffs` to well-formed hunks (mirrors ui-tool). */
 function narrowDiffs(diffs) {
 	if (!Array.isArray(diffs) || diffs.length === 0) return null;
 	const out = [];
@@ -900,86 +1049,262 @@ function narrowDiffs(diffs) {
 	}
 	return out;
 }
+function intendedDiff(block) {
+	const parsed = parsedArgsOf(block);
+	if (parsed === null) return null;
+	if (parsed.name === "str_replace_editor") {
+		const { command, path: path$1, file_text: fileText, old_str: oldText$1, new_str: newText$1 } = parsed.args;
+		if (typeof path$1 !== "string" || path$1.trim() === "") return null;
+		if (command === "create") {
+			if (fileText !== void 0 && typeof fileText !== "string") return null;
+			return {
+				tool: "str_replace_editor",
+				diff: {
+					path: path$1,
+					oldText: null,
+					newText: fileText ?? ""
+				}
+			};
+		}
+		if (command === "str_replace") {
+			if (oldText$1 !== void 0 && typeof oldText$1 !== "string") return null;
+			if (newText$1 !== void 0 && typeof newText$1 !== "string") return null;
+			return {
+				tool: "str_replace_editor",
+				diff: {
+					path: path$1,
+					oldText: oldText$1 ?? null,
+					newText: newText$1 ?? ""
+				}
+			};
+		}
+		return null;
+	}
+	const { file_path: path } = parsed.args;
+	if (typeof path !== "string" || path.trim() === "") return null;
+	if (parsed.name === "write") {
+		const { content } = parsed.args;
+		return typeof content === "string" ? {
+			tool: "write",
+			diff: {
+				path,
+				oldText: null,
+				newText: content
+			}
+		} : null;
+	}
+	if (parsed.name !== "edit") return null;
+	const { old_string: oldText, new_string: newText, replace_all: replaceAll } = parsed.args;
+	if (typeof oldText !== "string" || typeof newText !== "string") return null;
+	if (replaceAll !== void 0 && typeof replaceAll !== "boolean") return null;
+	return {
+		tool: "edit",
+		diff: {
+			path,
+			oldText: oldText || null,
+			newText
+		}
+	};
+}
+function appliedDiffs(meta) {
+	if (typeof meta !== "object" || meta === null || Array.isArray(meta)) return null;
+	const diffs = meta.diffs;
+	if (!Array.isArray(diffs)) return null;
+	if (diffs.length === 0) return "empty";
+	return narrowDiffs(diffs);
+}
 /** Diff-card derivation, or null when this call is not a diff card (mirrors ui-tool). */
 function diffCardOf(block) {
-	if (!("kind" in block)) {
-		const call = block.callView?.card === "diff" ? block.callView : null;
-		const diffs$1 = call === null ? null : narrowDiffs(call.diffs);
-		return diffs$1 === null ? null : { card: { diffs: diffs$1 } };
+	if (block.parentCallId !== void 0) return null;
+	const intended = intendedDiff(block);
+	if (intended === null) return null;
+	if (!("kind" in block)) return { card: { diffs: [intended.diff] } };
+	if (intended.tool === "str_replace_editor") return null;
+	if (block.isError) return null;
+	const applied = appliedDiffs(block.meta);
+	if (applied === null || applied === "empty") return intended.tool === "write" ? { card: { diffs: [intended.diff] } } : null;
+	return { card: { diffs: applied } };
+}
+function shellCallOf(name, args) {
+	if (name !== "bash" && name !== "pwsh") return null;
+	const { command, description, timeoutMs, workdir, run_in_background: background } = args;
+	if (typeof command !== "string" || command.trim() === "") return null;
+	if (timeoutMs !== void 0 && (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs <= 0)) return null;
+	if (workdir !== void 0 && typeof workdir !== "string") return null;
+	if (background !== void 0 && typeof background !== "boolean") return null;
+	if (description === void 0) return {
+		command,
+		description: void 0,
+		workdir: void 0,
+		persistent: true,
+		background: false
+	};
+	if (typeof description !== "string" || description.trim() === "") return null;
+	return {
+		command,
+		description,
+		workdir,
+		persistent: false,
+		background: background === true
+	};
+}
+/**
+* Parse the result text's trailing exit-status marker (mirrors the shell
+* renderer's literal contract without importing that Host-only package).
+* @param text - rendered shell result text.
+* @returns output with a trailing exit-code or signal marker extracted.
+*/
+function parseExitStatus(text) {
+	const signal = /\n\[killed by signal: ([^\]\n]+)\]$/.exec(text);
+	if (signal?.[1] !== void 0) return {
+		output: text.slice(0, signal.index),
+		signal: signal[1]
+	};
+	const exit = /\n\[exit code: (\d+)\]$/.exec(text);
+	if (exit?.[1] !== void 0) return {
+		output: text.slice(0, exit.index),
+		exitCode: Number(exit[1])
+	};
+	return {
+		output: text,
+		exitCode: 0
+	};
+}
+/**
+* Collapse `.` and `..` segments so the prompt label names the directory the
+* command actually ran in (local mirror of ui-tool's terminal normalization).
+* @param path - a joined or absolute path, possibly carrying `.`/`..` segments.
+* @returns the same path with those segments resolved.
+*/
+function normalizeSegments(path) {
+	if (!/(?:^|[/\\])\.\.?(?:[/\\]|$)/.test(path)) return path;
+	const separator = path.includes("\\") && !path.includes("/") ? "\\" : "/";
+	const rooted = /^[/\\]/.test(path);
+	const drive = /^[A-Za-z]:/.exec(path)?.[0] ?? "";
+	const body = collapse(path.slice(drive.length), rooted || drive !== "", separator);
+	const leading = rooted ? separator : "";
+	return drive === "" ? `${leading}${body}` : `${drive}${rooted ? leading : separator}${body}`;
+}
+function collapse(body, rooted, separator = "/") {
+	const kept = [];
+	for (const segment of body.split(/[/\\]/)) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") {
+			if (kept.length > 0 && kept[kept.length - 1] !== "..") kept.pop();
+			else if (!rooted) kept.push(segment);
+			continue;
+		}
+		kept.push(segment);
 	}
-	const result = block.resultView?.card === "diff" ? block.resultView : null;
-	const diffs = result === null ? null : narrowDiffs(result.diffs);
-	return diffs === null ? null : { card: { diffs } };
+	return kept.join(separator);
 }
 /**
-* Resolve a terminal view's working directory the way the render-intent
-* contract assigns it: an absolute path is used as-is, a relative one joins
-* under the session workspace, and an omitted one IS the session workspace.
-* @param viewCwd - the cwd the terminal call view carries, if any.
+* Resolve a shell call's workdir for display: an absolute path is used as-is,
+* a relative one joins under the session workspace, and an omitted one IS the
+* session workspace.
+* @param workdir - the raw call's workdir, if any.
 * @param sessionCwd - the session workspace root, if the caller knows it.
 * @returns the working directory for the prompt label, or undefined.
 */
-function resolveTerminalCwd(viewCwd, sessionCwd) {
-	if (viewCwd === void 0 || viewCwd === "") return sessionCwd;
-	if (sessionCwd === void 0 || sessionCwd === "") return viewCwd;
-	return (0, __deepseek_ai_dsh_client_runtime_client.resolveWorkspacePath)(sessionCwd, viewCwd);
+function resolveTerminalCwd(workdir, sessionCwd) {
+	if (workdir === void 0 || workdir === "") return sessionCwd;
+	if (sessionCwd === void 0 || sessionCwd === "") return normalizeSegments(workdir);
+	return normalizeSegments(resolveWorkspacePath(sessionCwd, workdir));
 }
 /** Terminal-card derivation, or null when this call is not a terminal card (mirrors ui-tool). */
 function terminalCardOf(block, sessionCwd) {
-	const call = block.callView?.card === "terminal" ? block.callView : null;
-	if (!("kind" in block)) return call === null ? null : {
+	if (block.parentCallId !== void 0) return null;
+	const parsed = parsedArgsOf(block);
+	if (parsed === null) return null;
+	if (parsed.name !== "bash" && parsed.name !== "pwsh") return null;
+	const call = shellCallOf(parsed.name, parsed.args);
+	if (call === null || call.background) return null;
+	const cwd = resolveTerminalCwd(call.workdir, sessionCwd);
+	if (!("kind" in block)) return {
 		description: call.description,
 		card: {
-			command: call.title,
-			cwd: resolveTerminalCwd(call.cwd, sessionCwd),
+			command: call.command,
+			cwd,
 			output: void 0,
 			exitCode: void 0,
 			signal: void 0,
 			running: true
 		}
 	};
-	const result = block.resultView?.card === "terminal" ? block.resultView : null;
-	if (result === null) return null;
+	if (block.isError || call.persistent) return null;
+	const output = singleResultText(block);
+	if (output === void 0) return null;
+	const status = parseExitStatus(output);
 	return {
-		description: call?.description,
+		description: call.description,
 		card: {
-			command: result.title ?? call?.title ?? "",
-			cwd: call === null ? void 0 : resolveTerminalCwd(call.cwd, sessionCwd),
-			output: result.output,
-			exitCode: result.exitCode,
-			signal: result.signal,
+			command: call.command,
+			cwd,
+			output: status.output,
+			exitCode: status.exitCode,
+			signal: status.signal,
 			running: false
 		}
 	};
 }
 /** Web-card derivation, or null when this call is not a web card (mirrors ui-tool). */
 function webCardOf(block) {
-	if (!("kind" in block)) return null;
-	const result = block.resultView;
-	if (result?.card !== "web") return null;
-	if (result.kind === "search") return {
-		kind: "search",
-		answer: result.answer,
-		sources: result.sources.map((source) => ({
-			url: source.url,
-			title: source.title,
-			snippet: source.snippet,
-			publishedAt: source.publishedAt
-		})),
-		truncated: result.truncated
-	};
-	if (result.kind === "fetch") return {
+	if (block.parentCallId !== void 0 || !("kind" in block) || block.isError) return null;
+	const parsed = parsedArgsOf(block);
+	if (parsed === null) return null;
+	if (parsed.name === "web_search") {
+		const { queries } = parsed.args;
+		if (!Array.isArray(queries) || queries.length === 0) return null;
+		if (!queries.every((query) => typeof query === "string" && query.trim() !== "")) return null;
+	} else if (parsed.name === "web_fetch") {
+		const { url } = parsed.args;
+		if (typeof url !== "string" || url.trim() === "") return null;
+	} else return null;
+	if (typeof block.meta !== "object" || block.meta === null || Array.isArray(block.meta)) return null;
+	const meta = block.meta;
+	if (typeof meta.truncated !== "boolean") return null;
+	if (parsed.name === "web_search") {
+		const sources = webSources(meta.sources);
+		if (sources === null || meta.answer !== void 0 && typeof meta.answer !== "string") return null;
+		return {
+			kind: "search",
+			answer: meta.answer,
+			sources,
+			truncated: meta.truncated
+		};
+	}
+	if (typeof meta.url !== "string") return null;
+	if (typeof meta.statusCode !== "number" || !Number.isInteger(meta.statusCode)) return null;
+	return {
 		kind: "fetch",
-		url: result.url,
-		statusCode: result.statusCode,
-		truncated: result.truncated
+		url: meta.url,
+		statusCode: meta.statusCode,
+		truncated: meta.truncated
 	};
-	return null;
+}
+function webSources(value) {
+	if (!Array.isArray(value)) return null;
+	const sources = [];
+	for (const source of value) {
+		if (typeof source !== "object" || source === null) return null;
+		const { url, title, snippet, publishedAt } = source;
+		if (typeof url !== "string") return null;
+		if (title !== void 0 && typeof title !== "string") return null;
+		if (snippet !== void 0 && typeof snippet !== "string") return null;
+		if (publishedAt !== void 0 && typeof publishedAt !== "string") return null;
+		sources.push({
+			url,
+			...title === void 0 ? {} : { title },
+			...snippet === void 0 ? {} : { snippet },
+			...publishedAt === void 0 ? {} : { publishedAt }
+		});
+	}
+	return sources;
 }
 
 //#endregion
 //#region src/client/merge-run.ts
-/** Tool-call node kind registered by ui-conversation's built-in tool definition. */
+/** Tool-call node kind registered by ui-chat's built-in tool definition. */
 const TOOL_CALL_KIND = "tool-call";
 /** Extract a root call block from any chat node, when it is a tool-call node. */
 function toolRootOf(node) {
@@ -1004,7 +1329,10 @@ function stepIdOf(node) {
 * Compute the merged group this call belongs to.
 *
 * 1. Locates this call's node in the chat order; null when it is not a chat
-*    tool-call node (e.g. a read dispatched as a subcall).
+*    tool-call node (e.g. a read dispatched as a subcall). The node key
+*    format stays a ui-conversation internal, so the seat finds itself by
+*    scanning the store for the tool-call node owning its call id instead of
+*    recomputing the key.
 * 2. Walks backward/forward to the maximal consecutive run containing it. A
 *    call continues the run when it is a grouped tool AND same-tool-same-run:
 *    the identical wire name, or a sibling of the same known variant family
@@ -1025,8 +1353,7 @@ function stepIdOf(node) {
 * @returns the group partition, or null when the call is not a chat tool-call node.
 */
 function readRun(order, nodes, myCallId, tools, groupBy, maxGroupSize) {
-	const myKey = (0, __deepseek_ai_dsh_client_runtime_client.conversationContextKey)(TOOL_CALL_KIND, myCallId);
-	const myIndex = order.indexOf(myKey);
+	const myIndex = myIndexOf(order, nodes, myCallId);
 	if (myIndex < 0) return null;
 	const myRoot = rootAtNode(order, nodes, myIndex);
 	if (myRoot === null) return null;
@@ -1061,6 +1388,17 @@ function readRun(order, nodes, myCallId, tools, groupBy, maxGroupSize) {
 		blocks
 	};
 }
+/** Index in the chat order of the tool-call node owning `callId`; -1 when absent. */
+function myIndexOf(order, nodes, callId) {
+	for (let index = 0; index < order.length; index++) {
+		const key = order[index];
+		if (key === void 0) continue;
+		const node = nodes.get(key);
+		if (node?.kind !== TOOL_CALL_KIND) continue;
+		if (toolRootOf(node)?.callId === callId) return index;
+	}
+	return -1;
+}
 function rootAtNode(order, nodes, index) {
 	const key = order[index];
 	const node = key === void 0 ? void 0 : nodes.get(key);
@@ -1137,29 +1475,100 @@ function terminalLabels(t) {
 		expand: (hidden) => t("terminal.expandRest", { n: hidden })
 	};
 }
+/** ReadBlock display copy from the plugin's own dictionary. */
+function readLabels(t) {
+	return {
+		window: (shown, total) => t("read.window", {
+			shown,
+			total
+		}),
+		copy: t("copy"),
+		copied: t("copied"),
+		collapseAria: t("read.collapseAria"),
+		expandAria: (count) => t("read.expandAria", { count }),
+		collapse: t("collapse"),
+		expand: (count) => t("read.expandRest", { count })
+	};
+}
+/** SearchBlock display copy from the plugin's own dictionary. */
+function searchLabels(t) {
+	return {
+		pathsSummary: (shown, total, truncated) => t(truncated ? "search.paths.truncated" : "search.paths", {
+			shown,
+			total
+		}),
+		matchesSummary: (shown, total, files, truncated) => t(truncated ? "search.matches.truncated" : "search.matches", {
+			shown,
+			total,
+			files
+		}),
+		copy: t("copy"),
+		copied: t("copied"),
+		noResults: t("search.noResults"),
+		collapseAria: t("search.collapseAria"),
+		expandAria: (count) => t("search.expandAria", { count }),
+		collapse: t("collapse"),
+		expand: (count) => t("search.expandRest", { count })
+	};
+}
+/** DiffBlock display copy from the plugin's own dictionary. */
+function diffLabels(t) {
+	return {
+		copy: t("copy"),
+		copied: t("copied"),
+		collapseAria: t("diff.collapseAria"),
+		expandAria: (count) => t("diff.expandAria", { count }),
+		collapse: t("collapse"),
+		expand: (count) => t("diff.expandRest", { count }),
+		files: (count) => t("diff.files", { count })
+	};
+}
+/** WebBlock display copy from the plugin's own dictionary. */
+function webLabels(t) {
+	return {
+		noResults: t("web.noResults"),
+		sourcesTruncated: t("web.sourcesTruncated"),
+		http: t("web.http"),
+		contentTruncated: t("web.contentTruncated"),
+		markdown: {
+			code: {
+				copyLabel: t("copy"),
+				copiedLabel: t("copied")
+			},
+			footnotes: t("markdown.footnotes")
+		}
+	};
+}
 /** One call's expanded-body card, mirroring the built-in ToolRow body. */
-function CardBody({ model, t }) {
+function CardBody({ model, home, t }) {
 	if (model.terminal !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.TerminalBlock, {
 		...model.terminal.card,
+		home,
 		maxLines: Infinity,
 		labels: terminalLabels(t)
 	});
 	if (model.diff !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.DiffBlock, {
 		...model.diff.card,
+		labels: diffLabels(t),
 		maxLines: CHAT_DIFF_MAX_LINES
 	});
 	if (model.read !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.ReadBlock, {
 		...model.read,
+		labels: readLabels(t),
 		maxLines: CHAT_READ_MAX_LINES
 	});
 	if (model.search !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.SearchBlock, {
 		...model.search.card,
+		labels: searchLabels(t),
 		maxLines: CHAT_SEARCH_MAX_LINES
 	}), model.search.recovery !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 		className: "mtc-recovery",
 		children: model.search.recovery
 	})] });
-	if (model.web !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.WebBlock, { ...model.web });
+	if (model.web !== null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.WebBlock, {
+		...model.web,
+		labels: webLabels(t)
+	});
 	const hasBody = model.body !== null;
 	const hasOutput = model.output !== null;
 	if (!hasBody && !hasOutput) return null;
@@ -1202,8 +1611,8 @@ function CardBody({ model, t }) {
 * call is rendered as the first child row so every file path lands on a child
 * row, never on the main row.
 */
-const RowCard = (0, react.memo)(function RowCard$1({ toolName, block, cwd, openFile, inspect, t, mergedCount, children }) {
-	const model = callRowModel(toolName, block, cwd);
+const RowCard = (0, react.memo)(function RowCard$1({ toolName, block, cwd, home, openFile, inspect, t, mergedCount, children }) {
+	const model = callRowModel(toolName, block, cwd, home);
 	const [expanded, setExpanded] = (0, react.useState)(false);
 	const hasChildren = mergedCount > 0;
 	const expandable = model.expandable || hasChildren;
@@ -1256,6 +1665,7 @@ const RowCard = (0, react.memo)(function RowCard$1({ toolName, block, cwd, openF
 					className: "mtc-card-body",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(CardBody, {
 						model,
+						home,
 						t
 					}), inspect !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
@@ -1289,8 +1699,8 @@ const RowCard = (0, react.memo)(function RowCard$1({ toolName, block, cwd, openF
 * renders as an open-file link (the sidebar preview) that stops propagation,
 * exactly like the main row's summary link.
 */
-const ChildRow = (0, react.memo)(function ChildRow$1({ toolName, block, cwd, openFile, t }) {
-	const model = callRowModel(toolName, block, cwd);
+const ChildRow = (0, react.memo)(function ChildRow$1({ toolName, block, cwd, home, openFile, t }) {
+	const model = callRowModel(toolName, block, cwd, home);
 	const [open, setOpen] = (0, react.useState)(false);
 	const stateLabel = stateStatus(model.state, t);
 	const expandable = model.expandable;
@@ -1342,6 +1752,7 @@ const ChildRow = (0, react.memo)(function ChildRow$1({ toolName, block, cwd, ope
 			className: "mtc-child-body",
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CardBody, {
 				model,
+				home,
 				t
 			})
 		})]
@@ -1359,8 +1770,8 @@ const ChildRow = (0, react.memo)(function ChildRow$1({ toolName, block, cwd, ope
 * and indents the children so their dots and paths land on the main row's
 * columns — no font/title constants to keep in sync.
 */
-function MergedToolRow({ callId, toolName, block, cwd, openFile, inspect, t, cfg, useSession }) {
-	const run = useSession((snapshot) => readRun(snapshot.chat.order, snapshot.chat.nodes, callId, cfg.tools, cfg.groupBy, cfg.maxGroupSize));
+function MergedToolRow({ callId, toolName, block, cwd, home, openFile, inspect, t, cfg, useChat }) {
+	const run = useChat((snapshot) => readRun(snapshot.order, snapshot.nodes, callId, cfg.tools, cfg.groupBy, cfg.maxGroupSize));
 	const rootRef = (0, react.useRef)(null);
 	/** Main separator dot's left offset from the card root; null before first measure. */
 	const [sepLeft, setSepLeft] = (0, react.useState)(null);
@@ -1383,6 +1794,7 @@ function MergedToolRow({ callId, toolName, block, cwd, openFile, inspect, t, cfg
 		toolName,
 		block,
 		cwd,
+		home,
 		openFile,
 		inspect,
 		t,
@@ -1399,6 +1811,7 @@ function MergedToolRow({ callId, toolName, block, cwd, openFile, inspect, t, cfg
 			toolName,
 			block: run.blocks[0] ?? block,
 			cwd,
+			home,
 			openFile,
 			inspect,
 			t,
@@ -1407,6 +1820,7 @@ function MergedToolRow({ callId, toolName, block, cwd, openFile, inspect, t, cfg
 				toolName,
 				block: child,
 				cwd,
+				home,
 				openFile,
 				t
 			}, child.callId))