dsh-m 0.3.0 → 0.4.1

package/lib/tools.js

@@ -2,6 +2,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 { appExitFromContext, scheduleRestart } from './core/restart.js';
+import { togglePlugin as coreTogglePlugin } from './core/toggle.js';
 export const CATEGORY_LABELS = {
     market: '市场',
     tools: '工具',
@@ -25,6 +26,9 @@ export function registerTools(ctx, cfg, deps = {}) {
         upgradePlugin: deps.upgradePlugin ?? upgradePlugin,
     };
     const restart = deps.restart ?? ((port = null) => scheduleRestart(port, { appExit: appExitFromContext(ctx) }));
+    const toggle = deps.togglePlugin ?? coreTogglePlugin;
+    // 开关委派服务探测（ADR-0001）：运行时按存在性，不判版本号
+    const getService = () => ctx.get?.('pluginManager');
     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.',
@@ -130,10 +134,11 @@ export function registerTools(ctx, cfg, deps = {}) {
     }));
     ctx.tools.register(defineTool({
         name: 'dshm_install',
-        description: 'Install a plugin from the dsh-m registry into the current web profile after the user names one (装 dsh-skins / 安装 web-search). Pass the id from dshm_search results. npm 源锁定最新精确版本，github 源锁定 commit SHA。Do not print CLI commands. After success, tell the user it needs a restart of dsh web, and offer dshm_restart.',
+        description: 'Install a plugin from the dsh-m registry into the current web profile after the user names one (装 dsh-skins / 安装 web-search). Pass the id from dshm_search results. npm 源锁定最新精确版本，github 源锁定 commit SHA。安装前做 peer 兼容预检（只检 @deepseek-ai/dsh(-*)；github 源不预检）：不兼容时返回结构化结果，向用户说明风险，用户确认后带 force: true 重试（force 等价 forceIncompatible）。Do not print CLI commands. After success, tell the user it needs a restart of dsh web, and offer dshm_restart.',
         parameters: {
             id: { type: 'string', required: true, description: '收录 id from dshm_search, e.g. dsh-skins' },
             version: { type: 'string', description: 'Optional exact semver (npm 源). Default latest.' },
+            force: { type: 'boolean', description: '用户已确认兼容风险后重试时置 true（跳过 peer 预检拦截）。' },
         },
         output: {
             schema: { type: 'object', additionalProperties: true },
@@ -152,7 +157,40 @@ 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 m.installFromRegistry(id, cfg, { version, namespace: 'host' }));
+            const force = args.force === true;
+            return cloneJson(await m.installFromRegistry(id, cfg, { version, forceIncompatible: force, namespace: 'host' }));
+        },
+    }));
+    ctx.tools.register(defineTool({
+        name: 'dshm_toggle',
+        description: 'Toggle a DSH plugin on/off (切换运行状态). Pass pkg from dshm_list and enabled (true=启用 / false=停用). 可逆操作：默认先与用户确认；用户同一句消息已明确表达（如「把 skins 关掉」）可直接执行。结果 applied=live 时告知已即时生效；restart-required 时提示需重启并提供 dshm_restart。受保护插件（dsh-m 自身与官方宿主命脉）会被拒绝。',
+        parameters: {
+            pkg: { type: 'string', required: true, description: '包名 from dshm_list, e.g. dsh-better-sidebar' },
+            enabled: { type: 'boolean', required: true, description: 'true = 启用，false = 停用' },
+        },
+        output: {
+            schema: { type: 'object', additionalProperties: true },
+            render: (_args, value) => [{ type: 'text', text: renderToggle(value) }],
+            presentationMeta: (_args, value) => ({ kind: 'dshm-toggle', ...value }),
+        },
+        presentCall: (args) => ({
+            card: 'generic',
+            title: `${args.enabled === true ? '启用' : '停用'} · ${String(args.pkg || '')}`,
+            content: [],
+        }),
+        presentResult: (_args, { isError, meta }) => ({
+            card: 'generic',
+            title: isError ? '开关操作失败' : `已${meta?.enabled === true ? '启用' : '停用'} · ${meta?.pkg || ''}`,
+            content: [],
+        }),
+        timeoutMs: 30_000,
+        async execute(args) {
+            const target = String(args.pkg || '').trim();
+            if (!target)
+                throw new Error('缺少 pkg');
+            if (typeof args.enabled !== 'boolean')
+                throw new Error('缺少 enabled（boolean）');
+            return cloneJson(await toggle(target, args.enabled, { getService: getService }));
         },
     }));
     ctx.tools.register(defineTool({
@@ -272,11 +310,29 @@ export function registerTools(ctx, cfg, deps = {}) {
                 `Plugin categories: ${Object.entries(CATEGORY_LABELS).map(([k, v]) => `${k}=${v}`).join(', ')}.`,
                 'Install only after the user names a card: dshm_install with its id. Then one short sentence mentioning the restart requirement; offer dshm_restart.',
                 'For installed plugins, call dshm_list / dshm_outdated. Upgrade only after the user confirms which one: dshm_upgrade. Uninstall only after confirmation: dshm_uninstall.',
+                'dshm_toggle switches a plugin on/off: confirm first unless the user already said it in the same message (把 skins 关掉 → execute directly); report live vs restart-required accordingly. ',
                 'dshm_restart only after the user agrees to restart; afterwards tell them to refresh once the page recovers.',
             ].join(' '),
         });
     });
 }
+/** 开关结果渲染（Task 15）。 */
+function renderToggle(out) {
+    const word = out.enabled ? '已启用' : '已停用';
+    if (out.applied === 'live') {
+        return `✅ ${out.pkg} ${word}（即时生效）。${out.warnings.join('；')}`;
+    }
+    return `✅ ${out.pkg} ${word}（需重启生效——询问是否 dshm_restart）。${out.warnings.join('；')}`;
+}
+/** 构建放行文案（ADR-0002）：列包名；兜底全量放行如实标注。 */
+function buildsNote(out) {
+    if (out.fallbackAllBuilds)
+        return '注意：该插件执行了构建脚本（名单不可读，已全量兜底放行）。';
+    const names = out.buildApprovals ?? [];
+    if (names.length === 0)
+        return '';
+    return `注意：该插件执行了构建脚本，已精确放行：${names.join('、')}。`;
+}
 function renderSearch(out) {
     if (!out.items?.length)
         return '收录清单中没有匹配的插件。对用户只说一句：没找到，可以换个词再搜。不要写长文。';
@@ -307,11 +363,19 @@ function renderList(out) {
     ].join('\n');
 }
 function renderInstall(out) {
-    const extra = out.usedAllowAllBuilds ? '注意：该插件执行了构建脚本（已按策略放行）。' : '';
+    const extra = buildsNote(out);
+    const compatNote = out.compat
+        ? '注意：该版本与当前 DSH 运行时 peer 不兼容，已按用户确认强制安装。'
+        : out.compatSkipped === 'github-source'
+            ? '注意：github 源未做兼容预检。'
+            : '';
+    const bundleNote = out.bundleWarning === 'no-patch-layer'
+        ? '注意：该包无补丁层（cordis.patch.yml 缺失且未进 bundles），已装入为纯依赖不会生效；如非预期可卸载（dshm_uninstall）或到收录仓库反馈。'
+        : '';
     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。不要打印安装命令。`;
+    return `✅ ${out.pkg} 已安装（${out.spec}）。${extra}${compatNote}${bundleNote}${heals}需要重启 DSH Web 生效——告知用户并询问是否 dshm_restart。不要打印安装命令。`;
 }
 function renderUninstall(out) {
     const parts = [`✅ ${out.pkg} 已卸载。`];
@@ -338,7 +402,7 @@ function renderOutdated(out) {
 function renderUpgrade(out) {
     const from = out.fromVersion ? `v${out.fromVersion} → ` : '';
     const to = out.version ? `v${out.version}` : out.sha ? out.sha.slice(0, 7) : '最新';
-    const extra = out.usedAllowAllBuilds ? '注意：该插件执行了构建脚本。' : '';
+    const extra = buildsNote(out);
     return `✅ ${out.pkg} 已升级（${from}${to}）。${extra}需要重启生效——询问是否 dshm_restart。`;
 }
 function clamp(n, min, max) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",
@@ -74,9 +74,15 @@
     "@types/node": "^24.0.0",
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",
+    "@types/semver": "7.8.0",
     "esbuild": "^0.25.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5.6.0"
+  },
+  "dependencies": {
+    "@deepseek-ai/dsh-atomic-write": "0.1.7-rc.2",
+    "semver": "7.8.5",
+    "yaml": "2.9.1"
   }
 }

package/registry.json

@@ -6,7 +6,17 @@
       "name": "DSH Marketplace",
       "description": "自定义清单的 DSH 插件市场，收录/安装/卸载/升级；已适配 0.1.2-rc.1、0.1.5-rc.1/rc.2 与 0.1.7-rc.1/rc.2，详见仓库。",
       "category": "market",
-      "tags": ["市场", "插件管理"],
+      "tags": [
+        "市场",
+        "插件管理"
+      ],
+      "verified": [
+        "0.1.2-rc.1",
+        "0.1.5-rc.1",
+        "0.1.5-rc.2",
+        "0.1.7-rc.1",
+        "0.1.7-rc.2"
+      ],
       "source": "npm",
       "npm": "dsh-m",
       "github": "iasiv5/dsh-m",
@@ -17,7 +27,14 @@
       "name": "DSH Skins",
       "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换，一键回到官方界面。",
       "category": "ui",
-      "tags": ["皮肤", "主题", "美化"],
+      "tags": [
+        "皮肤",
+        "主题",
+        "美化"
+      ],
+      "verified": [
+        "0.1.2-rc.1"
+      ],
       "source": "npm",
       "npm": "@iasiv5/dsh-skins",
       "github": "iasiv5/dsh-skins",
@@ -26,9 +43,16 @@
     {
       "id": "dsh-copilot-auth",
       "name": "DSH Copilot Auth",
-      "description": "为内置 Copilot 提供方补设备码登录/注销设置页，预置开箱路由；凭据入内置凭据库，模型目录兜底不覆盖定制。",
+      "description": "为内置 Copilot 提供方补登录/注销设置页与开箱路由；模型目录兜底不覆盖定制。适配 0.1.7-rc.2，旧版用 1.1.x。",
       "category": "tools",
-      "tags": ["Copilot", "认证", "模型接入"],
+      "tags": [
+        "Copilot",
+        "认证",
+        "模型接入"
+      ],
+      "verified": [
+        "0.1.7-rc.2"
+      ],
       "source": "npm",
       "npm": "@inventec/dsh-copilot-auth",
       "github": "iasiv5/dsh-copilot-auth",
@@ -37,9 +61,20 @@
     {
       "id": "dsh-skip-browser-auth",
       "name": "DSH Skip Browser Auth",
-      "description": "替换官方 Connection 提供方跳过 BrowserAuth，免输 Token；已适配 0.1.2-rc.1、0.1.5-rc.1/rc.2 与 0.1.7-rc.1/rc.2，详见仓库。",
+      "description": "替换官方 Connection 提供方跳过 BrowserAuth，免输 Token；已适配 0.1.2-rc.1、0.1.5-rc.1/rc.2 与 0.1.7-rc.1/rc.2。",
       "category": "tools",
-      "tags": ["BrowserAuth", "连接", "安全"],
+      "tags": [
+        "BrowserAuth",
+        "连接",
+        "安全"
+      ],
+      "verified": [
+        "0.1.2-rc.1",
+        "0.1.5-rc.1",
+        "0.1.5-rc.2",
+        "0.1.7-rc.1",
+        "0.1.7-rc.2"
+      ],
       "source": "npm",
       "npm": "@iasiv5/dsh-skip-browser-auth",
       "github": "iasiv5/dsh-skip-browser-auth",
@@ -50,7 +85,15 @@
       "name": "DSH Surf",
       "description": "网络冲浪入口：设置一级菜单一键打开自托管 Selkies/Chrome 远程桌面，视频流直连；需自建容器并挂认证反代。",
       "category": "tools",
-      "tags": ["浏览器", "远程桌面", "Selkies", "网络冲浪"],
+      "tags": [
+        "浏览器",
+        "远程桌面",
+        "Selkies",
+        "网络冲浪"
+      ],
+      "verified": [
+        "0.1.7-rc.2"
+      ],
       "source": "npm",
       "npm": "@iasiv5/dsh-surf",
       "github": "iasiv5/dsh-surf",
@@ -61,7 +104,16 @@
       "name": "DSH OBMC Web",
       "description": "在 DSH 里打开 OpenBMC 控制台：同源代理走 SSH 隧道，设置面板一键开启，支持 IP 探测与隧道重定向；需 SSH 跳板可达 BMC。",
       "category": "tools",
-      "tags": ["OpenBMC", "远程管理", "SSH 隧道", "KVM"],
+      "tags": [
+        "OpenBMC",
+        "远程管理",
+        "SSH 隧道",
+        "KVM"
+      ],
+      "verified": [
+        "0.1.7-rc.1",
+        "0.1.7-rc.2"
+      ],
       "source": "npm",
       "npm": "@iasiv5/dsh-obmc-web",
       "github": "iasiv5/dsh-obmc-web",
@@ -72,7 +124,12 @@
       "name": "DSH Better Sidebar",
       "description": "开放的侧边栏底座，支持三方拓展注册侧边栏页面；内置文件编辑、终端、侧边对话、Git 与子代理页。",
       "category": "ui",
-      "tags": ["侧边栏", "文件编辑", "终端", "Git"],
+      "tags": [
+        "侧边栏",
+        "文件编辑",
+        "终端",
+        "Git"
+      ],
       "source": "npm",
       "npm": "dsh-better-sidebar",
       "github": "omdsh-dev/DSH-better-sidebar",
@@ -83,7 +140,11 @@
       "name": "ModSearch",
       "description": "免费网页搜索、X 搜索与页面抓取插件，支持 Firecrawl、Tavily、Exa 等引擎自动故障切换。",
       "category": "search",
-      "tags": ["搜索", "网页抓取", "X"],
+      "tags": [
+        "搜索",
+        "网页抓取",
+        "X"
+      ],
       "source": "npm",
       "npm": "@liustack/modsearch",
       "github": "liustack/modsearch",
@@ -94,7 +155,11 @@
       "name": "DSH Docs Panel",
       "description": "侧边栏「全局文档」：全局 Markdown 笔记任何工作区可读，支持大纲跳转与一键转编辑器；需 better-sidebar ≥0.4.0。",
       "category": "ui",
-      "tags": ["文档", "Markdown", "侧边栏"],
+      "tags": [
+        "文档",
+        "Markdown",
+        "侧边栏"
+      ],
       "source": "npm",
       "npm": "dsh-docs-panel",
       "github": "mlosun/dsh-docs-panel",
@@ -105,7 +170,12 @@
       "name": "DSH Server Deck",
       "description": "服务器卡片仪表盘：实时 CPU/内存/磁盘与趋势图（1h~30d），点卡片进 xterm 终端；可选集成 better-sidebar。",
       "category": "tools",
-      "tags": ["服务器", "监控", "终端", "趋势图"],
+      "tags": [
+        "服务器",
+        "监控",
+        "终端",
+        "趋势图"
+      ],
       "source": "npm",
       "npm": "dsh-server-deck",
       "github": "meyaomiao/dsh-server-deck",
@@ -116,7 +186,11 @@
       "name": "DSH Flowglass",
       "description": "流镜：把当前会话画成三列泳道流程图，展示工具调用、并行分组与子代理分支；可选集成 better-sidebar。",
       "category": "ui",
-      "tags": ["可视化", "流程图", "会话"],
+      "tags": [
+        "可视化",
+        "流程图",
+        "会话"
+      ],
       "source": "npm",
       "npm": "dsh-flowglass",
       "github": "Iwctwbh/dsh-flowglass",
@@ -127,7 +201,10 @@
       "name": "DSH Auth",
       "description": "DSH Web 管理员认证：Argon2id 口令与可撤销会话，经 Caddy forward_auth 保护页面、API、下载、SSE 与 WebSocket。",
       "category": "tools",
-      "tags": ["认证", "安全"],
+      "tags": [
+        "认证",
+        "安全"
+      ],
       "source": "npm",
       "npm": "dsh-auth",
       "github": "hxy91819/dsh-auth",
@@ -138,7 +215,11 @@
       "name": "DeepSeek Harness Lark",
       "description": "飞书 / Lark 通道插件：把飞书消息桥接进 DeepSeek Harness 对话，支持文本与图片收发。",
       "category": "other",
-      "tags": ["飞书", "Lark", "通道"],
+      "tags": [
+        "飞书",
+        "Lark",
+        "通道"
+      ],
       "source": "npm",
       "npm": "deepseek-harness-lark",
       "github": "sliverp/DeepSeek-harness-lark",
@@ -149,7 +230,10 @@
       "name": "DeepSeek Harness QQBot",
       "description": "QQ Bot 通道插件：把 QQ 机器人消息桥接进 DeepSeek Harness 对话，支持文本与图片收发。",
       "category": "other",
-      "tags": ["QQ", "通道"],
+      "tags": [
+        "QQ",
+        "通道"
+      ],
       "source": "npm",
       "npm": "deepseek-harness-qqbot",
       "github": "sliverp/DeepSeek-harness-qqbot",
@@ -160,7 +244,10 @@
       "name": "DeepSeek Harness Weixin",
       "description": "微信通道插件：扫码登录，收发文本与图片消息，桥接进 DeepSeek Harness 对话。",
       "category": "other",
-      "tags": ["微信", "通道"],
+      "tags": [
+        "微信",
+        "通道"
+      ],
       "source": "npm",
       "npm": "deepseek-harness-weixin",
       "github": "sliverp/DeepSeek-harness-weixin",
@@ -171,7 +258,10 @@
       "name": "DeepSeek Harness WeCom",
       "description": "企业微信 AI Bot 通道插件：把企业微信消息桥接进 DeepSeek Harness 对话，支持文本与图片收发。",
       "category": "other",
-      "tags": ["企业微信", "通道"],
+      "tags": [
+        "企业微信",
+        "通道"
+      ],
       "source": "npm",
       "npm": "deepseek-harness-wecom",
       "github": "sliverp/DeepSeek-harness-wecom",
@@ -182,7 +272,10 @@
       "name": "DeepSeek Harness DingTalk",
       "description": "钉钉 Stream 通道插件：把钉钉消息桥接进 DeepSeek Harness 对话，支持文本与图片收发。",
       "category": "other",
-      "tags": ["钉钉", "通道"],
+      "tags": [
+        "钉钉",
+        "通道"
+      ],
       "source": "npm",
       "npm": "deepseek-harness-dingtalk",
       "github": "sliverp/DeepSeek-harness-dingtalk",
@@ -193,7 +286,11 @@
       "name": "BrowserSkill",
       "description": "浏览器自动化：把 BrowserSkill 的 browser_* 工具暴露给模型，让模型在对话中操作浏览器，详见仓库。",
       "category": "tools",
-      "tags": ["浏览器", "自动化", "工具调用"],
+      "tags": [
+        "浏览器",
+        "自动化",
+        "工具调用"
+      ],
       "source": "npm",
       "npm": "@wxg-prc-cpg/browser-skill-dsh-plugin",
       "github": "Tencent/BrowserSkill",
@@ -204,7 +301,11 @@
       "name": "WeKnora",
       "description": "知识库检索：把 WeKnora 接入模型，提供语义搜索、文档阅读与 RAG 问答等工具，可用自有知识库，详见仓库。",
       "category": "tools",
-      "tags": ["知识库", "RAG", "检索"],
+      "tags": [
+        "知识库",
+        "RAG",
+        "检索"
+      ],
       "source": "npm",
       "npm": "@wxg-prc-cpg/dsh-weknora",
       "github": "Tencent/WeKnora",
@@ -215,7 +316,12 @@
       "name": "DSH Chat Manager",
       "description": "会话管理器：在原生侧边栏搜索归档聊天、恢复会话并安全永久删除；需按内核版本选装，详见仓库。",
       "category": "tools",
-      "tags": ["会话管理", "归档", "聊天记录", "恢复"],
+      "tags": [
+        "会话管理",
+        "归档",
+        "聊天记录",
+        "恢复"
+      ],
       "source": "npm",
       "npm": "dsh-chat-manager",
       "github": "WSL043/dsh-chat-manager",