dsh-codex-subscription 2.2.2 → 2.2.3

package/lib/client.js

@@ -4627,6 +4627,50 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client-locales.js
 		const zh = {
+			"diagnosticReason_catalog-online": "在线目录已载入",
+			"diagnosticReason_catalog-fallback": "使用备用目录",
+			"diagnosticReason_storage-readable": "预测缓存可读",
+			"diagnosticReason_tool-registered": "全局工具已注册",
+			"diagnosticReason_tool-missing": "未找到全局工具",
+			"diagnosticsCoverageHint": "分别展示已检查的前置条件与最近 15 分钟的操作结果。请求完成不代表整个功能通过验收；未验证不等于故障。",
+			"diagnosticsVersionMismatch": "前后端插件版本不同，请重载后重试。",
+			"diagnosticsPartial": "部分信息未能采集，其余检查结果已保留。请在详情中查看失败或超时项。",
+			"diagnosticsCapability": "功能",
+			"diagnosticsReadiness": "前置条件",
+			"diagnosticsEvidence": "近期操作证据",
+			"diagnosticsUnverified": "尚未验证",
+			"diagnosticsHostCollected": "已采集宿主注册与选中结果（详情内）。这不证明界面可见或功能执行正常。",
+			"diagnosticsHostUnknown": "宿主界面检查不可用或未挂载，不能据此判断插件干扰。",
+			"diagnosticsDetails": "展开脱敏详情",
+			"diagnosticsCopyFailed": "复制失败，可展开详情手动复制。",
+			"diagnosticSource_rpc": "接口响应",
+			"diagnosticSource_tool": "工具",
+			"diagnosticOutcome_completed": "完成",
+			"diagnosticOutcome_failed": "失败",
+			"diagnosticOutcome_cancelled": "取消",
+			"diagnosticCapability_account": "登录",
+			"diagnosticCapability_accounts": "多账号",
+			"diagnosticCapability_settings": "设置",
+			"diagnosticCapability_models": "模型",
+			"diagnosticCapability_quota": "额度",
+			"diagnosticCapability_search": "搜索",
+			"diagnosticCapability_images": "生图与编辑",
+			"diagnosticCapability_sketch": "草图",
+			"diagnosticCapability_subagents": "子任务",
+			"diagnosticCapability_compaction": "压缩",
+			"diagnosticCapability_transport": "连接",
+			"diagnosticCapability_storage": "存储",
+			"diagnosticCapability_host-ui": "宿主界面",
+			"diagnosticReason_not-instrumented": "证据不足",
+			"diagnosticReason_disabled-or-host-owned": "未启用或由宿主管理",
+			"diagnosticReason_sign-in-required": "依赖登录",
+			"diagnosticReason_local-sign-in-present": "本地登录存在",
+			"diagnosticReason_sign-in-unverified": "登录未确认",
+			"diagnosticReason_settings-writable": "可写",
+			"diagnosticReason_settings-readonly": "不可写",
+			"diagnosticReason_restart-required": "需要重启",
+			"diagnosticReason_runtime-present": "组件已安装",
+			"diagnosticReason_runtime-missing": "组件未安装",
 			storageLoading: "正在读取缓存占用…",
 			storageTitle: "存储与缓存",
 			storageForecast: "额度预测缓存",
@@ -5099,6 +5143,50 @@ window.__ModuleLoader__.load({
 			imageRemoveAnnotation: "删除标注"
 		};
 		const en = {
+			"diagnosticReason_catalog-online": "Online catalog loaded",
+			"diagnosticReason_catalog-fallback": "Fallback catalog",
+			"diagnosticReason_storage-readable": "Forecast cache readable",
+			"diagnosticReason_tool-registered": "Global tool registered",
+			"diagnosticReason_tool-missing": "Global tool not found",
+			"diagnosticsCoverageHint": "Shows inspected prerequisites and operations observed in the last 15 minutes. Request completion is not end-to-end validation; unverified does not mean broken.",
+			"diagnosticsVersionMismatch": "Client and server versions differ. Reload and retry.",
+			"diagnosticsPartial": "Some inspections failed or timed out. Other results are preserved; see details.",
+			"diagnosticsCapability": "Capability",
+			"diagnosticsReadiness": "Prerequisites",
+			"diagnosticsEvidence": "Recent evidence",
+			"diagnosticsUnverified": "Unverified",
+			"diagnosticsHostCollected": "Host registrations and selection are included in details, not proof of visibility or execution.",
+			"diagnosticsHostUnknown": "Host inspection unavailable or unmounted; interference cannot be determined.",
+			"diagnosticsDetails": "Redacted details",
+			"diagnosticsCopyFailed": "Copy failed. Expand the details to copy manually.",
+			"diagnosticSource_rpc": "RPC response",
+			"diagnosticSource_tool": "Tool",
+			"diagnosticOutcome_completed": "Completed",
+			"diagnosticOutcome_failed": "Failed",
+			"diagnosticOutcome_cancelled": "Cancelled",
+			"diagnosticCapability_account": "Sign-in",
+			"diagnosticCapability_accounts": "Accounts",
+			"diagnosticCapability_settings": "Settings",
+			"diagnosticCapability_models": "Models",
+			"diagnosticCapability_quota": "Quota",
+			"diagnosticCapability_search": "Search",
+			"diagnosticCapability_images": "Images",
+			"diagnosticCapability_sketch": "Sketch",
+			"diagnosticCapability_subagents": "Subtasks",
+			"diagnosticCapability_compaction": "Compaction",
+			"diagnosticCapability_transport": "Connection",
+			"diagnosticCapability_storage": "Storage",
+			"diagnosticCapability_host-ui": "Host UI",
+			"diagnosticReason_not-instrumented": "Insufficient evidence",
+			"diagnosticReason_disabled-or-host-owned": "Disabled or host-managed",
+			"diagnosticReason_sign-in-required": "Sign-in required",
+			"diagnosticReason_local-sign-in-present": "Local sign-in present",
+			"diagnosticReason_sign-in-unverified": "Sign-in unverified",
+			"diagnosticReason_settings-writable": "Writable",
+			"diagnosticReason_settings-readonly": "Read-only",
+			"diagnosticReason_restart-required": "Restart required",
+			"diagnosticReason_runtime-present": "Runtime installed",
+			"diagnosticReason_runtime-missing": "Runtime missing",
 			storageLoading: "Reading cache size…",
 			storageTitle: "Storage and cache",
 			storageForecast: "Quota forecast cache",
@@ -5752,7 +5840,7 @@ window.__ModuleLoader__.load({
 .codexModelSelectEffort{flex:none;color:var(--dsw-alias-label-caption)}
 .codexModelSelectChevron{flex:none;color:var(--dsw-alias-label-caption);transition:transform 120ms}
 .codexModelSelectTrigger[aria-expanded=true] .codexModelSelectChevron{transform:rotate(180deg)}
-.codexModelSelectMenu,.codexModelSelectSubmenu{position:absolute;z-index:30;box-sizing:border-box;width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:min(420px,calc(100vw - 32px));max-height:min(360px,calc(100vh - 96px));padding:4px;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-specific-menu);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);overflow:hidden}
+.codexModelSelectMenu,.codexModelSelectSubmenu{position:absolute;z-index:30;box-sizing:border-box;width:max-content;min-width:min(240px,calc(100vw - 32px));max-width:min(420px,calc(100vw - 32px));max-height:min(360px,calc(100vh - 96px));padding:4px;border:1px solid var(--dsw-alias-border-inverted);border-radius:12px;background:var(--dsw-alias-bg-layer-2,#2c2c2e);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);overflow:hidden}
 .codexModelSelectMenu{right:0;bottom:calc(100% + 8px)}
 .codexModelSelectSubmenu{right:calc(100% + 8px);bottom:0;min-width:min(230px,calc(100vw - 32px))}
 .codexModelSelectCell{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;height:40px;box-sizing:border-box;padding:0 10px;border:0;border-radius:10px;background:transparent;color:inherit;font-size:14px;line-height:22px;text-align:left;cursor:pointer}
@@ -5763,7 +5851,7 @@ window.__ModuleLoader__.load({
 .codexModelSelectCellChevron{flex:none;color:var(--dsw-alias-label-tertiary)}
 .codexModelSelectGroups{min-height:0;max-height:352px;overflow-y:auto}
 .codexModelSelectGroup+.codexModelSelectGroup{margin-top:4px}
-.codexModelSelectGroupTitle{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-specific-menu);color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}
+.codexModelSelectGroupTitle{position:sticky;top:0;z-index:1;padding:5px 8px 3px;background:var(--dsw-alias-bg-layer-2,#2c2c2e);color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:500;line-height:18px}
 .codexModelSelectOption{display:flex;align-items:center;gap:8px;width:100%;min-width:100%;min-height:38px;box-sizing:border-box;padding:6px 8px;border:0;border-radius:10px;outline:0;background:transparent;color:inherit;text-align:left;cursor:pointer}
 .codexModelSelectOption:hover:not(:disabled),.codexModelSelectOption:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}
 .codexModelSelectOption:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}
@@ -7445,7 +7533,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.2.2";
+		const PACKAGE_VERSION = "2.2.3";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {
@@ -9426,23 +9514,29 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client-diagnostics.jsx
-		function DiagnosticsCard({ rpc, t }) {
+		function DiagnosticsCard({ rpc, t, diagnostics }) {
 			const [report, setReport] = (0, react.useState)();
 			const [busy, setBusy] = (0, react.useState)(false);
 			const [copied, setCopied] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)(false);
+			const [copyError, setCopyError] = (0, react.useState)(false);
 			const load = () => {
 				setBusy(true);
 				setError(false);
 				setCopied(false);
-				recoveryCall(rpc, "diagnostics").then(setReport).catch((error) => {
-					setReport(clientDiagnostic(error));
-					setError(true);
+				setCopyError(false);
+				Promise.allSettled([recoveryCall(rpc, "diagnostics"), Promise.resolve().then(() => diagnostics?.collect())]).then(([server, client]) => {
+					setError(server.status === "rejected");
+					setReport({
+						...server.status === "fulfilled" ? server.value : clientDiagnostic(server.reason),
+						client: client.status === "fulfilled" && client.value ? client.value : { status: "unknown" }
+					});
 				}).finally(() => setBusy(false));
 			};
 			const copy = () => {
 				if (report === void 0) return;
-				navigator.clipboard.writeText(JSON.stringify(report, null, 2)).then(() => setCopied(true)).catch(() => setError(true));
+				setCopyError(false);
+				Promise.resolve().then(() => navigator.clipboard.writeText(JSON.stringify(report, null, 2))).then(() => setCopied(true)).catch(() => setCopyError(true));
 			};
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "codexSubscriptionCard codexSubscriptionDiagnostics",
@@ -9481,11 +9575,51 @@ window.__ModuleLoader__.load({
 							]
 						})]
 					}),
-					report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", { children: JSON.stringify(report, null, 2) }),
+					report === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "codexSubscriptionHelp",
+							children: t("diagnosticsCoverageHint")
+						}),
+						report.version && report.client?.version && report.version !== report.client.version ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							role: "status",
+							children: t("diagnosticsVersionMismatch")
+						}) : null,
+						(report.inspection?.checks ?? []).some((item) => ["inspection-failed", "inspection-timeout"].includes(item.reason)) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							role: "status",
+							children: t("diagnosticsPartial")
+						}) : null,
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("table", {
+							style: {
+								width: "100%",
+								fontSize: 12,
+								textAlign: "left",
+								borderSpacing: "0 8px"
+							},
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("thead", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("diagnosticsCapability") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("diagnosticsReadiness") }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("th", { children: t("diagnosticsEvidence") })
+							] }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("tbody", { children: (report.inspection?.capabilities ?? []).map((item) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("tr", { children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: t(`diagnosticCapability_${item.id}`) }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("td", { children: [t(`diagnosticReason_${item.reason}`), item.blockedBy ? ` · ${t(`diagnosticCapability_${item.blockedBy}`)}` : ""] }),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("td", { children: item.latest ? `${item.latest.action} · ${t(`diagnosticSource_${item.latest.source}`)} · ${t(`diagnosticOutcome_${item.latest.status}`)} · ${new Date(item.latest.observedAt).toLocaleTimeString()}` : t("diagnosticsUnverified") })
+							] }, item.id)) })]
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+							className: "codexSubscriptionHelp",
+							children: report.client?.topology?.length ? t("diagnosticsHostCollected") : t("diagnosticsHostUnknown")
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t("diagnosticsDetails") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", { children: JSON.stringify(report, null, 2) })] })
+					] }),
 					error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 						className: "codexSubscriptionError",
 						role: "alert",
 						children: t("diagnosticsFailed")
+					}) : null,
+					copyError ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "codexSubscriptionError",
+						role: "alert",
+						children: t("diagnosticsCopyFailed")
 					}) : null
 				]
 			});
@@ -9996,7 +10130,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client-section.jsx
-		function CodexSection({ preference, rpc, accountStatus, t }) {
+		function CodexSection({ preference, rpc, accountStatus, t, diagnostics }) {
 			const [tab, setTab] = (0, react.useState)("account");
 			const id = (0, react.useId)();
 			const tabs = [
@@ -10115,13 +10249,167 @@ window.__ModuleLoader__.load({
 							t
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DiagnosticsCard, {
 							rpc,
-							t
+							t,
+							diagnostics
 						})]
 					})
 				]
 			});
 		}
 		//#endregion
+		//#region src/diagnostic-checks.js
+		const states = /* @__PURE__ */ new Set([
+			"pass",
+			"fail",
+			"warn",
+			"unknown",
+			"not-applicable"
+		]);
+		/** Adapters return bounded reason codes, never exceptions or raw service data. */
+		async function collectChecks(definitions, { timeoutMs = 1500, now = Date.now, source = "server", scope = "plugin-process" } = {}) {
+			return Promise.all(definitions.map(async ({ id, capability, run }) => {
+				const startedAt = now();
+				let timer;
+				const controller = new AbortController();
+				const base = {
+					id,
+					capability,
+					source,
+					scope
+				};
+				try {
+					if (!run) return {
+						...base,
+						status: "unknown",
+						reason: "not-instrumented",
+						observedAt: now()
+					};
+					const result = await Promise.race([Promise.resolve().then(() => run(controller.signal)), new Promise((resolve) => {
+						timer = setTimeout(() => {
+							controller.abort();
+							resolve({
+								status: "unknown",
+								reason: "inspection-timeout"
+							});
+						}, timeoutMs);
+					})]);
+					const valid = states.has(result?.status) && /^[a-z][a-z0-9-]{0,63}$/u.test(result?.reason ?? "");
+					return {
+						...base,
+						status: valid ? result.status : "unknown",
+						reason: valid ? result.reason : "invalid-inspection-result",
+						observedAt: now(),
+						elapsedMs: Math.max(0, now() - startedAt)
+					};
+				} catch {
+					return {
+						...base,
+						status: "unknown",
+						reason: "inspection-failed",
+						observedAt: now(),
+						elapsedMs: Math.max(0, now() - startedAt)
+					};
+				} finally {
+					clearTimeout(timer);
+				}
+			}));
+		}
+		Object.freeze([
+			"account",
+			"accounts",
+			"settings",
+			"models",
+			"quota",
+			"search",
+			"images",
+			"sketch",
+			"subagents",
+			"compaction",
+			"transport",
+			"storage",
+			"host-ui"
+		]);
+		//#endregion
+		//#region src/diagnostic-host.js
+		const roots = [
+			"settings.section",
+			"conversation.input.right",
+			"conversation.input.model",
+			"conversation.input.attachments",
+			"conversation.message.images",
+			"conversation.trajectory.images",
+			"shell.overlay"
+		];
+		const packageName = /^(?:@[a-z0-9_.-]+\/)?[a-z0-9][a-z0-9_.-]{0,99}$/u;
+		function projectHostSlots(slots) {
+			if (typeof slots?.snapshot !== "function") return void 0;
+			return roots.map((name) => {
+				const nodes = slots.snapshot(name);
+				const node = Array.isArray(nodes) ? nodes.find((item) => item.type === "slot" && item.name === name) : void 0;
+				const occupants = Array.isArray(node?.occupants) ? node.occupants : [];
+				return {
+					name,
+					declared: !!node,
+					truncated: occupants.length > 16,
+					occupants: occupants.slice(0, 16).map((value) => ({
+						owner: typeof value.registrant === "string" && packageName.test(value.registrant) ? value.registrant : "unknown",
+						active: value.active === true
+					}))
+				};
+			});
+		}
+		function createHostDiagnostics() {
+			const scopes = /* @__PURE__ */ new Map();
+			let sequence = 0;
+			return {
+				register(slots) {
+					const item = scopes.get(slots) ?? {
+						alias: `scope-${++sequence}`,
+						count: 0
+					};
+					item.count++;
+					scopes.set(slots, item);
+					return () => {
+						if (--item.count === 0) scopes.delete(slots);
+					};
+				},
+				async collect() {
+					const topology = [];
+					const active = [...scopes.entries()].slice(0, 8);
+					const checks = await collectChecks(active.map(([slots, item]) => ({
+						id: `host-slots-${item.alias}`,
+						capability: "host-ui",
+						run: () => {
+							const value = projectHostSlots(slots);
+							if (!value) return {
+								status: "unknown",
+								reason: "host-inspection-unavailable"
+							};
+							topology.push({
+								scope: item.alias,
+								slots: value
+							});
+							return {
+								status: "pass",
+								reason: "inspection-completed"
+							};
+						}
+					})), {
+						source: "client",
+						scope: "mounted-host-scopes"
+					});
+					return {
+						version: PACKAGE_VERSION,
+						generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+						checks,
+						topology,
+						truncated: scopes.size > active.length,
+						interpretation: "host-selection-not-visual-or-execution-proof"
+					};
+				}
+			};
+		}
+		//#endregion
 		//#region src/client.jsx
 		const inject = [
 			"slots",
@@ -10134,6 +10422,8 @@ window.__ModuleLoader__.load({
 			"sessions"
 		];
 		function apply(ctx) {
+			const diagnostics = createHostDiagnostics();
+			ctx.effect(() => diagnostics.register(ctx.slots), "codex-subscription: host inspection");
 			const imageViewer = new SubscriptionImageViewerService();
 			ctx.effect(() => ctx.locale.register(NS, {
 				zh,
@@ -10194,11 +10484,13 @@ window.__ModuleLoader__.load({
 					preference,
 					rpc,
 					accountStatus,
-					t
+					t,
+					diagnostics
 				})
 			}, CodexSection));
 			const sessions = ctx.get("sessions");
 			const installDirectorySlots = (scope) => {
+				scope.effect(() => diagnostics.register(scope.slots), "codex-subscription: scoped host inspection");
 				const modelDirectories = scope.get("modelDirectories");
 				scope.slots.inject("conversation.input.right", () => scope.slots.register({
 					name: "conversation.input.right",