dsh-ntr 0.2.1 → 0.3.0

package/lib/client.js

@@ -49,6 +49,12 @@ window.__ModuleLoader__.load({
 		const MAX_WATCHED = 6;
 		/** Raw JSON budget for one event block; the cut is marked. */
 		const RAW_MAX = 256e3;
+		/**
+		* How long a fetched update state stays fresh. The settings panel asks on every
+		* mount; without this, every open would hit the registry. A forced check (the
+		* card's own button) always goes out.
+		*/
+		const PLUGIN_UPDATE_TTL_MS = 6e5;
 		/** Pretty-printed JSON of an agent message (never throws, cuts only at {@link RAW_MAX} with a marker). */
 		function jsonText(value) {
 			let text;
@@ -262,6 +268,14 @@ window.__ModuleLoader__.load({
 				defaultCommand: "opencode",
 				defaultArgs: ["acp"]
 			},
+			{
+				id: "cursor",
+				name: "Cursor CLI",
+				description: "Cursor CLI — run as `agent acp` over stdio (legacy alias `cursor-agent acp`)",
+				detected: false,
+				defaultCommand: "agent",
+				defaultArgs: ["acp"]
+			},
 			{
 				id: "qwen",
 				name: "Qwen Code",
@@ -377,6 +391,22 @@ window.__ModuleLoader__.load({
 			cachedModelReads = /* @__PURE__ */ new Set();
 			/** Counts behind the last successful explicit re-detect, so a locale switch can re-render its summary. */
 			detectCounts;
+			/** When {@link UiState.pluginUpdate} was last read from the host (epoch ms). */
+			pluginUpdateFetchedAt = 0;
+			/**
+			* The shared in-flight `plugin/update-check`. The settings section mounts
+			* twice (both entries) and the update popover asks too; without this, two
+			* mounts in the same tick each fire their own registry read.
+			*/
+			pluginUpdateInflight;
+			/** Re-entry guard for `plugin/update-apply` (a double click is one install). */
+			pluginUpdateApplying = false;
+			/**
+			* Update read generation. An apply bumps it so a check that was already in
+			* flight (started before the install) cannot land afterwards and overwrite
+			* the install's verdict with the pre-install `available`.
+			*/
+			pluginUpdateGeneration = 0;
 			constructor(rpc, locale) {
 				this.rpc = rpc;
 				this.locale = locale;
@@ -499,14 +529,15 @@ window.__ModuleLoader__.load({
 			/** Snapshot refresh used on panel open and after a stream outage. */
 			async resync() {
 				try {
-					const [{ agents }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult] = await Promise.all([
+					const [{ agents }, { sessions }, defaultAgentInfo, detectResult, presetResult, tagHaloResult, deadlinesResult, versionResult] = await Promise.all([
 						this.call("agents/list"),
 						this.call("sessions/list"),
 						this.call("default/agent").catch(() => ({})),
 						this.call("agents/detect").catch(() => null),
 						this.call("preset/status").catch(() => null),
 						this.call("ui/tag-halo").catch(() => ({ halo: { ...DEFAULT_TAG_HALO } })),
-						this.call("ui/approval-deadlines").catch(() => ({ deadlines: void 0 }))
+						this.call("ui/approval-deadlines").catch(() => ({ deadlines: void 0 })),
+						this.call("plugin/version").catch(() => null)
 					]);
 					const detectedAgents = detectResult && detectResult.agents.length > 0 ? detectResult.agents : this.state.detectedAgents.length > 0 ? this.state.detectedAgents : [...DEFAULT_KNOWN_PRESETS];
 					this.mutate({
@@ -517,7 +548,8 @@ window.__ModuleLoader__.load({
 						detectedAgents,
 						preset: presetResult?.preset ?? void 0,
 						tagHalo: tagHaloResult?.halo ?? { ...DEFAULT_TAG_HALO },
-						approvalDeadlines: deadlinesResult.deadlines
+						approvalDeadlines: deadlinesResult.deadlines,
+						pluginVersion: versionResult?.version !== void 0 && versionResult.version !== "" ? versionResult.version : void 0
 					});
 					const active = this.state.activeSessionId ?? sessions[0]?.sessionId;
 					if (active !== void 0) await this.loadTranscript(active);
@@ -525,6 +557,89 @@ window.__ModuleLoader__.load({
 					this.mutate({ notice: String(error instanceof Error ? error.message : error) });
 				}
 			}
+			/**
+			* Read the plugin's update state (`plugin/update-check`). Throttled to ten
+			* minutes unless `force`: the settings panel asks on mount, and every
+			* remount must not hit the registry.
+			*
+			* An older host serves no such endpoint (`unknown endpoint`). That is a
+			* normal degradation, not an error worth a notice: the answer is `undefined`
+			* and the panel simply keeps its update entry hidden.
+			*/
+			async checkPluginUpdate(force = false) {
+				if (this.pluginUpdateInflight !== void 0) return this.pluginUpdateInflight;
+				const current = this.state.pluginUpdate;
+				if (!force && current !== void 0 && Date.now() - this.pluginUpdateFetchedAt < PLUGIN_UPDATE_TTL_MS) return current;
+				const generation = this.pluginUpdateGeneration;
+				const inflight = this.readPluginUpdate(generation);
+				this.pluginUpdateInflight = inflight;
+				try {
+					return await inflight;
+				} finally {
+					this.pluginUpdateInflight = void 0;
+				}
+			}
+			async readPluginUpdate(generation) {
+				try {
+					const pluginUpdate = await this.call("plugin/update-check");
+					if (generation !== this.pluginUpdateGeneration) return void 0;
+					this.pluginUpdateFetchedAt = Date.now();
+					this.mutate({ pluginUpdate });
+					return pluginUpdate;
+				} catch {
+					return;
+				}
+			}
+			/**
+			* Install one exact version (`plugin/update-apply`). The status flips to
+			* `applying` first so the badge answers the click; the host's answer then
+			* becomes the state.
+			*
+			* A failed call does NOT prove the install did not happen: on an HMR host
+			* the update uninstalls the plugin before reinstalling it, which can cut the
+			* response. Whatever the error, the disk may already carry the new version,
+			* so the state becomes `restart-required` (the one neutral verdict for "the
+			* running code is not the disk's") with `installed` dropped (unknown, not a
+			* fact to display) and the notice asks for a reload rather than restoring
+			* `available` and pretending nothing changed.
+			*/
+			async applyPluginUpdate(version) {
+				if (this.pluginUpdateApplying) return void 0;
+				this.pluginUpdateApplying = true;
+				this.pluginUpdateGeneration += 1;
+				const previous = this.state.pluginUpdate;
+				if (previous !== void 0) this.mutate({ pluginUpdate: {
+					...previous,
+					status: "applying"
+				} });
+				try {
+					const pluginUpdate = await this.call("plugin/update-apply", { version });
+					this.pluginUpdateFetchedAt = Date.now();
+					this.mutate({ pluginUpdate });
+					return pluginUpdate;
+				} catch (error) {
+					const message = error instanceof Error ? error.message : String(error);
+					const interrupted = previous !== void 0 ? {
+						...previous,
+						status: "restart-required",
+						installed: void 0,
+						message
+					} : {
+						status: "restart-required",
+						current: this.state.pluginVersion ?? "?",
+						message
+					};
+					this.pluginUpdateFetchedAt = 0;
+					this.mutate({
+						pluginUpdate: interrupted,
+						notice: this.locale("更新请求已中断；请刷新页面确认当前版本。", "The update request was interrupted. Reload the page to confirm the installed version.")
+					});
+					return;
+				} finally {
+					this.pluginUpdateGeneration += 1;
+					this.pluginUpdateApplying = false;
+				}
+			}
 			async detectAgents() {
 				this.mutate({ detecting: true });
 				try {
@@ -2638,7 +2753,7 @@ window.__ModuleLoader__.load({
 }
 .dwa-page-header { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-bottom: 28px; }
 .dwa-page-heading { min-width: 0; }
-.dwa-page-title { margin: 0; font-size: 20px; line-height: 1.35; font-weight: 550; letter-spacing: -0.02em; }
+.dwa-page-title { margin: 0; font-size: 20px; line-height: 1.35; font-weight: 550; letter-spacing: -0.02em; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
 .dwa-page-description { margin: 5px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-sm); }
 .dwa-btn {
   min-height: 32px; box-sizing: border-box; font: inherit; border-radius: var(--ntr-radius-sm);
@@ -2670,6 +2785,20 @@ window.__ModuleLoader__.load({
 .dwa-badge-success { background: var(--dsw-alias-state-success-tertiary, #dcfce7); color: var(--ntr-success); }
 .dwa-badge-warn { background: var(--dsw-alias-state-warn-tertiary, #fef3c7); color: var(--ntr-warn); }
 .dwa-badge-info { background: var(--dsw-alias-state-business-tertiary, #dbeafe); color: var(--dsw-alias-state-business-primary, #2563eb); }
+/* The update badge is a button (it expands the update card): strip the
+   browser's default button chrome, keep the badge look. */
+.dwa-update-badge { border: 0; font-family: inherit; cursor: pointer; }
+.dwa-update-badge:hover { opacity: 0.85; }
+/* The version badge doubles as the update entry: same badge look, no chrome. */
+.dwa-version-btn { border: 0; font-family: inherit; cursor: pointer; }
+.dwa-version-btn:hover { opacity: 0.85; }
+.dwa-version { font-family: var(--ds-font-family-code, monospace); }
+/* The update card sits between the page header and the permission mirror. */
+.dwa-update-card { margin-bottom: 16px; }
+.dwa-update-summary { display: flex; align-items: baseline; gap: 8px; flex-wrap: wrap; font-weight: 550; }
+.dwa-update-copy { margin: 6px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-xs); }
+.dwa-update-message { margin: 6px 0 0; color: var(--ntr-muted); font-size: var(--ntr-font-xs); white-space: pre-wrap; overflow-wrap: anywhere; }
+.dwa-update-actions { margin-top: 10px; }
 .dwa-dot { width: 7px; height: 7px; border-radius: 50%; display: inline-block; flex-shrink: 0; }
 .dwa-agent-list { display: flex; flex-direction: column; border-top: var(--ntr-line); }
 .dwa-agent-card { border-bottom: var(--ntr-line); min-width: 0; }
@@ -3320,6 +3449,139 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		/** The states that carry an update badge next to the version badge. */
+		function updateBadgeText(update, acp) {
+			if (update.status === "available") return acp.label(`可更新 v${update.latest ?? update.current}`, `Update v${update.latest ?? update.current}`);
+			if (update.status === "applying") return acp.label("更新中…", "Updating…");
+			if (update.status === "applied") {
+				const installed = update.installed ?? update.latest ?? update.current;
+				return acp.label(`已更新 v${installed}`, `Updated v${installed}`);
+			}
+			if (update.status === "restart-required") {
+				if (update.installed === void 0) return void 0;
+				return acp.label(`待重启 v${update.installed}`, `Restart for v${update.installed}`);
+			}
+		}
+		/**
+		* The version badge's update companion. Every badge is a button, `applying`
+		* included: the card is where the install's outcome is read, so the running
+		* install must be able to open it too. States without anything to act on get
+		* no badge at all — the version badge itself still opens the card.
+		*/
+		function PluginUpdateBadge(props) {
+			const { acp, update, open, onToggle } = props;
+			const text = updateBadgeText(update, acp);
+			if (text === void 0) return null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				type: "button",
+				className: "dwa-badge dwa-badge-info dwa-update-badge",
+				"aria-expanded": open,
+				"aria-controls": "ntr-plugin-update-card",
+				onClick: onToggle,
+				children: text
+			});
+		}
+		/**
+		* The update card. In-page, no dialog: the settings page already owns the one
+		* action (install the exact version the host reported), and a modal on top of
+		* a settings section would hide the version it is updating.
+		*
+		* The copy stays to one line per state (constraint 33); the host's raw error
+		* (`message`) is the only long text, and it wraps on its own line so a stack
+		* trace or a registry error is readable without stretching the card.
+		*/
+		function PluginUpdateCard(props) {
+			const { acp, update, onClose } = props;
+			const applying = update.status === "applying";
+			const latest = update.latest ?? update.current;
+			const onDisk = update.installed !== void 0 && update.installed !== update.current ? update.installed : void 0;
+			const published = update.publishedAt !== void 0 && !Number.isNaN(new Date(update.publishedAt).getTime()) ? new Date(update.publishedAt).toLocaleDateString() : void 0;
+			const copy = update.status === "available" ? acp.label("更新会卸载并重装插件，之后可能需要重启 DSH。", "Updating uninstalls and reinstalls the plugin, and may require restarting DSH.") : update.status === "applied" ? acp.label("已应用，刷新页面即可使用新版本。", "Applied. Reload the page to use the new version.") : update.status === "restart-required" ? update.installed !== void 0 ? acp.label(`磁盘已是 v${update.installed}，重启 DSH 后生效（桌面 App 退出重开；命令行重启 dsh web）。`, `On disk v${update.installed}. Restart DSH to apply (quit and reopen the app, or restart dsh web).`) : acp.label("更新可能已完成，请刷新页面确认当前版本。", "The update may already be complete. Refresh the page to confirm the current version.") : update.status === "busy" ? acp.label("有进行中的对话，结束后才能更新。", "Finish the running conversation before updating.") : update.status === "failed" ? acp.label("更新失败。", "Update failed.") : update.status === "current" ? acp.label("已是最新版本。", "Up to date.") : update.status === "source-install" ? acp.label("源码或本地安装，无法通过 registry 更新。", "Source or local install; update it through its own checkout.") : update.status === "managed" ? acp.label("此安装由宿主管理，不能在这里更新。", "This install is managed by the host and cannot be updated here.") : void 0;
+			const showMessage = (update.status === "failed" || update.status === "busy" || update.status === "managed") && update.message !== void 0;
+			const apply = async () => {
+				if (update.latest === void 0) return;
+				try {
+					await acp.applyPluginUpdate(update.latest);
+				} catch {}
+			};
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				id: "ntr-plugin-update-card",
+				className: "dwa-card dwa-update-card",
+				role: "group",
+				"aria-label": acp.label("插件更新", "Plugin update"),
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dwa-update-summary",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: acp.label(`当前 v${update.current}`, `Current v${update.current}`) }),
+							onDisk !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dwa-hint",
+								children: acp.label(`磁盘 v${onDisk}`, `On disk v${onDisk}`)
+							}),
+							update.latest !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									"aria-hidden": "true",
+									children: "→"
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: acp.label(`最新 v${latest}`, `Latest v${latest}`) }),
+								published !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dwa-hint",
+									children: published
+								})
+							] })
+						]
+					}),
+					copy !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: "dwa-update-copy",
+						children: copy
+					}),
+					showMessage && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "dwa-update-message",
+						children: update.message
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dwa-row-actions dwa-update-actions",
+						children: [
+							update.status === "available" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dwa-btn dwa-btn-primary",
+								onClick: () => {
+									apply();
+								},
+								children: acp.label("更新", "Update")
+							}),
+							applying && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dwa-btn dwa-btn-primary",
+								disabled: true,
+								children: acp.label("正在更新…", "Updating…")
+							}),
+							update.status !== "applying" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dwa-btn",
+								onClick: onClose,
+								children: acp.label("关闭", "Close")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dwa-btn dwa-btn-quiet",
+								disabled: applying,
+								onClick: () => void acp.checkPluginUpdate(true),
+								children: acp.label("重新检查", "Check again")
+							})
+						]
+					})
+				]
+			});
+		}
+		/**
+		* The card is drawn for every state a host can report about this install,
+		* except the two where there is no install to talk about at all.
+		*/
+		function updateCardVisible(update, open) {
+			if (update === void 0 || !open) return false;
+			return update.status !== "unsupported" && update.status !== "not-installed";
+		}
 		function AcpSettingsSection(props) {
 			const acp = props.acp;
 			ensureStyle();
@@ -3328,6 +3590,10 @@ window.__ModuleLoader__.load({
 			const [page, setPage] = (0, react.useState)("agents");
 			const [addOpen, setAddOpen] = (0, react.useState)(false);
 			const [addTarget, setAddTarget] = (0, react.useState)(void 0);
+			const [updateOpen, setUpdateOpen] = (0, react.useState)(false);
+			(0, react.useEffect)(() => {
+				acp.checkPluginUpdate();
+			}, [acp]);
 			const { configured, available } = partitionAgents(ui.detectedAgents, ui.agents);
 			const selected = addTarget ?? available[0] ?? NEW_AGENT_SEED;
 			const openAdd = () => {
@@ -3335,6 +3601,9 @@ window.__ModuleLoader__.load({
 				setPage("add");
 			};
 			const presetProblem = ui.preset !== void 0 && (!ui.preset.installed || ui.preset.problem !== void 0);
+			const update = ui.pluginUpdate;
+			const versionTitle = update?.status === "source-install" ? acp.label("源码或本地安装，无法通过 registry 更新。", "Source or local install; update it through its own checkout.") : void 0;
+			const versionOpensUpdate = update !== void 0 && update.status !== "unsupported" && update.status !== "not-installed";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dwa-root",
 				children: [
@@ -3342,9 +3611,31 @@ window.__ModuleLoader__.load({
 						className: "dwa-page-header",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "dwa-page-heading",
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", {
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("h2", {
 								className: "dwa-page-title",
-								children: acp.label("NTR 设置", "NTR settings")
+								"aria-label": acp.label("NTR 设置", "NTR settings"),
+								children: [
+									acp.label("NTR 设置", "NTR settings"),
+									ui.pluginVersion !== void 0 && (versionOpensUpdate ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dwa-badge dwa-version dwa-version-btn",
+										title: versionTitle,
+										"aria-expanded": updateOpen,
+										"aria-controls": "ntr-plugin-update-card",
+										onClick: () => setUpdateOpen((open) => !open),
+										children: `v${ui.pluginVersion}`
+									}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dwa-badge dwa-version",
+										title: versionTitle,
+										children: `v${ui.pluginVersion}`
+									})),
+									update !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PluginUpdateBadge, {
+										acp,
+										update,
+										open: updateOpen,
+										onToggle: () => setUpdateOpen((open) => !open)
+									})
+								]
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "dwa-page-description",
 								children: acp.label("连接智能体，设置你的对话偏好。", "Connect agents and set your conversation preferences.")
@@ -3356,6 +3647,11 @@ window.__ModuleLoader__.load({
 							children: acp.label("添加智能体", "Add agent")
 						})]
 					}),
+					update !== void 0 && updateCardVisible(update, updateOpen) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PluginUpdateCard, {
+						acp,
+						update,
+						onClose: () => setUpdateOpen(false)
+					}),
 					ledger.visible && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "dwa-card dwa-card-warn",
 						style: { marginBottom: 16 },