dsh-plugin-tool-management 0.8.0 → 0.8.5

package/lib/skills/service.js

@@ -9,7 +9,7 @@ import { Worker } from 'node:worker_threads';
 import { spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { basename, join } from 'node:path';
-import { state, setSkillEnabled, setPreferredSkill, setSourceEnabled, setSourceRemoved, deleteSkill, restoreTrash, permanentlyDeleteTrash, importSkill, importUploadedSkill, browseDirectories, createSkill, skillDetail, listProviderCandidates, getProviderSkill, userRoots, projectRoots, readManagerState, customRootsFromState, addCustomRoot, removeCustomRoot, logPath, trashRootPath, } from './core.js';
+import { state, setSkillEnabled, setPreferredSkill, markSkillsDisabled, setSourceEnabled, setSourceRemoved, deleteSkill, restoreTrash, permanentlyDeleteTrash, importSkill, importUploadedSkill, browseDirectories, createSkill, skillDetail, listProviderCandidates, getProviderSkill, userRoots, projectRoots, readManagerState, customRootsFromState, addCustomRoot, removeCustomRoot, logPath, trashRootPath, } from './core.js';
 const MAX_LOG_BYTES = 1 << 20;
 const PROVIDER_NAME = 'dsh-plugin-tool-management-external';
 const message = (e) => String((e && e.message) || e);
@@ -431,17 +431,43 @@ export function createSkillsService(ctx) {
             // requestRoot 未命中时回传原始 key，让 core 的 error.root.unknown 带上来源名
             // （否则传了不存在的 root 会收到「技能来源不存在：(空)」这种指错方向的提示）。
             const key = String(args.root || 'hub');
-            return createSkill({ name: args.name, description: args.description, body: args.body }, log, { root: (await requestRoot(key)) || key });
+            const res = await createSkill({ name: args.name, description: args.description, body: args.body }, log, { root: (await requestRoot(key)) || key });
+            // v0.8.5：新建技能默认不启动（用户裁定）——与子智能体 / MCP 同口径。
+            if (res && res.ok !== false && res.name) {
+                await markSkillsDisabled([{ root: String(res.root || 'hub'), name: String(res.name) }], log).catch(() => undefined);
+            }
+            return res;
+        }), afterWrite),
+        'skill-import': wrap((args) => write(async () => {
+            const res = await importSkill(String(args.source || ''), log, {
+                conflict: args.conflict === 'overwrite' ? 'overwrite' : 'skip',
+                dryRun: args.dryRun === true,
+            });
+            // 导入的技能默认停用；部分成功也对 imported 逐条停用。
+            const names = res && Array.isArray(res.imported) ? res.imported : [];
+            if (names.length)
+                await markSkillsDisabled(names.map((n) => ({ root: 'hub', name: String(n) })), log).catch(() => undefined);
+            return res;
+        }), afterWrite),
+        'skill-upload': wrap((args) => write(async () => {
+            const res = await importUploadedSkill({ name: args.name, entries: args.entries, zip: args.zip }, log, {
+                conflict: args.conflict === 'overwrite' ? 'overwrite' : 'skip',
+            });
+            // 上传/导入同口径：默认停用。
+            const names = res && Array.isArray(res.imported) ? res.imported : (res && res.name ? [res.name] : []);
+            if (names.length)
+                await markSkillsDisabled(names.map((n) => ({ root: 'hub', name: String(n) })), log).catch(() => undefined);
+            return res;
         }), afterWrite),
-        'skill-import': wrap((args) => write(() => importSkill(String(args.source || ''), log, {
-            conflict: args.conflict === 'overwrite' ? 'overwrite' : 'skip',
-            dryRun: args.dryRun === true,
-        })), afterWrite),
-        'skill-upload': wrap((args) => write(() => importUploadedSkill({ name: args.name, entries: args.entries, zip: args.zip }, log, {
-            conflict: args.conflict === 'overwrite' ? 'overwrite' : 'skip',
-        })), afterWrite),
         'skill-delete': wrap((args) => write(async () => deleteSkill(await requestRoot(String(args.root || 'dsh')), String(args.name || ''), log)), afterWrite),
-        'skill-trash-restore': wrap((args) => write(() => restoreTrash(String(args.id || ''), log, projectOptions())), afterWrite),
+        'skill-trash-restore': wrap((args) => write(async () => {
+            const res = await restoreTrash(String(args.id || ''), log, projectOptions());
+            // 恢复的技能默认停用（v0.8.5 用户裁定：新建/导入/恢复一律不启动，手动开启）。
+            if (res && res.ok !== false && res.name) {
+                await markSkillsDisabled([{ root: String(res.root || 'hub'), name: String(res.name) }], log).catch(() => undefined);
+            }
+            return res;
+        }), afterWrite),
         'skill-trash-delete': wrap((args) => write(() => permanentlyDeleteTrashSafely(String(args.id || ''), log))),
         // 自定义技能目录：添加（绝对路径，只读接入）/ 移除（连同策略键）。
         'skill-custom-add': wrap((args) => write(() => addCustomRoot(args && args.path, args && args.label, log)), afterWrite),

package/lib/subagents/catalog.js

@@ -38,7 +38,8 @@ export function renderSubagentCatalog(allowed, maxEntries = DEFAULT_CATALOG_MAX_
     const out = [
         '## 子智能体（人设）',
         '',
-        '需要委派独立任务时，用 `subagent_run` 并指定下面的人设名。',
+        '如需要委派独立任务，可从下面的人设中选用合适的（也可先用 `subagent_list` 查看全部人设）。',
+        '用 `subagent_run` 委派时，该人设的完整提示词会成为子代理的系统提示词，子代理在独立上下文中执行，只返回最终结果。',
         '',
         ...lines,
     ];

package/lib/subagents/service.js

@@ -161,19 +161,17 @@ export function createSubagentService(ctx, opts) {
         await writeFile(stateFile, JSON.stringify({ version: 1, enabled: list }, null, 2), 'utf8');
         enabledCache = list;
     }
-    /** 新建/导入/恢复的人设默认启用；文件缺失（本来就全启用）时无需写。 */
-    async function enablePersonaNames(names) {
+    /** 新建/导入/恢复的人设默认停用（v0.8.5 用户裁定，与技能 / MCP 同口径）：
+     *  文件缺失（含旧数据）时先把「全部启用」物化成显式全集**并排除新名**——
+     *  否则新名会随"文件缺失=全启用"的兼容语义被误判为启用。已有显式集合时新名
+     *  不在集合里，天然停用，无需写盘。 */
+    async function materializeEnabledExcluding(names) {
         const set = await readEnabled();
-        if (set === null)
+        if (set !== null)
             return;
-        let dirty = false;
-        for (const n of names)
-            if (set.indexOf(n) < 0) {
-                set.push(n);
-                dirty = true;
-            }
-        if (dirty)
-            await writeEnabled(set);
+        const docs = await list();
+        await writeEnabled(docs.map((d) => d.name).filter((n) => names.indexOf(n) < 0));
+        cache = null;
     }
     /** 改名跟随：旧名在集合里就改新名；不在（停用中）保持停用。 */
     async function renamePersonaInEnabled(from, to) {
@@ -354,8 +352,8 @@ export function createSubagentService(ctx, opts) {
                 return { ok: false, error: `创建人设目录失败: ${dir}（${message(e)}）` };
             }
             await writeFile(target, serializePersona(args), 'utf8');
-            // 新建即启用（文件缺失 = 本来全启用，无需写）；缓存失效让下次 list 带上新成员。
-            await enablePersonaNames([name]).catch(() => undefined);
+            // v0.8.5：新建默认不启动——显式集合下新名天然停用；文件缺失时先物化全集并排除新名。
+            await materializeEnabledExcluding([name]).catch(() => undefined);
             cache = null;
             return { ok: true, name };
         },
@@ -440,8 +438,8 @@ export function createSubagentService(ctx, opts) {
                 return { ok: false, error: `恢复失败: ${message(e)}` };
             }
             await purgeTrashEntry('agents', id);
-            // 恢复 = 拿回来用：自动启用（文件缺失本来就全启用，无需写）。
-            await enablePersonaNames([entry.name]).catch(() => undefined);
+            // v0.8.5：回收站恢复默认不启动（与新建/导入同口径）。
+            await materializeEnabledExcluding([entry.name]).catch(() => undefined);
             cache = null;
             return { ok: true, name: entry.name };
         },
@@ -492,7 +490,7 @@ export function createSubagentService(ctx, opts) {
                 imported.push(target.name);
             }
             if (imported.length) {
-                await enablePersonaNames(imported).catch(() => undefined);
+                await materializeEnabledExcluding(imported).catch(() => undefined);
                 cache = null;
             }
             return { ok: true, imported, skipped };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-tool-management",
-  "version": "0.8.0",
-  "description": "DSH plugin: one settings panel for MCP servers, Skills, AGENTS.md presets, archived sessions and scene memories — plus scene memory injected into the system prompt and one-shot persona subagents. Settings UI + HTTP API + 14 model tools (skill_mcp_manager_*, skill_manager_*, agentsmd_*, rule_manager_*, subagent_*). Install with one command: dsh plugin --profile web add dsh-plugin-tool-management@latest",
+  "version": "0.8.5",
+  "description": "DSH plugin: one settings panel for MCP servers, skills, scenes, memories, subagents, AGENTS.md presets and archived sessions — scene memory injects into the system prompt, scene lock freezes all five domains, deleted workspaces re-register with one click. Settings UI + HTTP API + 14 model tools (skill_mcp_manager_*, skill_manager_*, agentsmd_*, rule_manager_*, subagent_*). Install with one command: dsh plugin --profile web add dsh-plugin-tool-management@latest",
   "repository": {
     "type": "git",
     "url": "https://github.com/ouli-1242/dsh-plugin-tool-management"
@@ -66,12 +66,12 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2 <0.2.0-0",
-    "@deepseek-ai/dsh-workspace": ">=0.1.5-rc.2 <0.2.0-0",
-    "@deepseek-ai/dsh-spill-local": ">=0.1.5-rc.2 <0.2.0-0",
-    "@deepseek-ai/dsh-session-projection-cache": ">=0.1.5-rc.2 <0.2.0-0",
-    "@deepseek-ai/dsh-storage-domain": ">=0.1.5-rc.2 <0.2.0-0",
-    "@deepseek-ai/dsh-subagent-spawn-in-process": ">=0.1.5-rc.2 <0.2.0-0",
+    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-workspace": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-spill-local": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection-cache": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-storage-domain": ">=0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent-spawn-in-process": ">=0.1.5-rc.2",
     "react": "^18.2.0"
   },
   "peerDependenciesMeta": {