dsh-m 0.2.8 → 0.2.10

package/lib/host.js

@@ -1,6 +1,5 @@
 import { createRequire } from 'node:module';
 import Schema from '@deepseek-ai/schemastery';
-import { withMutationLock } from './core/market.js';
 import { createApiDispatcher } from './core/host-api.js';
 import { bindLoaderHost } from './core/live-plugin.js';
 import { createRegistryController } from './core/registry-controller.js';
@@ -36,7 +35,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, onMutation: withMutationLock });
+        const handleApi = createApiDispatcher({ controller, pkg });
         server.register({
             kind: 'exact',
             path: '/dshm',

package/lib/tools.js

@@ -1,6 +1,6 @@
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { installTimeoutMs } from './core/env.js';
-import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin, upgradePlugin, withMutationLock, } from './core/market.js';
+import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin, upgradePlugin, } from './core/market.js';
 import { scheduleRestart } from './core/restart.js';
 export const CATEGORY_LABELS = {
     market: '市场',
@@ -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 = {
@@ -77,18 +65,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,
@@ -163,7 +151,7 @@ export function registerTools(ctx, cfg, deps = {}) {
             if (!id)
                 throw new Error('缺少收录 id');
             const version = typeof args.version === 'string' && args.version.trim() ? args.version.trim() : undefined;
-            return cloneJson(await withMutationLock(() => m.installFromRegistry(id, cfg, { version, namespace: 'host' })));
+            return cloneJson(await m.installFromRegistry(id, cfg, { version, namespace: 'host' }));
         },
     }));
     ctx.tools.register(defineTool({
@@ -188,7 +176,7 @@ export function registerTools(ctx, cfg, deps = {}) {
             const target = String(args.pkg || '').trim();
             if (!target)
                 throw new Error('缺少 pkg');
-            return cloneJson(await withMutationLock(() => m.uninstallPlugin(target, cfg, { namespace: 'host' })));
+            return cloneJson(await m.uninstallPlugin(target, cfg, { namespace: 'host' }));
         },
     }));
     ctx.tools.register(defineTool({
@@ -247,7 +235,7 @@ export function registerTools(ctx, cfg, deps = {}) {
             const target = String(args.pkg || '').trim();
             if (!target)
                 throw new Error('缺少 pkg');
-            return cloneJson(await withMutationLock(() => m.upgradePlugin(target, cfg, { namespace: 'host' })));
+            return cloneJson(await m.upgradePlugin(target, cfg, { namespace: 'host' }));
         },
     }));
     ctx.tools.register(defineTool({
@@ -319,7 +307,10 @@ function renderList(out) {
 }
 function renderInstall(out) {
     const extra = out.usedAllowAllBuilds ? '注意：该插件执行了构建脚本（已按策略放行）。' : '';
-    return `✅ ${out.pkg} 已安装（${out.spec}）。${extra}需要重启 DSH Web 生效——告知用户并询问是否 dshm_restart。不要打印安装命令。`;
+    const heals = out.healActions?.length
+        ? `安装过程含 ${out.healActions.length} 步自愈（${out.healActions.map((h) => h.code).join('、')}）。`
+        : '';
+    return `✅ ${out.pkg} 已安装（${out.spec}）。${extra}${heals}需要重启 DSH Web 生效——告知用户并询问是否 dshm_restart。不要打印安装命令。`;
 }
 function renderUninstall(out) {
     const parts = [`✅ ${out.pkg} 已卸载。`];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "DSH Marketplace — 个人自用的 DeepSeek Harness 插件市场：收录、安装、卸载、升级 DSH 插件",
   "license": "MIT",
   "type": "module",
@@ -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": {

package/registry.json

@@ -67,6 +67,39 @@
       "github": "liustack/modsearch",
       "homepage": "https://github.com/liustack/modsearch"
     },
+    {
+      "id": "dsh-docs-panel",
+      "name": "DSH Docs Panel",
+      "description": "DSH 侧边栏里的「全局文档」：全局 Markdown 笔记，任何工作区随时可读，支持大纲跳转与一键转编辑器。（需先安装 dsh-better-sidebar ≥0.4.0）",
+      "category": "ui",
+      "tags": ["文档", "Markdown", "侧边栏", "需 better-sidebar"],
+      "source": "npm",
+      "npm": "dsh-docs-panel",
+      "github": "mlosun/dsh-docs-panel",
+      "homepage": "https://github.com/mlosun/dsh-docs-panel"
+    },
+    {
+      "id": "dsh-server-deck",
+      "name": "DSH Server Deck",
+      "description": "服务器卡片仪表盘：实时状态/CPU/内存/磁盘 + 趋势记录与可视化（1h/24h/7d/30d），点卡片进入 xterm 交互终端。可选集成 dsh-better-sidebar：装后注册为侧边栏「服务器」页签，装载顺序无关。",
+      "category": "tools",
+      "tags": ["服务器", "监控", "终端", "推荐 better-sidebar"],
+      "source": "npm",
+      "npm": "dsh-server-deck",
+      "github": "meyaomiao/dsh-server-deck",
+      "homepage": "https://github.com/meyaomiao/dsh-server-deck"
+    },
+    {
+      "id": "dsh-flowglass",
+      "name": "DSH Flowglass",
+      "description": "流镜：实时会话流程图插件，把当前会话画成三列泳道，展示工具调用、并行分组与子代理分支，支持逐层钻取。可选集成 dsh-better-sidebar：装后注册为按会话隔离的侧边栏 Tab。",
+      "category": "ui",
+      "tags": ["可视化", "流程图", "会话", "推荐 better-sidebar"],
+      "source": "npm",
+      "npm": "dsh-flowglass",
+      "github": "Iwctwbh/dsh-flowglass",
+      "homepage": "https://github.com/Iwctwbh/dsh-flowglass"
+    },
     {
       "id": "dsh-auth",
       "name": "DSH Auth",