dsh-plugin-discovery 1.2.0 → 1.2.5

package/index.js

@@ -389,6 +389,193 @@ async function searchNpm(query, limit) {
 	});
 }
 
+/** 在线搜索时把精选目录命中置顶，避免同名冷门包（如 @dsh-ssh/dsh-ssh）盖过已验证的 @linxin666/dsh-ssh。 */
+function catalogHitsForQuery(catalog, query, limit) {
+	const rows = filterCatalogPlugins(catalog, {
+		category: "",
+		query,
+		personalize: false,
+		installedNames: [],
+	});
+	return rows.slice(0, Math.max(0, limit)).map((row) => ({
+		...mapCatalogPlugin(row),
+		reason: "catalog",
+	}));
+}
+
+function suggestCatalogAlternatives(catalog, failedSpec, limit = 3) {
+	const failed = String(failedSpec || "").trim().toLowerCase();
+	if (!failed) return [];
+	const tokens = failed
+		.replace(/^@/, "")
+		.split(/[/@._-]+/)
+		.map((part) => part.trim().toLowerCase())
+		.filter((part) => part.length >= 3 && part !== "dsh" && part !== "plugin");
+	const uniq = [];
+	const seen = new Set([failed]);
+	for (const token of tokens.length ? tokens : [failed]) {
+		for (const row of catalogHitsForQuery(catalog, token, 8)) {
+			const spec = String(row.spec || "").trim();
+			if (!spec || seen.has(spec.toLowerCase())) continue;
+			seen.add(spec.toLowerCase());
+			uniq.push(spec);
+			if (uniq.length >= limit) return uniq;
+		}
+	}
+	return uniq;
+}
+
+/** ManagementError 没有 message 字段，只有 code / diagnostic；再拼上 packageResult 输出尾部。 */
+function formatChangeFailure(result, fallbackApplication = "failed") {
+	const parts = [];
+	const err = result?.error;
+	if (err && typeof err === "object") {
+		if (err.diagnostic) parts.push(String(err.diagnostic).trim());
+		if (err.code) parts.push(`错误码：${err.code}`);
+		if (Array.isArray(err.incompatible) && err.incompatible.length) {
+			const names = err.incompatible
+				.map((row) => `${row?.name || "?"}@${row?.version || "?"}`)
+				.filter(Boolean);
+			if (names.length) parts.push(`不兼容：${names.join("、")}`);
+		}
+	} else if (typeof err === "string" && err.trim()) {
+		parts.push(err.trim());
+	} else if (err?.message) {
+		parts.push(String(err.message).trim());
+	}
+
+	const pkg = result?.packageResult;
+	if (pkg && typeof pkg === "object") {
+		if (pkg.kind) parts.push(`失败类型：${pkg.kind}`);
+		if (pkg.timedOut) parts.push("安装超时（长时间无输出）");
+		if (typeof pkg.exitCode === "number") parts.push(`退出码：${pkg.exitCode}`);
+		const output = String(pkg.output || "").trim();
+		if (output) {
+			const lines = output
+				.split(/\r?\n/)
+				.map((line) => line.trim())
+				.filter(Boolean);
+			const tail = lines.slice(-8).join("\n");
+			if (tail) parts.push(tail);
+		}
+		if (pkg.logPath) parts.push(`完整日志：${pkg.logPath}`);
+	}
+
+	if (result?.failedAt) parts.push(`失败位置：${result.failedAt}`);
+	if (Array.isArray(result?.pendingBuilds) && result.pendingBuilds.length) {
+		parts.push(`待批准构建脚本：${result.pendingBuilds.join("、")}`);
+	}
+	if (Array.isArray(result?.warnings) && result.warnings.length) {
+		parts.push(`警告：${result.warnings.slice(0, 3).join("；")}`);
+	}
+
+	const unique = [];
+	const seen = new Set();
+	for (const part of parts) {
+		const text = String(part || "").trim();
+		if (!text || seen.has(text)) continue;
+		seen.add(text);
+		unique.push(text);
+	}
+	if (unique.length) return unique.join("\n");
+	const application = result?.application || fallbackApplication;
+	return `安装失败（${application}）。插件管理器未返回 diagnostic / 安装日志。`;
+}
+
+function extractIncompatibility(result) {
+	const code = result?.error?.code || null;
+	const incompatible = Array.isArray(result?.error?.incompatible)
+		? result.error.incompatible
+				.map((row) => ({
+					name: String(row?.name || "").trim(),
+					version: String(row?.version || "").trim(),
+					runtimeVersion: String(row?.runtimeVersion || "").trim(),
+					peers: row?.peers && typeof row.peers === "object" ? row.peers : {},
+				}))
+				.filter((row) => row.name && row.version)
+		: [];
+	return {
+		code,
+		incompatible,
+		needsRiskExemption: code === "incompatible-version" && incompatible.length > 0,
+	};
+}
+
+/** pnpm 11 拦截依赖安装脚本时，失败结果带 pendingBuilds；需用户确认后经 approvedBuilds 重试。 */
+function extractBuildBlock(result) {
+	const pendingBuilds = Array.isArray(result?.pendingBuilds)
+		? [...new Set(result.pendingBuilds.map((name) => String(name || "").trim()).filter(Boolean))]
+		: [];
+	const kind = result?.packageResult?.kind || null;
+	const code = result?.error?.code || null;
+	const blocked =
+		kind === "build-blocked" ||
+		code === "build-blocked" ||
+		/ERR_PNPM_IGNORED_BUILDS|Ignored build scripts/i.test(String(result?.packageResult?.output || ""));
+	return {
+		pendingBuilds,
+		needsBuildApproval: blocked && pendingBuilds.length > 0,
+	};
+}
+
+function normalizeApprovedBuilds(value) {
+	if (!Array.isArray(value)) return [];
+	return [...new Set(value.map((name) => String(name || "").trim()).filter(Boolean))];
+}
+
+/** 安装失败时从精选目录推荐相近/同标签插件，优先给出可替代的当前生态包。 */
+function buildFailureRecommendations(catalog, failedSpec, limit = 4) {
+	const failed = String(failedSpec || "").trim();
+	const seen = new Set([failed.toLowerCase()]);
+	const out = [];
+	const pushRow = (row, reason) => {
+		const spec = String(row?.spec || "").trim();
+		if (!spec || seen.has(spec.toLowerCase())) return;
+		seen.add(spec.toLowerCase());
+		out.push({
+			spec,
+			title: row.title || spec,
+			description: row.description || "",
+			source: "catalog",
+			installSpec: spec,
+			catalogId: row.id || row.spec,
+			reason: reason || "similar",
+			featured: row.featured === true,
+			rank: typeof row.rank === "number" ? row.rank : 0,
+		});
+	};
+
+	const plugins = Array.isArray(catalog?.plugins) ? catalog.plugins : [];
+	const failedRow = plugins.find((row) => String(row.spec || "").toLowerCase() === failed.toLowerCase());
+	if (failedRow) {
+		for (const rel of failedRow.related || []) {
+			const hit = plugins.find((row) => String(row.spec || "") === rel || String(row.id || "") === rel);
+			if (hit) pushRow(hit, "related");
+			if (out.length >= limit) return out;
+		}
+		for (const tag of failedRow.tags || []) {
+			for (const row of plugins) {
+				if ((row.tags || []).includes(tag)) pushRow(row, "tag");
+				if (out.length >= limit) return out;
+			}
+		}
+		for (const cat of failedRow.categories || []) {
+			if (cat === "featured") continue;
+			for (const row of plugins) {
+				if ((row.categories || []).includes(cat)) pushRow(row, "category");
+				if (out.length >= limit) return out;
+			}
+		}
+	}
+
+	for (const spec of suggestCatalogAlternatives(catalog, failed, limit)) {
+		const hit = plugins.find((row) => String(row.spec || "") === spec) || { spec, title: spec };
+		pushRow(hit, "similar");
+		if (out.length >= limit) break;
+	}
+	return out.slice(0, limit);
+}
+
 function mapGithubRepos(items) {
 	return (Array.isArray(items) ? items : []).map((repo) => ({
 		source: "github",
@@ -936,6 +1123,9 @@ class PluginDiscoveryService extends TypertRemoteService {
 
 		const limit = this.config.maxCandidates;
 		const token = opts.githubToken ?? this.config.githubToken;
+		await this.refreshCatalog({ force: false }).catch(() => {});
+		const catalog = this.getCatalog();
+		const catalogHits = catalogHitsForQuery(catalog, q === "dsh" ? "" : q, limit);
 		let raw = [];
 		try {
 			if (source === "npm" || source === "all") {
@@ -946,23 +1136,27 @@ class PluginDiscoveryService extends TypertRemoteService {
 			}
 		} catch (error) {
 			this.ctx.logger.warn("[plugin-discovery] search failed", error);
-			return {
-				ok: false,
-				message: error instanceof Error ? error.message : String(error),
-				results: [],
-				total: 0,
-			};
+			if (!catalogHits.length) {
+				return {
+					ok: false,
+					message: error instanceof Error ? error.message : String(error),
+					results: [],
+					total: 0,
+				};
+			}
+			// 在线源失败时仍返回精选命中，避免「搜得到却全空」
+			raw = [];
 		}
 
 		const seen = new Set();
 		const deduped = [];
-		for (const row of raw) {
+		for (const row of [...catalogHits, ...raw]) {
 			if (!row.spec || seen.has(row.spec)) continue;
 			seen.add(row.spec);
 			deduped.push({
 				...row,
 				installSpec: row.spec,
-				bundle: null,
+				bundle: row.bundle ?? null,
 			});
 			if (deduped.length >= limit) break;
 		}
@@ -1086,14 +1280,40 @@ class PluginDiscoveryService extends TypertRemoteService {
 				message: `「${existing}」已在 DSH 插件列表中，无需重复安装。请到「插件」页查看。`,
 			};
 		}
+		const withInstallHint = (message) => {
+			const text = String(message || "").trim() || "安装失败";
+			const looksNetwork =
+				/ERR_PNPM_META_FETCH_FAIL|fetch failed|ECONNRESET|ETIMEDOUT|ENOTFOUND|network|镜像/i.test(text);
+			if (!looksNetwork) return text;
+			const alts = suggestCatalogAlternatives(this.getCatalog(), trimmed);
+			if (!alts.length) {
+				return `${text}。若持续失败，可改用「分类浏览 / 为你推荐」里的精选包，或稍后重试。`;
+			}
+			return `${text}。可改试精选目录中的相近插件：${alts.join("、")}`;
+		};
+		const approvedBuilds = normalizeApprovedBuilds(opts.approvedBuilds);
 		try {
 			const result = await this.ctx.pluginManager.installBundle(trimmed, {
 				requestId,
 				enabled: true,
+				...(approvedBuilds.length ? { approvedBuilds } : {}),
 			});
 			const packageName = result?.bundle || pre.name || trimmed;
 			const application = result?.application;
 			const failed = application === "failed" || application === "cancelled";
+			const rawMessage = failed
+				? formatChangeFailure(result, application || "failed")
+				: `「${packageName}」安装完成（${application || "applied"} / ${result?.stage || "install"}）`;
+			const incompat = failed ? extractIncompatibility(result) : {};
+			const buildBlock = failed ? extractBuildBlock(result) : {};
+			const recommendations =
+				failed && (incompat.needsRiskExemption || incompat.code === "incompatible-version")
+					? buildFailureRecommendations(this.getCatalog(), trimmed, 4)
+					: undefined;
+			let message = failed ? withInstallHint(rawMessage) : rawMessage;
+			if (failed && recommendations && recommendations.length) {
+				message = `${message}\n推荐改试：${recommendations.map((row) => row.spec).join("、")}`;
+			}
 			return {
 				ok: !failed,
 				alreadyInstalled: false,
@@ -1101,15 +1321,71 @@ class PluginDiscoveryService extends TypertRemoteService {
 				requestId,
 				application,
 				stage: result?.stage,
-				message: failed
-					? result?.error?.message || `安装失败（${application || "unknown"}）`
-					: `「${packageName}」安装完成（${application || "applied"} / ${result?.stage || "install"}）`,
+				message,
+				detail: failed ? rawMessage : undefined,
+				logPath: failed ? result?.packageResult?.logPath : undefined,
+				code:
+					incompat.code ||
+					(buildBlock.needsBuildApproval ? "build-blocked" : undefined) ||
+					undefined,
+				incompatible: incompat.incompatible || undefined,
+				needsRiskExemption: incompat.needsRiskExemption === true,
+				pendingBuilds: buildBlock.pendingBuilds || undefined,
+				needsBuildApproval: buildBlock.needsBuildApproval === true,
+				approvedBuilds: approvedBuilds.length ? approvedBuilds : result?.approvedBuilds,
+				recommendations,
+				installSpec: trimmed,
 				result,
 			};
 		} catch (error) {
 			return {
 				ok: false,
 				requestId,
+				message: withInstallHint(error instanceof Error ? error.message : String(error)),
+				installSpec: trimmed,
+			};
+		}
+	}
+
+	/** Typert Remote：参数必须是独立形参，不能解构、不能默认值、不能 rest。 */
+	async grantVersionExemption(packageVersion, runtimeVersion, acceptRisk) {
+		if (!this.config.enabled) {
+			return { ok: false, message: "发现插件已停用" };
+		}
+		const pkg = String(packageVersion == null ? "" : packageVersion).trim();
+		const runtime = String(runtimeVersion == null ? "" : runtimeVersion).trim();
+		const accepted = acceptRisk === true;
+		if (!pkg || !runtime) {
+			return { ok: false, message: "缺少 packageVersion 或 runtimeVersion" };
+		}
+		if (!accepted) {
+			return {
+				ok: false,
+				message: "未确认风险。授予版本豁免必须 acceptRisk=true，并先明确告知可能崩溃或数据丢失。",
+			};
+		}
+		if (typeof this.ctx.pluginManager?.setVersionExemption !== "function") {
+			return { ok: false, message: "当前 DSH 不支持 setVersionExemption" };
+		}
+		try {
+			const result = await this.ctx.pluginManager.setVersionExemption(pkg, runtime, true, true);
+			const application = result?.application;
+			const failed = application === "failed" || application === "cancelled";
+			return {
+				ok: !failed,
+				packageVersion: pkg,
+				runtimeVersion: runtime,
+				application,
+				message: failed
+					? formatChangeFailure(result, application || "failed")
+					: `已为 ${pkg} 在 DSH ${runtime} 上授予精确版本豁免，可重新安装。`,
+				result,
+			};
+		} catch (error) {
+			return {
+				ok: false,
+				packageVersion: pkg,
+				runtimeVersion: runtime,
 				message: error instanceof Error ? error.message : String(error),
 			};
 		}
@@ -1124,6 +1400,23 @@ class PluginDiscoveryService extends TypertRemoteService {
 				return { ok: true, settled: null, pending: true, message: "安装仍在进行或已丢失" };
 			}
 			const failed = settled.application === "failed" || settled.application === "cancelled";
+			const failText = failed ? formatChangeFailure(settled, settled.application) : "";
+			const incompat = failed ? extractIncompatibility(settled) : {};
+			const buildBlock = failed ? extractBuildBlock(settled) : {};
+			const failedSpec =
+				(Array.isArray(incompat.incompatible) && incompat.incompatible[0]
+					? `${incompat.incompatible[0].name}@${incompat.incompatible[0].version}`
+					: "") || settled.bundle || "";
+			const recommendations =
+				failed && (incompat.needsRiskExemption || incompat.code === "incompatible-version")
+					? buildFailureRecommendations(this.getCatalog(), failedSpec, 4)
+					: undefined;
+			let message = failed
+				? failText
+				: `安装完成（${settled.application} / ${settled.stage}）`;
+			if (failed && recommendations && recommendations.length) {
+				message = `${message}\n推荐改试：${recommendations.map((row) => row.spec).join("、")}`;
+			}
 			return {
 				ok: !failed,
 				settled,
@@ -1131,9 +1424,19 @@ class PluginDiscoveryService extends TypertRemoteService {
 				packageName: settled.bundle,
 				application: settled.application,
 				stage: settled.stage,
-				message: failed
-					? settled.error?.message || `安装失败（${settled.application}）`
-					: `安装完成（${settled.application} / ${settled.stage}）`,
+				message,
+				detail: failed ? failText : undefined,
+				logPath: failed ? settled?.packageResult?.logPath : undefined,
+				code:
+					incompat.code ||
+					(buildBlock.needsBuildApproval ? "build-blocked" : undefined) ||
+					undefined,
+				incompatible: incompat.incompatible || undefined,
+				needsRiskExemption: incompat.needsRiskExemption === true,
+				pendingBuilds: buildBlock.pendingBuilds || undefined,
+				needsBuildApproval: buildBlock.needsBuildApproval === true,
+				recommendations,
+				installSpec: failedSpec || undefined,
 			};
 		} catch (error) {
 			return {
@@ -1260,6 +1563,7 @@ markRemoteMethod(PluginDiscoveryService.prototype, "checkSelfUpdate");
 markRemoteMethod(PluginDiscoveryService.prototype, "updateSelf");
 markRemoteMethod(PluginDiscoveryService.prototype, "resolve");
 markRemoteMethod(PluginDiscoveryService.prototype, "installPlugin");
+markRemoteMethod(PluginDiscoveryService.prototype, "grantVersionExemption");
 markRemoteMethod(PluginDiscoveryService.prototype, "listInstalled");
 markRemoteMethod(PluginDiscoveryService.prototype, "waitInstall");
 

package/package.json

@@ -1,74 +1,74 @@
-{
-  "name": "dsh-plugin-discovery",
-  "version": "1.2.0",
-  "type": "module",
-  "description": "Discover and install community DSH bundles from the sidebar: newbie essentials, recommendations, categories, self-update, and npm/GitHub search.",
-  "author": "hjhcos",
-  "license": "MIT",
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "deepseek",
-    "deepseek-harness",
-    "plugin",
-    "bundle",
-    "discovery",
-    "marketplace",
-    "recommend"
-  ],
-  "homepage": "https://github.com/hjhcos/dsh-plugin-discovery#readme",
-  "bugs": {
-    "url": "https://github.com/hjhcos/dsh-plugin-discovery/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/hjhcos/dsh-plugin-discovery.git"
-  },
-  "icon": "./icon.svg",
-  "exports": {
-    ".": "./index.js",
-    "./client": "./client.js",
-    "./package.json": "./package.json",
-    "./locale/*.json": "./locale/*.json"
-  },
-  "files": [
-    "index.js",
-    "mark-remote.js",
-    "client.js",
-    "cordis.patch.yml",
-    "icon.svg",
-    "data",
-    "locale",
-    "skill",
-    "docs",
-    "LICENSE",
-    "README.md"
-  ],
-  "dependencies": {
-    "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
-    "@deepseek-ai/schemastery": "~3.18.4"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
-    "@deepseek-ai/schemastery": "*"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "immediately": false,
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-sidebar",
-        "@deepseek-ai/dsh-client-ui-layout",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-api-remotes"
-      ]
-    }
-  }
-}
+{
+  "name": "dsh-plugin-discovery",
+  "version": "1.2.5",
+  "type": "module",
+  "description": "Discover and install community DSH bundles from the sidebar: newbie essentials, recommendations, categories, self-update, and npm/GitHub search.",
+  "author": "hjhcos",
+  "license": "MIT",
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek",
+    "deepseek-harness",
+    "plugin",
+    "bundle",
+    "discovery",
+    "marketplace",
+    "recommend"
+  ],
+  "homepage": "https://github.com/hjhcos/dsh-plugin-discovery#readme",
+  "bugs": {
+    "url": "https://github.com/hjhcos/dsh-plugin-discovery/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hjhcos/dsh-plugin-discovery.git"
+  },
+  "icon": "./icon.svg",
+  "exports": {
+    ".": "./index.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json",
+    "./locale/*.json": "./locale/*.json"
+  },
+  "files": [
+    "index.js",
+    "mark-remote.js",
+    "client.js",
+    "cordis.patch.yml",
+    "icon.svg",
+    "data",
+    "locale",
+    "skill",
+    "docs",
+    "LICENSE",
+    "README.md"
+  ],
+  "dependencies": {
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
+    "@deepseek-ai/schemastery": "~3.18.4"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "~4.0.4",
+    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
+    "@deepseek-ai/schemastery": "*"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": false,
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-sidebar",
+        "@deepseek-ai/dsh-client-ui-layout",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-api-remotes"
+      ]
+    }
+  }
+}