dsh-m 0.2.10 → 0.2.11

package/README.en.md

@@ -4,7 +4,7 @@
 [![npm](https://img.shields.io/npm/v/dsh-m?label=npm)](https://www.npmjs.com/package/dsh-m)
 [![Registry Check](https://img.shields.io/github/actions/workflow/status/iasiv5/dsh-m/registry.yml?branch=main&label=Registry%20Check)](../../actions/workflows/registry.yml)
 [![License](https://img.shields.io/github/license/iasiv5/dsh-m?label=License)](./LICENSE)
-[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20verified-2563eb)](#faq)
+[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%2B%200.1.5--rc.1%20contract%20checked-2563eb)](#faq)
 
 English · [中文](./README.md)
 
@@ -22,7 +22,7 @@ A DeepSeek Harness (DSH) plugin marketplace with a customizable registry: **brow
 ```text
 Install and enable the DSH plugin dsh-m:
 1. Run `dsh plugin --profile web add dsh-m`
-2. Restart DSH Web to load the plugin (on this machine: `systemctl --user restart dsh-web.service`; or restart it your usual way)
+2. Restart DSH Web to load the plugin (restart the DSH user unit used by your deployment; do not hardcode a unit name)
 3. Poll `curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:3080` until it returns 200 again
 4. Run `curl -s -X POST http://127.0.0.1:3080/dshm -H 'content-type: application/json' -d '{"method":"ping"}'` and confirm the reply has `plugin: dsh-m`
 5. Then remind me to refresh the page and click "Plugin Marketplace" at the bottom of the sidebar
@@ -40,7 +40,7 @@ The default registry includes DSH Skins, ModSearch, the Lark / QQ / Weixin / WeC
 | **Installed** | What your web profile actually has, annotated "via market / non-market"; update badges, upgrade, two-step confirm uninstall; 📖 README preview (64KB cap) |
 | **Settings** | Registry address draft with "Validate & apply / Restore default / Download default registry.json / Check entries reachability"; configured vs active address and status at a glance; force refresh; dsh-m self-update |
 
-After any mutation a "⚡ Restart" banner appears — restart goes through the systemd unit (same-origin checked, detached-helper fallback) and polls by boot id until the service is back. Installs stream live pnpm progress (resolve → download → link → build).
+After any mutation a "⚡ Restart" banner appears — under systemd, the DSH launcher's `appExit` hook hands the restart back to a unit configured with `Restart=on-failure` or `Restart=always`, avoiding a `systemctl` helper inside the unit cgroup that is about to stop; if `appExit` is unavailable, the fallback uses a manager-owned transient `systemd-run` service and only then a detached helper. The client confirms the replacement by boot id and dismisses the banner, leaving DSH Web's own background connection recovery in control; it does not force a full-page reload during the auth/route handoff. The current DSH Web `0.1.5-rc.1` runtime has now live-loaded dsh-m `0.2.11`; `/dshm` ping returned version `0.2.11`, and an authenticated page request completed `303 → 200`. The reported 404 was not reproducible once the service stabilized; journal evidence showed repeated `status=75/TEMPFAIL` restarts during the incident. Live DSH `0.1.2-rc.1`, transient-fallback, and repeated install/uninstall E2E experiments remain pre-release gaps. Installs stream live pnpm progress (resolve → download → link → build).
 
 ## Agent tools (7)
 
@@ -110,6 +110,9 @@ Listings over 200 entries trigger a performance notice. The market list is serve
 **4. What if my custom source goes down?**
 dsh-m serves its last successful cache for that source and marks it as cached; with no cache at all the market shows "registry unavailable" while installed plugins stay manageable. Fix the address or restore the default anytime.
 
+**5. Which DSH Web versions does the restart button support?**
+The public package contracts for `0.1.2-rc.1` and `0.1.5-rc.1` are checked; both expose the dsh-m `appExit` launcher hook. The current `openbmc-dsh.service` runtime has live-loaded dsh-m `0.2.11`; `/dshm` ping returned `0.2.11`, and an authenticated page request completed `303 → 200`. The reported 404 was not reproducible after service stabilization; journal evidence recorded repeated `status=75/TEMPFAIL` restarts during the incident. Live DSH `0.1.2-rc.1`, transient-fallback, and repeated install/uninstall E2E experiments remain pre-release gaps. Systemd deployments must configure `Restart=on-failure` or `Restart=always`; otherwise use the deployment's manual restart procedure.
+
 ## License
 
 MIT

package/README.md

@@ -4,7 +4,7 @@
 [![npm](https://img.shields.io/npm/v/dsh-m?label=npm)](https://www.npmjs.com/package/dsh-m)
 [![Registry Check](https://img.shields.io/github/actions/workflow/status/iasiv5/dsh-m/registry.yml?branch=main&label=Registry%20Check)](../../actions/workflows/registry.yml)
 [![License](https://img.shields.io/github/license/iasiv5/dsh-m?label=License)](./LICENSE)
-[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20verified-2563eb)](#faq)
+[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%2B%200.1.5--rc.1%20contract%20checked-2563eb)](#faq)
 
 [English](./README.en.md) · 中文
 
@@ -22,7 +22,7 @@
 ```text
 安装并启用 DSH 插件 dsh-m：
 1. 执行 `dsh plugin --profile web add dsh-m`
-2. 重启 DSH Web 使插件加载（本机：`systemctl --user restart dsh-web.service`；或按你的部署方式重启）
+2. 重启 DSH Web 使插件加载（按部署方式重启对应的 DSH user unit；unit 名称不要硬编码）
 3. 轮询 `curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:3080`，直到恢复 200
 4. 执行 `curl -s -X POST http://127.0.0.1:3080/dshm -H 'content-type: application/json' -d '{"method":"ping"}'`，确认返回 `plugin: dsh-m`
 5. 完成后提醒我刷新页面，点击侧栏底部的「插件市场」
@@ -40,7 +40,7 @@
 | **已装** | web profile 实装列表，标注「市场安装 / 非市场安装」；可升级徽标、升级、两段式确认卸载；📖 README 预览（64KB 截断） |
 | **设置** | registry 地址草稿 +「校验并应用 / 恢复默认 / 下载默认 registry.json / 检查条目可达性」；配置地址、生效来源与状态一目了然；强制刷新；dsh-m 自更新 |
 
-安装 / 卸载 / 升级完成后出现「⚡ 一键重启」横幅——重启走 systemd 单元（同源校验，兜底 detached helper），按 boot id 轮询直至服务恢复。安装过程实时显示 pnpm 进度（解析 → 下载 → 链接 → 构建）。
+安装 / 卸载 / 升级完成后出现「⚡ 一键重启」横幅——受 systemd 管理时通过 DSH launcher 的 `appExit` 交给服务的 `Restart` 策略，避免在待停止 unit 的 cgroup 内启动 `systemctl` helper；无 `appExit` 的 systemd 兜底改用 manager-owned transient `systemd-run`，最后才退回 detached-helper。客户端按 boot id 确认新进程已恢复后关闭横幅，交由 DSH Web 自身的后台连接重试恢复页面，不强制整页刷新，避免认证/路由切换期间白屏。已完成当前 DSH Web `0.1.5-rc.1` 运行时的 live 核验：web profile 已加载 dsh-m `0.2.11`，重启后 `/dshm` ping 返回 `version: 0.2.11`，携带当前认证 token 的页面请求流程为 `303 → 200`；无认证请求会被拒绝。此次白屏截图对应的 404 在服务稳定后未复现；journal 显示截图时段发生多次 `status=75/TEMPFAIL` 重启，当前暂判定为重启/认证过渡窗口现象，未发现 dsh-m Host 路由崩溃。DSH `0.1.2-rc.1` live E2E、transient fallback live E2E，以及连续安装/卸载实验仍是正式发布前的验证 gap。安装过程实时显示 pnpm 进度（解析 → 下载 → 链接 → 构建）。
 
 ## Agent 工具（7 个）
 
@@ -110,6 +110,9 @@ main 上的中间提交可能不稳定。dsh-m 只跟踪 **release / tag**（优
 **4. 自定义源挂了怎么办？**
 优先使用该源最近一次成功的缓存并标记「缓存来源」；完全没有缓存时市场显示「收录清单不可用」，已安装插件仍可正常管理。修正地址或恢复默认即可。
 
+**5. 重启按钮支持哪些 DSH Web 版本？**
+已核对 `0.1.2-rc.1` 与 `0.1.5-rc.1` 的公开包契约；两版都提供 dsh-m 使用的 `appExit` launcher hook。当前 `openbmc-dsh.service` 的 0.1.5 运行时已实际加载 dsh-m `0.2.11` 并完成 `/dshm` ping 与带认证页面的 `303 → 200` 核验；白屏期间的多次 `status=75/TEMPFAIL` 已记录，当前稳定服务未复现 404。0.1.2 live E2E、transient fallback live E2E 和连续插件安装/卸载实验仍需发布前补做。systemd 部署需要 unit 配置 `Restart=on-failure` 或 `Restart=always`，否则请使用部署方的手动重启方式。
+
 ## License
 
 MIT

package/docs/DESIGN.md

@@ -83,7 +83,7 @@ npm 安装 / GitHub 安装 / 升级 / 自升级 / 卸载是**同一个事务模
 - **卸载**（事务定序写死）：validate（严格读取：NOT_INSTALLED / NOT_DSH_PLUGIN / PLUGIN_METADATA_UNREADABLE，全部零写入零快照）→ 快照 → live-disable（先让 client bundle 下线，避免 404；回滚时尽力反向）→ 摘除该包补丁条目（`pnpm-workspace.yaml` 顶层 `patchedDependencies` 与 `package.json#pnpm.patchedDependencies`；残留条目会令 pnpm 以 `ERR_PNPM_UNUSED_PATCH` 整单失败，只精确匹配 `pkg` / `pkg@ver`，补丁文件本体保留并计入残留报告）→ remove → verify gone（仍在则回滚）。**不清理插件产生的数据/配置**，但把检测到的疑似残留路径（如 `~/.dsh/<plugin>.json`）列出报告。
 - **升级**：**按需检查**（`dshm_outdated` / `dshm_list` 时实时比对本地版本 vs npm latest / GitHub release，半自动——展示升级计划，确认后执行，即重开一次安装事务）。**不做后台定时器**。
 - **自更新**：dsh-m 对自己同样做版本比对 + 提示升级（设置页呈现）；执行即 `install-npm` 事务（integrity 缺失直接拒绝，不进事务）。
-- **重启**：内置**一键重启**，复用 skillhub 验证过的重启路径（本机 `dsh-web.service` 是转发 shim，不新建 systemd 单元、不监听 3080）。安装/卸载/升级完成后 GUI 弹「需重启生效 [一键重启]」横幅，工具返回重启提示。
+- **重启**：内置**一键重启**。在服务管理器托管的 DSH 进程内，只有确认 unit 的 `Restart=on-failure` / `Restart=always` 且 `75` 未被 `SuccessExitStatus` / `RestartPreventExitStatus` 覆盖时，才调用 launcher 提供的 `appExit(75)`；策略未知或不满足时改用 manager-owned transient `systemd-run` 调用 `systemctl`，不猜测或硬编码 unit 名称，也不在即将停止的 cgroup 内 detached spawn `systemctl`。无 systemd/appExit 时再退回 detached-helper 兼容路径。安装/卸载/升级完成后 GUI 弹「需重启生效 [一键重启]」横幅；客户端以 boot id 确认替换进程后关闭横幅，交由 DSH Web 自身后台连接恢复，不强制整页刷新；工具返回重启提示。
 - **安全基线（5 条）**：
   1. 所有拉取仅 HTTPS + 响应大小上限 + 超时；
   2. npm 安装校验 integrity；
@@ -182,5 +182,5 @@ npm 安装 / GitHub 安装 / 升级 / 自升级 / 卸载是**同一个事务模
 
 - profile 根：`$DSH_HOME/profiles/web`（默认 `~/.dsh/profiles/web`）；已装插件 = 其 `package.json` dependencies + `dsh.profile.bundles`。
 - 新装插件需**重启 dsh web** 才加载；HMR 仅在 `pnpm run dev:web` watcher 存活时有效。
-- 禁止创建监听 3080 的进程；`dsh-web.service` 为 shim，重启走其转发路径。
+- 禁止创建监听 3080 的进程；部署 unit 名称（例如 `openbmc-dsh.service`、`deepseek-harness.service` 或 `dsh-web.service`）只作运行时事实，不硬编码到 dsh-m；managed host 的重启由 `appExit` + unit `Restart` 策略完成。
 - 插件包协议要点：`type: module`、`main` host 入口、`exports["./client"]` 指向打包产物、`dsh.client.platform: "web"`、`dsh.bundle.patch: ./cordis.patch.yml`（`- insert: - id: dsh-m; name: dsh-m`）。

package/lib/client.js

@@ -388,6 +388,7 @@ var restart_wait_exports = {};
 __export(restart_wait_exports, {
   RESTART_DEADLINE_MS: () => RESTART_DEADLINE_MS,
   RESTART_POLL_MS: () => RESTART_POLL_MS,
+  isAmbiguousRestartRequestError: () => isAmbiguousRestartRequestError,
   nextRestartWait: () => nextRestartWait
 });
 function nextRestartWait({ phase, now = 0, deadlineAt = Infinity, bootChanged = false }) {
@@ -396,6 +397,10 @@ function nextRestartWait({ phase, now = 0, deadlineAt = Infinity, bootChanged =
   }
   return bootChanged ? "done" : "continue";
 }
+function isAmbiguousRestartRequestError(error) {
+  const name = error && typeof error === "object" ? error.name : "";
+  return name === "TypeError" || name === "AbortError" || name === "NetworkError";
+}
 var RESTART_POLL_MS, RESTART_DEADLINE_MS;
 var init_restart_wait = __esm({
   "src/client/restart-wait.js"() {
@@ -417,7 +422,7 @@ var { createMarkdown: createMarkdown2 } = (init_markdown(), __toCommonJS(markdow
 var { ExtLink, MdImg, renderMarkdown } = createMarkdown2(h);
 var { installedViewModel: installedViewModel2, registrySourceKey: registrySourceKey2 } = (init_installed_view(), __toCommonJS(installed_view_exports));
 var { pickPayload: pickPayload2, parseToolArgs: parseToolArgs2 } = (init_tool_view(), __toCommonJS(tool_view_exports));
-var { RESTART_POLL_MS: RESTART_POLL_MS2, RESTART_DEADLINE_MS: RESTART_DEADLINE_MS2, nextRestartWait: nextRestartWait2 } = (init_restart_wait(), __toCommonJS(restart_wait_exports));
+var { RESTART_POLL_MS: RESTART_POLL_MS2, RESTART_DEADLINE_MS: RESTART_DEADLINE_MS2, nextRestartWait: nextRestartWait2, isAmbiguousRestartRequestError: isAmbiguousRestartRequestError2 } = (init_restart_wait(), __toCommonJS(restart_wait_exports));
 var ZH = {
   "market.title": "\u63D2\u4EF6\u5E02\u573A",
   "tab.market": "\u5E02\u573A",
@@ -567,7 +572,7 @@ var ZH = {
   "restart.now": "\u26A1 \u4E00\u952E\u91CD\u542F",
   "restart.failed": "\u91CD\u542F\u5931\u8D25\uFF1A{err}",
   "restart.timeout": "\u91CD\u542F\u8D85\u65F6\uFF0C\u8BF7\u624B\u52A8\u68C0\u67E5 dsh web \u670D\u52A1\u72B6\u6001",
-  "restart.hint.done": "\u5DF2\u8BF7\u6C42\u91CD\u542F DSH web\uFF08via {via}\uFF09\u3002\u670D\u52A1\u51E0\u79D2\u5185\u6062\u590D\uFF0C\u4E4B\u540E\u8BA9\u7528\u6237\u5237\u65B0\u9875\u9762\u5373\u53EF\u3002",
+  "restart.hint.done": "\u5DF2\u8BF7\u6C42\u91CD\u542F DSH web\uFF08via {via}\uFF09\u3002\u670D\u52A1\u6062\u590D\u540E DSH Web \u4F1A\u5728\u540E\u53F0\u81EA\u52A8\u91CD\u8FDE\u3002",
   "phase.resolving": "\u89E3\u6790\u4F9D\u8D56",
   "phase.downloading": "\u4E0B\u8F7D",
   "phase.linking": "\u94FE\u63A5\u5B89\u88C5",
@@ -586,8 +591,6 @@ var ZH = {
 };
 var EN = {
   "market.title": "Plugin Marketplace",
-  "title.panel": "Plugin Marketplace",
-  "title.full": "DeepSeek Harness Plugin Marketplace",
   "tab.market": "Market",
   "tab.installed": "Installed",
   "tab.settings": "Settings",
@@ -735,7 +738,7 @@ var EN = {
   "restart.now": "\u26A1 Restart",
   "restart.failed": "Restart failed: {err}",
   "restart.timeout": "Restart timed out \u2014 check the dsh web service manually",
-  "restart.hint.done": "Restart requested (via {via}). The service will be back in seconds; ask the user to refresh afterwards.",
+  "restart.hint.done": "Restart requested (via {via}). DSH Web will reconnect in the background after the service returns.",
   "phase.resolving": "Resolving",
   "phase.downloading": "Downloading",
   "phase.linking": "Linking",
@@ -1012,7 +1015,11 @@ function RestartBanner({ note, onDone }) {
     setPhase("restarting");
     try {
       const ping0 = await api("ping");
-      await api("restart");
+      try {
+        await api("restart");
+      } catch (requestError) {
+        if (!isAmbiguousRestartRequestError2(requestError)) throw requestError;
+      }
       setPhase("waiting");
       const deadlineAt = Date.now() + RESTART_DEADLINE_MS2;
       for (; ; ) {

package/lib/core/host-api.js

@@ -161,6 +161,7 @@ export function createApiDispatcher(ctx) {
         checkRegistryEntries: ctx.deps?.checkRegistryEntries ?? checkRegistryEntries,
         npmLatest: ctx.deps?.npmLatest ?? npmLatest,
         runTransaction: ctx.deps?.runTransaction ?? runProfileTransaction,
+        scheduleRestart: ctx.deps?.scheduleRestart ?? scheduleRestart,
     };
     const cfg = () => ctx.controller.config;
     return async function handleApi(req, res) {
@@ -273,7 +274,7 @@ export function createApiDispatcher(ctx) {
                     break;
                 }
                 case 'restart': {
-                    const result = scheduleRestart(servingPort(req));
+                    const result = d.scheduleRestart(servingPort(req));
                     payload = { ...result };
                     break;
                 }

package/lib/core/restart.js

@@ -1,10 +1,11 @@
 /**
- * 自重启：移植自 skillhub restart.ts（tag→OIDC 同源的 dsh-web shim 环境已验证）。
- * 优先 systemd 单元重启（本机 = deepseek-harness.service，dsh-web.service 为转发 shim）；
- * 无 systemd 时退回 detached helper 等端口释放后换身重拉。
+ * 自重启：优先使用 DSH launcher 提供的 appExit 生命周期钩子，把重启交给
+ * systemd 等服务管理器的 Restart 策略；没有受管服务时再退回 detached helper。
+ * 只有无法使用 appExit 且能从 cgroup 识别服务时，才通过 manager-owned transient
+ * systemd-run 任务调用 systemctl 作为兼容兜底，避免 helper 留在待停止 unit cgroup。
  * 安全：restart 端点必须通过 trustedRestartRequest（Origin 与 Host 同源）。
  */
-import { spawn } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
@@ -96,17 +97,32 @@ export function systemdUnitName(cgroupText) {
     }
     return null;
 }
+function shellQuote(part) {
+    return `'${part.replace(/'/g, "'\\''")}'`;
+}
+/**
+ * Build a transient systemd-run command for callers that do not have appExit.
+ * The transient service is owned by the manager, not by the DSH unit that it
+ * will restart, so KillMode=control-group cannot kill the restart command.
+ */
 export function systemdRestartArgv(opts) {
     const unit = systemdUnitName(opts.cgroup);
     if (unit === null)
         return null;
-    if (opts.cgroup.includes('/user.slice/')) {
-        return { file: 'systemctl', args: ['--user', 'restart', '--no-block', unit] };
-    }
-    if (opts.uid === 0) {
-        return { file: 'systemctl', args: ['restart', '--no-block', unit] };
-    }
-    return { file: 'sudo', args: ['-n', 'systemctl', 'restart', '--no-block', unit] };
+    const userManager = opts.cgroup.includes('/user.slice/');
+    const targetArgs = userManager
+        ? ['systemctl', '--user', 'restart', '--no-block', unit]
+        : ['systemctl', 'restart', '--no-block', unit];
+    const script = `sleep 0.2; exec ${targetArgs.map(shellQuote).join(' ')}`;
+    const transientArgs = [
+        '--unit', `dshm-restart-${opts.pid ?? process.pid}-${Date.now()}.service`,
+        '--collect', '--service-type=exec', '/bin/sh', '-c', script,
+    ];
+    if (userManager)
+        return { file: 'systemd-run', args: ['--user', ...transientArgs] };
+    if (opts.uid === 0)
+        return { file: 'systemd-run', args: transientArgs };
+    return { file: 'sudo', args: ['-n', 'systemd-run', ...transientArgs] };
 }
 export function restartLaunch() {
     const launch = dshArgv();
@@ -129,6 +145,79 @@ function respawnInvocation(launch, platform = process.platform) {
         detached: false,
     };
 }
+/** DSH's launcher treats a non-zero appExit as a service-manager restart. */
+export const MANAGED_RESTART_EXIT_CODE = 75;
+/**
+ * Detect a process started by a service manager without depending on the unit
+ * name or on a particular DSH release's cgroup layout.
+ */
+export function serviceManagedEnv(env = process.env) {
+    const present = (value) => typeof value === 'string' && value.trim() !== '';
+    return typeof env === 'object' && env !== null
+        && (present(env.INVOCATION_ID) || present(env.NOTIFY_SOCKET));
+}
+function statusContainsExitCode(status, code) {
+    return String(status ?? '').split(/\s+/u).some((token) => token === String(code) || token === `STATUS=${code}`);
+}
+export function restartPolicyAllowsExit(policy, code = MANAGED_RESTART_EXIT_CODE) {
+    if (policy === null || policy === undefined)
+        return false;
+    if (policy.restart !== 'on-failure' && policy.restart !== 'always')
+        return false;
+    if (statusContainsExitCode(policy.successExitStatus, code))
+        return false;
+    if (statusContainsExitCode(policy.restartPreventExitStatus, code))
+        return false;
+    return true;
+}
+/** Query policy before voluntarily exiting; failure fails over to transient restart. */
+export function readSystemdRestartPolicy(opts) {
+    const unit = systemdUnitName(opts.cgroup);
+    if (unit === null)
+        return null;
+    const userManager = opts.cgroup.includes('/user.slice/');
+    const file = userManager || opts.uid === 0 ? 'systemctl' : 'sudo';
+    const args = userManager
+        ? ['--user', 'show', '--value', '--property=Restart', '--property=SuccessExitStatus', '--property=RestartPreventExitStatus', unit]
+        : opts.uid === 0
+            ? ['show', '--value', '--property=Restart', '--property=SuccessExitStatus', '--property=RestartPreventExitStatus', unit]
+            : ['-n', 'systemctl', 'show', '--value', '--property=Restart', '--property=SuccessExitStatus', '--property=RestartPreventExitStatus', unit];
+    try {
+        const output = execFileSync(file, args, {
+            encoding: 'utf8',
+            timeout: 1_000,
+            stdio: ['ignore', 'pipe', 'ignore'],
+            env: process.env,
+        });
+        const [restart = '', successExitStatus = '', restartPreventExitStatus = ''] = String(output).split(/\r?\n/u);
+        return { restart: restart.trim(), successExitStatus: successExitStatus.trim(), restartPreventExitStatus: restartPreventExitStatus.trim() };
+    }
+    catch {
+        return null;
+    }
+}
+function reportRestartError(scope, error) {
+    try {
+        const message = error instanceof Error ? error.message : String(error);
+        process.stderr.write(`[dsh-m] ${scope} failed: ${message}\n`);
+    }
+    catch {
+        /* stderr may already be closed while the host is shutting down */
+    }
+}
+/** Read the optional launcher hook without coupling core code to Cordis types. */
+export function appExitFromContext(context) {
+    const getter = context?.get;
+    if (typeof getter !== 'function')
+        return undefined;
+    try {
+        const candidate = getter.call(context, 'appExit');
+        return typeof candidate === 'function' ? candidate : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function restartHelperSource(spawned, launch, logs, port) {
     return [
         "const { spawn } = require('node:child_process')",
@@ -181,19 +270,35 @@ function restartHelperSource(spawned, launch, logs, port) {
 }
 export function scheduleRestart(port = null, deps = {}) {
     const pid = deps.pid ?? process.pid;
-    const systemd = systemdRestartArgv({
-        cgroup: deps.cgroup ?? readProcCgroup(),
-        uid: deps.uid ?? (typeof process.getuid === 'function' ? process.getuid() : 1),
-    });
+    const cgroup = deps.cgroup ?? readProcCgroup();
+    const uid = deps.uid ?? (typeof process.getuid === 'function' ? process.getuid() : 1);
+    const systemd = systemdRestartArgv({ cgroup, uid, pid });
+    const managed = typeof deps.appExit === 'function' && serviceManagedEnv(deps.env ?? process.env);
+    const policy = deps.restartPolicy ?? (managed && systemd !== null ? readSystemdRestartPolicy({ cgroup, uid }) : null);
+    if (managed && (systemd === null || restartPolicyAllowsExit(policy))) {
+        const timer = (deps.setTimeout ?? setTimeout)(() => deps.appExit(MANAGED_RESTART_EXIT_CODE), 150);
+        timer.unref?.();
+        return { pid, helperPid: undefined, via: 'app-exit' };
+    }
     if (systemd !== null) {
         ;
         (deps.setTimeout ?? setTimeout)(() => {
-            const helper = (deps.spawn ?? spawn)(systemd.file, systemd.args, {
-                detached: true,
-                stdio: 'ignore',
-                env: process.env,
-            });
-            helper.unref();
+            try {
+                const helper = (deps.spawn ?? spawn)(systemd.file, systemd.args, {
+                    detached: true,
+                    stdio: 'ignore',
+                    env: process.env,
+                });
+                helper.once?.('error', (error) => reportRestartError('transient restart helper', error));
+                helper.once?.('exit', (code, signal) => {
+                    if (code !== 0)
+                        reportRestartError('transient restart helper', `exit=${code ?? 'null'} signal=${signal ?? 'none'}`);
+                });
+                helper.unref();
+            }
+            catch (error) {
+                reportRestartError('transient restart helper', error);
+            }
         }, 500);
         return { pid, helperPid: undefined, via: 'systemd' };
     }
@@ -202,12 +307,29 @@ export function scheduleRestart(port = null, deps = {}) {
     const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
     const logOut = join(tmpdir(), `dshm-restart-${stamp}.out.log`);
     const logErr = join(tmpdir(), `dshm-restart-${stamp}.err.log`);
-    const helper = (deps.spawn ?? spawn)((deps.nodeExecutable ?? nodeExecutable)(), ['-e', restartHelperSource(spawned, launch, { out: logOut, err: logErr }, port)], {
-        detached: true,
-        stdio: 'ignore',
-        env: process.env,
-    });
+    let helper;
+    try {
+        helper = (deps.spawn ?? spawn)((deps.nodeExecutable ?? nodeExecutable)(), ['-e', restartHelperSource(spawned, launch, { out: logOut, err: logErr }, port)], {
+            detached: true,
+            stdio: 'ignore',
+            env: process.env,
+        });
+        helper.once?.('error', (error) => reportRestartError('detached restart helper', error));
+    }
+    catch (error) {
+        // Do not terminate the live host if the replacement could not be started.
+        reportRestartError('detached restart helper', error);
+        return { pid, helperPid: undefined, via: 'helper' };
+    }
     helper.unref();
-    (deps.setTimeout ?? setTimeout)(() => (deps.kill ?? process.kill)(pid, 'SIGTERM'), 500);
+    (deps.setTimeout ?? setTimeout)(() => {
+        try {
+            ;
+            (deps.kill ?? process.kill)(pid, 'SIGTERM');
+        }
+        catch (error) {
+            reportRestartError('detached host shutdown', error);
+        }
+    }, 500);
     return { pid, helperPid: helper.pid, via: 'helper' };
 }

package/lib/host.js

@@ -4,6 +4,7 @@ import { createApiDispatcher } from './core/host-api.js';
 import { bindLoaderHost } from './core/live-plugin.js';
 import { createRegistryController } from './core/registry-controller.js';
 import { registerTools } from './tools.js';
+import { appExitFromContext, scheduleRestart } from './core/restart.js';
 const require = createRequire(import.meta.url);
 const pkg = require('../package.json');
 export const name = 'dshm';
@@ -20,7 +21,11 @@ export function apply(ctx, config) {
     // registry controller：active config / configured / pending / rejected 分离 + generation fence；
     // tools 与 Host API 共用同一 active config object（apply 原地更新字段，live 生效）
     const controller = createRegistryController(config);
-    registerTools(ctx, controller.config);
+    // DSH 0.1.2-rc.1 and 0.1.5-rc.1 both expose appExit through dsh-cmdline;
+    // using it avoids guessing the service unit from release-specific cgroups.
+    const appExit = appExitFromContext(ctx);
+    const restart = (port = null) => scheduleRestart(port, { appExit });
+    registerTools(ctx, controller.config, { restart });
     // 设置页（GUI 设置卡片的宿主命名空间）：applies 'live'，scope 提供 get/update/watch
     ctx.inject(['settings'], (c) => {
         const settings = c.settings;
@@ -35,7 +40,7 @@ export function apply(ctx, config) {
     // 本地 API：单路由 + method 分发（防护与状态映射在 core/host-api.ts）
     ctx.inject(['webServer'], (c) => {
         const server = c.webServer;
-        const handleApi = createApiDispatcher({ controller, pkg });
+        const handleApi = createApiDispatcher({ controller, pkg, deps: { scheduleRestart: restart } });
         server.register({
             kind: 'exact',
             path: '/dshm',

package/lib/tools.js

@@ -1,7 +1,7 @@
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { installTimeoutMs } from './core/env.js';
 import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin, upgradePlugin, } from './core/market.js';
-import { scheduleRestart } from './core/restart.js';
+import { appExitFromContext, scheduleRestart } from './core/restart.js';
 export const CATEGORY_LABELS = {
     market: '市场',
     tools: '工具',
@@ -24,6 +24,7 @@ export function registerTools(ctx, cfg, deps = {}) {
         uninstallPlugin: deps.uninstallPlugin ?? uninstallPlugin,
         upgradePlugin: deps.upgradePlugin ?? upgradePlugin,
     };
+    const restart = deps.restart ?? ((port = null) => scheduleRestart(port, { appExit: appExitFromContext(ctx) }));
     ctx.tools.register(defineTool({
         name: 'dshm_search',
         description: 'Search your personal DSH plugin marketplace (dsh-m) and show clickable plugin cards. ALWAYS call this instead of web_search or bash when the user wants to find/recommend/browse their curated DSH plugins (插件). Call EXACTLY ONCE per user message; extract a real keyword (主题, 搜索) rather than pasting the whole sentence. Omit query to browse all listings. After cards appear, reply with AT MOST one short sentence. Do not print install commands.',
@@ -240,13 +241,13 @@ export function registerTools(ctx, cfg, deps = {}) {
     }));
     ctx.tools.register(defineTool({
         name: 'dshm_restart',
-        description: 'Restart DSH web so newly installed/uninstalled/upgraded plugins take effect. ONLY call after the user agrees (用户同意重启后). The page reloads automatically after the service comes back.',
+        description: 'Restart DSH web so newly installed/uninstalled/upgraded plugins take effect. ONLY call after the user agrees (用户同意重启后). DSH Web reconnects in the background after the service comes back.',
         parameters: {},
         output: {
             schema: { type: 'object', additionalProperties: true },
             render: (_args, value) => [{
                     type: 'text',
-                    text: `已请求重启 DSH web（via ${value.via}）。服务几秒内恢复，之后让用户刷新页面即可。对用户最多一句短话。`,
+                    text: `已请求重启 DSH web（via ${value.via}）。服务恢复后 DSH Web 会在后台自动重连。对用户最多一句短话。`,
                 }],
             presentationMeta: (_args, value) => ({ kind: 'dshm-restart', ...value }),
         },
@@ -258,7 +259,7 @@ export function registerTools(ctx, cfg, deps = {}) {
         }),
         timeoutMs: 15_000,
         async execute() {
-            return cloneJson(scheduleRestart(null));
+            return cloneJson(restart(null));
         },
     }));
     ctx.inject(['systemPrompt'], (c) => {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "dsh-m",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "DSH Marketplace — 个人自用的 DeepSeek Harness 插件市场：收录、安装、卸载、升级 DSH 插件",
   "license": "MIT",
   "type": "module",
   "main": "lib/host.js",
   "bin": {
-    "dshm": "./lib/cli.js"
+    "dshm": "lib/cli.js"
   },
   "exports": {
     ".": "./lib/host.js",