dsh-m 0.4.2 → 0.5.0

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, } from './core/market.js';
+import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin, upgradePlugin, InstallGuardError, } from './core/market.js';
 import { appExitFromContext, scheduleRestart } from './core/restart.js';
 import { togglePlugin as coreTogglePlugin } from './core/toggle.js';
 export const CATEGORY_LABELS = {
@@ -10,6 +10,38 @@ export const CATEGORY_LABELS = {
     search: '搜索',
     other: '其他',
 };
+/** 工具 deadline 对齐（M1 Task 7）：search 45s（core 44s）、list/outdated 65s（core 60s + 5s 回包余量）。 */
+const SEARCH_TOOL_TIMEOUT_MS = 45_000;
+const SEARCH_CORE_DEADLINE_MS = 44_000;
+const INSTALLED_TOOL_TIMEOUT_MS = 65_000;
+const INSTALLED_CORE_DEADLINE_MS = 60_000;
+/** 社区开放分类安全 slug（与 host-api 侧同语义） */
+const COMMUNITY_SLUG_RE = /^[a-z0-9-]{1,32}$/;
+/** 社区 summary 四键投影（Task 7 ②）：agent 工具输出只带这四个字段。 */
+export function communityToolSummary(c) {
+    if (!c)
+        return { acceptedCount: null, route: null, status: 'unavailable', version: null };
+    const unavailableLike = c.status === 'disabled' || c.status === 'unavailable';
+    return {
+        acceptedCount: unavailableLike ? null : c.acceptedCount,
+        route: unavailableLike ? null : c.route,
+        status: c.status,
+        version: c.version,
+    };
+}
+/** latestErrorCode → 安全化原因（Task 7 ⑨）：不泄露内部细节，按 code 归类。 */
+export function latestErrorCodeReason(code) {
+    switch (code) {
+        case 'budget-exhausted':
+            return '因 GitHub 预算未完成';
+        case 'rate-limited':
+            return 'GitHub 限流';
+        case 'timeout':
+            return '检查超时';
+        default:
+            return '网络错误';
+    }
+}
 function cloneJson(value) {
     return JSON.parse(JSON.stringify(value));
 }
@@ -36,9 +68,10 @@ export function registerTools(ctx, cfg, deps = {}) {
             query: { type: 'string', description: 'Main keyword, e.g. 主题 or 搜索. Optional.' },
             category: {
                 type: 'string',
-                description: `Optional first-level category: ${Object.keys(CATEGORY_LABELS).join(', ')}`,
+                description: `Optional category: curated ${Object.keys(CATEGORY_LABELS).join('/')} or any community slug ([a-z0-9-]{1,32}, e.g. theme/memory/git).`,
             },
             limit: { type: 'number', description: 'Cards in this batch. Default all (registry is curated & small).' },
+            primary_only: { type: 'boolean', description: '只看主清单（排除社区条目）. Optional.' },
         },
         output: {
             schema: { type: 'object', additionalProperties: true },
@@ -56,19 +89,30 @@ export function registerTools(ctx, cfg, deps = {}) {
             title: isError ? '市场搜索失败' : `DSH 市场 · ${meta?.items?.length ?? 0} 条`,
             content: [],
         }),
-        timeoutMs: timeoutMs + 5000,
-        async execute(args) {
-            const category = typeof args.category === 'string' && args.category ? args.category : null;
+        timeoutMs: SEARCH_TOOL_TIMEOUT_MS,
+        async execute(args, exec) {
+            const categoryRaw = typeof args.category === 'string' ? args.category.trim() : '';
+            let category = null;
+            if (categoryRaw !== '') {
+                if (categoryRaw in CATEGORY_LABELS || COMMUNITY_SLUG_RE.test(categoryRaw))
+                    category = categoryRaw;
+                else
+                    throw new Error(`非法分类: ${categoryRaw}（需精选分类或 [a-z0-9-]{1,32} slug）`);
+            }
             const rawLimit = Number(args.limit);
             const limit = Number.isFinite(rawLimit) && rawLimit > 0 ? clamp(rawLimit, 1, 80) : undefined;
-            // metadata-only：agent 卡片不需要 latest；与 Host GUI 共用 host namespace
+            // metadata-only：agent 卡片不需要 latest；与 Host GUI 共用 host namespace；
+            // deadline 44s 是本 waiter 的绝对上限（工具 timeout 45s 先到兜底）
             const result = await m.listMarket(cfg, {
                 query: String(args.query || ''),
                 category,
                 offset: 0,
                 limit,
+                primaryOnly: args.primary_only === true,
                 withLatest: false,
                 namespace: 'host',
+                deadlineMs: SEARCH_CORE_DEADLINE_MS,
+                signal: exec?.signal,
             });
             // 安装标注唯一来源：listMarket 的单次 profile 快照。
             // 状态不完整且存在可被误标的条目时 fail-closed——不把未知安装状态呈现成未安装；
@@ -81,6 +125,7 @@ export function registerTools(ctx, cfg, deps = {}) {
                 category,
                 total: result.total,
                 registry: summaryOf(result.registryState),
+                community: communityToolSummary(result.community),
                 items: result.items.map((e) => ({
                     id: e.id,
                     name: e.name,
@@ -113,11 +158,16 @@ export function registerTools(ctx, cfg, deps = {}) {
             title: isError ? '列出失败' : `已装 · ${meta?.items?.length ?? 0} 个`,
             content: [],
         }),
-        timeoutMs: timeoutMs + 5000,
-        async execute() {
-            const result = await m.listInstalledWithMeta(cfg, { namespace: 'host' });
+        timeoutMs: INSTALLED_TOOL_TIMEOUT_MS,
+        async execute(_args, exec) {
+            const result = await m.listInstalledWithMeta(cfg, {
+                namespace: 'host',
+                deadlineMs: INSTALLED_CORE_DEADLINE_MS,
+                signal: exec?.signal,
+            });
             return cloneJson({
                 registry: summaryOf(result.registryState),
+                community: communityToolSummary(result.community),
                 profileDir: result.profileDir,
                 others: result.others,
                 items: result.items.map((it) => ({
@@ -128,6 +178,8 @@ export function registerTools(ctx, cfg, deps = {}) {
                     registryId: it.registryId ?? null,
                     latestVersion: it.latestVersion ?? null,
                     outdated: it.outdated,
+                    latestError: it.latestError ?? null,
+                    latestErrorCode: it.latestErrorCode ?? null,
                 })),
             });
         },
@@ -146,11 +198,12 @@ export function registerTools(ctx, cfg, deps = {}) {
             presentationMeta: (_args, value) => ({ kind: 'dshm-install', ...value }),
         },
         presentCall: (args) => ({ card: 'generic', title: `安装 · ${String(args.id || '')}`, kind: 'search', content: [] }),
-        presentResult: (_args, { isError, meta }) => ({
-            card: 'generic',
-            title: isError ? '安装失败' : `已安装 · ${meta?.pkg || ''}`,
-            content: [],
-        }),
+        presentResult: (_args, { isError, meta }) => {
+            const out = meta;
+            if (out?.guard === true)
+                return { card: 'generic', title: `守卫拦截 · ${out.compensation?.status ?? ''}`, content: [] };
+            return { card: 'generic', title: isError ? '安装失败' : `已安装 · ${out?.pkg || ''}`, content: [] };
+        },
         timeoutMs: installTimeoutMs() + 60_000,
         async execute(args) {
             const id = String(args.id || '').trim();
@@ -158,7 +211,16 @@ export function registerTools(ctx, cfg, deps = {}) {
                 throw new Error('缺少收录 id');
             const version = typeof args.version === 'string' && args.version.trim() ? args.version.trim() : undefined;
             const force = args.force === true;
-            return cloneJson(await m.installFromRegistry(id, cfg, { version, forceIncompatible: force, namespace: 'host' }));
+            try {
+                return cloneJson(await m.installFromRegistry(id, cfg, { version, forceIncompatible: force, namespace: 'host' }));
+            }
+            catch (err) {
+                if (err instanceof InstallGuardError) {
+                    // 结构化 error result（M2 Task 3 ㉑-㉜）：不渲染「已安装」，无 force 通道；restartSafe 随结果携带
+                    return { ok: false, guard: true, kind: err.kind, message: err.message, violations: err.violations, compensation: err.compensation, needsRestart: err.needsRestart, restartSafe: err.restartSafe, ...(err.repairBasis ? { repairBasis: err.repairBasis } : {}) };
+                }
+                throw err;
+            }
         },
     }));
     ctx.tools.register(defineTool({
@@ -231,11 +293,24 @@ export function registerTools(ctx, cfg, deps = {}) {
         presentResult: (_args, { isError, meta }) => {
             const out = meta;
             const n = out?.items?.filter((it) => it.outdated).length ?? 0;
-            return { card: 'generic', title: isError ? '检查失败' : n ? `${n} 个可升级` : '全部最新', content: [] };
+            const incomplete = out?.incompleteCount ?? 0;
+            // 禁止「未完成检查」冒充「全部最新」（Task 7 ⑨）
+            const title = isError
+                ? '检查失败'
+                : incomplete > 0
+                    ? `${n} 个可升级（${incomplete} 项检查未完成）`
+                    : n
+                        ? `${n} 个可升级`
+                        : '全部最新';
+            return { card: 'generic', title, content: [] };
         },
-        timeoutMs: timeoutMs + 10_000,
-        async execute() {
-            const result = await m.listInstalledWithMeta(cfg, { namespace: 'host' });
+        timeoutMs: INSTALLED_TOOL_TIMEOUT_MS,
+        async execute(_args, exec) {
+            const result = await m.listInstalledWithMeta(cfg, {
+                namespace: 'host',
+                deadlineMs: INSTALLED_CORE_DEADLINE_MS,
+                signal: exec?.signal,
+            });
             const items = result.items.map((it) => ({
                 pkg: it.pkg,
                 name: it.name,
@@ -244,11 +319,16 @@ export function registerTools(ctx, cfg, deps = {}) {
                 latestVersion: it.latestVersion ?? null,
                 latestTag: it.latestTag ?? null,
                 outdated: it.outdated,
+                latestError: it.latestError ?? null,
+                latestErrorCode: it.latestErrorCode ?? null,
             }));
+            const incompleteCount = items.filter((it) => it.latestErrorCode !== null).length;
             return cloneJson({
                 registry: summaryOf(result.registryState),
+                community: communityToolSummary(result.community),
                 items,
                 outdatedCount: items.filter((it) => it.outdated).length,
+                incompleteCount,
             });
         },
     }));
@@ -264,17 +344,26 @@ export function registerTools(ctx, cfg, deps = {}) {
             presentationMeta: (_args, value) => ({ kind: 'dshm-upgrade', ...value }),
         },
         presentCall: (args) => ({ card: 'generic', title: `升级 · ${String(args.pkg || '')}`, content: [] }),
-        presentResult: (_args, { isError, meta }) => ({
-            card: 'generic',
-            title: isError ? '升级失败' : `已升级 · ${meta?.pkg || ''}`,
-            content: [],
-        }),
+        presentResult: (_args, { isError, meta }) => {
+            const out = meta;
+            if (out?.guard === true)
+                return { card: 'generic', title: `守卫拦截 · ${out.compensation?.status ?? ''}`, content: [] };
+            return { card: 'generic', title: isError ? '升级失败' : `已升级 · ${out?.pkg || ''}`, content: [] };
+        },
         timeoutMs: installTimeoutMs() + 60_000,
         async execute(args) {
             const target = String(args.pkg || '').trim();
             if (!target)
                 throw new Error('缺少 pkg');
-            return cloneJson(await m.upgradePlugin(target, cfg, { namespace: 'host' }));
+            try {
+                return cloneJson(await m.upgradePlugin(target, cfg, { namespace: 'host' }));
+            }
+            catch (err) {
+                if (err instanceof InstallGuardError) {
+                    return { ok: false, guard: true, kind: err.kind, message: err.message, violations: err.violations, compensation: err.compensation, needsRestart: err.needsRestart, restartSafe: err.restartSafe, ...(err.repairBasis ? { repairBasis: err.repairBasis } : {}) };
+                }
+                throw err;
+            }
         },
     }));
     ctx.tools.register(defineTool({
@@ -363,6 +452,15 @@ function renderList(out) {
     ].join('\n');
 }
 function renderInstall(out) {
+    const guardBlock = out.guard !== true ? null : [
+        `⛔ 安装被装后守卫拦截：${out.message ?? ''}`,
+        `终态：${out.compensation?.status ?? '—'}（${out.compensation?.note ?? ''}）`,
+        out.repairBasis ? `修复依据：${out.repairBasis}` : null,
+        out.restartSafe === true ? '可以重启 DSH Web。' : '修复后再重启（不要现在一键重启）。',
+        '对用户如实说明守卫拦截与终态，不得说「已安装成功」或「已恢复原版本」。',
+    ].filter(Boolean).join('\n');
+    if (out.guard === true)
+        return guardBlock;
     const extra = buildsNote(out);
     const compatNote = out.compat
         ? '注意：该版本与当前 DSH 运行时 peer 不兼容，已按用户确认强制安装。'
@@ -388,16 +486,22 @@ function renderUninstall(out) {
 }
 function renderOutdated(out) {
     const outdated = (out.items || []).filter((it) => it.outdated);
+    const incomplete = (out.items || []).filter((it) => it.latestErrorCode);
     if (!out.items?.length)
         return 'web profile 没有已装插件。';
-    if (!outdated.length)
-        return `全部 ${out.items.length} 个插件均已是最新版本。对用户一句短话。`;
-    const lines = outdated.map((it) => `${it.name} (${it.pkg})：v${it.version} → ${it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : '最新')}`);
-    return [
-        `${outdated.length}/${out.items.length} 个插件可升级：`,
-        lines.join('\n'),
-        '询问用户要升级哪个，确认后调 dshm_upgrade（pkg）。',
-    ].join('\n');
+    const head = [];
+    if (outdated.length) {
+        head.push(`${outdated.length}/${out.items.length} 个插件可升级：`, outdated.map((it) => `${it.name} (${it.pkg})：v${it.version} → ${it.latestTag || (it.latestVersion ? `v${it.latestVersion}` : '最新')}`).join('\n'));
+    }
+    else {
+        head.push(`全部 ${out.items.length} 个插件均已是最新版本。`);
+    }
+    // 禁止「未完成检查」冒充「全部最新」（Task 7 ⑨）：按 code 安全化原因列出
+    if (incomplete.length) {
+        head.push(`${incomplete.length} 项检查未完成：`, incomplete.map((it) => `· ${it.name} (${it.pkg})——${latestErrorCodeReason(it.latestErrorCode)}`).join('\n'));
+    }
+    head.push('询问用户要升级哪个，确认后调 dshm_upgrade（pkg）。');
+    return head.join('\n');
 }
 function renderUpgrade(out) {
     const from = out.fromVersion ? `v${out.fromVersion} → ` : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",