@klarkxy/dsh-safe-auto 0.2.3 → 0.3.0

package/lib/client.js

@@ -33,57 +33,69 @@ let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-
 let react_dom = require("react-dom");
 let react_jsx_runtime = require("react/jsx-runtime");
 //#region ../dsh-model-route/lib/menu.js
-/** Localize standard effort ids only when the provider has not supplied a display name. */
-function modelMenuEffortLabel(effort, locale) {
-	if (effort.name !== effort.id) return effort.name;
-	return {
-		off: ["关闭", "Off"],
-		none: ["无", "None"],
-		minimal: ["最低", "Minimal"],
-		low: ["低", "Low"],
-		medium: ["中", "Medium"],
-		high: ["高", "High"],
-		xhigh: ["极高", "Extra high"],
-		max: ["最高", "Maximum"],
-		ultra: ["超高", "Ultra"]
-	}[effort.id]?.[locale?.toLowerCase().startsWith("zh") ? 0 : 1] ?? effort.name;
-}
-/** The short model label shown inside a provider group. */
-function modelMenuShortName(choice) {
-	const sep = choice.label.indexOf(" / ");
-	return sep > 0 ? choice.label.slice(sep + 3) : choice.model;
-}
-/** Group catalog choices by provider and filter them by a case-insensitive query. */
-function groupModelMenuChoices(choices, query) {
-	const needle = query.trim().toLowerCase();
-	const matched = needle ? choices.filter((choice) => choice.label.toLowerCase().includes(needle) || choice.model.toLowerCase().includes(needle) || choice.provider.toLowerCase().includes(needle)) : choices;
-	const groups = [];
-	for (const choice of matched) {
-		const sep = choice.label.indexOf(" / ");
-		const name = sep > 0 ? choice.label.slice(0, sep) : choice.provider;
-		const last = groups.at(-1);
-		if (last && last.provider === choice.provider) last.items.push(choice);
-		else groups.push({
-			provider: choice.provider,
-			name,
-			items: [choice]
-		});
-	}
-	return groups;
-}
-//#endregion
-//#region ../dsh-model-route/lib/index.js
 /**
 * Host model-catalog parsing shared by plugin settings UIs and model hubs.
 * Pure and browser-safe: no React, no host imports. The catalog envelope is
 * structural so hosts may add fields without breaking consumers.
 */
+/** Both services are required: Cordis checks the nested namespace separately. */
+const MODEL_CATALOG_INJECT = ["remote", "remote.session"];
 function asRecord(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function asText(value) {
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
+/** A useful diagnostic even when a transport rejects with a plain object. */
+function modelCatalogErrorMessage(value) {
+	if (value instanceof Error && value.message) return value.message;
+	return asText(asRecord(value)?.message) ?? asText(value) ?? "Unable to load the model catalog.";
+}
+/**
+* Validate and unwrap a successful catalog without discarding provider failures
+* or newer host metadata. Names and metadata remain optional for older hosts.
+* A broken response is never presented as a successfully loaded empty menu.
+*/
+function checkedModelCatalog(value) {
+	const envelope = asRecord(value);
+	if (envelope?.ok === false) throw new Error(modelCatalogErrorMessage(envelope.error ?? envelope));
+	const root = envelope?.ok === true ? asRecord(envelope.value) : envelope;
+	const malformed = (field) => {
+		throw new Error(`Invalid model catalog: ${field}.`);
+	};
+	if (!root || !Array.isArray(root.groups)) return malformed("groups must be an array");
+	for (const value of root.groups) {
+		const group = asRecord(value);
+		if (!group || !asText(group.id) || !Array.isArray(group.models)) return malformed("each group needs an id and models array");
+		for (const value of group.models) {
+			const model = asRecord(value);
+			if (!model || !asText(model.id)) return malformed("each model needs an id");
+			if (model.reasoning !== void 0) {
+				const reasoning = asRecord(model.reasoning);
+				if (!reasoning || !Array.isArray(reasoning.efforts) || reasoning.efforts.some((value) => !parseEffort(value))) return malformed("reasoning efforts must be an array of identified efforts");
+			}
+		}
+	}
+	if (root.failures !== void 0 && (!Array.isArray(root.failures) || root.failures.some((value) => {
+		const failure = asRecord(value);
+		return !failure || !asText(failure.id) || typeof failure.name !== "string" || typeof failure.message !== "string";
+	}))) return malformed("failures must be an array of provider failures");
+	return root;
+}
+/** Read through the injected session namespace; absence and rejection are errors. */
+async function readModelCatalog(client) {
+	const session = client.remote?.session;
+	if (typeof session?.modelCatalog !== "function") throw new Error("Model catalog unavailable: inject both remote and remote.session.");
+	return checkedModelCatalog(await session.modelCatalog());
+}
+/** Provider failures are partial results, not a transport failure. */
+function modelCatalogFailures(value) {
+	try {
+		return checkedModelCatalog(value).failures ?? [];
+	} catch {
+		return [];
+	}
+}
 function parseEffort(value) {
 	const row = asRecord(value);
 	const id = row ? asText(row.id) : void 0;
@@ -139,9 +151,201 @@ function modelMenuEffortOptions(choice, current) {
 	});
 	return listed;
 }
+/** Localize standard effort ids only when the provider has not supplied a display name. */
+function modelMenuEffortLabel(effort, locale) {
+	if (effort.name !== effort.id) return effort.name;
+	return {
+		off: ["关闭", "Off"],
+		none: ["无", "None"],
+		minimal: ["最低", "Minimal"],
+		low: ["低", "Low"],
+		medium: ["中", "Medium"],
+		high: ["高", "High"],
+		xhigh: ["极高", "Extra high"],
+		max: ["最高", "Maximum"],
+		ultra: ["超高", "Ultra"]
+	}[effort.id]?.[locale?.toLowerCase().startsWith("zh") ? 0 : 1] ?? effort.name;
+}
+/** The short model label shown inside a provider group. */
+function modelMenuShortName(choice) {
+	const sep = choice.label.indexOf(" / ");
+	return sep > 0 ? choice.label.slice(sep + 3) : choice.model;
+}
+/** Group catalog choices by provider and filter them by a case-insensitive query. */
+function groupModelMenuChoices(choices, query) {
+	const needle = query.trim().toLowerCase();
+	const matched = needle ? choices.filter((choice) => choice.label.toLowerCase().includes(needle) || choice.model.toLowerCase().includes(needle) || choice.provider.toLowerCase().includes(needle)) : choices;
+	const groups = [];
+	for (const choice of matched) {
+		const sep = choice.label.indexOf(" / ");
+		const name = sep > 0 ? choice.label.slice(0, sep) : choice.provider;
+		const last = groups.at(-1);
+		if (last && last.provider === choice.provider) last.items.push(choice);
+		else groups.push({
+			provider: choice.provider,
+			name,
+			items: [choice]
+		});
+	}
+	return groups;
+}
 //#endregion
 //#region ../dsh-model-route/lib/ui.js
 /**
+* Latest refresh wins, including retries while a previous request is pending.
+* Keep load stable (for example with useCallback); changing it invalidates the
+* previous source and fetches again, so switching clients cannot publish stale data.
+*/
+function useModelCatalog(load, options = {}) {
+	const enabled = options.enabled !== false;
+	const enabledRef = (0, react.useRef)(enabled);
+	enabledRef.current = enabled;
+	const live = (0, react.useRef)(false);
+	const source = (0, react.useRef)(load);
+	const revision = (0, react.useRef)(0);
+	const [state, setState] = (0, react.useState)(() => {
+		try {
+			return {
+				catalog: options.initialCatalog === void 0 ? void 0 : checkedModelCatalog(options.initialCatalog),
+				loading: enabled,
+				error: ""
+			};
+		} catch (error) {
+			return {
+				catalog: void 0,
+				loading: enabled,
+				error: modelCatalogErrorMessage(error)
+			};
+		}
+	});
+	const refresh = (0, react.useCallback)(async () => {
+		if (!live.current || !enabledRef.current) return;
+		const request = ++revision.current;
+		setState((previous) => ({
+			...previous,
+			loading: true,
+			error: ""
+		}));
+		try {
+			const catalog = checkedModelCatalog(await load());
+			if (live.current && request === revision.current) setState({
+				catalog,
+				loading: false,
+				error: ""
+			});
+		} catch (error) {
+			if (live.current && request === revision.current) setState((previous) => ({
+				...previous,
+				loading: false,
+				error: modelCatalogErrorMessage(error)
+			}));
+		}
+	}, [load, enabled]);
+	(0, react.useEffect)(() => {
+		live.current = true;
+		if (source.current !== load) {
+			source.current = load;
+			setState({
+				catalog: void 0,
+				loading: enabled,
+				error: ""
+			});
+		}
+		if (enabled) refresh();
+		else setState((previous) => ({
+			...previous,
+			loading: false
+		}));
+		return () => {
+			live.current = false;
+			++revision.current;
+		};
+	}, [enabled, refresh]);
+	(0, react.useEffect)(() => {
+		if (!enabled) return;
+		const reload = () => {
+			refresh();
+		};
+		if (typeof window !== "undefined") window.addEventListener("focus", reload);
+		let unsubscribe;
+		try {
+			unsubscribe = options.subscribe?.(reload);
+		} catch (error) {
+			setState((previous) => ({
+				...previous,
+				error: modelCatalogErrorMessage(error)
+			}));
+		}
+		return () => {
+			if (typeof window !== "undefined") window.removeEventListener("focus", reload);
+			unsubscribe?.();
+		};
+	}, [
+		enabled,
+		refresh,
+		options.subscribe
+	]);
+	const choices = (0, react.useMemo)(() => parseModelMenuChoices(state.catalog), [state.catalog]);
+	const failures = (0, react.useMemo)(() => state.catalog === void 0 ? [] : modelCatalogFailures(state.catalog), [state.catalog]);
+	return {
+		...state,
+		choices,
+		failures,
+		refresh
+	};
+}
+/** Also accepts a mapped state from a caller that owns broader async orchestration. */
+function ModelCatalogStatus({ state, locale }) {
+	const zh = locale?.toLowerCase().startsWith("zh") === true;
+	const copy = zh ? {
+		loading: "正在加载模型…",
+		error: "模型列表加载失败",
+		partial: "部分提供商的模型未能加载",
+		retry: "重试"
+	} : {
+		loading: "Loading models…",
+		error: "Unable to load models",
+		partial: "Some providers could not load their models",
+		retry: "Retry"
+	};
+	if (!state.loading && !state.error && state.failures.length === 0) return null;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "dsh-model-catalog-status",
+		lang: zh ? "zh" : "en",
+		children: [
+			state.loading ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				role: "status",
+				children: copy.loading
+			}) : null,
+			state.error ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+				role: "alert",
+				children: [
+					copy.error,
+					": ",
+					state.error
+				]
+			}) : null,
+			state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				role: "status",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: copy.partial }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", { children: state.failures.map((failure, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", { children: [
+					failure.name || failure.id,
+					": ",
+					failure.message
+				] }, `${failure.id}:${index}`)) })]
+			}) : null,
+			state.error || state.failures.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+				type: "button",
+				size: "sm",
+				disabled: state.loading,
+				onClick: () => {
+					state.refresh();
+				},
+				children: copy.retry
+			}) : null
+		]
+	});
+}
+/**
 * ModelMenu: the standard editor of one model-route field — the visible half
 * of the x-model-route contract. A feature plugin's settings page renders it
 * for its own marked field; the model hub renders one per detected field.
@@ -1149,6 +1353,29 @@ ${scope} {
 & .dsh-ui-select:disabled { color: var(--dsw-alias-label-tertiary); cursor: default; }
 & .dsh-ui-select[aria-invalid='true'] { border-color: var(--dsw-alias-state-error-primary); }
 
+/* --- Native textarea. The primitives ship no textarea either, so a settings
+ * prompt keeps the platform element and the same field shell as the select:
+ * 0.5px l4, radius-md, layer-3, 13/1.5 type. It grows vertically instead of
+ * locking to the select's 34px row. --- */
+& .dsh-ui-textarea {
+  box-sizing: border-box;
+  width: 100%;
+  min-width: 0;
+  resize: vertical;
+  padding: 8px 12px;
+  border: 0.5px solid var(--dsw-alias-border-l4);
+  border-radius: var(--dsw-radius-md);
+  background: var(--dsw-alias-bg-layer-3);
+  font: inherit;
+  font-size: 13px;
+  line-height: 1.5;
+  color: var(--dsw-alias-label-primary);
+}
+& .dsh-ui-textarea:focus-visible { outline: none; border-color: var(--dsw-alias-state-business-primary); }
+& .dsh-ui-textarea:disabled { color: var(--dsw-alias-label-tertiary); cursor: default; }
+& .dsh-ui-textarea::placeholder { color: var(--dsw-alias-label-dimmed); }
+& .dsh-ui-textarea[aria-invalid='true'] { border-color: var(--dsw-alias-state-error-primary); }
+
 /* Long panels scroll inside themselves instead of growing the host page. */
 & .dsh-ui-panel { display: flex; flex-direction: column; gap: 16px; min-width: 0; }
 & .dsh-ui-panel-wide { max-width: 100%; }
@@ -1348,8 +1575,7 @@ const name = "dsh-safe-auto-client";
 const inject = [
 	"slots",
 	"connection",
-	"remote",
-	"remote.session",
+	...MODEL_CATALOG_INJECT,
 	"locale"
 ];
 const CHANNEL = "/dsh-safe-auto";
@@ -1357,11 +1583,7 @@ const BUNDLE = "@klarkxy/dsh-safe-auto";
 const TEXT = {
 	zh: {
 		requestFailed: "请求失败",
-		confirmationUnavailable: "确认已不可用",
-		approvalInvalid: "确认请求无效",
-		approvalExpiredError: "确认已超时或不再等待处理",
 		invalidSession: "会话无效",
-		sessionInactive: "会话未激活，请打开后重试",
 		childSession: "子会话不能启用安全自动",
 		invalidRequest: "请求无效",
 		settingsChanged: "配置已更新，请刷新后重试",
@@ -1371,7 +1593,6 @@ const TEXT = {
 		workspaceUnavailable: "当前无法使用需原生审批的工作区写入权限",
 		unknownPreset: "权限预设无效",
 		controlUnloaded: "安全自动已停用",
-		browserRequired: "请在浏览器中确认这次调用",
 		unknownSetting: "审核模型设置无效",
 		invalidModel: "审核模型或提供方标识无效",
 		modelPair: "提供方和模型必须一起配置",
@@ -1408,37 +1629,22 @@ const TEXT = {
 		tabReviewer: "审核配置",
 		details: "安全说明",
 		tabLimits: "预算边界",
-		safetyDetail: "只处理原生 write/edit/bash/pwsh 的单次沙箱提权。审核会保留真人任务授权及后续限制，并按需读取工作区内的包配置和脚本；模型通过时自动放行。其余有效请求请你在 60 秒内确认，超时拒绝。确认只适用于这一次调用。",
-		unableLabel: "无法自动判断时：",
-		unableValue: "请你在 60 秒内确认；超时拒绝",
-		approvalTitle: "确认这一次调用",
-		approvalPending: (count) => `${count} 个请求待确认`,
-		approvalCountdown: (seconds) => `剩余 ${seconds} 秒 · 超时拒绝`,
-		approvalExpired: "确认已超时，已拒绝。",
-		approvalAllow: "仅允许这一次",
-		approvalDeny: "拒绝",
-		approvalReview: "模型审核意见",
-		approvalRefresh: (message) => `${message}。正在刷新请求；不会自动重试决定。`,
-		approvalEffect: "完整调用内容",
+		safetyDetail: "普通调用照常在工作区沙箱内运行，插件不拦截。需要审批的请求（沙箱提权、少量危险命令，以及其他工具的审批）交给审核模型：通过就只放行这一次，拒绝或审核失败就把原因告诉智能体。",
+		reviewInput: "发给审核模型的内容：对话记录（你的消息标为可信，其余只作参考，超长时截断）、工作目录和这次操作的完整参数。",
+		breakerDetail: "同一轮对话里连续拒绝 3 次，或最近 50 次审核拒绝 10 次，本轮暂停自动审批，等你发新消息。",
 		prompt: "额外审核提示词",
 		promptHint: (count) => `${count}/4096 · 只可补充审核约束，不可扩大授权或覆盖安全规则。`,
-		limitsLine: (l) => `单次审查超时 ${l.timeoutMs} ms · 输入上限 ${l.maxInputBytes} bytes · 输出上限 ${l.outputTokens} tokens`,
-		limitsFuses: (l) => `每个任务最多审查 ${l.maxReviewsPerTask} 次 · 连续拒绝 ${l.consecutiveDenials} 次后熔断`,
-		limitsHelp: "预算在 profile 中配置，保存设置或重新启用不会补充；动作、真人指令和有界的本地脚本证据会发送给审核模型。",
+		limitsLine: (l) => `单次审核超时 ${Math.round(l.timeoutMs / 1e3)} 秒 · 输出上限 ${l.outputTokens} tokens · 对话记录上限 ${l.maxTranscriptBytes} bytes`,
+		limitsHelp: "这些上限在 profile 中配置。",
 		save: "保存",
 		refreshDiscard: "刷新（丢弃草稿）",
 		saveFailed: (message) => `${message}。草稿已保留，刷新后重新编辑，不会自动重试。`,
-		catalogFailed: (message) => `模型目录读取失败，已保存值保持不变：${message}`,
 		saved: "已保存",
-		summary: "安全自动：沙箱提权时由独立审核模型把关，通过才自动放行。"
+		summary: "安全自动：需要审批的请求交给审核模型判断，通过才放行这一次。"
 	},
 	en: {
 		requestFailed: "Request failed",
-		confirmationUnavailable: "Confirmation is no longer available",
-		approvalInvalid: "Invalid approval request",
-		approvalExpiredError: "Approval expired or is no longer pending",
 		invalidSession: "Invalid session",
-		sessionInactive: "Session is not active; open it and retry",
 		childSession: "Child sessions cannot select Safe Auto",
 		invalidRequest: "Invalid request",
 		settingsChanged: "Settings changed; reload and retry",
@@ -1448,7 +1654,6 @@ const TEXT = {
 		workspaceUnavailable: "Workspace Write with native approval is unavailable",
 		unknownPreset: "Unknown permission preset",
 		controlUnloaded: "Safe Auto control unloaded",
-		browserRequired: "Browser confirmation required",
 		unknownSetting: "Invalid reviewer model setting",
 		invalidModel: "Invalid reviewer provider/model identifier",
 		modelPair: "Provider and model must be configured together",
@@ -1485,29 +1690,18 @@ const TEXT = {
 		tabReviewer: "Reviewer",
 		details: "Safety notes",
 		tabLimits: "Limits",
-		safetyDetail: "Reviews one native write/edit/bash/pwsh sandbox escalation at a time. Earlier human task authorization and later restrictions remain visible; workspace package definitions and scripts may supply evidence. A model pass auto-approves. Other valid requests ask you to confirm within 60 seconds and are denied on timeout. Confirmation grants this call only.",
-		unableLabel: "When it cannot judge automatically: ",
-		unableValue: "Ask you to confirm within 60 seconds; deny on timeout",
-		approvalTitle: "Confirm this call",
-		approvalPending: (count) => `${count} pending confirmation${count === 1 ? "" : "s"}`,
-		approvalCountdown: (seconds) => `${seconds} seconds left · Deny on timeout`,
-		approvalExpired: "Confirmation expired and was denied.",
-		approvalAllow: "Allow this call only",
-		approvalDeny: "Reject",
-		approvalReview: "Model review opinion",
-		approvalRefresh: (message) => `${message}. Refreshing requests; your decision will not be retried automatically.`,
-		approvalEffect: "Complete call content",
+		safetyDetail: "Ordinary calls run inside the workspace sandbox as usual; the plugin does not intercept them. Requests that need approval (sandbox escalations, a short list of dangerous commands, and approval prompts from other tools) go to the reviewer model: a pass approves that one call; a denial or review failure is explained to the agent.",
+		reviewInput: "Sent to the reviewer: the conversation (your messages marked trusted, everything else as evidence, truncated when long), the working directory, and the complete arguments of the action.",
+		breakerDetail: "After 3 consecutive denials, or 10 denials among the last 50 reviews in one turn, automatic approval pauses until your next message.",
 		prompt: "Additional reviewer prompt",
 		promptHint: (count) => `${count}/4096 · May add review constraints, never expand authorization or override safety rules.`,
-		limitsLine: (l) => `Review timeout ${l.timeoutMs} ms · Input cap ${l.maxInputBytes} bytes · Output cap ${l.outputTokens} tokens`,
-		limitsFuses: (l) => `At most ${l.maxReviewsPerTask} reviews per task · Breaker opens after ${l.consecutiveDenials} consecutive denials`,
-		limitsHelp: "Budgets live in the profile and are not refilled by saving or re-enabling. Actions, human instructions and bounded local script evidence are sent to the reviewer model.",
+		limitsLine: (l) => `Review timeout ${Math.round(l.timeoutMs / 1e3)} s · Output cap ${l.outputTokens} tokens · Transcript cap ${l.maxTranscriptBytes} bytes`,
+		limitsHelp: "These limits are configured in the profile.",
 		save: "Save",
 		refreshDiscard: "Refresh (discard draft)",
 		saveFailed: (message) => `${message}. Draft retained; refresh before editing again. No automatic retry.`,
-		catalogFailed: (message) => `Model catalog failed; saved values retained: ${message}`,
 		saved: "Saved",
-		summary: "Safe Auto: an independent reviewer vets each sandbox escalation and only a pass auto-approves."
+		summary: "Safe Auto: a reviewer model answers approval requests and approves only the calls that pass."
 	}
 };
 /** The host locale may arrive as the injected service or as a plain tag. */
@@ -1529,13 +1723,7 @@ function useText(locale) {
 const LOCAL_ERRORS = {
 	"Request failed": "requestFailed",
 	"Request rejected": "requestFailed",
-	"Confirmation is no longer available": "confirmationUnavailable",
-	"Invalid approval response": "approvalInvalid",
-	"Invalid approval payload": "approvalInvalid",
-	"Approval expired or is no longer pending": "approvalExpiredError",
-	"Approval expired or invalidated": "approvalExpiredError",
 	"Invalid session": "invalidSession",
-	"Session is not active; open it and retry": "sessionInactive",
 	"Child sessions cannot select Safe Auto": "childSession",
 	"Invalid request": "invalidRequest",
 	"Settings changed; reload and retry": "settingsChanged",
@@ -1546,7 +1734,6 @@ const LOCAL_ERRORS = {
 	"Workspace Write with native approval is unavailable": "workspaceUnavailable",
 	"Unknown permission preset": "unknownPreset",
 	"Safe Auto control unloaded": "controlUnloaded",
-	"Browser confirmation required": "browserRequired",
 	"Unknown Safe Auto model setting": "unknownSetting",
 	"invalid reviewer provider/model identifier": "invalidModel",
 	"provider and model must be configured together": "modelPair",
@@ -1555,11 +1742,16 @@ const LOCAL_ERRORS = {
 function errorMessage(error) {
 	return (typeof error === "string" ? error : error?.message) || TEXT.en.requestFailed;
 }
+const INACTIVE_SESSION = "Session is not active; open it and retry";
+function shownPermissionError(error) {
+	const message = errorMessage(error);
+	return message === INACTIVE_SESSION ? "" : message;
+}
 function errorText(t, error) {
 	const message = typeof error === "string" ? error : error?.message;
 	const key = Object.hasOwn(LOCAL_ERRORS, message) ? LOCAL_ERRORS[message] : void 0;
 	const unknownField = /^unknown config field: (.+)$/.exec(message || "");
-	const invalidField = /^(?:(enabled|staticReadonly) must be a boolean|(provider|model|reasoningEffort|reviewerPrompt) must be a string|invalid (timeoutMs|maxInputBytes|outputTokens|maxReviewsPerTask|consecutiveDenials|humanApprovalTimeoutMs))$/.exec(message || "");
+	const invalidField = /^(?:(enabled) must be a boolean|(provider|model|reasoningEffort|reviewerPrompt) must be a string|invalid (timeoutMs|outputTokens|maxTranscriptBytes))$/.exec(message || "");
 	const text = key ? t(key) : unknownField ? t("unknownConfigField", unknownField[1]) : invalidField ? t("invalidConfigField", invalidField[1] || invalidField[2] || invalidField[3]) : ["config must be an object", "invalid configuration"].includes(message) ? t("invalidConfig") : message || t("requestFailed");
 	return error?.context ? t(error.context, text) : text;
 }
@@ -1603,120 +1795,6 @@ function createRequestScope() {
 		}
 	};
 }
-const monotonicNow = () => globalThis.performance?.now?.() ?? Date.now();
-function approvalRemaining(request, now = monotonicNow()) {
-	return Math.max(0, request.deadline - now);
-}
-/** Per-session serial reads and one-shot writes. A response's server remainder
-* is anchored before the round trip so network delay cannot extend the prompt. */
-function createApprovalController({ api, sessionId, onState, now = monotonicNow, schedule = setTimeout, cancel = clearTimeout, intervalMs = 1e3, readGate = createPluginReadGate() }) {
-	let active = true, reading = false, writing = false, generation = 0, readSequence = 0, timer;
-	let state = {
-		requests: [],
-		busy: false,
-		error: ""
-	};
-	const publish = (next) => {
-		state = {
-			...state,
-			...next
-		};
-		if (active) onState(state);
-	};
-	const arm = () => {
-		if (active) {
-			cancel(timer);
-			timer = schedule(() => {
-				refresh();
-			}, intervalMs);
-		}
-	};
-	async function refresh(manual = false) {
-		if (!active || reading || writing) return false;
-		if (manual) {
-			generation++;
-			readGate.reset();
-		}
-		if (!readGate.canRead()) {
-			arm();
-			return false;
-		}
-		cancel(timer);
-		reading = true;
-		const ticket = generation, readId = ++readSequence, started = now();
-		try {
-			const value = await readGate.run(() => api.getApprovals(sessionId));
-			if (active && ticket === generation) {
-				const previous = new Map(state.requests.map((request) => [request.id, request.deadline]));
-				const requests = (value?.requests || []).map((request) => ({
-					...request,
-					deadline: Math.min(previous.get(request.id) ?? Infinity, started + Math.max(0, Number(request.remainingMs) || 0))
-				})).filter((request) => approvalRemaining(request, now()) > 0);
-				publish({
-					requests,
-					error: ""
-				});
-			}
-		} catch (error) {
-			if (active && ticket === generation) publish({ error: errorMessage(error) });
-		} finally {
-			if (readId === readSequence) {
-				reading = false;
-				arm();
-			}
-		}
-		return true;
-	}
-	return {
-		refresh,
-		reconnect() {
-			generation++;
-			readSequence++;
-			readGate.reset();
-			reading = false;
-			if (!writing) refresh();
-		},
-		dispose() {
-			active = false;
-			generation++;
-			readGate.reset();
-			cancel(timer);
-		},
-		async answer(requestId, outcome) {
-			const request = state.requests.find((item) => item.id === requestId);
-			if (!active || writing || !request || approvalRemaining(request, now()) <= 0) return false;
-			writing = true;
-			generation++;
-			cancel(timer);
-			publish({
-				busy: true,
-				error: ""
-			});
-			readGate.reset();
-			try {
-				if ((await api.answerApproval({
-					sessionId,
-					requestId,
-					outcome
-				}))?.accepted !== true) throw new Error("Confirmation is no longer available");
-				if (active) publish({ requests: state.requests.filter((item) => item.id !== requestId) });
-			} catch (error) {
-				if (active) publish({
-					requests: state.requests.filter((item) => item.id !== requestId),
-					error: errorMessage(error)
-				});
-			} finally {
-				writing = false;
-				if (active) {
-					publish({ busy: false });
-					if (!reading) refresh();
-					else arm();
-				}
-			}
-			return true;
-		}
-	};
-}
 function reviewerMenuState(values, catalog) {
 	const provider = values.provider || "", model = values.model || "";
 	const follow = !provider && !model;
@@ -1765,52 +1843,6 @@ const css = `${officialUiCss("dsh-safe-auto")}${modelMenuCss}
 /* A fieldset is the settings group and takes the contract's card surface; its
  * legend keeps the UA inline padding from indenting the group title. */
 .dsh-safe-auto legend { padding: 0; }
-/* The primitives ship no textarea, so it keeps the platform element at the
- * official field geometry, exactly as dsh-ui-select does for a native select. */
-.dsh-safe-auto-input {
-  box-sizing: border-box;
-  width: 100%;
-  min-width: 0;
-  padding: 8px 12px;
-  border: 0.5px solid var(--dsw-alias-border-l4);
-  border-radius: var(--dsw-radius-md);
-  background: var(--dsw-alias-bg-layer-3);
-  font: inherit;
-  font-size: 13px;
-  line-height: 20px;
-  color: var(--dsw-alias-label-primary);
-  resize: vertical;
-}
-.dsh-safe-auto-input:disabled { opacity: 0.4; cursor: not-allowed; }
-.dsh-safe-auto-approval-dialog {
-  display: flex;
-  flex-direction: column;
-  max-height: 100%;
-  max-width: 100%;
-}
-/* The host card sizes every modal to a 380px column; an approval shows whole
- * commands and file contents, so it claims a wider one. The doubled class
- * keeps this rule ahead of the card's own width regardless of style order. */
-.dsh-safe-auto.dsh-safe-auto-approval-dialog { width: min(640px, 100%); }
-.dsh-safe-auto-approval-content {
-  flex: 1 1 auto;
-  min-height: 0;
-  min-width: 0;
-  overflow: auto;
-}
-.dsh-safe-auto-approval-pre {
-  max-height: 35vh;
-  overflow: auto;
-  white-space: pre-wrap;
-  overflow-wrap: anywhere;
-  margin: 0;
-  padding: 8px 12px;
-  border: 0.5px solid var(--dsw-alias-border-l4);
-  border-radius: var(--dsw-radius-md);
-  background: var(--dsw-alias-bg-layer-3);
-  color: var(--dsw-alias-label-primary);
-  font-size: 13px;
-}
 `;
 function Style() {
 	return h("style", null, css);
@@ -1821,47 +1853,6 @@ function ErrorText({ error, t }) {
 		className: "dsh-ui-error dsh-ui-wrap"
 	}, errorText(t, error)) : null;
 }
-/** Values are rendered as plain text, with no Markdown or HTML interpretation. */
-function ApprovalDialog({ request, pendingCount = 1, remainingMs, busy = false, error = "", onAnswer, locale }) {
-	const t = useText(locale);
-	if (!request) return null;
-	const expired = remainingMs <= 0;
-	const action = request.action || {};
-	const fields = Object.entries({
-		tool: action.tool,
-		cwd: action.cwd,
-		...action.arguments
-	});
-	return h(_deepseek_ai_dsh_client_ui_primitives.Modal, {
-		open: true,
-		title: t("approvalTitle"),
-		closeLabel: t("approvalDeny"),
-		onClose: () => {
-			if (!busy && !expired) onAnswer(request.id, "deny");
-		},
-		className: "dsh-safe-auto dsh-safe-auto-approval-dialog",
-		contentClassName: "dsh-safe-auto-approval-content",
-		footer: h("div", { className: "dsh-safe-auto dsh-ui-actions" }, h(Style), h(_deepseek_ai_dsh_client_ui_primitives.Button, {
-			variant: "ghost",
-			disabled: busy || expired,
-			"data-modal-autofocus": true,
-			onClick: () => onAnswer(request.id, "deny")
-		}, t("approvalDeny")), h(_deepseek_ai_dsh_client_ui_primitives.Button, {
-			variant: "primary",
-			disabled: busy || expired,
-			onClick: () => onAnswer(request.id, "allow")
-		}, t("approvalAllow")))
-	}, h("div", { className: "dsh-safe-auto dsh-ui-stack" }, h(Style), h("p", {
-		className: "dsh-ui-meta",
-		role: "status"
-	}, t("approvalPending", pendingCount), " · ", expired ? t("approvalExpired") : t("approvalCountdown", Math.ceil(remainingMs / 1e3))), h("div", { className: "dsh-ui-field" }, h("span", { className: "dsh-ui-label" }, t("approvalEffect")), fields.map(([field, value]) => h("div", {
-		key: field,
-		className: "dsh-ui-field"
-	}, h("span", { className: "dsh-ui-meta" }, field), h("pre", { className: "dsh-safe-auto-approval-pre" }, typeof value === "string" ? value : JSON.stringify(value, null, 2))))), h("div", { className: "dsh-ui-field" }, h("span", { className: "dsh-ui-label" }, t("approvalReview")), h("pre", { className: "dsh-safe-auto-approval-pre" }, JSON.stringify(request.review || {}, null, 2))), h(ErrorText, {
-		error,
-		t
-	})));
-}
 /** Composer permission control via the replacement slot: native presets plus Safe Auto. */
 function PermissionMenu({ sessionId, locked, api, locale, initialSnapshot = null }) {
 	const t = useText(locale);
@@ -1871,20 +1862,15 @@ function PermissionMenu({ sessionId, locked, api, locale, initialSnapshot = null
 	const [busy, setBusy] = (0, react.useState)(false);
 	const scopeRef = (0, react.useRef)(null);
 	const refreshRef = (0, react.useRef)(null);
-	const approvalsRef = (0, react.useRef)(null);
-	const [approvals, setApprovals] = (0, react.useState)({
-		sessionId,
-		requests: [],
-		busy: false,
-		error: ""
-	});
-	const [approvalNow, setApprovalNow] = (0, react.useState)(monotonicNow);
 	const refresh = (automatic = false) => scopeRef.current?.run(() => api.getSession(sessionId), {
 		value: (value) => {
 			setSnapshot(value);
 			setError("");
 		},
-		error: (e) => setError(errorMessage(e))
+		error: (e) => {
+			const message = shownPermissionError(e);
+			if (message) setError(message);
+		}
 	}, false, automatic);
 	refreshRef.current = refresh;
 	(0, react.useEffect)(() => {
@@ -1905,50 +1891,6 @@ function PermissionMenu({ sessionId, locked, api, locale, initialSnapshot = null
 			globalThis.removeEventListener?.("focus", focus);
 		};
 	}, [api, sessionId]);
-	const approvalsEnabled = Boolean(snapshot?.safeAuto);
-	(0, react.useEffect)(() => {
-		setApprovals({
-			sessionId,
-			requests: [],
-			busy: false,
-			error: ""
-		});
-		if (!approvalsEnabled) return void 0;
-		const controller = createApprovalController({
-			api,
-			sessionId,
-			onState: (value) => {
-				setApprovalNow(monotonicNow());
-				setApprovals({
-					...value,
-					sessionId
-				});
-			}
-		});
-		approvalsRef.current = controller;
-		controller.refresh();
-		const stopConnection = api.subscribeGeneration?.(() => controller.reconnect());
-		const focus = () => {
-			controller.refresh();
-		};
-		globalThis.addEventListener?.("focus", focus);
-		return () => {
-			controller.dispose();
-			stopConnection?.();
-			approvalsRef.current = null;
-			globalThis.removeEventListener?.("focus", focus);
-		};
-	}, [
-		api,
-		sessionId,
-		approvalsEnabled
-	]);
-	const pending = approvalsEnabled && approvals.sessionId === sessionId ? approvals.requests.filter((request) => approvalRemaining(request, approvalNow) > 0) : [];
-	(0, react.useEffect)(() => {
-		if (!pending.length) return void 0;
-		const timer = setInterval(() => setApprovalNow(monotonicNow()), 250);
-		return () => clearInterval(timer);
-	}, [pending.length]);
 	const choose = (value) => {
 		const scope = scopeRef.current;
 		if (!snapshot || scope?.writing) return;
@@ -1969,8 +1911,9 @@ function PermissionMenu({ sessionId, locked, api, locale, initialSnapshot = null
 				setOpen(false);
 			},
 			error: (e) => {
-				setError({
-					message: errorMessage(e),
+				const message = shownPermissionError(e);
+				if (message) setError({
+					message,
 					context: "refreshRetry"
 				});
 				refreshRef.current();
@@ -2021,23 +1964,7 @@ function PermissionMenu({ sessionId, locked, api, locale, initialSnapshot = null
 	}), h(ErrorText, {
 		error,
 		t
-	}), h(ErrorText, {
-		error: approvals.error && {
-			message: approvals.error,
-			context: "approvalRefresh"
-		},
-		t
-	}), pending.length ? h(ApprovalDialog, {
-		key: pending[0].id,
-		request: pending[0],
-		pendingCount: pending.length,
-		remainingMs: approvalRemaining(pending[0], approvalNow),
-		busy: approvals.busy,
-		onAnswer: (id, outcome) => {
-			approvalsRef.current?.answer(id, outcome);
-		},
-		locale
-	}) : null);
+	}));
 }
 function ReviewerFields({ values, catalog, disabled, onChange, locale }) {
 	const t = useText(locale);
@@ -2098,9 +2025,12 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 	const t = useText(locale);
 	const [settings, setSettings] = (0, react.useState)(initialSettings);
 	const [values, setValues] = (0, react.useState)(initialSettings?.values || null);
-	const [catalog, setCatalog] = (0, react.useState)(initialCatalog);
+	const catalogState = useModelCatalog((0, react.useCallback)(() => api.modelCatalog(), [api]), {
+		initialCatalog: initialCatalog ?? void 0,
+		subscribe: api.subscribeGeneration
+	});
+	const { catalog, refresh: refreshCatalog } = catalogState;
 	const [error, setError] = (0, react.useState)("");
-	const [catalogError, setCatalogError] = (0, react.useState)("");
 	const [busy, setBusy] = (0, react.useState)(false);
 	const [saved, setSaved] = (0, react.useState)(false);
 	const [tab, setTab] = (0, react.useState)(initialTab);
@@ -2169,11 +2099,6 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 		setSyncError("");
 		refreshRef.current(false, true);
 		let alive = true;
-		Promise.resolve().then(() => api.modelCatalog()).then((value) => {
-			if (alive) setCatalog(value);
-		}, (e) => {
-			if (alive) setCatalogError(errorMessage(e));
-		});
 		const focus = () => {
 			if (!dirty.current) refreshRef.current(false, true);
 		};
@@ -2186,6 +2111,7 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 			if (!alive) return;
 			setSyncError("");
 			external.current = true;
+			refreshCatalog();
 			if (dirty.current && !scope.writing) setExternalChange(true);
 			refreshRef.current(false, true);
 		}, (message) => {
@@ -2199,7 +2125,7 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 			stopSettings?.();
 			globalThis.removeEventListener?.("focus", focus);
 		};
-	}, [api]);
+	}, [api, refreshCatalog]);
 	const change = (next) => {
 		dirty.current = true;
 		setSaved(false);
@@ -2275,7 +2201,7 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 			key: "prompt",
 			className: "dsh-ui-field"
 		}, h("span", { className: "dsh-ui-label" }, t("prompt")), h("textarea", {
-			className: "dsh-safe-auto-input",
+			className: "dsh-ui-textarea",
 			rows: 6,
 			maxLength: 4096,
 			disabled: busy,
@@ -2291,20 +2217,13 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 			id: "sa-prompt-hint",
 			className: "dsh-ui-help"
 		}, t("promptHint", (values.reviewerPrompt || "").length))
-	]), tabPanel("details", "dsh-ui-stack", h("div", { className: "dsh-ui-help" }, h("p", null, t("safetyDetail")), h("p", null, h("span", { className: "dsh-ui-label" }, t("unableLabel")), t("unableValue")))), settings?.policyLimits && tabPanel("limits", "dsh-ui-stack", [
-		h("p", {
-			key: "line",
-			className: "dsh-ui-meta dsh-ui-wrap"
-		}, t("limitsLine", settings.policyLimits)),
-		h("p", {
-			key: "fuses",
-			className: "dsh-ui-meta dsh-ui-wrap"
-		}, t("limitsFuses", settings.policyLimits)),
-		h("p", {
-			key: "help",
-			className: "dsh-ui-help"
-		}, t("limitsHelp"))
-	]), h("div", { className: "dsh-ui-actions" }, h(_deepseek_ai_dsh_client_ui_primitives.Button, {
+	]), tabPanel("details", "dsh-ui-stack", h("div", { className: "dsh-ui-help" }, h("p", null, t("safetyDetail")), h("p", null, t("reviewInput")), h("p", null, t("breakerDetail")))), settings?.policyLimits && tabPanel("limits", "dsh-ui-stack", [h("p", {
+		key: "line",
+		className: "dsh-ui-meta dsh-ui-wrap"
+	}, t("limitsLine", settings.policyLimits)), h("p", {
+		key: "help",
+		className: "dsh-ui-help"
+	}, t("limitsHelp"))]), h("div", { className: "dsh-ui-actions" }, h(_deepseek_ai_dsh_client_ui_primitives.Button, {
 		variant: "primary",
 		disabled: busy || externalChange || !dirty.current || (values.reviewerPrompt || "").length > 4096,
 		onClick: save
@@ -2315,12 +2234,9 @@ function SettingsPanel({ view, api, locale, initialSettings = null, initialCatal
 	}, t("refreshDiscard")))), h(ErrorText, {
 		error,
 		t
-	}), h(ErrorText, {
-		error: catalogError && {
-			message: catalogError,
-			context: "catalogFailed"
-		},
-		t
+	}), h(ModelCatalogStatus, {
+		state: catalogState,
+		locale: localeLanguage(locale)
 	}), externalChange && h("p", {
 		role: "alert",
 		className: "dsh-ui-error"
@@ -2340,11 +2256,9 @@ function apply(ctx) {
 		subscribeGeneration: (listener) => ctx.connection.generation?.subscribe(listener) ?? (() => {}),
 		getSettings: () => call("settings.get", {}),
 		saveSettings: (payload) => call("settings.save", payload),
-		modelCatalog: () => ctx.remote.session.modelCatalog(),
+		modelCatalog: () => readModelCatalog(ctx),
 		getSession: (sessionId) => call("session.get", { sessionId }),
-		selectSession: (payload) => call("session.select", payload),
-		getApprovals: (sessionId) => call("approval.list", { sessionId }),
-		answerApproval: (payload) => call("approval.answer", payload)
+		selectSession: (payload) => call("session.select", payload)
 	});
 	ctx.slots.inject("conversation.input.permission", () => ctx.slots.register({
 		name: "conversation.input.permission",
@@ -2364,15 +2278,12 @@ function apply(ctx) {
 	}, SettingsPanel));
 }
 //#endregion
-exports.ApprovalDialog = ApprovalDialog;
 exports.BUNDLE = BUNDLE;
 exports.CHANNEL = CHANNEL;
 exports.PermissionMenu = PermissionMenu;
 exports.ReviewerFields = ReviewerFields;
 exports.SettingsPanel = SettingsPanel;
 exports.apply = apply;
-exports.approvalRemaining = approvalRemaining;
-exports.createApprovalController = createApprovalController;
 exports.createRequestScope = createRequestScope;
 exports.errorText = errorText;
 exports.inject = inject;