@changfenhuang/dsh-genui 0.11.3 → 0.12.0

package/lib/index.js

@@ -784,6 +784,188 @@ function isGenuiSpec(value) {
 	return true;
 }
 //#endregion
+//#region src/client/genui-runtime/limits.ts
+/** Resource limits shared by GenUI repair, validation, and rendering. */
+const GENUI_LIMITS = {
+	/** Maximum nesting depth of the component tree. */
+	maxDepth: 8,
+	/** Maximum total nodes across the whole spec. */
+	maxNodes: 200,
+	/** Maximum length of any plain string field. */
+	maxString: 2e3,
+	/** Maximum length of a `code` body. */
+	maxCode: 12e3,
+	/** Maximum length of a mermaid source. */
+	maxMermaid: 8e3,
+	/** Maximum `grid` columns. */
+	maxGridCols: 12,
+	/** Maximum `tabs` count. */
+	maxTabs: 12,
+	/** Maximum `accordion` items. */
+	maxAccordionItems: 24,
+	/** Maximum `list` items. */
+	maxListItems: 50,
+	/** Maximum `select`/`radio` options. */
+	maxOptions: 50,
+	/** Maximum `table` rows / columns. */
+	maxTableRows: 50,
+	maxTableCols: 12,
+	/** Maximum `chart` data points per series. */
+	maxChartPoints: 60,
+	/** Maximum `plot` series and per-series parameters. */
+	maxPlotSeries: 8,
+	maxPlotParams: 6,
+	/** Maximum `scene3d` meshes. */
+	maxMeshes: 5,
+	/** Maximum `quiz` options. */
+	maxQuizOptions: 8,
+	/** Maximum `steps` / `timeline` / `breadcrumb` / `keyvalue` entries. */
+	maxSteps: 24,
+	maxTimelineItems: 24,
+	maxBreadcrumbItems: 12,
+	maxKeyValuePairs: 24,
+	/** Maximum `file-tree` nesting. */
+	maxTreeDepth: 6,
+	/** Maximum `diagram` nodes / edges / zones / focal accents. */
+	maxDiagramNodes: 9,
+	maxDiagramEdges: 12,
+	maxDiagramZones: 3,
+	maxDiagramFocal: 2,
+	maxDiagramLabel: 14,
+	/** Maximum depth of an `echart` option object. */
+	maxEChartOptionDepth: 10,
+	/** Maximum length of any single array inside an `echart` option. */
+	maxEChartArrayLen: 500,
+	/** Maximum entries traversed while sanitizing an `echart` option. */
+	maxEChartOptionNodes: 2e3
+};
+//#endregion
+//#region src/client/table-details.ts
+/** 使用 table repair 相同的转换规则处理列和行。 */
+function prepareTableRows(table) {
+	const declaredColumns = table.columns;
+	const columnsSpecified = Array.isArray(declaredColumns) && declaredColumns.length > 0;
+	let columns = repairColumnValues(columnsSpecified && Array.isArray(declaredColumns) && typeof declaredColumns[0] === "object" && declaredColumns[0] !== null ? declaredColumns.map(columnHeaderText) : declaredColumns);
+	let rawRows = table.rows !== void 0 ? table.rows : table.data;
+	if (Array.isArray(rawRows) && rawRows.length > 0 && typeof rawRows[0] === "object" && rawRows[0] !== null && !Array.isArray(rawRows[0])) {
+		const keys = Array.isArray(table.columns) && table.columns.length > 0 && typeof table.columns[0] === "object" && table.columns[0] !== null ? table.columns.map(columnKeyOf).filter((key) => key !== void 0) : Object.keys(rawRows[0]);
+		rawRows = rawRows.map((row) => keys.map((key) => cellText(row[key])));
+	}
+	let derived = null;
+	if (!columnsSpecified && Array.isArray(rawRows) && rawRows.length > 0 && Array.isArray(rawRows[0])) {
+		const grid = repairRows(rawRows);
+		const candidate = grid.length === 0 ? null : deriveTableColumns(grid);
+		if (candidate !== null && repairRows(candidate.rows).length === candidate.rows.length) {
+			derived = candidate;
+			columns = candidate.columns.map((column) => column.slice(0, 128));
+		}
+	}
+	if (columns.length === 0 && !Array.isArray(table.columns)) return null;
+	const rows = repairRows(derived === null ? rawRows : derived.rows);
+	if (!Array.isArray(rawRows)) return null;
+	return {
+		columns: columns.slice(0, GENUI_LIMITS.maxTableCols),
+		rows
+	};
+}
+/** 返回 repair 后可显示详情的 table 行。 */
+function tableRowsForDetails(table) {
+	return prepareTableRows(table)?.rows ?? [];
+}
+/** 按照 table renderer 的规则识别分组标题行。 */
+function isTableGroupHeaderRow(row, types) {
+	if (!Array.isArray(row) || !Array.isArray(types) || types[0] !== "group") return false;
+	return String(row[0] ?? "").trim() !== "" && row.slice(1).every((cell) => String(cell ?? "").trim() === "");
+}
+/** 判断详情索引对应的行是否可展开并显示。 */
+function isTableDetailReachable(table, rowIndex) {
+	const rows = tableRowsForDetails(table);
+	return rowIndex >= 0 && rowIndex < rows.length && !isTableGroupHeaderRow(rows[rowIndex], table.types);
+}
+/** 按照 guard 接受的 object alias 规则修复 table 列。 */
+function repairColumnValues(value) {
+	if (!Array.isArray(value)) return [];
+	const columns = [];
+	for (const item of value) {
+		if (columns.length >= GENUI_LIMITS.maxTableCols) break;
+		if (typeof item === "string") columns.push(item.slice(0, 128));
+		else if (item !== null && typeof item === "object") {
+			const column = item;
+			const label = typeof column.label === "string" ? column.label : typeof column.value === "string" ? column.value : typeof column.title === "string" ? column.title : JSON.stringify(item);
+			columns.push(label.slice(0, 128));
+		}
+	}
+	return columns;
+}
+/** 按照 table repair 的单元格规则裁剪并清理行。 */
+function repairRows(value) {
+	if (!Array.isArray(value)) return [];
+	const rows = [];
+	for (const row of value) {
+		if (rows.length >= GENUI_LIMITS.maxTableRows) break;
+		if (!Array.isArray(row)) continue;
+		const cells = [];
+		for (const cell of row) {
+			if (cells.length >= GENUI_LIMITS.maxTableCols) break;
+			if (typeof cell === "string") cells.push(cell.slice(0, 256));
+			else if (typeof cell === "number" && Number.isFinite(cell)) cells.push(cell);
+		}
+		if (cells.length > 0) rows.push(cells);
+	}
+	return rows;
+}
+/** 从有效的首行表头生成 table 列。 */
+function deriveTableColumns(rows) {
+	const header = rows[0];
+	if (header === void 0 || header.length === 0) return null;
+	const body = rows.slice(1);
+	if (body.length === 0) {
+		const columns = header.map((cell) => String(cell).trim());
+		return columns.every((column) => column !== "") ? {
+			columns,
+			rows: []
+		} : null;
+	}
+	if (body.every((row) => row.length === header.length)) return {
+		columns: header.map((cell) => String(cell).trim()),
+		rows: body
+	};
+	return {
+		columns: Array.from({ length: header.length }, (_unused, index) => `列${index + 1}`),
+		rows
+	};
+}
+/** 读取 object row 映射到列时使用的 key。 */
+function columnKeyOf(value) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const column = value;
+	for (const key of [
+		"key",
+		"dataIndex",
+		"title",
+		"label"
+	]) if (typeof column[key] === "string" && column[key] !== "") return column[key];
+}
+/** 将 object row 中的值转换为 table 单元格，并保留列位置。 */
+function cellText(value) {
+	if (typeof value === "string") return value;
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	if (value === null || value === void 0) return "";
+	return JSON.stringify(value);
+}
+/** 读取 object column 显示的标题。 */
+function columnHeaderText(value) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return String(value);
+	const column = value;
+	for (const key of [
+		"title",
+		"label",
+		"key",
+		"dataIndex"
+	]) if (typeof column[key] === "string" && column[key] !== "") return column[key];
+	return JSON.stringify(value);
+}
+//#endregion
 //#region src/client/genui-runtime/normalize.ts
 /** Deterministic GenUI alias and structural normalization. */
 function record$1(value) {
@@ -801,6 +983,15 @@ const STAT_METRIC_FIELDS = [
 	"spark",
 	"size"
 ];
+const LIST_ITEM_ALIASES = {
+	label: "title",
+	name: "title",
+	description: "desc",
+	content: "desc",
+	text: "desc",
+	body: "desc",
+	detail: "desc"
+};
 /**
 * Normalize one metric record of a stat group into a single-metric `stat`
 * node, or null when the entry is not a metric at all.
@@ -935,11 +1126,35 @@ function normalizeNode(value, path, warnings) {
 		if (isNode$1(child)) return normalizeNodeValue(child, `${path}.items[${index}]`);
 		if (Array.isArray(child) && child.length === 1 && typeof child[0] === "string") return child[0];
 		const holder = record$1(child);
-		if (holder === void 0 || !("description" in holder)) return holder === void 0 ? child : { ...holder };
+		if (holder === void 0) return child;
 		const normalizedHolder = { ...holder };
-		const description = normalizedHolder.description;
-		delete normalizedHolder.description;
-		if (!("desc" in normalizedHolder) && typeof description === "string") normalizedHolder.desc = description;
+		const itemPath = `${path}.items[${index}]`;
+		for (const [alias, canonical] of Object.entries(LIST_ITEM_ALIASES)) {
+			if (!(alias in normalizedHolder)) continue;
+			const keptCanonical = canonical in normalizedHolder;
+			if (!keptCanonical) normalizedHolder[canonical] = normalizedHolder[alias];
+			delete normalizedHolder[alias];
+			warnings.push({
+				kind: "alias",
+				path: `${itemPath}.${alias}`,
+				type,
+				field: alias,
+				canonical,
+				message: keptCanonical ? `${itemPath}.${alias} is ignored because canonical field '${canonical}' is present` : `${itemPath}.${alias} normalized/adopted as '${canonical}'`
+			});
+		}
+		if (!("title" in normalizedHolder) && typeof normalizedHolder.desc === "string") {
+			normalizedHolder.title = normalizedHolder.desc;
+			delete normalizedHolder.desc;
+			warnings.push({
+				kind: "alias",
+				path: `${itemPath}.desc`,
+				type,
+				field: "desc",
+				canonical: "title",
+				message: `${itemPath}.desc normalized/adopted as 'title'`
+			});
+		}
 		return normalizedHolder;
 	});
 	else if (type === "keyvalue" && Array.isArray(out.pairs)) {
@@ -979,6 +1194,17 @@ function normalizeNode(value, path, warnings) {
 			items: Array.isArray(holder.items) ? holder.items.map((child, childIndex) => normalizeNodeValue(child, `${path}.items[${index}].items[${childIndex}]`)) : holder.items
 		};
 	});
+	else if (type === "table" && Array.isArray(out.details)) {
+		const table = {
+			columns: out.columns,
+			rows: out.rows,
+			types: out.types
+		};
+		out.details = out.details.map((detail, rowIndex) => {
+			if (!Array.isArray(detail) || !isTableDetailReachable(table, rowIndex)) return detail;
+			return detail.map((child, childIndex) => normalizeNodeValue(child, `${path}.details[${rowIndex}][${childIndex}]`));
+		});
+	}
 	return out;
 }
 /**
@@ -1057,6 +1283,16 @@ function visitNativeNodes(value, path, visit) {
 		const holder = record(item);
 		if (holder?.items !== void 0 && Array.isArray(holder.items)) holder.items.forEach((child, childIndex) => children(child, `${path}.items[${index}].items[${childIndex}]`));
 	});
+	else if (type === "table" && Array.isArray(value.details)) {
+		const table = {
+			columns: value.columns,
+			rows: value.rows,
+			types: value.types
+		};
+		value.details.forEach((detail, rowIndex) => {
+			if (Array.isArray(detail) && isTableDetailReachable(table, rowIndex)) detail.forEach((child, childIndex) => children(child, `${path}.details[${rowIndex}][${childIndex}]`));
+		});
+	}
 }
 function pushUnknownField(warnings, path, field, type) {
 	warnings.push({
@@ -1106,6 +1342,22 @@ function diagnoseUnknownGenuiFields(value) {
 			pushUnknownField(warnings, path, field, node.type);
 		}
 		diagnoseNestedFields(node, path, definition, warnings);
+		if (node.type === "list" && Array.isArray(node.items)) node.items.forEach((item, index) => {
+			if (isNode(item)) return;
+			const holder = record(item);
+			if (holder === void 0) return;
+			for (const field of Object.keys(holder)) {
+				if (field === "title" || field === "desc") continue;
+				const itemPath = `${path}.items[${index}]`;
+				warnings.push({
+					kind: "unknown-field",
+					path: `${itemPath}.${field}`,
+					message: `${itemPath}.${field}: list items render 'title' and 'desc' only — '${field}' is dropped`,
+					type: "list",
+					field
+				});
+			}
+		});
 	};
 	if (Array.isArray(root.items) && !isComponentRoot(root)) {
 		for (const field of Object.keys(root)) {
@@ -1121,61 +1373,121 @@ function diagnoseUnknownGenuiFields(value) {
 	return warnings;
 }
 //#endregion
-//#region src/client/genui-runtime/limits.ts
-/** Resource limits shared by GenUI repair, validation, and rendering. */
-const GENUI_LIMITS = {
-	/** Maximum nesting depth of the component tree. */
-	maxDepth: 8,
-	/** Maximum total nodes across the whole spec. */
-	maxNodes: 200,
-	/** Maximum length of any plain string field. */
-	maxString: 2e3,
-	/** Maximum length of a `code` body. */
-	maxCode: 12e3,
-	/** Maximum length of a mermaid source. */
-	maxMermaid: 8e3,
-	/** Maximum `grid` columns. */
-	maxGridCols: 12,
-	/** Maximum `tabs` count. */
-	maxTabs: 12,
-	/** Maximum `accordion` items. */
-	maxAccordionItems: 24,
-	/** Maximum `list` items. */
-	maxListItems: 50,
-	/** Maximum `select`/`radio` options. */
-	maxOptions: 50,
-	/** Maximum `table` rows / columns. */
-	maxTableRows: 50,
-	maxTableCols: 12,
-	/** Maximum `chart` data points per series. */
-	maxChartPoints: 60,
-	/** Maximum `plot` series and per-series parameters. */
-	maxPlotSeries: 8,
-	maxPlotParams: 6,
-	/** Maximum `scene3d` meshes. */
-	maxMeshes: 5,
-	/** Maximum `quiz` options. */
-	maxQuizOptions: 8,
-	/** Maximum `steps` / `timeline` / `breadcrumb` / `keyvalue` entries. */
-	maxSteps: 24,
-	maxTimelineItems: 24,
-	maxBreadcrumbItems: 12,
-	maxKeyValuePairs: 24,
-	/** Maximum `file-tree` nesting. */
-	maxTreeDepth: 6,
-	/** Maximum `diagram` nodes / edges / zones / focal accents. */
-	maxDiagramNodes: 9,
-	maxDiagramEdges: 12,
-	maxDiagramZones: 3,
-	maxDiagramFocal: 2,
-	maxDiagramLabel: 14,
-	/** Maximum depth of an `echart` option object. */
-	maxEChartOptionDepth: 10,
-	/** Maximum length of any single array inside an `echart` option. */
-	maxEChartArrayLen: 500,
-	/** Maximum entries traversed while sanitizing an `echart` option. */
-	maxEChartOptionNodes: 2e3
-};
+//#region src/client/walk-spec.ts
+/** 遍历完整 GenUI 组件树，并提供每个组件在 spec 中的路径。 */
+function walkGenuiNodes(spec, visitor) {
+	const walk = (nodes, path, depth) => {
+		if (depth > GENUI_LIMITS.maxDepth) return;
+		nodes.forEach((node, index) => visit(node, `${path}[${index}]`, depth));
+	};
+	const visit = (node, at, depth) => {
+		if (depth > GENUI_LIMITS.maxDepth) return;
+		visitor(node, at);
+		if (depth >= GENUI_LIMITS.maxDepth) return;
+		switch (node.type) {
+			case "row":
+			case "col":
+			case "grid":
+			case "card":
+				walk(node.items, `${at}.items`, depth + 1);
+				break;
+			case "tabs":
+				node.tabs.forEach((tab, tabIndex) => walk(tab.items, `${at}.tabs[${tabIndex}].items`, depth + 1));
+				break;
+			case "accordion":
+				node.items.forEach((item, itemIndex) => walk(item.items, `${at}.items[${itemIndex}].items`, depth + 1));
+				break;
+			case "list":
+				node.items.forEach((item, itemIndex) => {
+					if (item !== null && typeof item === "object" && "type" in item) visit(item, `${at}.items[${itemIndex}]`, depth + 1);
+				});
+				break;
+			case "table": node.details?.slice(0, tableRowsForDetails(node).length).forEach((detail, rowIndex) => {
+				if (detail !== null && isTableDetailReachable(node, rowIndex)) walk(detail, `${at}.details[${rowIndex}]`, depth + 1);
+			});
+		}
+	};
+	walk(spec.items, "items", 0);
+}
+//#endregion
+//#region src/client/submission-registry.ts
+/** 从 spec 建立成员表，并诊断 submission key 和 submit.groups。 */
+function analyzeSubmissionRegistry(spec) {
+	const members = /* @__PURE__ */ new Map();
+	const paths = /* @__PURE__ */ new Map();
+	const diagnostics = [];
+	const submits = [];
+	walkGenuiNodes(spec, (node, path) => {
+		if (node.type === "submit") {
+			if (node.groups !== void 0) submits.push({
+				groups: node.groups,
+				path
+			});
+			return;
+		}
+		let member;
+		let keyPath;
+		switch (node.type) {
+			case "radio":
+				if (node.group === void 0) return;
+				member = {
+					kind: "radio",
+					key: node.group,
+					label: node.label ?? node.group,
+					options: node.options.slice(0, GENUI_LIMITS.maxOptions),
+					...node.answer === void 0 ? {} : { answer: node.answer },
+					...node.explanation === void 0 ? {} : { explanation: node.explanation }
+				};
+				keyPath = `${path}.group`;
+				break;
+			case "checkbox":
+				if (node.group === void 0) return;
+				member = {
+					kind: "checkbox",
+					key: node.group
+				};
+				keyPath = `${path}.group`;
+				break;
+			case "input":
+			case "textarea":
+			case "select":
+			case "slider":
+				if (node.id === void 0) return;
+				member = {
+					kind: "field",
+					key: node.id,
+					fieldType: node.type,
+					secret: node.type === "input" && node.inputType === "password"
+				};
+				keyPath = `${path}.id`;
+				break;
+			default: return;
+		}
+		if (member === void 0) return;
+		const existing = members.get(member.key);
+		if (existing !== void 0) {
+			if (existing.kind !== "checkbox" || member.kind !== "checkbox") diagnostics.push(`${keyPath} conflicts with ${paths.get(member.key)}: submission key '${member.key}' is already used`);
+			return;
+		}
+		members.set(member.key, member);
+		paths.set(member.key, keyPath);
+	});
+	for (const { groups, path } of submits) {
+		const seen = /* @__PURE__ */ new Set();
+		groups.forEach((key, index) => {
+			const at = `${path}.groups[${index}]`;
+			if (seen.has(key)) diagnostics.push(`${at}: duplicate submission member '${key}'`);
+			seen.add(key);
+			const member = members.get(key);
+			if (member === void 0) diagnostics.push(`${at}: submit.groups references unknown submission member '${key}'`);
+			else if (member.kind === "field" && member.secret) diagnostics.push(`${at}: submit.groups cannot require secret field '${key}'`);
+		});
+	}
+	return {
+		registry: { members },
+		diagnostics
+	};
+}
 //#endregion
 //#region src/client/genui-runtime/value-utils.ts
 /** Shared primitive sanitizers used by the GenUI guard. */
@@ -1235,6 +1547,46 @@ function opt(key, value) {
 	return value === void 0 ? {} : { [key]: value };
 }
 //#endregion
+//#region src/client/file-link.ts
+/** Decode a local file destination and its optional first line fragment. */
+function parseFileLink(value) {
+	if (value.length > 2048) return void 0;
+	const hash = value.indexOf("#");
+	const destination = hash < 0 ? value : value.slice(0, hash);
+	if (destination.includes("?")) return void 0;
+	let path;
+	try {
+		path = decodeURIComponent(destination);
+	} catch {
+		return;
+	}
+	if (path === "" || /[\u0000-\u001f\u007f]/.test(path) || /^[\\/]{2}/.test(path) || /^[a-z][a-z\d+.-]*:/i.test(path) && !/^[a-z]:[\\/]/i.test(path)) return void 0;
+	if (hash < 0) return { path };
+	const match = /^L([1-9]\d*)(?:-L([1-9]\d*))?$/.exec(value.slice(hash + 1));
+	if (match === null) return void 0;
+	const line = Number(match[1]);
+	const end = match[2] === void 0 ? line : Number(match[2]);
+	if (!Number.isSafeInteger(line) || !Number.isSafeInteger(end) || end < line) return void 0;
+	return {
+		path,
+		line
+	};
+}
+/** Classify a link destination while preserving the existing external URL policy. */
+function classifyLinkTarget(value) {
+	const external = safeHref(value);
+	if (external !== void 0) return {
+		type: "external",
+		href: external
+	};
+	if (typeof value !== "string") return { type: "invalid" };
+	const file = parseFileLink(value.trim());
+	return file === void 0 ? { type: "invalid" } : {
+		type: "file",
+		file
+	};
+}
+//#endregion
 //#region src/client/guard.ts
 function fieldKindMatches(value, kind) {
 	switch (kind) {
@@ -1479,10 +1831,11 @@ function repairNodeFields(value, ctx, depth) {
 		case "link": {
 			const label = str(v.label, GENUI_LIMITS.maxString);
 			if (label === void 0) return null;
+			const target = classifyLinkTarget(v.href);
 			return {
 				type: "link",
 				label,
-				...opt("href", safeHref(v.href))
+				...opt("href", target.type === "external" ? target.href : target.type === "file" ? String(v.href).trim() : void 0)
 			};
 		}
 		case "image": {
@@ -1587,25 +1940,9 @@ function repairNodeFields(value, ctx, depth) {
 			};
 		}
 		case "table": {
-			let rawCols = v.columns;
-			let rawRows = v.rows !== void 0 ? v.rows : v.data;
-			if (Array.isArray(rawCols) && rawCols.length > 0 && typeof rawCols[0] === "object" && rawCols[0] !== null) rawCols = rawCols.map((c) => columnHeaderText(c));
-			if (Array.isArray(rawRows) && rawRows.length > 0 && typeof rawRows[0] === "object" && rawRows[0] !== null && !Array.isArray(rawRows[0])) {
-				const keys = Array.isArray(v.columns) && v.columns.length > 0 && typeof v.columns[0] === "object" && v.columns[0] !== null ? v.columns.map((c) => columnKeyOf(c)).filter((k) => k !== void 0) : Object.keys(rawRows[0]);
-				rawRows = rawRows.map((row) => keys.map((k) => cellText(row[k])));
-			}
-			let derived = null;
-			if ((!Array.isArray(rawCols) || rawCols.length === 0) && Array.isArray(rawRows) && rawRows.length > 0 && Array.isArray(rawRows[0])) {
-				const grid = repairRows(rawRows, GENUI_LIMITS.maxTableRows, GENUI_LIMITS.maxTableCols);
-				const candidate = grid === void 0 || grid.length === 0 ? null : deriveTableColumns(grid);
-				if (candidate !== null && repairRows(candidate.rows, GENUI_LIMITS.maxTableRows, GENUI_LIMITS.maxTableCols)?.length === candidate.rows.length) {
-					derived = candidate;
-					rawCols = candidate.columns;
-				}
-			}
-			const columns = repairStrings(rawCols, GENUI_LIMITS.maxTableCols, 128);
-			const rows = repairRows(derived === null ? rawRows : derived.rows, GENUI_LIMITS.maxTableRows, GENUI_LIMITS.maxTableCols);
-			if (columns === void 0 || rows === void 0) return null;
+			const prepared = prepareTableRows(v);
+			if (prepared === null) return null;
+			const { columns, rows } = prepared;
 			const rawTypes = Array.isArray(v.types) ? v.types : void 0;
 			const types = rawTypes === void 0 ? void 0 : columns.map((_c, i) => {
 				const raw = rawTypes[i];
@@ -1613,6 +1950,11 @@ function repairNodeFields(value, ctx, depth) {
 			});
 			const rawDetails = Array.isArray(v.details) ? v.details : void 0;
 			const details = rawDetails === void 0 ? void 0 : rows.map((_row, i) => {
+				if (!isTableDetailReachable({
+					columns,
+					rows,
+					types
+				}, i)) return null;
 				const entry = repairItems(rawDetails[i], ctx, depth + 1);
 				return entry.length === 0 ? null : entry;
 			});
@@ -1918,71 +2260,21 @@ function repairListItems(v, cap, ctx, depth) {
 			continue;
 		}
 		const o = obj(item);
-		const title = o === void 0 ? void 0 : str(o.title, GENUI_LIMITS.maxString);
-		if (title !== void 0) {
-			out.push({
-				title,
-				...opt("desc", o === void 0 ? void 0 : str(o.desc, GENUI_LIMITS.maxString) ?? str(o.description, GENUI_LIMITS.maxString))
-			});
-			continue;
-		}
 		if (o !== void 0 && typeof o.type === "string") {
 			if (ctx.remaining <= 0) break;
 			ctx.remaining -= 1;
 			const node = repairNode(o, ctx, depth);
 			if (node !== null) out.push(node);
+			continue;
 		}
+		const title = o === void 0 ? void 0 : str(o.title, GENUI_LIMITS.maxString);
+		if (title !== void 0) out.push({
+			title,
+			...opt("desc", str(o?.desc, GENUI_LIMITS.maxString))
+		});
 	}
 	return out;
 }
-function repairRows(v, rowCap, colCap) {
-	if (!Array.isArray(v)) return void 0;
-	const out = [];
-	for (const row of v) {
-		if (out.length >= rowCap) break;
-		if (!Array.isArray(row)) continue;
-		const cells = [];
-		for (const cell of row) {
-			if (cells.length >= colCap) break;
-			if (typeof cell === "string") cells.push(cell.slice(0, 256));
-			else if (typeof cell === "number" && Number.isFinite(cell)) cells.push(cell);
-		}
-		if (cells.length > 0) out.push(cells);
-	}
-	return out;
-}
-/** Left-aligned, undecorated columns for a table whose rows came without one. */
-function derivedColumnNames(count) {
-	return Array.from({ length: count }, (_unused, index) => `列${index + 1}`);
-}
-/**
-* Derive `columns` for a table that shipped only rows, without inventing
-* content: the leading cell array is adopted as the header row and removed
-* from the body — the shape both JSON table dumps and DataFrame-shaped
-* exports are meant to be read as. Returns null when no unambiguous
-* derivation exists (ragged rows) so the caller keeps its existing
-* drop-and-report behaviour instead of rendering a fabricated header.
-*/
-function deriveTableColumns(rows) {
-	const header = rows[0];
-	if (header === void 0 || header.length === 0) return null;
-	const body = rows.slice(1);
-	if (body.length === 0) {
-		const columns = header.map((cell) => String(cell).trim());
-		return columns.every((column) => column !== "") ? {
-			columns,
-			rows: []
-		} : null;
-	}
-	if (body.every((row) => row.length === header.length)) return {
-		columns: header.map((cell) => String(cell).trim()),
-		rows: body
-	};
-	return {
-		columns: derivedColumnNames(header.length),
-		rows
-	};
-}
 function repairChartData(v, cap) {
 	if (!Array.isArray(v)) return void 0;
 	const out = [];
@@ -2023,53 +2315,15 @@ function repairTabs(v, ctx, depth) {
 	for (const tab of v) {
 		if (out.length >= GENUI_LIMITS.maxTabs) break;
 		const o = obj(tab);
-		const label = o === void 0 ? void 0 : str(o.label, 128);
-		if (label === void 0 || o === void 0) continue;
-		const rawItems = o.items !== void 0 ? o.items : o.content !== void 0 ? Array.isArray(o.content) ? o.content : [o.content] : void 0;
-		out.push({
-			label,
-			items: repairItems(rawItems, ctx, depth + 1)
-		});
-	}
-	return out;
-}
-/** Header text for an object-shaped table column ({title,key} antd style). */
-function columnHeaderText(c) {
-	const o = obj(c);
-	if (o === void 0) return String(c);
-	for (const k of [
-		"title",
-		"label",
-		"key",
-		"dataIndex"
-	]) {
-		const s = o[k];
-		if (typeof s === "string" && s !== "") return s;
-	}
-	return JSON.stringify(c);
-}
-/** Row key for an object-shaped column, mirroring columnHeaderText's order. */
-function columnKeyOf(c) {
-	const o = obj(c);
-	if (o === void 0) return void 0;
-	for (const k of [
-		"key",
-		"dataIndex",
-		"title",
-		"label"
-	]) {
-		const s = o[k];
-		if (typeof s === "string" && s !== "") return s;
+		const label = o === void 0 ? void 0 : str(o.label, 128);
+		if (label === void 0 || o === void 0) continue;
+		const rawItems = o.items !== void 0 ? o.items : o.content !== void 0 ? Array.isArray(o.content) ? o.content : [o.content] : void 0;
+		out.push({
+			label,
+			items: repairItems(rawItems, ctx, depth + 1)
+		});
 	}
-}
-/** Cell text for object-array rows: strings/finite numbers pass through,
-* everything else stringifies so the column alignment is preserved
-* (repairRows would drop null/undefined cells and shift the row). */
-function cellText(v) {
-	if (typeof v === "string") return v;
-	if (typeof v === "number" && Number.isFinite(v)) return v;
-	if (v === null || v === void 0) return "";
-	return JSON.stringify(v);
+	return out;
 }
 function repairPlotSeries(v, cap) {
 	if (!Array.isArray(v)) return void 0;
@@ -2500,6 +2754,14 @@ function countGenuiNodes(value, cap = Number.POSITIVE_INFINITY) {
 				const lo = obj(li);
 				if (lo !== void 0 && typeof lo.type === "string") walk([lo]);
 			}
+			else if (v.type === "table" && Array.isArray(v.details)) {
+				const rowCount = tableRowsForDetails(v).length;
+				for (let rowIndex = 0; rowIndex < Math.min(v.details.length, rowCount); rowIndex++) {
+					if (count >= cap) return;
+					const detail = v.details[rowIndex];
+					if (Array.isArray(detail) && isTableDetailReachable(v, rowIndex)) walk(detail);
+				}
+			}
 		}
 	};
 	const root = obj(value);
@@ -2539,6 +2801,10 @@ function visitDeclaredGenuiNodes(value, cap, visit) {
 		else if (v.type === "accordion" && Array.isArray(v.items)) for (let row = 0; row < v.items.length; row++) walkItemsOf(v.items[row], `${at}.items[${row}]`);
 		else if ((v.type === "row" || v.type === "col" || v.type === "grid" || v.type === "card") && Array.isArray(v.items)) walk(v.items, `${at}.items`);
 		else if (v.type === "list" && Array.isArray(v.items)) for (let row = 0; row < v.items.length; row++) walkNode(v.items[row], `${at}.items[${row}]`);
+		else if (v.type === "table" && Array.isArray(v.details)) {
+			const rowCount = tableRowsForDetails(v).length;
+			for (let row = 0; row < Math.min(v.details.length, rowCount); row++) if (Array.isArray(v.details[row]) && isTableDetailReachable(v, row)) walk(v.details[row], `${at}.details[${row}]`);
+		}
 	}
 	function walkItemsOf(holder, path) {
 		const o = obj(holder);
@@ -2618,6 +2884,7 @@ function validateCanonicalGenuiSpec(value) {
 		}
 	};
 	walk(v.items, 0, "items");
+	if (errors.length === 0) errors.push(...analyzeSubmissionRegistry(v).diagnostics);
 	const uniqueErrors = [...new Set(errors)];
 	return {
 		ok: uniqueErrors.length === 0,
@@ -2643,13 +2910,14 @@ function processGenuiSpec(value) {
 	const renderedNativeCount = repaired === null ? 0 : countRenderedNativeGenuiNodes(repaired);
 	const renderedTotalCount = repaired === null ? 0 : countGenuiNodes(repaired);
 	const errors = validation.errors.filter((error) => !error.includes(": unknown type "));
+	if (repaired !== null && errors.length === 0) errors.push(...analyzeSubmissionRegistry(repaired).diagnostics);
 	if (declaredNativeCount > renderedNativeCount) errors.push(`repair dropped ${declaredNativeCount - renderedNativeCount} declared native node(s): declared ${declaredNativeCount}, rendered ${renderedNativeCount}`);
 	return {
 		value: normalized.value,
 		normalized: normalized.value,
 		repaired,
 		spec: repaired,
-		errors,
+		errors: [...new Set(errors)],
 		warnings: [...normalized.warnings, ...diagnoseUnknownGenuiFields(normalized.value)],
 		declaredCount: declaredNativeCount,
 		renderedCount: renderedTotalCount,
@@ -2666,31 +2934,30 @@ function isIntentionalBudgetCut(processed) {
 function isRenderableProcess(processed) {
 	return processed.spec !== null && (processed.errors.length === 0 || isIntentionalBudgetCut(processed));
 }
-/** Longest declared-node path prefix a validation error points at. */
-const DECLARED_NODE_PATH_RE = /^(items\[\d+\](?:\.(?:items\[\d+\]|tabs\[\d+\]\.items\[\d+\]))*)/;
+/** Longest node or aligned table-detail slot path a validation error points at. */
+const DECLARED_NODE_PATH_RE = /^(items\[\d+\](?:\.(?:items\[\d+\]|tabs\[\d+\]\.items\[\d+\]|details\[\d+\](?:\[\d+\])?))*)/;
 function errorNodePath(error) {
 	const match = DECLARED_NODE_PATH_RE.exec(error);
 	return match === null ? null : match[1] ?? null;
 }
-/** Where the node at a declared path lives: its parent array and index. */
+/** Where the node or table-detail slot at a validation path lives. */
 function nodeSlotAt(root, path) {
-	const steps = [...path.matchAll(/(?:^|\.)(items|tabs)\[(\d+)\]/g)];
-	if (steps.length === 0 || steps[steps.length - 1][1] !== "items") return void 0;
+	const steps = [...path.matchAll(/(?:^|\.)(items|tabs|details)\[(\d+)\]|\[(\d+)\]/g)];
+	if (steps.length === 0 || steps[steps.length - 1][1] === "tabs") return void 0;
 	let current = root;
-	for (let i = 0; i < steps.length - 1; i++) {
+	for (let i = 0; i < steps.length; i++) {
 		const step = steps[i];
-		const holder = obj(current);
-		const list = holder === void 0 ? void 0 : holder[step[1]];
-		current = Array.isArray(list) ? list[Number(step[2])] : void 0;
+		const list = step[1] === void 0 ? current : obj(current)?.[step[1]];
+		const index = Number(step[2] ?? step[3]);
+		if (!Array.isArray(list) || index >= list.length) return void 0;
+		if (i === steps.length - 1) return {
+			array: list,
+			index,
+			preserveIndex: step[1] === "details"
+		};
+		current = list[index];
 		if (current === void 0) return void 0;
 	}
-	const holder = obj(current);
-	const list = holder === void 0 ? void 0 : holder.items;
-	if (!Array.isArray(list)) return void 0;
-	return {
-		array: list,
-		index: Number(steps[steps.length - 1][2])
-	};
 }
 /** Deep-clone a JSON value for pruning; null when it cannot round-trip. */
 function cloneJsonValue(value) {
@@ -2716,20 +2983,31 @@ function partialRepairGenuiSpec(processed) {
 	if (isRenderableProcess(processed)) return processed.spec;
 	if (processed.spec === null) return null;
 	const root = obj(processed.value);
-	if (root === void 0 || isComponentRoot(root)) return null;
-	if (processed.declaredNativeCount <= 1) return null;
+	if (root === void 0) return null;
 	const paths = /* @__PURE__ */ new Set();
+	const overhangPaths = /* @__PURE__ */ new Set();
 	for (const error of processed.errors) {
 		if (error.startsWith("spec exceeds ")) continue;
 		const nodePath = errorNodePath(error);
-		if (nodePath !== null) paths.add(nodePath);
+		if (nodePath === null) continue;
+		if (error === `${nodePath}.details must not contain more entries than rows`) overhangPaths.add(nodePath);
+		else paths.add(nodePath);
 	}
-	if (paths.size === 0) return null;
-	const pruned = cloneJsonValue(processed.value);
+	if (paths.size === 0 && overhangPaths.size === 0) return null;
+	const pruned = cloneJsonValue(isComponentRoot(root) ? wrapSingleComponentRoot(root) : root);
 	if (pruned === null) return null;
 	const slots = [...paths].map((path) => nodeSlotAt(pruned, path)).filter((slot) => slot !== void 0);
+	const overhangSlots = [...overhangPaths].map((path) => nodeSlotAt(pruned, path)).filter((slot) => slot !== void 0);
+	for (const { array, index } of overhangSlots) {
+		const table = obj(array[index]);
+		if (table?.type === "table" && Array.isArray(table.details)) table.details.length = Math.min(table.details.length, tableRowsForDetails(table).length);
+	}
 	const byArray = /* @__PURE__ */ new Map();
-	for (const { array, index } of slots) {
+	for (const { array, index, preserveIndex } of slots) {
+		if (preserveIndex) {
+			array[index] = null;
+			continue;
+		}
 		const indexes = byArray.get(array);
 		if (indexes === void 0) byArray.set(array, [index]);
 		else indexes.push(index);
@@ -2913,6 +3191,24 @@ function validateNode(value, depth, at, errors, walk) {
 			if (!Array.isArray(v.rows)) errors.push(`${at}: type 'table' requires rows (array)`);
 			if (v.types !== void 0 && !Array.isArray(v.types)) errors.push(`${at}.types must be an array of column cell types`);
 			if (v.details !== void 0 && !Array.isArray(v.details)) errors.push(`${at}.details must be an array aligned with rows`);
+			if (Array.isArray(v.details)) {
+				const table = {
+					columns: v.columns,
+					rows: v.rows,
+					types: v.types
+				};
+				const rowCount = tableRowsForDetails(table).length;
+				if (v.details.length > rowCount) errors.push(`${at}.details must not contain more entries than rows`);
+				for (let i = 0; i < Math.min(v.details.length, rowCount); i++) {
+					const detail = v.details[i];
+					if (detail === null || !isTableDetailReachable(table, i)) continue;
+					if (!Array.isArray(detail)) {
+						errors.push(`${at}.details[${i}] must be an array or null`);
+						continue;
+					}
+					walk(detail, depth + 1, `${at}.details[${i}]`);
+				}
+			}
 			validateTableRows(v.rows, `${at}.rows`, errors);
 			break;
 		case "chart":
@@ -3015,12 +3311,12 @@ function validateNode(value, depth, at, errors, walk) {
 *    with ASCII quotes (e.g. `对"别名路径"判定失败`), which makes JSON.parse
 *    fail near that quote with "Expected ',' or ']'...".
 * 2. Trailing commas before `}` / `]` or at end of input.
+* 3. Valueless object keys immediately before a complete key-and-colon pair.
 *
-* The state-machine scan walks the raw body tracking string-open state:
-* - inside a string, a quote whose next non-space char is NOT one of `, ] } :`
-*   (or end of input) cannot legally close the string → escape it as `\"`;
-* - a `,` whose next non-space char is `}` / `]` / end of input is a trailing
-*   comma → drop it.
+* A shared grammar-aware scan distinguishes object keys from values and
+* checks the continuation after a potential string terminator. Ambiguous
+* value quotes use bounded backtracking; trailing commas are dropped only
+* outside strings.
 *
 * Returns `{ text, repairs }` on success, or null when nothing needed fixing
 * or the body still does not parse (callers fall through to tier-2 / banner).
@@ -3030,61 +3326,323 @@ function repairFenceJson(raw) {
 		JSON.parse(raw);
 		return null;
 	} catch {}
+	return scanFenceJson(raw, false);
+}
+/** A fixed search budget prevents quote ambiguity from becoming exponential. */
+const MAX_QUOTE_ATTEMPTS = 32;
+const MAX_QUOTE_LOOKAHEAD = 4096;
+function isJsonSpace(ch) {
+	return ch === " " || ch === "	" || ch === "\n" || ch === "\r";
+}
+/** Skip only complete, valueless object keys followed by a valued member. */
+function skipValuelessKeys(raw, start, limit = raw.length) {
+	let cursor = start;
+	let repairs = 0;
+	while (cursor < limit && raw[cursor] === "\"") {
+		const keyStart = cursor++;
+		while (cursor < limit && raw[cursor] !== "\"") if (raw[cursor] === "\\") cursor += 2;
+		else cursor++;
+		if (cursor >= limit) return null;
+		cursor++;
+		try {
+			JSON.parse(raw.slice(keyStart, cursor));
+		} catch {
+			return null;
+		}
+		while (cursor < limit && isJsonSpace(raw[cursor])) cursor++;
+		if (raw[cursor] === ":") return repairs > 0 ? {
+			start: keyStart,
+			repairs
+		} : null;
+		if (raw[cursor] !== ",") return null;
+		repairs++;
+		cursor++;
+		while (cursor < limit && isJsonSpace(raw[cursor])) cursor++;
+	}
+	return null;
+}
+/**
+* Quote closure is contextual: only keys may be followed by `:`, and a comma
+* must introduce the next member of the enclosing object/array. Walk closing
+* delimiters too, so a bracket in a quoted code example cannot end a value
+* when prose immediately follows it inside the enclosing JSON structure.
+* Lookahead has a fixed bound; inconclusive long continuations keep the
+* terminator interpretation and leave the final JSON.parse as the arbiter.
+*/
+function quoteCanClose(raw, index, key, scopes, complete) {
+	const limit = Math.min(raw.length, index + MAX_QUOTE_LOOKAHEAD);
+	let cursor = index + 1;
+	const skipSpace = () => {
+		while (cursor < limit && isJsonSpace(raw[cursor])) cursor++;
+	};
+	skipSpace();
+	if (cursor >= limit) return true;
+	if (key) return raw[cursor] === ":";
+	let scopeIndex = scopes.length - 1;
+	if (raw[cursor] === ":") return false;
+	while (raw[cursor] === "}" || raw[cursor] === "]") {
+		const scope = scopes[scopeIndex];
+		if (scope === void 0) return false;
+		if (raw[cursor] === scope.closer) scopeIndex--;
+		else if (!complete) return false;
+		cursor++;
+		skipSpace();
+		if (cursor >= limit) return true;
+		if (scopeIndex < 0) return complete;
+	}
+	if (raw[cursor] !== ",") return false;
+	const scope = scopes[scopeIndex];
+	if (scope === void 0) return false;
+	cursor++;
+	skipSpace();
+	if (cursor >= limit) return true;
+	if (raw[cursor] === scope.closer) return true;
+	if (scope.closer === "]") return /["[{tfn\-0-9]/.test(raw[cursor]);
+	if (raw[cursor] !== "\"") return false;
+	const valueless = skipValuelessKeys(raw, cursor, limit);
+	if (valueless !== null) cursor = valueless.start;
+	cursor++;
+	while (cursor < limit) {
+		if (raw[cursor] === "\\") {
+			cursor += 2;
+			continue;
+		}
+		if (raw[cursor] === "\"") {
+			cursor++;
+			skipSpace();
+			return cursor >= limit || raw[cursor] === ":";
+		}
+		if (raw[cursor].charCodeAt(0) < 32) return false;
+		cursor++;
+	}
+	return true;
+}
+/** Both tiers share the same string-aware scan and quote decisions. */
+function scanFenceCandidate(raw, complete, contentQuotes) {
 	let out = "";
+	const scopes = [];
 	let inString = false;
+	let key = false;
+	let interiorQuote = false;
 	let escaped = false;
 	let repairs = 0;
+	let rootEnd = 0;
+	let rawRootEnd = 0;
+	let invalidValue = false;
+	const choices = [];
+	const finishValue = () => {
+		const scope = scopes[scopes.length - 1];
+		if (scope !== void 0) scope.expecting = "comma";
+	};
 	for (let i = 0; i < raw.length; i++) {
 		const ch = raw[i];
 		if (escaped) {
+			if (inString && ch === "\"") interiorQuote = true;
 			out += ch;
 			escaped = false;
 			continue;
 		}
-		if (inString && ch === "\\") {
-			out += ch;
-			escaped = true;
-			continue;
-		}
-		if (ch === "\"") {
-			if (!inString) {
-				inString = true;
+		if (inString) {
+			if (ch === "\\") {
 				out += ch;
+				escaped = true;
 				continue;
 			}
-			let j = i + 1;
-			while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
-			const next = j < raw.length ? raw[j] : "";
-			if (next === "," || next === "]" || next === "}" || next === ":" || next === "") {
+			if (ch !== "\"") {
+				out += ch;
+				continue;
+			}
+			let next = i + 1;
+			while (next < raw.length && isJsonSpace(raw[next])) next++;
+			const ordinaryEnd = !key && (!interiorQuote && ",}]:".includes(raw[next] ?? "\0") || scopes[scopes.length - 1]?.closer === "]" && raw[next] === ",");
+			if (!contentQuotes.has(i) && (ordinaryEnd || quoteCanClose(raw, i, key, scopes, complete))) {
 				inString = false;
 				out += ch;
+				const scope = scopes[scopes.length - 1];
+				if (key) {
+					if (scope !== void 0) scope.expecting = "colon";
+				} else {
+					finishValue();
+					if (scope !== void 0 && interiorQuote) {
+						if (choices.length === MAX_QUOTE_ATTEMPTS) choices.shift();
+						choices.push(i);
+					}
+				}
 			} else {
 				out += "\\\"";
+				interiorQuote = true;
 				repairs++;
 			}
 			continue;
 		}
+		if (ch === "\"") {
+			key = scopes[scopes.length - 1]?.expecting === "key";
+			if (key) {
+				const valueless = skipValuelessKeys(raw, i);
+				if (valueless !== null) {
+					repairs += valueless.repairs;
+					i = valueless.start - 1;
+					continue;
+				}
+			}
+			interiorQuote = false;
+			inString = true;
+			out += ch;
+			continue;
+		}
+		if (ch === "{" || ch === "[") {
+			finishValue();
+			scopes.push({
+				closer: ch === "{" ? "}" : "]",
+				expecting: ch === "{" ? "key" : "value"
+			});
+			out += ch;
+			continue;
+		}
+		if (ch === "}" || ch === "]") {
+			if (scopes[scopes.length - 1]?.closer === ch) {
+				scopes.pop();
+				out += ch;
+				if (scopes.length === 0 && rootEnd === 0) {
+					rootEnd = out.length;
+					rawRootEnd = i + 1;
+				}
+			} else if (complete) repairs++;
+			else out += ch;
+			continue;
+		}
 		if (ch === ",") {
 			let j = i + 1;
-			while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
-			const next = j < raw.length ? raw[j] : "";
-			if (next === "}" || next === "]" || next === "") {
+			while (j < raw.length && isJsonSpace(raw[j])) j++;
+			if (j === raw.length || raw[j] === "}" || raw[j] === "]") {
 				repairs++;
 				continue;
 			}
+			const scope = scopes[scopes.length - 1];
+			if (scope !== void 0) scope.expecting = scope.closer === "}" ? "key" : "value";
+		} else if (ch === ":") {
+			const scope = scopes[scopes.length - 1];
+			if (scope !== void 0) scope.expecting = "value";
+		} else if (!isJsonSpace(ch) && scopes[scopes.length - 1]?.expecting === "value") {
+			let j = i + 1;
+			while (j < raw.length && !isJsonSpace(raw[j]) && !"{}[],:\"".includes(raw[j])) j++;
+			const token = raw.slice(i, j);
+			if (!/^(?:true|false|null|-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?)$/.test(token)) invalidValue = true;
+			finishValue();
+			out += token;
+			i = j - 1;
+			continue;
 		}
 		out += ch;
 	}
-	if (repairs === 0) return null;
-	try {
-		JSON.parse(out);
-		return {
-			text: out,
-			repairs
-		};
-	} catch {
-		return null;
+	const unfinishedString = inString;
+	if (complete) {
+		if (inString) {
+			out += "\"";
+			repairs++;
+		}
+		while (scopes.length > 0) {
+			out += scopes.pop().closer;
+			repairs++;
+		}
+	}
+	return {
+		text: out,
+		repairs,
+		rootEnd,
+		rawRootEnd,
+		choices,
+		unfinishedString,
+		invalidValue
+	};
+}
+/** Find an authoritative, already-valid object/array prefix without repair. */
+function originalJsonPrefix(raw) {
+	const scopes = [];
+	let inString = false;
+	let escaped = false;
+	let started = false;
+	for (let i = 0; i < raw.length; i++) {
+		const ch = raw[i];
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (inString) {
+			if (ch === "\\") escaped = true;
+			else if (ch === "\"") inString = false;
+			continue;
+		}
+		if (!started) {
+			if (isJsonSpace(ch)) continue;
+			if (ch !== "{" && ch !== "[") return null;
+			started = true;
+		}
+		if (ch === "\"") {
+			inString = true;
+			continue;
+		}
+		if (ch === "{" || ch === "[") scopes.push(ch === "{" ? "}" : "]");
+		else if (ch === "}" || ch === "]") {
+			if (scopes.pop() !== ch) return null;
+			if (scopes.length === 0) {
+				const text = raw.slice(0, i + 1).trimEnd();
+				try {
+					JSON.parse(text);
+					return text;
+				} catch {
+					return null;
+				}
+			}
+		}
+	}
+	return null;
+}
+/**
+* Prefer real terminators; if the resulting whole body fails, try interpreting
+* a bounded number of ambiguous value quotes as content. Each attempt is an
+* iterative scan, not a recursive parser; no engine-specific error offset is
+* needed. Fixed attempts/lookahead give O(n) time and O(n) working storage.
+*/
+function scanFenceJson(raw, complete) {
+	const original = originalJsonPrefix(raw);
+	if (original !== null) return complete ? {
+		text: original,
+		repairs: 1
+	} : null;
+	const pending = [[]];
+	let prefix = null;
+	for (let attempt = 0; attempt < MAX_QUOTE_ATTEMPTS && pending.length > 0; attempt++) {
+		const forced = pending.pop();
+		const scanned = scanFenceCandidate(raw, complete, new Set(forced));
+		if (scanned.repairs > 0 && !(forced.length > 0 && scanned.unfinishedString)) try {
+			JSON.parse(scanned.text);
+			return {
+				text: scanned.text,
+				repairs: scanned.repairs
+			};
+		} catch {}
+		if (complete && scanned.rootEnd > 0 && (prefix === null || scanned.rawRootEnd > prefix.rawEnd)) {
+			const text = scanned.text.slice(0, scanned.rootEnd).trimEnd();
+			try {
+				JSON.parse(text);
+				prefix = {
+					text,
+					repairs: scanned.repairs + 1,
+					rawEnd: scanned.rawRootEnd
+				};
+			} catch {}
+		}
+		if (scanned.invalidValue) continue;
+		const last = forced[forced.length - 1] ?? -1;
+		for (const quote of scanned.choices) if (quote > last) pending.push([...forced, quote]);
+		if (pending.length > MAX_QUOTE_ATTEMPTS) pending.splice(0, pending.length - MAX_QUOTE_ATTEMPTS);
 	}
+	if (prefix !== null) return {
+		text: prefix.text,
+		repairs: prefix.repairs
+	};
+	return null;
 }
 /**
 * Rewrite the "Tetris table" shape into legal JSON: the model closed the
@@ -3215,8 +3773,8 @@ function rewriteTetrisTableColumns(raw) {
 * client uses the host-provided fence source; the validate tool is by
 * definition pre-emission), so a streaming half can never flash premature UI.
 *
-* ONE unified scan: the tier-1 fixes (quote escaping + trailing-comma drops)
-* are folded into the same pass, so bodies that combine BOTH defect classes
+* One shared scan implementation folds the tier-1 fixes (quote escaping +
+* trailing-comma drops) into structural completion, so bodies with BOTH defects
 * (a trailing comma AND a missing closer) heal in one shot — the old
 * two-phase chain lost tier-1's partial work when its whole-body parse
 * failed, and re-scanning the raw text could not compose the repairs.
@@ -3240,91 +3798,7 @@ function completeFenceJson(raw) {
 			repairs: scanned.repairs + tetris.repairs
 		};
 	}
-	let out = "";
-	const stack = [];
-	let inString = false;
-	let escaped = false;
-	let repairs = 0;
-	for (let i = 0; i < raw.length; i++) {
-		const ch = raw[i];
-		if (escaped) {
-			out += ch;
-			escaped = false;
-			continue;
-		}
-		if (inString) {
-			if (ch === "\\") {
-				out += ch;
-				escaped = true;
-				continue;
-			}
-			if (ch !== "\"") {
-				out += ch;
-				continue;
-			}
-			let j = i + 1;
-			while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
-			const next = j < raw.length ? raw[j] : "";
-			if (next === "," || next === "]" || next === "}" || next === ":" || next === "") {
-				inString = false;
-				out += ch;
-			} else {
-				out += "\\\"";
-				repairs++;
-			}
-			continue;
-		}
-		if (ch === "\"") {
-			inString = true;
-			out += ch;
-			continue;
-		}
-		if (ch === "{") {
-			stack.push("}");
-			out += ch;
-			continue;
-		}
-		if (ch === "[") {
-			stack.push("]");
-			out += ch;
-			continue;
-		}
-		if (ch === "}" || ch === "]") {
-			if (stack[stack.length - 1] === ch) {
-				stack.pop();
-				out += ch;
-			} else repairs++;
-			continue;
-		}
-		if (ch === ",") {
-			let j = i + 1;
-			while (j < raw.length && (raw[j] === " " || raw[j] === "	" || raw[j] === "\n" || raw[j] === "\r")) j++;
-			const next = j < raw.length ? raw[j] : "";
-			if (next === "}" || next === "]" || next === "") {
-				repairs++;
-				continue;
-			}
-		}
-		out += ch;
-	}
-	if (inString) {
-		out += "\"";
-		repairs++;
-	}
-	while (stack.length > 0) {
-		out += stack.pop();
-		repairs++;
-	}
-	if (repairs === 0) return null;
-	try {
-		JSON.parse(out);
-		return {
-			text: out,
-			repairs
-		};
-	} catch {
-		return null;
-	}
+	return scanFenceJson(raw, true);
 }
 //#endregion
 //#region src/plugin/genui-diagnostic.ts
@@ -3737,6 +4211,7 @@ function formatProcessWarnings(processed) {
 			const canonicalPath = `${separator < 0 ? "" : warning.path.slice(0, separator + 1)}${warning.canonical}`;
 			return warning.message.includes("ignored") ? `warning=alias_ignored path=${warning.path} canonical=${canonicalPath}` : `warning=alias_normalized path=${warning.path} canonical=${canonicalPath}`;
 		}
+		if (warning.kind === "unknown-field") return `warning=unknown_field path=${JSON.stringify(warning.path)} detail=${JSON.stringify(warning.message)}`;
 		return `warning=process detail=${JSON.stringify(warning.message)}`;
 	});
 }
@@ -3831,7 +4306,7 @@ function createRenderUiTool() {
 * before emitting — turning "render a red banner after the fact" into
 * "verify before you send". Purely local: no LLM, no network, no DOM.
 */
-const VALIDATE_DESCRIPTION = "Validate the JSON body of a ```dsh-ui fence BEFORE emitting it — use for non-trivial specs (≥3 nodes or containing a table); skip for trivial ones (≤2 nodes). Pass the exact JSON text you are about to put inside the fence as the \"spec\" argument (a string). Returns a [genui-validation] protocol block with status, diagnostics, next action, and reply_language=conversation. When invalid JSON is repairable, repaired_json contains the fixed body; emit it only with next=emit_repaired_fence. A warning=block_markdown requires the indicated replacement node and another validation call.";
+const VALIDATE_DESCRIPTION = "Validate the JSON body of a ```dsh-ui fence BEFORE emitting it — use for non-trivial specs (≥3 nodes or containing a table); skip for trivial ones (≤2 nodes). Pass the exact JSON text you are about to put inside the fence as the \"spec\" argument (a string). Returns a [genui-validation] protocol block with status, diagnostics, next action, and reply_language=conversation. When invalid JSON is repairable, repaired_json contains the fixed body; emit it only with next=emit_repaired_fence. A warning=unknown_field requires fixing the indicated path and another validation call. A warning=block_markdown requires the indicated replacement node and another validation call.";
 const VALIDATE_PARAMETERS = {
 	type: "object",
 	properties: { spec: {
@@ -3947,6 +4422,7 @@ function createValidateDshUiTool() {
 					if (processed.spec !== null && processed.errors.length === 0) {
 						const warnings = formatProcessWarnings(processed);
 						const inlineWarnings = formatInlineContentWarnings(processed.spec);
+						const requiresCorrection = inlineWarnings.length > 0 || processed.warnings.some((warning) => warning.kind === "unknown-field");
 						return `${validationProtocol([
 							"status=invalid",
 							"error=invalid_json",
@@ -3956,7 +4432,7 @@ function createValidateDshUiTool() {
 							...inlineWarnings,
 							"repair=applied",
 							`repair_count=${repaired.repairs}`,
-							inlineWarnings.length === 0 ? "next=emit_repaired_fence" : "next=fix_and_revalidate"
+							requiresCorrection ? "next=fix_and_revalidate" : "next=emit_repaired_fence"
 						])}\nrepaired_json:\n\`\`\`\n${repaired.text}\n\`\`\``;
 					}
 				}
@@ -3988,12 +4464,13 @@ function createValidateDshUiTool() {
 			}
 			const warnings = formatProcessWarnings(processed);
 			const inlineWarnings = formatInlineContentWarnings(processed.spec);
+			const requiresCorrection = inlineWarnings.length > 0 || processed.warnings.some((warning) => warning.kind === "unknown-field");
 			return validationProtocol([
 				"status=valid",
 				`rendered=${processed.renderedCount}`,
 				...warnings,
 				...inlineWarnings,
-				inlineWarnings.length === 0 ? "next=emit_fence" : "next=fix_and_revalidate"
+				requiresCorrection ? "next=fix_and_revalidate" : "next=emit_fence"
 			]);
 		},
 		presentCall() {
@@ -4236,9 +4713,9 @@ function fenceFailures(text) {
 }
 /** `null` when this fence renders; otherwise the reason it does not. */
 function fenceFailureDetail(fence) {
-	if (!fence.closed) return "error=unterminated_fence\nrequired=closing_fence";
 	const resolution = resolveFence(fence.raw, { settled: true });
 	if (resolution.spec !== null) return null;
+	if (!fence.closed) return "error=unterminated_fence\nrequired=closing_fence";
 	if (resolution.processed !== null) return droppedNodeFailure(resolution.processed, resolution.value)?.join("\n") ?? ["error=invalid_spec", ...resolution.processed.errors.map((error) => `diagnostic=${JSON.stringify(error)}`)].join("\n");
 	return "error=invalid_json\nrepair=failed";
 }
@@ -4288,25 +4765,84 @@ function createFeedbackMessage(text, sessionFormatVersion) {
 	return Object.freeze(message);
 }
 /**
-* Decide whether this turn boundary should steer a fence correction — the pure
-* core of the loop, so every bound (one per turn, one per fence, cancellation)
-* is testable without a host.
+* Decide whether this turn boundary should steer a correction — the pure core of
+* the loop, so every bound (per-turn cap, per-fence ledger, cancellation) is
+* testable without a host.
 *
-* @param input - reply text, turn identity, and the session's accounting.
+* The decision is driven by FORMAL events only: fences in the reply body, a
+* `validate_dsh_ui` call, a delivered body text or a successful `render_ui`
+* result. The reasoning block is
+* never read here — a draft inside the thinking block is not proof that the model
+* chose to deliver it, so it must not change any decision.
+*
+* @param input - reply text, turn identity, formal signals, and the accounting.
 * @returns the correction to send, or null when the loop must stay silent.
 */
 function planFenceFeedback(input) {
 	if (input.aborted) return null;
-	if (input.lastCorrectedTurn === input.turn) return null;
-	if (input.text.trim() === "") return null;
-	const failures = fenceFailures(input.text).filter((failure) => !input.corrected.has(failure.fingerprint));
-	if (failures.length === 0) return null;
-	return {
+	const used = input.correctionsTurn === input.turn ? input.correctionsThisTurn ?? 0 : 0;
+	if (used >= 2) return null;
+	const failures = fenceFailures(input.text).filter((failure) => !input.correctedSpec.has(failure.fingerprint));
+	if (failures.length > 0) return {
 		text: fenceCorrectionText(failures),
 		fingerprints: failures.map((failure) => failure.fingerprint),
-		turn: input.turn
+		turn: input.turn,
+		kind: "render"
+	};
+	if (input.validatedThisTurn !== true || input.deliveredThisTurn === true) return null;
+	if (input.deliveryRemindedTurns?.has(input.turn) === true) return null;
+	return {
+		text: missingBodyCorrectionText(input.turn, used + 1, input.renderUiToolEnabled ?? true),
+		fingerprints: [],
+		turn: input.turn,
+		kind: "delivery"
 	};
 }
+/**
+* Correction for a validated GenUI turn that reached the boundary without any
+* formal delivery.
+*
+* @param turn - turn that reached the boundary.
+* @param attempt - correction number within the shared turn budget.
+* @param renderUiToolEnabled - whether the correction may recommend `render_ui`.
+* @returns the message text to steer into the running turn.
+*/
+function missingBodyCorrectionText(turn, attempt = 1, renderUiToolEnabled = true) {
+	return `${`${MARKER_PREFIX}turn-${turn}]\n\n[genui-fence-repair]\nstatus=nothing_delivered\nfences=0\nnext=emit_fence_in_body\nrepeat_rendered_content=false\nreply_language=conversation\n\n`}本轮尚未产生正式回答，也没有通过支持的通道交付结果${attempt <= 1 ? "" : `（第 ${attempt} 次提醒）`}。请根据用户当前请求完成正式答复；需要 UI 时，在回答正文输出你最终选定的 dsh-ui 围栏${renderUiToolEnabled ? "，或明确调用 render_ui" : ""}。可以修改或放弃此前候选；不能完成时，请在正文说明原因。\n`;
+}
+/**
+* 将 GenUI 回合中仅含 reasoning 的完整响应转换为宿主已有的可重试空响应错误。
+*
+* @param options - LLM stream waterfall 拦截的请求。
+* @param source - 本次请求的 provider stream。
+* @returns 原始 stream；仅符合条件的终止 stop 会被改写。
+*/
+async function* retryReasoningOnlyGenuiStream(options, source) {
+	const { EMPTY_RESPONSE_CODE, isAgentLoopRequest } = await import("@deepseek-ai/dsh-llm");
+	if (!isAgentLoopRequest(options)) {
+		yield* source;
+		return;
+	}
+	let hasReasoningBlock = false;
+	let hasOtherBlock = false;
+	for await (const chunk of source) {
+		if (chunk.type === "block-end") {
+			if (chunk.block.type === "reasoning") hasReasoningBlock = true;
+			else hasOtherBlock = true;
+		}
+		if (chunk.type === "finish" && chunk.reason.kind === "stop" && hasReasoningBlock && !hasOtherBlock) yield {
+			type: "finish",
+			reason: {
+				kind: "error",
+				failure: {
+					message: "GenUI turn completed with reasoning only and no deliverable response",
+					code: EMPTY_RESPONSE_CODE
+				}
+			}
+		};
+		else yield chunk;
+	}
+}
 /** Text of one assistant message's text blocks, in order. */
 function textOfContent(content) {
 	if (!Array.isArray(content)) return "";
@@ -4316,9 +4852,59 @@ function textOfContent(content) {
 		return record.type === "text" && typeof record.text === "string" ? record.text : "";
 	}).filter((part) => part !== "").join("\n");
 }
-/** Fingerprints this loop already recorded inside a steered correction. */
-function markersIn(text) {
-	const out = [];
+/** 读取 render_ui result protocol 中明确返回的 status。 */
+function renderResultStatus(content) {
+	const lines = textOfContent(content).split(/\r?\n/u);
+	if (lines[0]?.trim() !== "[genui-render]") return void 0;
+	for (const line of lines.slice(1)) {
+		if (line === "status=rendered") return "rendered";
+		if (line === "status=invalid") return "invalid";
+	}
+}
+/** 从 legacy wrapper 与 Session format v4 中提取 tool result 数据。 */
+function observedToolResult(message) {
+	if (typeof message !== "object" || message === null) return null;
+	const record = message;
+	if (typeof record.toolCallId === "string") return {
+		callId: record.toolCallId,
+		isError: record.isError === true,
+		content: record.content
+	};
+	if (!Array.isArray(record.content)) return null;
+	const block = record.content.find((part) => typeof part === "object" && part !== null && part.type === "tool-result");
+	if (typeof block?.toolCallId !== "string") return null;
+	return {
+		callId: block.toolCallId,
+		isError: block.isError === true,
+		content: block.content
+	};
+}
+/** Tool whose SUCCESSFUL result is a formal delivery. */
+const DELIVERY_TOOL = "render_ui";
+/**
+* Whether one assistant message delivered a non-empty body text.
+*
+* Deliberately narrow: a non-empty text block. A `render_ui` call is decided
+* by its `tool/result`, not by the call appearing in a message — a call that
+* failed (or whose result has not arrived) is not a delivery. Other tools
+* (validate_dsh_ui, bash, …) may succeed without producing any answer, so
+* they are NOT counted as delivery.
+*
+* @param content - assistant content blocks.
+* @returns true when this message delivered a body text.
+*/
+function deliveredBodyText(content) {
+	if (!Array.isArray(content)) return false;
+	return content.some((block) => {
+		if (typeof block !== "object" || block === null) return false;
+		const record = block;
+		return record.type === "text" && typeof record.text === "string" && record.text.trim() !== "";
+	});
+}
+/** 分类当前与 legacy correction message 中的 marker。 */
+function feedbackMarkersIn(text) {
+	const renderFingerprints = [];
+	const deliveryTurns = [];
 	let cursor = 0;
 	while (cursor < text.length) {
 		const current = text.indexOf(MARKER_PREFIX, cursor);
@@ -4329,31 +4915,54 @@ function markersIn(text) {
 		const index = useLegacy ? legacy : current;
 		const end = text.indexOf("]", index + prefix.length);
 		if (end < 0) break;
-		out.push(text.slice(index + prefix.length, end));
+		const marker = text.slice(index + prefix.length, end);
+		const turn = /^turn-(\d+)$/u.exec(marker);
+		if (turn !== null) deliveryTurns.push(Number(turn[1]));
+		else renderFingerprints.push(marker);
 		cursor = end + 1;
 	}
-	return out;
+	return {
+		renderFingerprints,
+		deliveryTurns
+	};
+}
+/** 恢复一条持久化 correction 消耗的 turn budget。 */
+function accountReplayedCorrection(state, turn) {
+	if (state.correctionsTurn !== turn) {
+		state.correctionsTurn = turn;
+		state.correctionsThisTurn = 1;
+		return;
+	}
+	state.correctionsThisTurn = Math.min(2, state.correctionsThisTurn + 1);
 }
 /** Identify this plugin's source across current and migrated session shapes. */
 function isFeedbackSource(source) {
 	return source?.kind === FEEDBACK_SOURCE_KIND || source?.kind === "plugin" && source.plugin === "@changfenhuang/dsh-genui";
 }
 /**
-* 根据插件配置启用围栏反馈流程。
+* 注册 GenUI 回合跟踪、宿主重试判定和可选的围栏修正流程。
 *
-* @param ctx - the host context.
-* @param enabled - the plugin config flag; the loop is inert when false.
+* @param ctx - 宿主 Context。
+* @param enabled - 是否启用同回合围栏修正。
+* @param renderUiToolEnabled - 是否已注册 `render_ui` 工具。
 */
-function installFenceFeedback(ctx, enabled) {
-	if (!enabled) return;
+function installFenceFeedback(ctx, enabled, renderUiToolEnabled = true) {
 	const sessions = /* @__PURE__ */ new Map();
 	const stateOf = (sessionId) => {
 		let state = sessions.get(sessionId);
 		if (state === void 0) {
 			state = {
 				text: "",
-				corrected: /* @__PURE__ */ new Set(),
-				lastCorrectedTurn: void 0
+				validatedThisTurn: false,
+				isSubagent: false,
+				deliveredThisTurn: false,
+				pendingRenders: /* @__PURE__ */ new Set(),
+				correctedSpec: /* @__PURE__ */ new Set(),
+				deliveryRemindedTurns: /* @__PURE__ */ new Set(),
+				correctionsThisTurn: 0,
+				correctionsTurn: void 0,
+				currentTurn: void 0,
+				accountedCorrectionMessageIds: /* @__PURE__ */ new Set()
 			};
 			sessions.set(sessionId, state);
 		}
@@ -4362,46 +4971,123 @@ function installFenceFeedback(ctx, enabled) {
 	ctx.on("session/disposed", (session) => {
 		sessions.delete(String(session.id));
 	});
-	ctx.on("session/event", (session, event) => {
+	const resetTurnState = (state, turn) => {
+		state.text = "";
+		state.validatedThisTurn = false;
+		state.deliveredThisTurn = false;
+		state.pendingRenders.clear();
+		state.currentTurn = turn;
+	};
+	const observeEvent = (session, event) => {
 		const sessionId = String(session.id);
+		if (event.type === "turn/start") {
+			const state = stateOf(sessionId);
+			state.isSubagent = session.header.parentSession !== void 0;
+			state.correctedSpec.clear();
+			resetTurnState(state, event.data.turn);
+			return;
+		}
 		if (event.type === "assistant/message") {
-			const text = textOfContent(event.data.message?.content);
-			if (extractDshUiFences(text).length === 0) {
-				const state = sessions.get(sessionId);
-				if (state !== void 0) state.text = "";
-				return;
-			}
-			stateOf(sessionId).text = text;
+			const content = event.data.message?.content;
+			const text = textOfContent(content);
+			const state = stateOf(sessionId);
+			state.isSubagent = session.header.parentSession !== void 0;
+			state.text = extractDshUiFences(text).length > 0 ? text : "";
+			state.deliveredThisTurn = state.deliveredThisTurn || deliveredBodyText(content);
+			return;
+		}
+		if (event.type === "tool/call") {
+			const data = event.data;
+			const state = stateOf(sessionId);
+			state.isSubagent = session.header.parentSession !== void 0;
+			if (data.name === "validate_dsh_ui") state.validatedThisTurn = true;
+			if (data.name === DELIVERY_TOOL && typeof data.callId === "string") state.pendingRenders.add(data.callId);
+			return;
+		}
+		if (event.type === "tool/result") {
+			const data = event.data;
+			const result = observedToolResult(data.message);
+			if (result === null) return;
+			const state = stateOf(sessionId);
+			state.isSubagent = session.header.parentSession !== void 0;
+			if (!state.pendingRenders.delete(result.callId)) return;
+			if (data.error === void 0 && result.isError !== true && renderResultStatus(result.content) === "rendered") state.deliveredThisTurn = true;
 			return;
 		}
 		if (event.type !== "user/message") return;
 		const data = event.data;
 		if (isFeedbackSource(data.source)) {
-			const fingerprints = markersIn(textOfContent(data.content));
-			if (fingerprints.length === 0) return;
+			const markers = feedbackMarkersIn(textOfContent(data.content));
+			if (markers.renderFingerprints.length === 0 && markers.deliveryTurns.length === 0) return;
 			const state = stateOf(sessionId);
-			for (const fingerprint of fingerprints) state.corrected.add(fingerprint);
+			state.isSubagent = session.header.parentSession !== void 0;
+			for (const fingerprint of markers.renderFingerprints) state.correctedSpec.add(fingerprint);
+			for (const turn of markers.deliveryTurns) state.deliveryRemindedTurns.add(turn);
+			if (typeof data.id === "string" && !state.accountedCorrectionMessageIds.has(data.id)) {
+				state.accountedCorrectionMessageIds.add(data.id);
+				const turn = markers.deliveryTurns[0] ?? state.currentTurn;
+				if (turn !== void 0) accountReplayedCorrection(state, turn);
+			}
 			return;
 		}
+		if (data.source?.kind !== "user") return;
 		const state = sessions.get(sessionId);
-		if (state !== void 0) state.text = "";
+		if (state !== void 0) {
+			state.isSubagent = session.header.parentSession !== void 0;
+			resetTurnState(state, state.currentTurn);
+		}
+	};
+	const restoreHistory = (session) => {
+		if (sessions.has(String(session.id))) return;
+		for (const event of session.snapshotEvents()) observeEvent(session, event);
+	};
+	ctx.on("session/event", (session, event) => {
+		restoreHistory(session);
+		observeEvent(session, event);
 	});
+	ctx.on("session/created", restoreHistory);
+	const restoreSessions = (sessionCtx) => {
+		const store = sessionCtx.reflect.get("sessions");
+		if (store === void 0) return;
+		for (const session of store.list()) restoreHistory(session);
+	};
+	restoreSessions(ctx);
+	ctx.inject(["sessions"], restoreSessions);
+	ctx.on("llm/stream", (options, next) => {
+		if (options.sessionId === void 0 || options.purpose !== void 0) return next();
+		const state = sessions.get(String(options.sessionId));
+		if (state?.validatedThisTurn !== true || state.isSubagent) return next();
+		return retryReasoningOnlyGenuiStream(options, next());
+	}, { global: true });
 	ctx.on("agent/turn-stopping", ({ agent, turn, signal }) => {
+		if (!enabled) return;
 		if (agent.session.header.parentSession !== void 0) return;
 		const state = sessions.get(String(agent.session.id));
 		if (state === void 0) return;
+		state.currentTurn = turn;
+		if (state.pendingRenders.size > 0) return;
+		const usedThisTurn = state.correctionsTurn === turn ? state.correctionsThisTurn : 0;
 		const plan = planFenceFeedback({
 			text: state.text,
 			turn,
-			lastCorrectedTurn: state.lastCorrectedTurn,
-			corrected: state.corrected,
-			aborted: signal.aborted
+			correctedSpec: state.correctedSpec,
+			deliveryRemindedTurns: state.deliveryRemindedTurns,
+			validatedThisTurn: state.validatedThisTurn,
+			deliveredThisTurn: state.deliveredThisTurn,
+			aborted: signal.aborted,
+			correctionsThisTurn: usedThisTurn,
+			correctionsTurn: state.correctionsTurn,
+			renderUiToolEnabled
 		});
 		if (plan === null) return;
-		for (const fingerprint of plan.fingerprints) state.corrected.add(fingerprint);
-		state.lastCorrectedTurn = plan.turn;
+		for (const fingerprint of plan.fingerprints) state.correctedSpec.add(fingerprint);
+		if (plan.kind === "delivery") state.deliveryRemindedTurns.add(plan.turn);
+		state.correctionsTurn = plan.turn;
+		state.correctionsThisTurn = usedThisTurn + 1;
 		try {
-			agent.steer(createFeedbackMessage(plan.text, agent.session.header.version));
+			const message = createFeedbackMessage(plan.text, agent.session.header.version);
+			state.accountedCorrectionMessageIds.add(message.id);
+			agent.steer(message);
 		} catch (error) {
 			ctx.logger?.warn?.(`dsh-genui: fence feedback steering failed (${error instanceof Error ? error.message : String(error)})`);
 		}
@@ -4463,6 +5149,7 @@ async function serveGenuiAsset(req, res) {
 		res.end();
 	}
 }
+const RENDER_UI_TOOL_GUIDANCE = "- Tool channel: render_ui 工具把同一 spec 渲染为工具行卡片；围栏用于回答内联 UI。";
 /** The fence language description injected into every assembled system prompt.
 *  Deliberately slim: the `genui` skill carries the full component→field
 *  mapping; this section keeps only the contract that must always be
@@ -4499,12 +5186,13 @@ Rules:
 - JSON 严格：坏组件被丢弃，坏围栏变代码块；≥3 节点或含 table 时调 validate_dsh_ui，按诊断修改并重验；小围栏字段存疑也先验证。
 - warning=block_markdown：按 replacement 改写并重验。
 - 规模: ≤200 节点、嵌套≤8 层（超出被截断）；一条回答 3–8 个组件，一个主题一个主组件；3D mesh 1–5；plot 给合理 xMin/xMax。
-- LOCAL-FIRST + actions: UI 能自己做的状态变化（判卷、判题、重置、展开、选中）就地完成，零往返；action 只用于必须模型参与的事。交互组件带 "action":"name"，交互以 [genui-action] name + 组件数据回传，届时重渲染更新 UI；无 action 的按钮禁用。
-- Durable state: 交互状态按「会话+内容指纹」持久化——刷新/重放恢复；重渲染相同内容保留，新内容重置。
+- LOCAL-FIRST + actions: UI 能自己做的状态变化（判卷、判题、重置、展开、选中）就地完成，零往返；action 只用于必须模型参与的事。交互以 [genui-action] name + 组件数据回传，届时重渲染更新 UI；无 action 的按钮禁用。
+- Durable state: 交互状态按「会话+内容指纹」持久化——刷新/重放恢复；相同内容保留，新内容重置。
 - 卷子模式: 每题一个 radio（group+answer+explanation）+ 一个 submit（groups 全列），本地判分。
 - Secrets ban: 不索取密码、API Key、Token、恢复码；需要时拒绝并解释。
-- Tool channel: render_ui 工具把同一 spec 渲染为工具行卡片（交付物型界面用）；围栏用于回答内联 UI。
-- Panel: "panel":true 只渲染进会话面板 dock 并原地更新；"append":true 追加合并（同标签 tabs 追加/新标签加入/尾部追加）；上限 200 节点/200 次追加，满了发 replace 重建。面板组件来的 [genui-action] 只回一个 panel:true 围栏 + 至多一行 10 字内确认，不解释、不用普通围栏。`;
+${RENDER_UI_TOOL_GUIDANCE}
+- 围栏位置：\`dsh-ui\` 只写在**回答正文**；写在 reasoning/思考块里不渲染、用户看不到——思考里验证好 spec，正文再输出同一份。
+- Panel: "panel":true 只渲染进会话面板 dock 并原地更新；"append":true 追加合并；上限 200 节点/200 次追加，满了发 replace 重建。面板来的 [genui-action] 只回一个 panel:true 围栏 + 至多一行 10 字内确认。`;
 /**
 * Register the GenUI output-language section and the render_ui tool.
 * @param ctx - cordis context.
@@ -4557,15 +5245,16 @@ function bundledSkillProvider() {
 	};
 }
 function apply(ctx, config) {
+	const renderUiToolEnabled = config?.renderUiTool !== false;
 	ctx.systemPrompt.section({
 		name: "genui:fence",
 		order: ctx.systemPrompt.getSectionOrder("STRUCTURED_OUTPUT"),
-		text: GENUI_SECTION_TEXT
+		text: renderUiToolEnabled ? GENUI_SECTION_TEXT : GENUI_SECTION_TEXT.replace(`${RENDER_UI_TOOL_GUIDANCE}\n`, "")
 	});
-	installFenceFeedback(ctx, config?.fenceFeedback !== false);
+	installFenceFeedback(ctx, config?.fenceFeedback !== false, renderUiToolEnabled);
 	ctx.inject(["tools"], (toolsCtx) => {
 		toolsCtx.effect(function* () {
-			yield toolsCtx.tools.register(createRenderUiTool());
+			if (renderUiToolEnabled) yield toolsCtx.tools.register(createRenderUiTool());
 			yield toolsCtx.tools.register(createValidateDshUiTool());
 		}, "dsh-genui: model tools");
 	});