dsh-m 0.2.9 → 0.2.11

package/lib/core/dsh-cli.js

@@ -314,19 +314,6 @@ function writeDangerouslyAllowAllBuilds(profileDirectory) {
     writeFileSync(file, next);
     return true;
 }
-export function rewritePnpmError(err) {
-    const text = err instanceof Error ? err.message : String(err);
-    if (/ERR_PNPM_UNUSED_PATCH/.test(text)) {
-        return new Error('profile 的补丁配置（patchedDependencies）里存在不再使用的条目，pnpm 拒绝执行。卸载时 dsh-m 会自动摘除目标包自己的补丁条目；仍报此错通常是其他包留有失效补丁，请手工清理 profile 的 pnpm-workspace.yaml。');
-    }
-    if (isPrepareBlocked(text)) {
-        return new Error('该插件需要执行构建脚本（prepare），pnpm 默认拦截。dsh-m 已写入 profile 的 dangerouslyAllowAllBuilds 并重试；若仍失败请检查 web profile 是否可写。');
-    }
-    if (/ERR_PNPM_PUBLIC_HOIST_PATTERN_DIFF/.test(text)) {
-        return new Error('当前 profile 的 node_modules 由不同主版本的 pnpm 生成，安装前需要先重建依赖。');
-    }
-    return err instanceof Error ? err : new Error(text);
-}
 /**
  * 失败摘要：命令失败时从完整输出里提取可诊断的行，而不是盲取末尾。
  * 2026-09-05 实证（dsh-better-sidebar 安装失败）：pnpm ndjson 错误行 ~1.2KB，
@@ -618,22 +605,6 @@ export function makeAddViaLadder(deps) {
 function errText(err) {
     return err instanceof Error ? err.message : String(err);
 }
-/**
- * 安装。返回 usedAllowAllBuilds 供 UI 明确报告「该插件执行了构建脚本」。
- * source 形如：`pkg@1.2.3`（npm 精确锁定）或 `github:owner/repo#sha`（锁 SHA）。
- * 薄包装：调 makeAddViaLadder，非 ok 时 throw（对 legacy 调用方保持现行报错形状）。
- */
-export async function addDshPlugin(source, deps = {}) {
-    const ladder = makeAddViaLadder({
-        runDshPlugin: deps.runDshPlugin ?? runDshPlugin,
-        allowAllBuilds: deps.allowAllBuilds,
-    });
-    const outcome = await ladder(source, deps.profileDir ?? webProfileDir());
-    if (outcome.class === 'ok') {
-        return { output: outcome.output, usedAllowAllBuilds: outcome.usedAllowAllBuilds === true };
-    }
-    throw rewritePnpmError(new Error(outcome.output));
-}
 /** 卸载（转发 pnpm remove；调用方须先做 live-disable）。 */
 export async function removeDshPlugin(pkg, deps = {}) {
     if (!isSafePluginTarget(pkg))

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/installed.js

@@ -1,10 +1,16 @@
 /**
  * 已装插件识别（DESIGN.md §3）：profile 的 package.json 是唯一事实源，
  * 不引入额外状态文件。移植自 skillhub installed-plugins.ts（去 README 暂缓）。
+ *
+ * 完整性契约（2026-09-09）：枚举结果必含 `complete`——只有当顶层 manifest 与每个
+ * 依赖的 package.json 都可读、可解析为非数组对象、且每项都能归类（DSH 插件 → items /
+ * 确认非 DSH → others）时才为 true；任一项「无法判断」即 complete:false（partial 结果
+ * 保留，该依赖不计入 others）。当前 complete 仅被 listMarket → dshm_search 消费；
+ * 已装列表（listInstalledWithMeta）/ dshm_list / CLI list·outdated / 升级路径的
+ * incomplete 展示与处理为后续独立任务。
  */
 import { open, readFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
-import { isSafePluginTarget, removeDshPlugin } from './dsh-cli.js';
 import { webProfileDir } from './env.js';
 const PKG_NAME_RE = /^(@[A-Za-z0-9-*~][A-Za-z0-9-*._~]*\/)?[A-Za-z0-9-._~]+$/;
 export function isSafePkgName(raw) {
@@ -58,30 +64,74 @@ export function githubRepoFromRepository(raw) {
     const m = /github\.com[/:]([A-Za-z0-9._-]+)\/([A-Za-z0-9._-]+?)(?:\.git)?$/i.exec(url.trim());
     return m ? `${m[1]}/${m[2]}` : null;
 }
-export async function readPkgJson(dir) {
+/** JSON 合法根：非 null、非数组的对象（typeof [] === 'object'，数组必须显式排除）。 */
+function isRecord(value) {
+    return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+/** 单包 package.json 唯一读取实现：读不到 / 坏 JSON / 根非对象一律 ok:false。 */
+async function readPkgJsonResult(dir) {
+    let raw;
     try {
-        const raw = JSON.parse(await readFile(join(dir, 'package.json'), 'utf8'));
-        return raw && typeof raw === 'object' ? raw : null;
+        raw = JSON.parse(await readFile(join(dir, 'package.json'), 'utf8'));
     }
     catch {
-        return null;
+        return { ok: false };
     }
+    if (!isRecord(raw))
+        return { ok: false };
+    return { ok: true, value: raw };
 }
-export async function readProfileDeps(profileDir) {
+export async function readPkgJson(dir) {
+    const result = await readPkgJsonResult(dir);
+    return result.ok ? result.value ?? null : null;
+}
+/** 空 deps 统一无原型容器：与逐项解析产物保持同一原型语义，继承属性不得伪装成依赖成员。 */
+function emptyDeps() {
+    return Object.create(null);
+}
+/**
+ * 顶层 profile package.json 唯一读取实现（完整性 + partial 语义）：
+ * - 读不到 / 坏 JSON / 根非数组对象 → complete:false, deps:{}（manifest 缺失 ≠ 合法空 profile）；
+ * - 合法但无 dependencies 字段，或 dependencies 为空对象 → complete:true, deps:{}（唯一合法空形态）；
+ * - dependencies 存在但类型非法（null/数组/标量）→ complete:false, deps:{}；
+ * - 逐项：key 不安全（isSafePkgName 拒绝 `__proto__`、`_`/`.` 开头分段等）或 spec 非字符串/纯空白
+ *   → 该项计入 incomplete（complete:false）并跳过，其余合法项保留。
+ *   容器为无原型对象（Object.create(null)）——第二层防御：特殊属性名不受 Object.prototype
+ *   setter/继承语义影响，数据结构与早退路径的空容器保持一致。
+ */
+async function readProfileDepsResult(profileDir) {
+    let raw;
     try {
-        const raw = JSON.parse(await readFile(join(profileDir, 'package.json'), 'utf8'));
-        if (!raw || typeof raw !== 'object' || !raw.dependencies || typeof raw.dependencies !== 'object')
-            return {};
-        const out = {};
-        for (const [name, spec] of Object.entries(raw.dependencies)) {
-            if (typeof spec === 'string' && spec !== '')
-                out[name] = spec;
-        }
-        return out;
+        raw = JSON.parse(await readFile(join(profileDir, 'package.json'), 'utf8'));
     }
     catch {
-        return {};
+        return { complete: false, deps: emptyDeps() };
+    }
+    if (!isRecord(raw))
+        return { complete: false, deps: emptyDeps() };
+    if (!Object.prototype.hasOwnProperty.call(raw, 'dependencies'))
+        return { complete: true, deps: emptyDeps() };
+    const dependencies = raw.dependencies;
+    if (!isRecord(dependencies))
+        return { complete: false, deps: emptyDeps() };
+    let complete = true;
+    const deps = emptyDeps();
+    for (const [name, spec] of Object.entries(dependencies)) {
+        if (!isSafePkgName(name)) {
+            complete = false;
+            continue;
+        }
+        if (typeof spec !== 'string' || spec.trim() === '') {
+            complete = false;
+            continue;
+        }
+        deps[name] = spec;
     }
+    return { complete, deps };
+}
+/** 宽松读取（README 路径）：只返回可确认的依赖项，个别非法项被跳过而不是整体丢弃。 */
+export async function readProfileDeps(profileDir) {
+    return (await readProfileDepsResult(profileDir)).deps;
 }
 function sanitizePkgJson(raw, fallbackName) {
     return {
@@ -93,17 +143,31 @@ function sanitizePkgJson(raw, fallbackName) {
         githubRepo: githubRepoFromRepository(raw.repository),
     };
 }
-/** 枚举 web profile 已安装插件（只读）。 */
+/** 枚举 web profile 已安装插件（只读）。complete:false 时 items/others 为 partial 结果（已确认部分保留）。 */
 export async function listInstalledPlugins(profileDir = webProfileDir()) {
     const root = resolve(profileDir);
-    const deps = await readProfileDeps(root);
+    const result = await readProfileDepsResult(root);
+    let complete = result.complete;
+    const deps = result.deps;
     const items = [];
     let others = 0;
     for (const pkg of Object.keys(deps).sort()) {
         const spec = deps[pkg];
         const dir = resolvePluginDir(root, pkg, spec);
-        const raw = dir ? await readPkgJson(dir) : null;
-        if (!raw || !('dsh' in raw)) {
+        if (!dir) {
+            // 依赖键不安全、目录无法解析 → 无法判断（不冒充非 DSH）
+            complete = false;
+            continue;
+        }
+        const rawResult = await readPkgJsonResult(dir);
+        if (!rawResult.ok) {
+            // package.json 缺失/不可读/坏 JSON/根非对象 → 无法判断
+            complete = false;
+            continue;
+        }
+        const raw = rawResult.value;
+        if (!('dsh' in raw)) {
+            // 确认非 DSH 依赖
             others += 1;
             continue;
         }
@@ -121,23 +185,7 @@ export async function listInstalledPlugins(profileDir = webProfileDir()) {
             githubRepo: githubRepoFromRepository(raw.repository),
         });
     }
-    return { items, others, profileDir: root };
-}
-/** 从 web profile 卸载已安装的 dsh 插件。pkg 必须来自 profile 依赖（先 live-disable，见 market.ts）。 */
-export async function removeInstalledPlugin(pkg, profileDir = webProfileDir(), deps = {}) {
-    const key = String(pkg || '').trim();
-    if (!isSafePkgName(key) || !isSafePluginTarget(key))
-        throw new Error(`无效插件包名: ${pkg}`);
-    const root = resolve(profileDir);
-    const listed = await readProfileDeps(root);
-    if (!(key in listed))
-        throw new Error(`web profile 未安装该插件: ${key}`);
-    const dir = resolvePluginDir(root, key, listed[key]);
-    const raw = dir ? await readPkgJson(dir) : null;
-    if (!raw || !('dsh' in raw))
-        throw new Error(`不是 dsh 插件: ${key}`);
-    await removeDshPlugin(key, deps);
-    return { pkg: key };
+    return { items, others, complete, profileDir: root };
 }
 // ---------- README 预览（借鉴 skillhub，64KB 截断） ----------
 const README_MAX_BYTES = 64 * 1024;
@@ -170,8 +218,11 @@ export async function readInstalledPluginReadme(pkg, profileDir = webProfileDir(
         throw new Error(`无效插件包名: ${pkg}`);
     const root = resolve(profileDir);
     const deps = await readProfileDeps(root);
-    if (!(key in deps))
+    // 授权边界必须用 own-property 判定：`in` 会沿原型链命中继承属性（如 'constructor'），
+    // 绕过「pkg 必须来自 profile dependencies」的成员约束
+    if (!Object.hasOwn(deps, key)) {
         throw new Error(`web profile 未安装该插件: ${key}`);
+    }
     const dir = resolvePluginDir(root, key, deps[key]);
     if (!dir)
         throw new Error(`无法解析插件目录: ${key}`);

package/lib/core/market.js

@@ -227,7 +227,8 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
         };
     }
     const installed = await installedTask;
-    const installedComplete = installed !== null;
+    // 完整性两层来源：枚举 throw → null；枚举 partial resolve → complete:false（installed.ts 完整性契约）
+    const installedComplete = installed !== null && installed.complete === true;
     const installedItems = installed?.items ?? [];
     // 全量统计 + query/category 过滤 + 分页（同步，极轻）
     const all = loaded.registry.plugins;

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: '工具',
@@ -15,18 +15,6 @@ function cloneJson(value) {
 function summaryOf(state) {
     return { isDefault: state.isDefault, status: state.status, stale: state.stale };
 }
-function matchInstalledByEntry(entry, installed) {
-    return installed.find((it) => {
-        if (entry.npm && (it.pkg === entry.npm || it.name === entry.npm))
-            return true;
-        if (entry.github && it.source === 'github') {
-            const m = /^github:([^#]+)/.exec(it.spec);
-            if (m && m[1] === entry.github)
-                return true;
-        }
-        return false;
-    });
-}
 export function registerTools(ctx, cfg, deps = {}) {
     const timeoutMs = cfg.timeoutMs ?? 20_000;
     const m = {
@@ -36,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.',
@@ -77,18 +66,18 @@ export function registerTools(ctx, cfg, deps = {}) {
                 withLatest: false,
                 namespace: 'host',
             });
-            const installed = await import('./core/installed.js');
-            const inst = await installed.listInstalledPlugins();
-            const merged = result.items.map((e) => {
-                const i = matchInstalledByEntry(e, inst.items);
-                return { ...e, installed: Boolean(i), installedPkg: i?.pkg, installedVersion: i?.version };
-            });
+            // 安装标注唯一来源：listMarket 的单次 profile 快照。
+            // 状态不完整且存在可被误标的条目时 fail-closed——不把未知安装状态呈现成未安装；
+            // 空结果（registry 不可用/超时/无匹配）无可误标条目，维持优雅空结果。
+            if (!result.installedComplete && result.items.length > 0) {
+                throw new Error('读取 web profile 安装状态失败，安装标注不可用；请稍后重试');
+            }
             return cloneJson({
                 query: String(args.query || ''),
                 category,
                 total: result.total,
                 registry: summaryOf(result.registryState),
-                items: merged.map((e) => ({
+                items: result.items.map((e) => ({
                     id: e.id,
                     name: e.name,
                     description: e.description,
@@ -252,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 }),
         },
@@ -270,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.9",
+  "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",
@@ -45,6 +45,7 @@
     "build": "node scripts/build.mjs",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "test": "node --test tests/*.test.mjs",
+    "pretest": "npm run build",
     "prepare": "npm run build"
   },
   "dsh": {