soulnet-dsh 0.1.3 → 0.1.4

package/lib/client.js

@@ -600,11 +600,11 @@ window.__ModuleLoader__.load({
 		/** Browser-side settle guarantee: no API call may hang past this (a request lost to a
 		* server restart would otherwise leave UI loading states frozen forever). */
 		const CALL_TIMEOUT_MS = 3e4;
-		async function call(route, body) {
+		async function call(route, body, timeoutMs = CALL_TIMEOUT_MS) {
 			const ctl = new AbortController();
 			const timer = setTimeout(() => {
 				ctl.abort();
-			}, CALL_TIMEOUT_MS);
+			}, timeoutMs);
 			let response;
 			try {
 				response = await fetch(`${API_BASE}${route}`, body === void 0 && route === "state" ? {
@@ -621,7 +621,7 @@ window.__ModuleLoader__.load({
 					signal: ctl.signal
 				});
 			} catch (e) {
-				if (e instanceof DOMException && e.name === "AbortError") throw new ApiError(`${route}: no answer within ${CALL_TIMEOUT_MS / 1e3}s (server busy or restarting)`, -32603, 0);
+				if (e instanceof DOMException && e.name === "AbortError") throw new ApiError(`${route}: no answer within ${timeoutMs / 1e3}s (server busy or restarting)`, -32603, 0);
 				throw e;
 			} finally {
 				clearTimeout(timer);
@@ -639,6 +639,13 @@ window.__ModuleLoader__.load({
 		}
 		const api = {
 			state: () => call("state"),
+			/** Self-upgrade: is a newer soulnet-dsh published? */
+			upgradeCheck: () => call("upgrade.check", {}),
+			/** Self-upgrade: install `soulnet-dsh@version` (pnpm may take minutes — long timeout). */
+			upgradeRun: (version, registry) => call("upgrade.run", {
+				version,
+				...registry === void 0 ? {} : { registry }
+			}, 6e5),
 			createIdentity: (name) => call("identity.create", { name }),
 			parseCard: (uri) => call("card.parse", { uri }),
 			addFriend: (cardUri, note) => call("friends.add", {
@@ -2366,6 +2373,19 @@ window.__ModuleLoader__.load({
 			"settings.config.home": "Data directory",
 			"settings.config.hint": "Changes apply the next time dsh starts (the peer process is spawned with them). Empty path = PATH lookup, then the plugin's bin/; empty directory = $SOULNET_HOME, then ~/.soulnet.",
 			"settings.config.unavailable": "Settings are editable from a local (loopback) browser only.",
+			"settings.upgrade": "Version & updates",
+			"settings.upgrade.badge": "update",
+			"settings.upgrade.current": "Current version",
+			"settings.upgrade.check": "Check for updates",
+			"settings.upgrade.checking": "Checking…",
+			"settings.upgrade.uptodate": "v{version} is the latest published version.",
+			"settings.upgrade.available": "New version v{latest} is available (you run v{current}).",
+			"settings.upgrade.do": "Upgrade to v{version}",
+			"settings.upgrade.installing": "Installing v{version}… (pnpm in the dsh profile; this can take a minute)",
+			"settings.upgrade.restarting": "Installed. Restarting dsh — this page reloads by itself once it is back.",
+			"settings.upgrade.manual": "Installed v{version}. Refresh this page to load the new interface; the host half takes effect only after dsh is restarted.",
+			"settings.upgrade.failed": "Upgrade failed ({message}).",
+			"settings.upgrade.hint": "Upgrades install soulnet-dsh from the npm registry (npmjs, falling back to npmmirror) into the dsh profile.",
 			"settings.friends": "Friends",
 			"settings.friends.hint": "Friends are read-only threads on the SoulMirror page: your alter writes to them, you tell your alter what to say.",
 			"settings.friends.none": "No friends yet. Paste a card URI below or use /add.",
@@ -2639,7 +2659,8 @@ window.__ModuleLoader__.load({
 			"settings.agents.intro": "Named seat agents behind your identity: each runs as its own dsh session in its own working directory, wakes when a group message @mentions its name (whitelist-gated), and posts as \"you · <name>\".",
 			"settings.agents.none": "No agents yet — add one below.",
 			"settings.agents.name": "Name (used as @mention)",
-			"settings.agents.cwd": "Working directory (the repository it works in)",
+			"settings.agents.cwd": "Working directory - the folder it reads, writes and runs commands in (optional)",
+			"settings.agents.cwdHint": "Leave empty for its own default folder",
 			"settings.agents.preset": "Capability preset",
 			"settings.agents.preset.default": "standard coding agent (default)",
 			"settings.agents.prompt": "Persona / instructions (its system brief; edits apply from its next turn)",
@@ -2780,6 +2801,19 @@ window.__ModuleLoader__.load({
 			"settings.config.home": "数据目录",
 			"settings.config.hint": "改动下次启动 dsh 时生效（轻端进程按这些参数启动）。路径留空 = 查 PATH，再查插件 bin/；目录留空 = $SOULNET_HOME，再 ~/.soulnet。",
 			"settings.config.unavailable": "只有本机（loopback）浏览器可以编辑设置。",
+			"settings.upgrade": "版本与更新",
+			"settings.upgrade.badge": "有新版",
+			"settings.upgrade.current": "当前版本",
+			"settings.upgrade.check": "检查更新",
+			"settings.upgrade.checking": "检查中…",
+			"settings.upgrade.uptodate": "v{version} 已是最新发布版本。",
+			"settings.upgrade.available": "发现新版本 v{latest}（当前 v{current}）。",
+			"settings.upgrade.do": "升级到 v{version}",
+			"settings.upgrade.installing": "正在安装 v{version}…（在 dsh profile 里跑 pnpm，可能要一会儿）",
+			"settings.upgrade.restarting": "安装完成。正在重启 dsh——恢复后本页会自动刷新。",
+			"settings.upgrade.manual": "已安装 v{version}。界面部分刷新本页即生效；宿主部分要重启 dsh 才完整生效。",
+			"settings.upgrade.failed": "升级失败（{message}）。",
+			"settings.upgrade.hint": "升级会从 npm 源（npmjs，不通时退 npmmirror）把 soulnet-dsh 装进 dsh profile。",
 			"settings.friends": "好友",
 			"settings.friends.hint": "好友在灵镜页面里是只读的往来记录：分身替你写信，你只吩咐分身。",
 			"settings.friends.none": "还没有好友。在下面贴名片链接，或用 /add。",
@@ -3053,7 +3087,8 @@ window.__ModuleLoader__.load({
 			"settings.agents.intro": "挂在你身份下的具名代理：各自一条 dsh 会话、各有工作目录，群里被 @名字 才唤醒（白名单把关），发言署名「你 · 名字」。",
 			"settings.agents.none": "还没有代理——在下面添加一个。",
 			"settings.agents.name": "名字（群里 @ 它用）",
-			"settings.agents.cwd": "工作目录（它干活的仓库）",
+			"settings.agents.cwd": "工作目录——它读写文件、跑命令的文件夹（选填）",
+			"settings.agents.cwdHint": "留空 = 使用它自己的默认目录",
 			"settings.agents.preset": "能力预设",
 			"settings.agents.preset.default": "标准编码 Agent（默认）",
 			"settings.agents.prompt": "人设 / 指令（写进它的系统提示；保存后下一回合生效）",
@@ -3181,7 +3216,7 @@ window.__ModuleLoader__.load({
 						overflowY: "auto",
 						borderRadius: 12,
 						border: "1px solid rgba(127,127,127,.3)",
-						background: "var(--dsw-alias-bg-elevated, var(--dsw-alias-bg-primary, #fff))",
+						background: "var(--dsw-specific-menu, var(--dsw-alias-bg-layer-2, #fff))",
 						boxShadow: "0 12px 40px rgba(0,0,0,.28)",
 						padding: 16,
 						display: "grid",
@@ -3599,6 +3634,7 @@ window.__ModuleLoader__.load({
 			const [agentNames, setAgentNames] = (0, react.useState)([]);
 			const [agentsSheetOpen, setAgentsSheetOpen] = (0, react.useState)(false);
 			const [mention, setMention] = (0, react.useState)(void 0);
+			const [mentionIdx, setMentionIdx] = (0, react.useState)(0);
 			const [busyVoices, setBusyVoices] = (0, react.useState)({});
 			const [workFeeds, setWorkFeeds] = (0, react.useState)({});
 			const [openWork, setOpenWork] = (0, react.useState)(/* @__PURE__ */ new Set());
@@ -3797,6 +3833,7 @@ window.__ModuleLoader__.load({
 					start: caret - m[2].length - 1,
 					query: m[2]
 				});
+				setMentionIdx(0);
 			};
 			const pickMention = (name) => {
 				if (mention === void 0) return;
@@ -4109,19 +4146,23 @@ window.__ModuleLoader__.load({
 									overflowY: "auto",
 									borderRadius: 8,
 									border: "1px solid rgba(127,127,127,.35)",
-									background: "var(--dsw-alias-bg-elevated, var(--dsw-alias-bg-primary, #fff))",
+									background: "var(--dsw-specific-menu, var(--dsw-alias-bg-layer-2, #fff))",
 									boxShadow: "0 6px 24px rgba(0,0,0,.18)",
 									padding: 4,
 									display: "grid"
 								},
 								"data-soulmirror-mention-pop": true,
-								children: mentionMatches.map((p) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+								children: mentionMatches.map((p, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 									type: "button",
 									className: "sm-linkbtn",
 									style: {
 										textAlign: "left",
 										padding: "6px 8px",
-										borderRadius: 6
+										borderRadius: 6,
+										...i === Math.min(mentionIdx, mentionMatches.length - 1) ? { background: "var(--dsw-alias-interactive-bg-hover)" } : {}
+									},
+									onMouseEnter: () => {
+										setMentionIdx(i);
 									},
 									onMouseDown: (e) => {
 										e.preventDefault();
@@ -4159,12 +4200,20 @@ window.__ModuleLoader__.load({
 								},
 								onKeyDown: (e) => {
 									if (e.key === "Escape" && mention !== void 0) {
+										e.preventDefault();
+										e.stopPropagation();
 										setMention(void 0);
 										return;
 									}
+									if (mention !== void 0 && mentionMatches.length > 0 && (e.key === "ArrowDown" || e.key === "ArrowUp")) {
+										e.preventDefault();
+										const len = mentionMatches.length;
+										setMentionIdx((i) => (Math.min(i, len - 1) + (e.key === "ArrowDown" ? 1 : len - 1)) % len);
+										return;
+									}
 									if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
 										e.preventDefault();
-										if (mention !== void 0 && mentionMatches.length > 0) pickMention(mentionMatches[0].name);
+										if (mention !== void 0 && mentionMatches.length > 0) pickMention(mentionMatches[Math.min(mentionIdx, mentionMatches.length - 1)].name);
 										else send();
 									}
 								},
@@ -4208,6 +4257,156 @@ window.__ModuleLoader__.load({
 			] });
 		}
 		//#endregion
+		//#region src/client/upgrade-store.ts
+		/**
+		* Client store of the plugin self-upgrade (Settings → SoulMirror network →
+		* "Version & updates"; host routes `upgrade.check` / `upgrade.run`).
+		*
+		* The client half does a SILENT check once per page load (client/index.ts);
+		* `hasUpdate` then puts the badge on the Settings entry. `run()` drives the
+		* whole one-click path: install → the host answers `restarting: true` and
+		* exits → this store polls `/state` until the RESTARTED server answers, then
+		* reloads the page (phase `reloading`). A host that could not arm the
+		* relaunch helper answers `restarting: false` and the UI shows the
+		* manual-restart hint instead (phase `done-manual`).
+		*/
+		const EMPTY = {
+			phase: "idle",
+			current: void 0,
+			latest: void 0,
+			hasUpdate: false,
+			registry: void 0,
+			error: void 0,
+			output: void 0,
+			checked: false
+		};
+		/** How long the restart may take before the store gives up and shows the manual hint. */
+		const RESTART_LIMIT_MS = 18e4;
+		const RESTART_POLL_MS = 2e3;
+		var UpgradeStore = class {
+			snapshot = EMPTY;
+			listeners = /* @__PURE__ */ new Set();
+			checkedOnce = false;
+			getSnapshot = () => this.snapshot;
+			subscribe = (listener) => {
+				this.listeners.add(listener);
+				return () => {
+					this.listeners.delete(listener);
+				};
+			};
+			set(patch) {
+				this.snapshot = {
+					...this.snapshot,
+					...patch
+				};
+				for (const listener of this.listeners) listener();
+			}
+			/**
+			* Query the host for the latest published version. Silent mode (page load)
+			* swallows errors — an offline machine must not grow error banners on its
+			* own; the manual button reports them.
+			*/
+			check = async (options = {}) => {
+				if (this.snapshot.phase === "checking" || this.snapshot.phase === "installing" || this.snapshot.phase === "restarting") return;
+				if (options.silent === true && this.checkedOnce) return;
+				this.checkedOnce = true;
+				this.set({
+					phase: "checking",
+					...options.silent === true ? {} : { error: void 0 }
+				});
+				try {
+					const result = await api.upgradeCheck();
+					this.set({
+						phase: "idle",
+						current: result.current,
+						latest: result.latest,
+						hasUpdate: result.hasUpdate,
+						registry: result.registry,
+						checked: true,
+						error: void 0
+					});
+				} catch (error) {
+					this.set({
+						phase: "idle",
+						checked: true,
+						...options.silent === true ? {} : { error: error instanceof Error ? error.message : String(error) }
+					});
+				}
+			};
+			/** One-click upgrade to the checked `latest`. */
+			run = async () => {
+				const { latest, registry } = this.snapshot;
+				if (latest === void 0 || this.snapshot.phase === "installing" || this.snapshot.phase === "restarting") return;
+				this.set({
+					phase: "installing",
+					error: void 0,
+					output: void 0
+				});
+				let result;
+				try {
+					result = await api.upgradeRun(latest, registry);
+				} catch (error) {
+					this.set({
+						phase: "failed",
+						error: error instanceof Error ? error.message : String(error)
+					});
+					return;
+				}
+				if (!result.ok) {
+					this.set({
+						phase: "failed",
+						error: `pnpm exit ${result.exitCode}`,
+						output: result.output
+					});
+					return;
+				}
+				if (!result.restarting) {
+					this.set({
+						phase: "done-manual",
+						hasUpdate: false,
+						current: result.version
+					});
+					return;
+				}
+				this.set({
+					phase: "restarting",
+					hasUpdate: false,
+					current: result.version
+				});
+				await this.waitForRestart();
+			};
+			/**
+			* The old server exits ~500 ms after answering; poll `/state` until it
+			* FIRST disappears and THEN answers again, so an answer from the old
+			* process does not reload us into the old bundle.
+			*/
+			async waitForRestart() {
+				const deadline = Date.now() + RESTART_LIMIT_MS;
+				let sawDown = false;
+				while (Date.now() < deadline) {
+					await new Promise((resolve) => setTimeout(resolve, RESTART_POLL_MS));
+					try {
+						if (!(await fetch(`/soulmirror/api/state`, {
+							method: "GET",
+							signal: AbortSignal.timeout(1500)
+						})).ok) {
+							sawDown = true;
+							continue;
+						}
+						if (sawDown) {
+							this.set({ phase: "reloading" });
+							location.reload();
+							return;
+						}
+					} catch {
+						sawDown = true;
+					}
+				}
+				this.set({ phase: "done-manual" });
+			}
+		};
+		const upgradeStore = new UpgradeStore();
+		//#endregion
 		//#region src/client/SettingsSection.tsx
 		/**
 		* `settings.section` "SoulMirror network": backend status, identity (create on
@@ -4367,6 +4566,121 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		/**
+		* "Version & updates": the plugin self-upgrade (host routes `upgrade.check` /
+		* `upgrade.run`, client state in upgrade-store.ts). One click installs the
+		* new version and, when the peer supports `host.relaunch`, restarts dsh and
+		* reloads this page by itself; otherwise it says what to restart manually.
+		*/
+		function UpgradeCard({ t }) {
+			const up = (0, react.useSyncExternalStore)(upgradeStore.subscribe, upgradeStore.getSnapshot);
+			const busy = up.phase !== "idle" && up.phase !== "done-manual" && up.phase !== "failed";
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				style: card,
+				"data-soulmirror-upgrade": true,
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						style: rowStyle,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", {
+							style: h4,
+							children: t("settings.upgrade")
+						}), up.hasUpdate ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							style: {
+								background: "rgb(220,80,60)",
+								color: "#fff",
+								borderRadius: 999,
+								padding: "1px 8px",
+								fontSize: "0.72em"
+							},
+							"data-soulmirror-upgrade-badge": true,
+							children: t("settings.upgrade.badge")
+						}) : null]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						style: rowStyle,
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								style: small$1,
+								children: [
+									t("settings.upgrade.current"),
+									": ",
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: up.current !== void 0 ? `v${up.current}` : "—" })
+								]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								disabled: busy,
+								onClick: () => {
+									upgradeStore.check();
+								},
+								children: up.phase === "checking" ? t("settings.upgrade.checking") : t("settings.upgrade.check")
+							}),
+							up.hasUpdate && up.latest !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								disabled: busy,
+								onClick: () => {
+									upgradeStore.run();
+								},
+								"data-soulmirror-upgrade-run": true,
+								children: t("settings.upgrade.do", { version: up.latest })
+							}) : null
+						]
+					}),
+					up.phase === "idle" && up.hasUpdate && up.latest !== void 0 && up.current !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: small$1,
+						children: t("settings.upgrade.available", {
+							latest: up.latest,
+							current: up.current
+						})
+					}) : null,
+					up.phase === "idle" && !up.hasUpdate && up.checked && up.error === void 0 && up.current !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: small$1,
+						children: t("settings.upgrade.uptodate", { version: up.current })
+					}) : null,
+					up.phase === "installing" && up.latest !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: small$1,
+						children: t("settings.upgrade.installing", { version: up.latest })
+					}) : null,
+					up.phase === "restarting" || up.phase === "reloading" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: small$1,
+						role: "status",
+						children: t("settings.upgrade.restarting")
+					}) : null,
+					up.phase === "done-manual" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: {
+							...small$1,
+							opacity: .95
+						},
+						role: "status",
+						children: t("settings.upgrade.manual", { version: up.current ?? "" })
+					}) : null,
+					(up.phase === "failed" || up.error !== void 0) && up.error !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: {
+							...small$1,
+							color: "rgb(220,80,60)"
+						},
+						role: "alert",
+						children: t("settings.upgrade.failed", { message: up.error })
+					}) : null,
+					up.phase === "failed" && up.output !== void 0 && up.output !== "" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+						style: {
+							...mono,
+							whiteSpace: "pre-wrap",
+							maxHeight: 160,
+							overflow: "auto",
+							margin: 0,
+							opacity: .8,
+							userSelect: "text"
+						},
+						children: up.output
+					}) : null,
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						style: small$1,
+						children: t("settings.upgrade.hint")
+					})
+				]
+			});
+		}
 		const BINARY_SOURCE_KEYS = {
 			"setting": "settings.binary.setting",
 			"platform-package": "settings.binary.platform-package",
@@ -4603,6 +4917,7 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(UpgradeCard, { t }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						style: card,
 						"data-soulmirror-settings-alter": true,
@@ -5175,7 +5490,7 @@ window.__ModuleLoader__.load({
 						overflowY: "auto",
 						borderRadius: 12,
 						border: "1px solid rgba(127,127,127,.3)",
-						background: "var(--dsw-alias-bg-elevated, var(--dsw-alias-bg-primary, #fff))",
+						background: "var(--dsw-specific-menu, var(--dsw-alias-bg-layer-2, #fff))",
 						boxShadow: "0 12px 40px rgba(0,0,0,.28)",
 						padding: 16,
 						display: "grid",
@@ -5232,6 +5547,7 @@ window.__ModuleLoader__.load({
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 								style: field,
 								value: cwd,
+								placeholder: t("settings.agents.cwdHint"),
 								onChange: (e) => {
 									setCwd(e.target.value);
 								},
@@ -10663,6 +10979,7 @@ window.__ModuleLoader__.load({
 					if (rootEl === null) return;
 					const target = e.target instanceof Node ? e.target : e.target;
 					if (target === null) return;
+					if (!target.isConnected) return;
 					if (rootEl.contains(target)) return;
 					if (target?.closest?.("[data-soulmirror-footer]") != null) return;
 					pageStore.close();
@@ -10765,6 +11082,12 @@ window.__ModuleLoader__.load({
 		*/
 		const STYLE_ID = "soulmirror-styles";
 		const CSS = `
+/* Native form controls follow the ACTIVE theme: the option list of a <select>
+   (and scrollbars, checkboxes...) is OS-rendered and ignores CSS tokens - it
+   only obeys color-scheme. dsh marks its dark theme on <body>. */
+body[data-ds-dark-theme] { color-scheme: dark; }
+.sm-page-root select option, .sm-page-root select optgroup { background: var(--dsw-specific-menu); color: var(--dsw-alias-label-primary); }
+
 .sm-footer {
   flex: none; display: flex; align-items: center; gap: 8px;
   width: calc(100% + 4px); height: 42px; margin: 4px -2px 0; padding: 0 10px 0 8px;
@@ -11237,6 +11560,7 @@ body[data-ds-dark-theme] .sm-page-root {
 				locale: NS,
 				inject: overlayInjected
 			}, InboxOverlay));
+			upgradeStore.check({ silent: true });
 			const settingsInjected = () => ({
 				openSession,
 				scope
@@ -11246,7 +11570,7 @@ body[data-ds-dark-theme] .sm-page-root {
 				id: "soulmirror",
 				order: 80,
 				locale: NS,
-				label: () => t("settings.nav"),
+				label: () => upgradeStore.getSnapshot().hasUpdate ? `${t("settings.nav")} ●` : t("settings.nav"),
 				inject: settingsInjected
 			}, SoulmirrorSettingsSection));
 			ctx.slots.inject("settings.onboarding", () => ctx.slots.register({