@kesike/dsh-exit 0.2.3 → 0.2.5

package/README.md

@@ -31,7 +31,7 @@
 
 ## 🎬 GitHub showcase
 
-The animation, video, and screenshot below are repository showcase assets. They stay in GitHub for documentation and are intentionally excluded from the npm package.
+Follow the exit flow below, then see the plugin in a running dsh settings panel.
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/KeS1Ke/dsh-exit/main/docs/dsh-exit-landscape.webp" alt="Landscape animated dsh-exit flow generated by Archify" width="720">
@@ -62,7 +62,7 @@ The capture below is a current dsh settings view with `dsh-exit` installed. The
 | Bundle patch | [`cordis.patch.yml`](cordis.patch.yml) | Inserts the plugin row into the dsh profile. |
 | Package metadata | [`package.json`](package.json) | Declares the host entry, web client, and bundle patch. |
 
-The npm package contains only the four core runtime files above plus package metadata and README files. GitHub-only media is kept separately:
+The package stays focused on the runtime files and package metadata. Additional screenshots and source materials are provided below:
 
 | Showcase asset | Location |
 | --- | --- |

package/README.zh-CN.md

@@ -31,7 +31,7 @@
 
 ## 🎬 GitHub 展示区
 
-下面的动画、视频和截图是仓库专用展示素材，保留在 GitHub 用于文档展示，并明确排除在 npm 包之外。
+下面展示退出流程，以及插件在 dsh 设置面板中的实际效果。
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/KeS1Ke/dsh-exit/main/docs/dsh-exit-landscape.webp" alt="由 Archify 生成的横版 dsh-exit 动态流程图" width="720">
@@ -62,7 +62,7 @@
 | Bundle 补丁 | [`cordis.patch.yml`](cordis.patch.yml) | 向 dsh profile 插入插件行。 |
 | 包元数据 | [`package.json`](package.json) | 声明宿主入口、Web 客户端和 Bundle 补丁。 |
 
-npm 包只包含上面四个核心运行文件、包元数据和 README；GitHub 展示素材单独保留在仓库中：
+npm 包聚焦于运行所需的源码和包元数据，下面同时提供截图和流程源文件：
 
 | 展示素材 | 位置 |
 | --- | --- |

package/lib/client.js

@@ -2,8 +2,9 @@
 /**
  * dsh-exit 客户端：
  * - 在 dsh 设置菜单中注册一个始终排在最后的“退出”栏目
- * - 栏目中的退出按钮首次点击弹确认弹窗；确认后调用 remote.dshExit.exit()，
- *   服务端结束宿主进程并释放端口，不操作终端窗口或浏览器标签页
+ * - 提供对齐展示的退出与重新启动操作；确认后分别调用
+ *   remote.dshExit.exit() / remote.dshExit.restart()
+ * - 重启成功后等待后台服务恢复并自动刷新页面
  *
  * 页面使用 dsh 已提供的 React、slots 和 locale 运行时，不引入新的运行时依赖。
  */
@@ -19,9 +20,11 @@ window.__ModuleLoader__.load({
 
 		/** 与 archive-manager「删除会话」相同的错误红（设计令牌）。 */
 		const ERROR_RED = "var(--dsw-alias-state-error-primary)";
+		const RESTART_BLUE = "var(--dsw-alias-state-business-primary)";
 
 		/** Lucide power 图标（ISC 许可，免费），16px 线性风格贴合现有按钮。 */
-		const ICON_SVG = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 2v10"/><path d="M18.4 6.6a9 9 0 1 1-12.77.04"/></svg>';
+		const EXIT_ICON_SVG = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 2v10"/><path d="M18.4 6.6a9 9 0 1 1-12.77.04"/></svg>';
+		const RESTART_ICON_SVG = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12a9 9 0 0 0-15.5-6.2L3 8"/><path d="M3 3v5h5"/><path d="M3 12a9 9 0 0 0 15.5 6.2L21 16"/><path d="M16 16h5v5"/></svg>';
 
 		const CSS_TEXT = [
 			".dshExitSettings{box-sizing:border-box;max-width:720px;padding:28px 32px 40px;color:var(--dsw-alias-label-primary)}",
@@ -30,12 +33,22 @@ window.__ModuleLoader__.load({
 			".dshExitSettingsIcon svg{width:20px;height:20px}",
 			".dshExitSettingsTitle{margin:0;font-size:20px;line-height:28px;font-weight:650;color:var(--dsw-alias-label-primary)}",
 			".dshExitSettingsDescription{margin:6px 0 0;max-width:560px;font-size:13px;line-height:20px;color:var(--dsw-alias-label-secondary)}",
-			".dshExitSettingsCard{display:flex;align-items:center;justify-content:space-between;gap:24px;margin-top:24px;padding:20px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;background:var(--dsw-alias-bg-layer-2)}",
+			".dshExitSettingsActions{display:flex;flex-direction:column;gap:12px;margin-top:24px}",
+			".dshExitSettingsCard{display:grid;grid-template-columns:34px minmax(0,1fr) auto;align-items:center;gap:14px;padding:20px;border:1px solid var(--dsw-alias-border-l2);border-radius:14px;background:var(--dsw-alias-bg-layer-2)}",
+			".dshExitActionIcon{box-sizing:border-box;width:34px;height:34px;display:grid;place-items:center;border:1px solid currentColor;border-radius:10px;background:var(--dsw-alias-button-elevated-fill)}",
+			".dshExitActionIcon--exit{color:" + ERROR_RED + "}",
+			".dshExitActionIcon--restart{color:" + RESTART_BLUE + "}",
+			".dshExitActionIcon svg{width:18px;height:18px}",
+			".dshExitSettingsCopy{min-width:0}",
+			".dshExitSettingsActionTitle{margin:0 0 3px;font-size:14px;line-height:20px;font-weight:650;color:var(--dsw-alias-label-primary)}",
 			".dshExitSettingsWarning{margin:0;max-width:430px;font-size:13px;line-height:20px;color:var(--dsw-alias-label-secondary)}",
-			".dshExitSettingsButton{display:inline-flex;align-items:center;justify-content:center;gap:8px;flex:none;min-width:112px;height:36px;padding:0 16px;cursor:pointer;border:0;border-radius:10px;background:" + ERROR_RED + ";color:#fff;font-size:13px;font-weight:650;transition:filter .12s ease,opacity .12s ease}",
+			".dshExitSettingsButton{display:inline-flex;align-items:center;justify-content:center;gap:8px;flex:none;min-width:112px;height:36px;padding:0 16px;cursor:pointer;border:0;border-radius:10px;color:#fff;font-size:13px;font-weight:650;transition:filter .12s ease,opacity .12s ease}",
+			".dshExitSettingsButton--exit{background:" + ERROR_RED + "}",
+			".dshExitSettingsButton--restart{background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground)}",
 			".dshExitSettingsButton svg{width:16px;height:16px}",
 			".dshExitSettingsButton:hover:not(:disabled){filter:brightness(1.08)}",
-			".dshExitSettingsButton:focus-visible{outline:2px solid " + ERROR_RED + ";outline-offset:2px}",
+			".dshExitSettingsButton--restart:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover)}",
+			".dshExitSettingsButton:focus-visible{outline:2px solid var(--dsw-alias-border-l3);outline-offset:2px}",
 			".dshExitSettingsButton:disabled{cursor:default;opacity:.6}",
 			".dshExitNavCell{color:" + ERROR_RED + " !important}",
 			".dshExitNavCell .dshExitNavLabel{color:" + ERROR_RED + " !important;font-weight:650}",
@@ -53,8 +66,11 @@ window.__ModuleLoader__.load({
 			".dshExitCancel:hover{background:var(--dsw-alias-interactive-bg-hover)}",
 			".dshExitCancel:disabled{cursor:default;opacity:.6}",
 			".dshExitConfirm{cursor:pointer;height:32px;padding:0 14px;border-radius:10px;border:none;background:" + ERROR_RED + ";color:#fff;font-size:13px;font-weight:600}",
+			".dshExitConfirm--restart{background:var(--dsw-alias-button-primary-fill);color:var(--dsw-alias-label-primary-foreground)}",
 			".dshExitConfirm:hover:not(:disabled){filter:brightness(1.08)}",
-			".dshExitConfirm:disabled{cursor:default;opacity:.6}"
+			".dshExitConfirm--restart:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover)}",
+			".dshExitConfirm:disabled{cursor:default;opacity:.6}",
+			"@media (max-width:620px){.dshExitSettings{padding:24px 20px 32px}.dshExitSettingsCard{grid-template-columns:34px minmax(0,1fr)}.dshExitSettingsButton{grid-column:1 / -1;justify-self:start}}"
 		].join("\n");
 
 		/** 客户端严格编解码 shim：与服务端 exitedSchema 对应。 */
@@ -81,6 +97,19 @@ window.__ModuleLoader__.load({
 						typeSymbol: "@kesike/dsh-exit/types#Exited",
 						schema: exitedClientSchema
 					}
+				},
+				{
+					id: "@kesike/dsh-exit#dshExit/restart",
+					service: "dshExit",
+					namespace: "dshExit",
+					method: "restart",
+					invocation: { kind: "direct" },
+					parameters: [],
+					result: {
+						mode: "strict",
+						typeSymbol: "@kesike/dsh-exit/types#Restarted",
+						schema: exitedClientSchema
+					}
 				}
 			]
 		};
@@ -89,35 +118,57 @@ window.__ModuleLoader__.load({
 		const DICT = {
 			zh: {
 				nav: "退出",
-				title: "退出 dsh",
-				description: "从这里安全结束 dsh 宿主进程，并释放它占用的端口。",
-				warning: "确认后将结束所有运行中的会话并停止后台服务，当前 dsh Web 端口 {endpoint} 会随之释放。",
-				button: "确认退出",
+				title: "退出与重新启动 dsh",
+				description: "从这里安全结束或重新启动 dsh 宿主进程，并管理它占用的端口。",
+				exitActionTitle: "结束 dsh",
+				exitWarning: "确认后将结束所有运行中的会话并停止后台服务，当前 dsh Web 端口 {endpoint} 会随之释放。",
+				exitButton: "确认退出",
+				restartActionTitle: "重新启动 dsh",
+				restartWarning: "重新启动会短暂中断所有运行中的会话；后台服务恢复后，页面将自动刷新。",
+				restartButton: "重新启动",
 				dialogTitle: "退出 DeepSeek Harness？",
 				dialogBody: "退出后将结束所有运行中的会话并停止后台服务，当前 dsh Web 端口 {endpoint} 会随之释放。",
+				restartDialogTitle: "重新启动 DeepSeek Harness？",
+				restartDialogBody: "这会结束当前运行中的会话，后台服务将释放并重新监听 {endpoint}。服务恢复后页面将自动刷新。",
 				cancel: "取消",
 				confirm: "确认退出",
+				restartConfirm: "确认重启",
 				exiting: "正在退出…",
-				errorPrefix: "退出失败："
+				restarting: "正在重新启动…",
+				restartWaiting: "后台服务正在重新启动，恢复后页面将自动刷新。",
+				restartTimeout: "后台服务尚未恢复，请稍后手动刷新页面。",
+				exitErrorPrefix: "退出失败：",
+				restartErrorPrefix: "重启失败："
 			},
 			en: {
 				nav: "Exit",
-				title: "Exit dsh",
-				description: "Safely terminate the dsh host process and release the ports it owns.",
-				warning: "Confirming ends all running sessions and stops the background service, releasing the current dsh Web port {endpoint}.",
-				button: "Confirm exit",
+				title: "Exit or restart dsh",
+				description: "Safely terminate or restart the dsh host process and manage the ports it owns.",
+				exitActionTitle: "Exit dsh",
+				exitWarning: "Confirming ends all running sessions and stops the background service, releasing the current dsh Web port {endpoint}.",
+				exitButton: "Confirm exit",
+				restartActionTitle: "Restart dsh",
+				restartWarning: "Restarting briefly interrupts all running sessions; this page refreshes automatically after the service recovers.",
+				restartButton: "Restart",
 				dialogTitle: "Exit DeepSeek Harness?",
 				dialogBody: "This ends all running sessions and stops the background service, releasing the current dsh Web port {endpoint}.",
+				restartDialogTitle: "Restart DeepSeek Harness?",
+				restartDialogBody: "This ends the current sessions while the background service releases and reclaims {endpoint}. The page refreshes automatically after recovery.",
 				cancel: "Cancel",
 				confirm: "Confirm exit",
+				restartConfirm: "Confirm restart",
 				exiting: "Exiting…",
-				errorPrefix: "Exit failed: "
+				restarting: "Restarting…",
+				restartWaiting: "The background service is restarting. This page will refresh after it recovers.",
+				restartTimeout: "The background service has not recovered yet. Please refresh this page later.",
+				exitErrorPrefix: "Exit failed: ",
+				restartErrorPrefix: "Restart failed: "
 			}
 		};
 
-		let exiting = false;
 		let overlayEl = null;
 		let escHandler = null;
+		let restartPollTimer = null;
 
 		function injectCss() {
 			if (document.querySelector("style[data-plugin-css='dsh-exit']")) return;
@@ -150,7 +201,7 @@ window.__ModuleLoader__.load({
 				const originalIcon = cell.firstElementChild;
 				const icon = document.createElement("span");
 				icon.className = "dshExitNavIcon";
-				icon.innerHTML = ICON_SVG;
+				icon.innerHTML = EXIT_ICON_SVG;
 				if (originalIcon !== null && originalIcon !== label) {
 					originalIcon.dataset.dshExitOriginalIcon = "true";
 					originalIcon.style.display = "none";
@@ -173,6 +224,31 @@ window.__ModuleLoader__.load({
 
 		function ExitSettingsSection({ ctx, t }) {
 			const endpoint = currentDshEndpoint();
+			const actionCard = ({ action, icon, title, warning, button }) => h("div", {
+				className: "dshExitSettingsCard",
+				key: action
+			}, [
+				h("span", {
+					className: "dshExitActionIcon dshExitActionIcon--" + action,
+					dangerouslySetInnerHTML: { __html: icon },
+					"aria-hidden": "true",
+					key: "icon"
+				}),
+				h("div", { className: "dshExitSettingsCopy", key: "copy" }, [
+					h("h3", { className: "dshExitSettingsActionTitle", key: "title" }, textOf(t, title)),
+					h("p", { className: "dshExitSettingsWarning", key: "warning" }, textOf(t, warning, { endpoint }))
+				]),
+				h("button", {
+					type: "button",
+					className: "dshExitSettingsButton dshExitSettingsButton--" + action,
+					"aria-label": textOf(t, button),
+					onClick: (event) => openModal(ctx, event.currentTarget, t, action),
+					key: "button"
+				}, [
+					h("span", { dangerouslySetInnerHTML: { __html: icon }, "aria-hidden": "true", key: "icon" }),
+					textOf(t, button)
+				])
+			]);
 			return h("section", {
 				className: "dshExitSettings",
 				"aria-labelledby": "dsh-exit-settings-title"
@@ -180,7 +256,7 @@ window.__ModuleLoader__.load({
 				h("div", { className: "dshExitSettingsHeader", key: "header" }, [
 					h("span", {
 						className: "dshExitSettingsIcon",
-						dangerouslySetInnerHTML: { __html: ICON_SVG },
+						dangerouslySetInnerHTML: { __html: EXIT_ICON_SVG },
 						key: "icon"
 					}),
 					h("div", { key: "copy" }, [
@@ -188,23 +264,30 @@ window.__ModuleLoader__.load({
 						h("p", { className: "dshExitSettingsDescription", key: "description" }, textOf(t, "description"))
 					])
 				]),
-				h("div", { className: "dshExitSettingsCard", key: "card" }, [
-					h("p", { className: "dshExitSettingsWarning", key: "warning" }, textOf(t, "warning", { endpoint })),
-					h("button", {
-						type: "button",
-						className: "dshExitSettingsButton",
-						"aria-label": textOf(t, "button"),
-						onClick: (event) => openModal(ctx, event.currentTarget, t),
-						key: "button"
-					}, [
-						h("span", { dangerouslySetInnerHTML: { __html: ICON_SVG }, key: "icon" }),
-						textOf(t, "button")
-					])
+				h("div", { className: "dshExitSettingsActions", key: "actions" }, [
+					actionCard({
+						action: "exit",
+						icon: EXIT_ICON_SVG,
+						title: "exitActionTitle",
+						warning: "exitWarning",
+						button: "exitButton"
+					}),
+					actionCard({
+						action: "restart",
+						icon: RESTART_ICON_SVG,
+						title: "restartActionTitle",
+						warning: "restartWarning",
+						button: "restartButton"
+					})
 				])
 			]);
 		}
 
 		function closeModal() {
+			if (restartPollTimer !== null) {
+				clearTimeout(restartPollTimer);
+				restartPollTimer = null;
+			}
 			if (escHandler) {
 				document.removeEventListener("keydown", escHandler);
 				escHandler = null;
@@ -215,8 +298,53 @@ window.__ModuleLoader__.load({
 			}
 		}
 
-		function openModal(ctx, exitBtn, t) {
+		function waitForRestart({ title, body, errorEl, actions, cancel, confirm, t }) {
+			const startedAt = Date.now();
+			let sawUnavailable = false;
+			title.textContent = textOf(t, "restarting");
+			body.textContent = textOf(t, "restartWaiting");
+			actions.style.display = "none";
+			const check = async () => {
+				try {
+					const response = await fetch("/?dshRestartProbe=" + Date.now(), { cache: "no-store" });
+					if (response.ok && (sawUnavailable || Date.now() - startedAt >= 5_000)) {
+						globalThis.location.reload();
+						return;
+					}
+				} catch {
+					sawUnavailable = true;
+				}
+				if (Date.now() - startedAt >= 60_000) {
+					restartPollTimer = null;
+					errorEl.textContent = textOf(t, "restartTimeout");
+					actions.style.removeProperty("display");
+					confirm.style.display = "none";
+					cancel.disabled = false;
+					return;
+				}
+				restartPollTimer = setTimeout(check, 500);
+			};
+			restartPollTimer = setTimeout(check, 800);
+		}
+
+		function openModal(ctx, actionBtn, t, action) {
 			const endpoint = currentDshEndpoint();
+			const isRestart = action === "restart";
+			const keys = isRestart ? {
+				title: "restartDialogTitle",
+				body: "restartDialogBody",
+				confirm: "restartConfirm",
+				pending: "restarting",
+				button: "restartButton",
+				error: "restartErrorPrefix"
+			} : {
+				title: "dialogTitle",
+				body: "dialogBody",
+				confirm: "confirm",
+				pending: "exiting",
+				button: "exitButton",
+				error: "exitErrorPrefix"
+			};
 			const text = (key) => textOf(t, key, { endpoint });
 			closeModal();
 			overlayEl = document.createElement("div");
@@ -225,13 +353,13 @@ window.__ModuleLoader__.load({
 			panel.className = "dshExitModal";
 			panel.setAttribute("role", "dialog");
 			panel.setAttribute("aria-modal", "true");
-			panel.setAttribute("aria-label", text("dialogTitle"));
+			panel.setAttribute("aria-label", text(keys.title));
 			const title = document.createElement("h3");
 			title.className = "dshExitTitle";
-			title.textContent = text("dialogTitle");
+			title.textContent = text(keys.title);
 			const body = document.createElement("p");
 			body.className = "dshExitBody";
-			body.textContent = text("dialogBody");
+			body.textContent = text(keys.body);
 			const errorEl = document.createElement("p");
 			errorEl.className = "dshExitError";
 			const actions = document.createElement("div");
@@ -242,48 +370,51 @@ window.__ModuleLoader__.load({
 			cancel.textContent = text("cancel");
 			const confirm = document.createElement("button");
 			confirm.type = "button";
-			confirm.className = "dshExitConfirm";
-			confirm.textContent = text("confirm");
+			confirm.className = "dshExitConfirm" + (isRestart ? " dshExitConfirm--restart" : "");
+			confirm.textContent = text(keys.confirm);
 			actions.append(cancel, confirm);
 			panel.append(title, body, errorEl, actions);
 			overlayEl.appendChild(panel);
 
 			escHandler = (event) => {
-				if (event.key === "Escape" && !confirm.disabled) closeModal();
+				if (event.key === "Escape" && !cancel.disabled) closeModal();
 			};
 			document.addEventListener("keydown", escHandler);
 			overlayEl.addEventListener("click", (event) => {
-				if (event.target === overlayEl && !confirm.disabled) closeModal();
+				if (event.target === overlayEl && !cancel.disabled) closeModal();
 			});
 			cancel.addEventListener("click", () => {
-				if (!confirm.disabled) closeModal();
+				if (!cancel.disabled) closeModal();
 			});
 			confirm.addEventListener("click", () => {
-				exiting = true;
 				confirm.disabled = true;
 				cancel.disabled = true;
 				errorEl.textContent = "";
-				exitBtn.disabled = true;
-				exitBtn.setAttribute("aria-label", text("exiting"));
+				actionBtn.disabled = true;
+				actionBtn.setAttribute("aria-label", text(keys.pending));
 				Promise.resolve()
 					.then(() => {
 						const service = ctx.get("remote.dshExit");
 						if (service === undefined) throw new Error("dsh-exit 服务不可用（宿主未注册？）");
-						return service.exit();
+						if (typeof service[action] !== "function") throw new Error("dsh-exit 不支持 " + action + " 操作");
+						return service[action]();
 						})
 					.then((result) => {
 						if (!result || result.ok !== true) {
-							throw new Error((result && result.error && result.error.message) || "退出调用失败");
+							throw new Error((result && result.error && result.error.message) || action + " 调用失败");
+						}
+						if (isRestart) {
+							waitForRestart({ title, body, errorEl, actions, cancel, confirm, t });
+						} else {
+							closeModal();
 						}
-						closeModal();
 					})
 					.catch((reason) => {
-						exiting = false;
 						confirm.disabled = false;
 						cancel.disabled = false;
-						exitBtn.disabled = false;
-						exitBtn.setAttribute("aria-label", "退出");
-						errorEl.textContent = text("errorPrefix") + (reason instanceof Error ? reason.message : String(reason));
+						actionBtn.disabled = false;
+						actionBtn.setAttribute("aria-label", text(keys.button));
+						errorEl.textContent = text(keys.error) + (reason instanceof Error ? reason.message : String(reason));
 					});
 			});
 			document.body.appendChild(overlayEl);
@@ -316,7 +447,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 
-		exports.inject = ["slots", "locale"];
+		exports.inject = ["slots", "locale", "remote"];
 		exports.apply = apply;
 		return module.exports;
 	}

package/lib/index.js

@@ -2,10 +2,15 @@
 /**
  * dsh-exit：把「退出 dsh 宿主并释放端口」暴露给浏览器的一个宿主服务。
  *
- * 远程面：`remote.dshExit.exit()`（Typert Remote，经 /api/dshExit/exit 网关）。
- * 调用后：先应答，再延迟 400ms 结束宿主进程——端口随进程退出释放；
+ * 远程面：`remote.dshExit.exit()` / `remote.dshExit.restart()`（Typert Remote）。
+ * 调用后：先应答，再延迟 400ms 请求 dsh 完成有界清理并结束宿主进程；
+ * 重启时由独立辅助进程等待旧宿主退出，再在 Windows Terminal 新前台窗口中
+ * 用原启动参数拉起新宿主。
  * 不操作宿主终端窗口或系统托盘。
  */
+import { existsSync } from "node:fs";
+import { spawn, spawnSync } from "node:child_process";
+import { join } from "node:path";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 
 const exitedSchema = {
@@ -30,6 +35,20 @@ const EXIT_INVOCATIONS = [
 			schema: exitedSchema
 		},
 		sourceLocation: { file: "@kesike/dsh-exit/lib/index.js", line: 1, column: 1 }
+	},
+	{
+		id: "@kesike/dsh-exit#dshExit/restart",
+		service: "dshExit",
+		namespace: "dshExit",
+		method: "restart",
+		invocation: { kind: "direct" },
+		parameters: [],
+		result: {
+			mode: "strict",
+			typeSymbol: "@kesike/dsh-exit/types#Restarted",
+			schema: exitedSchema
+		},
+		sourceLocation: { file: "@kesike/dsh-exit/lib/index.js", line: 1, column: 1 }
 	}
 ];
 
@@ -57,14 +76,192 @@ function markRemoteMethod(instance, method) {
 	Remote(method)(void 0, context);
 }
 
+/** 拒绝在 supervisor/Node IPC 管道下自脱离重启，避免新宿主失去外部生命周期管理。 */
+function hasSupervisorChannel() {
+	return process.env.NODE_CHANNEL_FD !== undefined ||
+		process.env.NODE_UNIQUE_ID !== undefined ||
+		typeof process.send === "function";
+}
+
+/** 等待 detached 子进程确认已成功创建；异步 error 不能由 spawn() 的 try/catch 捕获。 */
+function waitForSpawn(child, label) {
+	return new Promise((resolve, reject) => {
+		child.once("spawn", resolve);
+		child.once("error", (error) => {
+			const detail = error instanceof Error ? error.message : String(error);
+			reject(new Error(`${label} failed to start: ${detail}`, { cause: error }));
+		});
+	});
+}
+
+/** 解析 PowerShell 7，避免新 Windows Terminal tab 落回 Windows PowerShell 5。 */
+function resolvePowerShell7() {
+	const candidates = [
+		process.env.ProgramW6432 === undefined ? undefined : join(process.env.ProgramW6432, "PowerShell", "7", "pwsh.exe"),
+		process.env.ProgramFiles === undefined ? undefined : join(process.env.ProgramFiles, "PowerShell", "7", "pwsh.exe"),
+		process.env.LOCALAPPDATA === undefined ? undefined : join(process.env.LOCALAPPDATA, "Programs", "PowerShell", "7", "pwsh.exe")
+	].filter((candidate) => candidate !== undefined && existsSync(candidate));
+	if (candidates[0] !== undefined) return candidates[0];
+	const result = spawnSync("where.exe", ["pwsh.exe"], {
+		encoding: "utf8",
+		stdio: ["ignore", "pipe", "ignore"],
+		windowsHide: true
+	});
+	const executable = String(result.stdout || "")
+		.split(/\r?\n/)
+		.map((line) => line.trim())
+		.find(Boolean);
+	if (result.status === 0 && executable !== undefined) return executable;
+	throw new Error("dsh-exit: PowerShell 7 (pwsh.exe) is not available");
+}
+
+/** 通过 PowerShell 7 解析当前用户安装的 Windows Terminal 本体。 */
+function resolveWindowsTerminal(shellPath) {
+	const command = [
+		"$package = Get-AppxPackage -Name 'Microsoft.WindowsTerminal' | Sort-Object Version -Descending | Select-Object -First 1",
+		"if ($null -eq $package) { exit 1 }",
+		"$terminal = Join-Path $package.InstallLocation 'WindowsTerminal.exe'",
+		"if (-not (Test-Path -LiteralPath $terminal)) { exit 1 }",
+		"Write-Output $terminal"
+	].join("; ");
+	const result = spawnSync(shellPath, [
+		"-NoLogo",
+		"-NoProfile",
+		"-NonInteractive",
+		"-ExecutionPolicy",
+		"Bypass",
+		"-Command",
+		command
+	], {
+		encoding: "utf8",
+		stdio: ["ignore", "pipe", "pipe"],
+		windowsHide: true
+	});
+	const terminal = String(result.stdout || "")
+		.split(/\r?\n/)
+		.map((line) => line.trim())
+		.find((line) => line.endsWith("WindowsTerminal.exe") && existsSync(line));
+	if (result.status === 0 && terminal !== undefined) return terminal;
+	const detail = String(result.stderr || "").trim();
+	throw new Error("dsh-exit: Windows Terminal (WindowsTerminal.exe) is not available" +
+		(detail === "" ? "" : ": " + detail));
+}
+
+/** 将 Node 重启参数编码成 PowerShell 7 的 -EncodedCommand，避免 WT 二次解析。 */
+function encodePowerShellLaunch(payload) {
+	const payloadBase64 = Buffer.from(JSON.stringify(payload), "utf8").toString("base64");
+	const nodeCommand = [
+		`$payloadJson = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${payloadBase64}'))`,
+		"$payload = $payloadJson | ConvertFrom-Json",
+		"Set-Location -LiteralPath $payload.cwd",
+		"$arguments = @($payload.args)",
+		"& $payload.execPath @arguments",
+		"exit $LASTEXITCODE"
+	].join("; ");
+	const nodeCommandBase64 = Buffer.from(nodeCommand, "utf16le").toString("base64");
+	return nodeCommandBase64;
+}
+
+const RESTART_HELPER = String.raw`
+const { spawn } = require("node:child_process");
+const payload = JSON.parse(process.argv[1]);
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const isAlive = (pid) => {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (error) {
+		// ESRCH means the PID is gone. Treat every other failure as alive so
+		// permissions or transient Windows errors fail closed instead of
+		// starting a second host while the old one may still own the port.
+		return error?.code !== "ESRCH";
+	}
+};
+(async () => {
+	const deadline = Date.now() + payload.waitTimeoutMs;
+	while (isAlive(payload.parentPid) && Date.now() < deadline) await sleep(200);
+	if (isAlive(payload.parentPid)) process.exit(1);
+	await sleep(250);
+	const terminalLaunch = payload.launcher === "windows-terminal";
+	const launchArgs = terminalLaunch ? [
+		"-w",
+		"new",
+		"new-tab",
+		"--title",
+		payload.title,
+		"--startingDirectory",
+		payload.cwd,
+		"--inheritEnvironment",
+		payload.shellPath,
+		"-NoLogo",
+		"-NoProfile",
+		"-ExecutionPolicy",
+		"Bypass",
+		"-EncodedCommand",
+		payload.commandBase64
+	] : payload.args;
+	const child = spawn(terminalLaunch ? payload.terminalPath : payload.execPath, launchArgs, {
+		cwd: payload.cwd,
+		env: process.env,
+		detached: true,
+		stdio: "ignore",
+		windowsHide: terminalLaunch ? false : true
+	});
+	child.once("error", () => {
+		process.exitCode = 1;
+	});
+	child.once("spawn", () => child.unref());
+})().catch(() => {
+	process.exitCode = 1;
+});
+`;
+
+/** 启动一个与旧宿主生命周期解耦的 helper；Windows 下直接打开新的可见 Windows Terminal 窗口。 */
+function scheduleRestart() {
+	if (hasSupervisorChannel()) {
+		throw new Error("dsh-exit: refusing self-restart under supervisor or Node IPC");
+	}
+	const launcher = process.platform === "win32" ? "windows-terminal" : "direct";
+	const env = { ...process.env };
+	delete env.NODE_CHANNEL_FD;
+	delete env.NODE_UNIQUE_ID;
+	const restartPayload = {
+		parentPid: process.pid,
+		execPath: process.execPath,
+		args: [...process.execArgv, ...process.argv.slice(1)],
+		cwd: process.cwd(),
+	};
+	const shellPath = launcher === "windows-terminal" ? resolvePowerShell7() : undefined;
+	const terminalPath = launcher === "windows-terminal" ? resolveWindowsTerminal(shellPath) : undefined;
+	const payload = JSON.stringify({
+		...restartPayload,
+		launcher,
+		shellPath,
+		terminalPath,
+		commandBase64: launcher === "windows-terminal" ? encodePowerShellLaunch(restartPayload) : undefined,
+		title: "dsh-web",
+		waitTimeoutMs: 15_000
+	});
+	const helper = spawn(process.execPath, ["-e", RESTART_HELPER, payload], {
+		env,
+		detached: true,
+		stdio: "ignore",
+		windowsHide: true
+	});
+	const started = waitForSpawn(helper, "restart helper");
+	helper.unref();
+	return started;
+}
+
 class DshExitService extends TypertRemoteService {
 	static name = "dshExit";
 	static inject = ["typert"];
-	exiting = false;
+	closing = null;
 
 	constructor(ctx) {
 		super(ctx, "dshExit");
 		markRemoteMethod(this, "exit");
+		markRemoteMethod(this, "restart");
 		const existing = ctx.get("typert");
 		if (existing !== undefined) {
 			existing.register(EXIT_TYPERT);
@@ -75,12 +272,41 @@ class DshExitService extends TypertRemoteService {
 		}
 	}
 
+	scheduleRestart() {
+		return scheduleRestart();
+	}
+
+	/** 让远程响应先写回浏览器，再通过 dsh 的 appExit 执行有界资源清理。 */
+	requestShutdown() {
+		const appExit = this.ctx.get("appExit");
+		setTimeout(() => {
+			if (typeof appExit === "function") appExit(0);
+			else process.exit(0);
+		}, 400);
+	}
+
 	/** 结束宿主并释放端口；不触碰宿主终端窗口。 */
 	async exit() {
-		if (this.exiting) return true;
-		this.exiting = true;
+		if (this.closing !== null) return true;
+		this.closing = "exit";
 		this.ctx.logger?.info?.("dsh-exit: exit requested from the web UI");
-		setTimeout(() => process.exit(0), 400);
+		this.requestShutdown();
+		return true;
+	}
+
+	/** 清理并结束当前宿主，待旧进程退出后使用相同 Node 参数重新启动。 */
+	async restart() {
+		if (this.closing !== null) return true;
+		this.closing = "restart";
+		try {
+			await this.scheduleRestart();
+		} catch (error) {
+			this.closing = null;
+			this.ctx.logger?.error?.("dsh-exit: failed to schedule restart", error);
+			throw error;
+		}
+		this.ctx.logger?.info?.("dsh-exit: restart requested from the web UI");
+		this.requestShutdown();
 		return true;
 	}
 }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@kesike/dsh-exit",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "description": "在 dsh web 界面提供退出按钮：确认后结束宿主进程并释放端口",
+  "scripts": {
+    "test": "node --test"
+  },
   "keywords": [
     "dsh",
     "deepseek-harness",
@@ -29,6 +32,13 @@
   "engines": {
     "node": ">=22.19.0 || >=24.0.0"
   },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-api-remotes": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.1-rc.2"
+  },
   "files": [
     "lib",
     "cordis.patch.yml",
@@ -44,8 +54,9 @@
     },
     "client": {
       "inject": [
+        "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-locale"
       ],
       "platform": "web"