@max-null/dsh-plugin-center 0.2.1 → 0.2.3

package/client.js

@@ -413,11 +413,6 @@ var STRINGS = {
     diagInstalled: "\u5DF2\u5B89\u88C5\u63D2\u4EF6\uFF08{n}\uFF09",
     diagDisabled: "\u7981\u7528\u72B6\u6001",
     diagPnpmLog: "pnpm \u65E5\u5FD7\uFF08\u5C3E\u90E8\uFF09",
-    aiTitle: "AI \u63A8\u8350",
-    aiPlaceholder: "\u63CF\u8FF0\u4F60\u7684\u9700\u6C42\uFF0C\u8BA9 AI \u63A8\u8350\u63D2\u4EF6\u2026\uFF08\u4F8B\u5982\uFF1A\u80FD\u9884\u89C8 Markdown \u7684\u63D2\u4EF6\uFF09",
-    aiAsk: "\u63A8\u8350",
-    aiAsking: "AI \u601D\u8003\u4E2D\u2026",
-    aiFail: "AI \u63A8\u8350\u5931\u8D25\uFF1A{e}",
     scoreLabel: "\u8BC4\u5206",
     screenshot: "\u622A\u56FE",
     noScreenshot: "\u65E0\u622A\u56FE",
@@ -492,11 +487,6 @@ var STRINGS = {
     diagInstalled: "Installed plugins ({n})",
     diagDisabled: "Disabled state",
     diagPnpmLog: "pnpm log (tail)",
-    aiTitle: "AI recommendation",
-    aiPlaceholder: "Describe what you need \u2014 e.g. a Markdown preview plugin\u2026",
-    aiAsk: "Recommend",
-    aiAsking: "AI is thinking\u2026",
-    aiFail: "AI recommendation failed: {e}",
     scoreLabel: "Score",
     screenshot: "Screenshot",
     noScreenshot: "No screenshot",
@@ -667,6 +657,7 @@ function MarketView({ category, single, source, search, onCount }) {
     void rpc("install", { spec: m.spec }).then(
       (v) => {
         const durationMs = typeof v === "object" && v !== null ? v.durationMs : void 0;
+        const detail = typeof v === "object" && v !== null ? v.detail : void 0;
         if (v !== true && durationMs === void 0) throw new Error(t("installNotApplied"));
         setBusy(null);
         pendingInstall.add(m.spec);
@@ -675,7 +666,7 @@ function MarketView({ category, single, source, search, onCount }) {
           if (c !== void 0) c.plugins = c.plugins.map((p) => p.name === m.name ? { ...p, installed: true } : p);
         }
         setItems((prev) => prev.map((p) => p.name === m.name ? { ...p, installed: true } : p));
-        showToast(t("installQueued", { n: m.name }) + (durationMs !== void 0 ? `\uFF08${(durationMs / 1e3).toFixed(1)}s\uFF09` : ""), "ok", 5e3);
+        showToast(detail ?? t("installQueued", { n: m.name }) + (durationMs !== void 0 ? `\uFF08${(durationMs / 1e3).toFixed(1)}s\uFF09` : ""), "ok", 7e3);
       },
       (e) => {
         setBusy(null);
@@ -728,7 +719,11 @@ function MarketView({ category, single, source, search, onCount }) {
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-spacer" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "pc-iconbtn", title: t("screenshot"), "aria-label": t("screenshot"), disabled: shotBusy !== null, onClick: () => {
           showScreenshot(m);
-        }, children: shotBusy === m.name ? "\u2026" : "\u{1F4F7}" }),
+        }, children: shotBusy === m.name ? "\u2026" : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", { width: "14", height: "14", viewBox: "0 0 16 16", fill: "none", stroke: "currentColor", strokeWidth: "1.5", "aria-hidden": "true", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("rect", { x: "2", y: "3.5", width: "12", height: "9", rx: "1.5" }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("circle", { cx: "8", cy: "8", r: "2.6" }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", { d: "M5.5 3.5 6.4 1.8h3.2l.9 1.7" })
+        ] }) }),
         m.installed || pendingInstall.has(m.spec) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-tag", children: pendingInstall.has(m.spec) ? t("pendingRestart") : t("installedTag") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { className: "pc-btn primary", disabled: busy !== null, onClick: () => {
           install(m);
         }, children: busy === m.name ? t("installing") : t("install") })
@@ -892,10 +887,6 @@ function CenterPanel({ variant = "section" }) {
   const [busyUpdate, setBusyUpdate] = (0, import_react.useState)(null);
   const [checking, setChecking] = (0, import_react.useState)(false);
   const [togglingId, setTogglingId] = (0, import_react.useState)(null);
-  const [aiQuery, setAiQuery] = (0, import_react.useState)("");
-  const [aiBusy, setAiBusy] = (0, import_react.useState)(false);
-  const [aiResult, setAiResult] = (0, import_react.useState)(null);
-  const [aiError, setAiError] = (0, import_react.useState)(null);
   const handleToggle = (p) => {
     if (togglingId !== null) return;
     const id = p.entryId;
@@ -929,23 +920,6 @@ function CenterPanel({ variant = "section" }) {
       }
     );
   };
-  const askAi = () => {
-    const q = aiQuery.trim();
-    if (q === "" || aiBusy) return;
-    setAiBusy(true);
-    setAiResult(null);
-    setAiError(null);
-    void rpc("suggest", { query: q }).then(
-      (v) => {
-        setAiBusy(false);
-        setAiResult(v);
-      },
-      (e) => {
-        setAiBusy(false);
-        setAiError(e instanceof Error ? e.message : String(e));
-      }
-    );
-  };
   const refreshUpdates = (0, import_react.useCallback)((silent = false) => {
     setChecking(true);
     void rpc("checkUpdates", { since: new Date(Date.now() - 30 * 864e5).toISOString() }).then(
@@ -1104,63 +1078,7 @@ function CenterPanel({ variant = "section" }) {
       }, children: c }, c))
     ] })
   ] }) : null;
-  const aiBar = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { style: { display: "flex", flexDirection: "column", gap: 6, flex: "none" }, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pc-ai-row", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        "input",
-        {
-          className: "pc-search",
-          style: { flex: 1 },
-          value: aiQuery,
-          onChange: (e) => {
-            setAiQuery(e.target.value);
-          },
-          onKeyDown: (e) => {
-            if (e.key === "Enter") askAi();
-          },
-          placeholder: t("aiPlaceholder")
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { className: "pc-btn primary", disabled: aiBusy || aiQuery.trim() === "", onClick: askAi, children: aiBusy ? t("aiAsking") : t("aiAsk") })
-    ] }),
-    aiError !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "pc-sub", style: { color: "var(--dsw-alias-state-error-primary)" }, children: t("aiFail", { e: aiError }) }),
-    aiResult !== null && aiResult.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "pc-grid single", children: aiResult.map((item) => {
-      const installed = (installedCache ?? []).some((p) => p.name === item.name || p.spec === item.spec || p.name === item.spec);
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pc-card", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pc-row", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-name", children: item.name }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-spacer" }),
-          item.stars != null && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "pc-ver", children: [
-            "\u2605 ",
-            item.stars
-          ] }),
-          installed ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-tag", children: t("installedTag") }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            "button",
-            {
-              className: "pc-btn primary",
-              onClick: () => {
-                if (item.spec === void 0 || item.spec === null || item.spec === "") {
-                  showToast(t("installFailed", { e: "\u672A\u627E\u5230\u8BE5\u63D2\u4EF6\u7684\u5B89\u88C5 spec" }), "error", 8e3);
-                  return;
-                }
-                void rpc("install", { spec: item.spec }).then(
-                  () => {
-                    pendingInstall.add(item.spec);
-                    showToast(t("installQueued", { n: item.name }), "ok", 5e3);
-                  },
-                  (e) => showToast(t("installFailed", { e: e instanceof Error ? e.message : String(e) }), "error", 15e3)
-                );
-              },
-              children: t("install")
-            }
-          )
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "pc-desc", children: item.reason })
-      ] }, item.name);
-    }) })
-  ] });
   const marketToolbar = view === "market" ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pc-filter", children: [
-    aiBar,
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "pc-toolbar pc-toolbar-main", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { className: "pc-search", style: { flex: 1, minWidth: 120 }, value: marketSearch, onChange: (e) => {
         setMarketSearch(e.target.value);
@@ -1171,11 +1089,7 @@ function CenterPanel({ variant = "section" }) {
       }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "awesome", children: "awesome-dsh-plugin" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "oh-my-dsh", children: "Oh-My-DSH" }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("option", { value: "dsh-market", children: [
-          "dsh-market\uFF08",
-          counts.dshMarket,
-          "\uFF09"
-        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "dsh-market", children: "dsh-market" }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "all", children: t("allMarkets") })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "pc-spacer" }),

package/dist/engine.d.ts

@@ -45,12 +45,17 @@ export declare class PluginCenterEngine extends Service {
     private awesomeCache;
     private awesomeDone;
     private awesomeFetching;
+    /** 上次 fetch 失败时刻（0=未失败过）：失败后冷却 60s 再重试，
+     *  防止瞬时网络故障让源永久失效（2026-08-22 dsh-market（0）实测）。 */
+    private awesomeFailedAt;
     private ohMyDshCache;
     private ohMyDshDone;
     private ohMyDshFetching;
+    private ohMyDshFailedAt;
     private dshMarketCache;
     private dshMarketDone;
     private dshMarketFetching;
+    private dshMarketFailedAt;
     /** README-extracted screenshot URL per plugin name (lazy, P2). */
     private readonly screenshotCache;
     private installedNamesCache;
@@ -74,15 +79,15 @@ export declare class PluginCenterEngine extends Service {
     dshVersion(): Promise<string>;
     /** Non-group Loader entries, cross-matched with market categories. */
     listInstalled(): Promise<InstalledPlugin[]>;
-    /** Start the awesome catalog fetch once, keeping the process-local cache. */
+    /** Start the awesome catalog fetch (with failed-retry cooldown). */
     private prefetchAwesome;
     /** Backfill npm latest versions into the awesome cache (best-effort, concurrent). */
     private fillNpmVersions;
     /** Single-registry latest version for the market bulk backfill (npmmirror is fast). */
     private fastNpmVersion;
-    /** Start the Oh-My-DSH fetch once (single PLUGINS.md parse). */
+    /** Start the Oh-My-DSH fetch (single PLUGINS.md parse, with failed-retry cooldown). */
     private prefetchOhMyDsh;
-    /** Start the dsh-market fetch once (2BingLing/dsh-market, ~3900 plugins, trimmed). */
+    /** Start the dsh-market fetch (2BingLing/dsh-market, ~3900 plugins, trimmed, with failed-retry cooldown). */
     private prefetchDshMarket;
     /** Installed plugin names (no file IO) — cached so market polling stays cheap. */
     private installedNames;
@@ -116,6 +121,8 @@ export declare class PluginCenterEngine extends Service {
     screenshot(name: string): Promise<string | null>;
     /** AI recommendation: keyword-filtered candidates ranked by the model. */
     suggest(query: string): Promise<Suggestion[]>;
-    /** Wait for the dsh-market catalog (fetch or failure), with a hard deadline. */
-    private waitDshMarket;
+    /** Wait for all three market sources (fetch or failure), with a hard deadline. */
+    private waitAllSources;
+    /** 三源市场合并（按 name 去重；spec 优先 npm 名——比 github 回退更可靠）。 */
+    private combinedMarketCache;
 }

package/dist/engine.js

@@ -13,6 +13,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { buildInstalledPlugin, clearPackageCache, resolvePackage } from "./meta.js";
 import { fetchAwesomePluginsJson, fetchDshMarketPlugins, fetchOhMyDshOverrides, fetchOhMyDshPlugins, mapConcurrent, mergePlugins, } from "./market.js";
 import { detectUpdate, installPlugin, updatePlugin } from "./update.js";
+import { reconcileInstalled, readDependencyKeys } from "./reconcile.js";
 import { readDisabledState, setDisabled } from "./toggle.js";
 /** Runtime mirror of cordis FiberState (a cross-package const enum). */
 const FIBER_PHASE = {
@@ -62,12 +63,17 @@ export class PluginCenterEngine extends Service {
     awesomeCache = [];
     awesomeDone = false;
     awesomeFetching = false;
+    /** 上次 fetch 失败时刻（0=未失败过）：失败后冷却 60s 再重试，
+     *  防止瞬时网络故障让源永久失效（2026-08-22 dsh-market（0）实测）。 */
+    awesomeFailedAt = 0;
     ohMyDshCache = [];
     ohMyDshDone = false;
     ohMyDshFetching = false;
+    ohMyDshFailedAt = 0;
     dshMarketCache = [];
     dshMarketDone = false;
     dshMarketFetching = false;
+    dshMarketFailedAt = 0;
     /** README-extracted screenshot URL per plugin name (lazy, P2). */
     screenshotCache = new Map();
     installedNamesCache = null;
@@ -155,11 +161,16 @@ export class PluginCenterEngine extends Service {
             .map(p => ({ ...p, categories: categoryByName.get(p.name) ?? [] }))
             .sort((a, b) => SOURCE_ORDER[a.source] - SOURCE_ORDER[b.source]);
     }
-    /** Start the awesome catalog fetch once, keeping the process-local cache. */
+    /** Start the awesome catalog fetch (with failed-retry cooldown). */
     prefetchAwesome() {
-        if (this.awesomeFetching || this.awesomeDone)
+        if (this.awesomeFetching)
+            return;
+        if (this.awesomeDone && this.awesomeCache.length > 0)
+            return;
+        if (this.awesomeDone && Date.now() - this.awesomeFailedAt < 60_000)
             return;
         this.awesomeFetching = true;
+        this.awesomeDone = false;
         void (async () => {
             try {
                 const [plugins, overrides] = await Promise.all([fetchAwesomePluginsJson(), fetchOhMyDshOverrides()]);
@@ -172,7 +183,9 @@ export class PluginCenterEngine extends Service {
                 this.awesomeCache = merged;
                 await this.fillNpmVersions();
             }
-            catch { /* keep whatever cached so far */ }
+            catch {
+                this.awesomeFailedAt = Date.now();
+            }
             this.awesomeDone = true;
             this.awesomeFetching = false;
         })();
@@ -205,30 +218,44 @@ export class PluginCenterEngine extends Service {
             return null;
         }
     }
-    /** Start the Oh-My-DSH fetch once (single PLUGINS.md parse). */
+    /** Start the Oh-My-DSH fetch (single PLUGINS.md parse, with failed-retry cooldown). */
     prefetchOhMyDsh() {
-        if (this.ohMyDshFetching || this.ohMyDshDone)
+        if (this.ohMyDshFetching)
+            return;
+        if (this.ohMyDshDone && this.ohMyDshCache.length > 0)
+            return;
+        if (this.ohMyDshDone && Date.now() - this.ohMyDshFailedAt < 60_000)
             return;
         this.ohMyDshFetching = true;
+        this.ohMyDshDone = false;
         void (async () => {
             try {
                 this.ohMyDshCache = mergePlugins([await fetchOhMyDshPlugins()]);
             }
-            catch { /* empty on failure */ }
+            catch {
+                this.ohMyDshFailedAt = Date.now();
+            }
             this.ohMyDshDone = true;
             this.ohMyDshFetching = false;
         })();
     }
-    /** Start the dsh-market fetch once (2BingLing/dsh-market, ~3900 plugins, trimmed). */
+    /** Start the dsh-market fetch (2BingLing/dsh-market, ~3900 plugins, trimmed, with failed-retry cooldown). */
     prefetchDshMarket() {
-        if (this.dshMarketFetching || this.dshMarketDone)
+        if (this.dshMarketFetching)
+            return;
+        if (this.dshMarketDone && this.dshMarketCache.length > 0)
+            return;
+        if (this.dshMarketDone && Date.now() - this.dshMarketFailedAt < 60_000)
             return;
         this.dshMarketFetching = true;
+        this.dshMarketDone = false;
         void (async () => {
             try {
                 this.dshMarketCache = mergePlugins([await fetchDshMarketPlugins()]);
             }
-            catch { /* empty on failure */ }
+            catch {
+                this.dshMarketFailedAt = Date.now();
+            }
             this.dshMarketDone = true;
             this.dshMarketFetching = false;
         })();
@@ -251,18 +278,18 @@ export class PluginCenterEngine extends Service {
         const decorate = (plugins) => plugins.map(p => ({ ...p, installed: installedNames.has(p.name) || installedNames.has(p.spec) }));
         if (source === 'awesome') {
             this.prefetchAwesome();
-            return { plugins: decorate(this.awesomeCache), done: this.awesomeDone };
+            return { plugins: decorate(this.awesomeCache), done: this.awesomeDone && this.awesomeCache.length > 0 };
         }
         if (source === 'oh-my-dsh') {
             this.prefetchOhMyDsh();
-            return { plugins: decorate(this.ohMyDshCache), done: this.ohMyDshDone };
+            return { plugins: decorate(this.ohMyDshCache), done: this.ohMyDshDone && this.ohMyDshCache.length > 0 };
         }
         if (source === 'dsh-market') {
             this.prefetchDshMarket();
             // Score-first order (best first) so the big catalog reads usefully.
             return {
                 plugins: decorate(this.dshMarketCache).sort((a, b) => (b.score?.total ?? 0) - (a.score?.total ?? 0)),
-                done: this.dshMarketDone,
+                done: this.dshMarketDone && this.dshMarketCache.length > 0,
             };
         }
         this.prefetchAwesome();
@@ -270,7 +297,9 @@ export class PluginCenterEngine extends Service {
         this.prefetchDshMarket();
         return {
             plugins: decorate(mergePlugins([this.awesomeCache, this.ohMyDshCache, this.dshMarketCache])),
-            done: this.awesomeDone && this.ohMyDshDone && this.dshMarketDone,
+            done: (this.awesomeDone && this.awesomeCache.length > 0)
+                && (this.ohMyDshDone && this.ohMyDshCache.length > 0)
+                && (this.dshMarketDone && this.dshMarketCache.length > 0),
         };
     }
     /** Detect updates for every installed third-party/local plugin, TTL-cached. */
@@ -286,7 +315,25 @@ export class PluginCenterEngine extends Service {
         return this.updatesCache.digests;
     }
     async install(spec) {
-        return this.enqueuePnpm(() => installPlugin(spec, this.baseUrl));
+        return this.enqueuePnpm(async () => {
+            // Snapshot inside the serialized chain: concurrent installs would
+            // otherwise diff each other's additions.
+            const before = readDependencyKeys(this.baseUrl);
+            const result = await installPlugin(spec, this.baseUrl);
+            if (result.ok) {
+                // `dsh plugin add` reconciles bundles into dsh.profile.bundles and
+                // reports non-plugin repos; mirror that so "restart to take effect"
+                // is true for real bundles and honest for repo-only packages
+                // (2026-08-22: EAC 装完不生效——无插件入口，提示误导).
+                try {
+                    const { note } = reconcileInstalled(this.baseUrl, before);
+                    if (note !== '')
+                        result.detail = note;
+                }
+                catch { /* best-effort */ }
+            }
+            return result;
+        });
     }
     /** Update one installed plugin to the detected target version (exact — see update.ts). */
     async update(name, version) {
@@ -356,13 +403,15 @@ export class PluginCenterEngine extends Service {
         const q = query.trim();
         if (q === '')
             return [];
-        await this.waitDshMarket();
+        await this.waitAllSources();
         const llm = this.ctx.get('llm');
         if (llm?.stream === undefined) {
             throw new Error('llm 服务不可用（当前 profile 未提供 dsh-llm）');
         }
         const tokens = q.toLowerCase().split(/[\s,，、;；]+/u).filter(Boolean);
-        const scored = this.dshMarketCache
+        // 候选 = 三源合并（2026-08-22：此前只用 dsh-market，awesome/Oh-My-DSH
+        // 的精选插件进不了推荐；合并后按 name 去重、spec 优先 npm 名）。
+        const scored = this.combinedMarketCache()
             .map(p => ({
             p,
             hits: tokens.reduce((n, tok) => n + (p.name.toLowerCase().includes(tok)
@@ -375,7 +424,7 @@ export class PluginCenterEngine extends Service {
         if (scored.length === 0)
             return [];
         const list = scored.map(({ p }) => `- ${p.name} | ${p.stars ?? 0}★ | ${p.description.zh.slice(0, 60)}`).join('\n');
-        const system = '你是 DeepSeek Harness 插件市场的推荐助手。根据用户需求从候选插件中选择 3-5 个最合适的，只输出一个 JSON 数组（不要 markdown 代码块、不要任何多余文字）：[{"name":"插件名","reason":"一句话中文推荐理由（20 字以内）"}]';
+        const system = '你是 DeepSeek Harness 插件市场的推荐助手。根据用户需求从候选插件中选择 3-5 个最合适的，只输出一个 JSON 数组（不要 markdown 代码块、不要任何多余文字）：[{"name":"插件名","reason":"一句话中文推荐理由（20 字以内）"}]。名称必须从候选列表原样复制，禁止改写、拼接或编造';
         // Message 契约：content 是 ContentBlock 数组（非字符串），且需要 id/source。
         const chunks = llm.stream({
             provider: 'deepseek-official',
@@ -428,7 +477,14 @@ export class PluginCenterEngine extends Service {
                 && typeof item.reason === 'string')
                 .slice(0, 5)
                 .map(item => {
-                const hit = this.dshMarketCache.find(p => p.name === item.name || p.spec === item.name || p.npm === item.name);
+                // 模型可能改写 owner/路径（幻觉，如 zhu1090093659 非真实 owner）
+                // 或输出 monorepo 子路径——先精确匹配（name/spec/npm），再 # 截断，
+                // 最后回退 repo 名匹配（2026-08-22：DamonKoy/dsh-web-ui#dsh-web-ui-all
+                // 被输出成 zhu1090093659/dsh-web-ui#packages/...，精确匹配失败无星）。
+                const base = item.name.split('#')[0].trim();
+                const repo = base.split('/').pop() ?? '';
+                const hit = this.combinedMarketCache().find(p => p.name === base || p.spec === base || p.npm === base
+                    || (p.name.split('/').pop()?.split('#')[0] ?? '') === repo);
                 return {
                     name: item.name,
                     reason: item.reason,
@@ -442,12 +498,38 @@ export class PluginCenterEngine extends Service {
             throw new Error(`模型输出无法解析：${text.slice(0, 400)}`);
         }
     }
-    /** Wait for the dsh-market catalog (fetch or failure), with a hard deadline. */
-    async waitDshMarket() {
+    /** Wait for all three market sources (fetch or failure), with a hard deadline. */
+    async waitAllSources() {
+        this.prefetchAwesome();
+        this.prefetchOhMyDsh();
         this.prefetchDshMarket();
         const deadline = Date.now() + 65_000;
-        while (!this.dshMarketDone && Date.now() < deadline) {
+        while (!(this.awesomeDone && this.ohMyDshDone && this.dshMarketDone) && Date.now() < deadline) {
             await new Promise(resolve => setTimeout(resolve, 200));
         }
     }
+    /** 三源市场合并（按 name 去重；spec 优先 npm 名——比 github 回退更可靠）。 */
+    combinedMarketCache() {
+        const map = new Map();
+        for (const list of [this.awesomeCache, this.ohMyDshCache, this.dshMarketCache]) {
+            for (const p of list) {
+                const cur = map.get(p.name);
+                if (cur === undefined) {
+                    map.set(p.name, p);
+                    continue;
+                }
+                map.set(p.name, {
+                    ...cur,
+                    spec: p.npm ?? cur.npm ?? p.spec ?? cur.spec,
+                    npm: cur.npm ?? p.npm,
+                    // 同一条目多源星数不同：取最大值（2026-08-22：awesome ★4 曾
+                    // 覆盖 dsh-market 高星——合并顺序导致低星胜出）。
+                    stars: Math.max(cur.stars ?? 0, p.stars ?? 0) || null,
+                    score: cur.score ?? p.score,
+                    description: cur.description.zh !== '' && cur.description.en !== '' ? cur.description : p.description,
+                });
+            }
+        }
+        return [...map.values()];
+    }
 }

package/dist/market.js

@@ -108,9 +108,12 @@ function categorizeTags(tags) {
  * file is ~10 MB, so the trimmed result (~1.5 MB) is what the engine caches.
  */
 export async function fetchDshMarketPlugins() {
+    // 10MB 聚合文件 + raw.githubusercontent 不稳定：60s 曾实测超时失败
+    // （2026-08-22 用户看到 dsh-market（0）——失败后无重试，永远空），
+    // 超时放宽到 120s。
     const res = await fetch('https://raw.githubusercontent.com/2BingLing/dsh-market/master/data/plugins.json', {
         headers: UA,
-        signal: AbortSignal.timeout(60000),
+        signal: AbortSignal.timeout(120000),
     });
     if (!res.ok)
         throw new Error(`dsh-market plugins.json: HTTP ${res.status}`);
@@ -122,6 +125,12 @@ export async function fetchDshMarketPlugins() {
         // are excluded from the catalog rather than offered with a broken spec.
         if (p.type === 'skill' || p.install?.method === 'skills-add')
             continue;
+        // Entries without README install commands are usually desktop apps or
+        // config repos, not installable plugins (2026-08-22: 4299 条里 943 条
+        // 无 commands——如 Deepseek-Harness-EAC「一键启动桌面端」被当插件
+        // 推荐，装完不可用；installSpecOf 只能 fallback 一个假 spec）。
+        if (!Array.isArray(p.install?.commands) || p.install.commands.length === 0)
+            continue;
         const name = typeof p.name === 'string' && p.name !== '' ? p.name : '';
         const full = typeof p.fullName === 'string' && p.fullName !== '' ? p.fullName : name;
         if (full === '')
@@ -167,10 +176,15 @@ export async function fetchOhMyDshPlugins() {
             if (link === null)
                 continue;
             const stars = Number(cells[5]);
+            // spec 必须用 URL 的 owner/repo——链接文本常只是包名（如
+            // [open-design](https://github.com/nexu-io/open-design)），
+            // github:open-design 是无效 spec（2026-08-22 实测：Oh-My-DSH
+            // 全部条目 spec 错，open-design 装不上）。
+            const repo = /github\.com\/([^/]+\/[^/]+)/u.exec(link[2]);
             plugins.push({
                 name: link[1],
                 url: link[2],
-                spec: `github:${link[1]}`,
+                spec: `github:${repo?.[1] ?? link[1]}`,
                 categories: category !== '' ? [category] : [],
                 description: { en: '', zh: cells[6] },
                 stars: Number.isFinite(stars) ? stars : null,

package/dist/reconcile.d.ts

@@ -0,0 +1,12 @@
+/** Snapshot of the profile's declared dependencies (keys only). */
+export declare function readDependencyKeys(profileDir: string): ReadonlySet<string>;
+/** Human feedback for the install toast, joined by `；`. */
+export interface ReconcileOutcome {
+    note: string;
+}
+/**
+ * Compare the dependency set against `before`; for each new entry, read the
+ * installed manifest and either register the bundle or report the truth.
+ * Best-effort: never throws (the install itself already succeeded).
+ */
+export declare function reconcileInstalled(profileDir: string, before: ReadonlySet<string>): ReconcileOutcome;

package/dist/reconcile.js

@@ -0,0 +1,81 @@
+/**
+ * Post-install reconciliation: after a successful `pnpm add`, figure out
+ * which dependency actually appeared, register it as a bundle when the
+ * package ships `dsh.bundle.patch` (mirroring `dsh plugin add`'s
+ * reconcilePlugins — without this the loader never mounts the plugin and
+ * "restart to take effect" is a lie), and honestly report repos that are
+ * NOT plugin packages at all (no manifest, e.g. pnpm's placeholder for a
+ * repo without package.json like Deepseek-Harness-EAC, 2026-08-22).
+ */
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+/** Snapshot of the profile's declared dependencies (keys only). */
+export function readDependencyKeys(profileDir) {
+    try {
+        const pkg = JSON.parse(readFileSync(join(profileDir, 'package.json'), 'utf8'));
+        return new Set(Object.keys(pkg.dependencies ?? {}));
+    }
+    catch {
+        return new Set();
+    }
+}
+/**
+ * Compare the dependency set against `before`; for each new entry, read the
+ * installed manifest and either register the bundle or report the truth.
+ * Best-effort: never throws (the install itself already succeeded).
+ */
+export function reconcileInstalled(profileDir, before) {
+    const notes = [];
+    const pkgPath = join(profileDir, 'package.json');
+    let pkg;
+    try {
+        pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+    }
+    catch {
+        return { note: '' };
+    }
+    const added = Object.keys(pkg.dependencies ?? {}).filter(name => !before.has(name));
+    for (const name of added) {
+        const dir = join(profileDir, 'node_modules', name);
+        if (!existsSync(dir))
+            continue;
+        let manifest = null;
+        try {
+            manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+        }
+        catch {
+            manifest = null;
+        }
+        if (manifest === null || typeof manifest.name !== 'string' || manifest._pnpmPlaceholder !== undefined) {
+            notes.push(`「${name}」已下载，但该仓库不是插件包（无插件入口），不会被 DSH 加载`);
+            continue;
+        }
+        const isBundle = manifest.dsh?.bundle?.patch !== undefined;
+        if (isBundle) {
+            const bundles = pkg.dsh?.profile?.bundles;
+            if (!Array.isArray(bundles) || !bundles.includes(name)) {
+                if (!pkg.dsh)
+                    pkg.dsh = {};
+                if (!pkg.dsh.profile)
+                    pkg.dsh.profile = {};
+                const list = Array.isArray(bundles) ? bundles : [];
+                list.push(name);
+                pkg.dsh.profile.bundles = list;
+                try {
+                    writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+                    notes.push(`「${name}」已安装并注册，重启后生效`);
+                }
+                catch {
+                    notes.push(`「${name}」已安装（注册失败，需手动加入 dsh.profile.bundles）`);
+                }
+            }
+            else {
+                notes.push(`「${name}」已安装`);
+            }
+        }
+        else {
+            notes.push(`「${name}」已安装为依赖（非 bundle 插件，未注册加载）`);
+        }
+    }
+    return { note: notes.join('；') };
+}

package/dist/rpc.js

@@ -31,7 +31,7 @@ export class PluginCenterRpc extends Service {
                         const result = await ctx.pluginCenter.install(spec);
                         if (!result.ok)
                             return internal(`install ${spec} 失败：${result.detail}`);
-                        return { ok: true, value: { durationMs: result.durationMs } };
+                        return { ok: true, value: { durationMs: result.durationMs, detail: result.detail } };
                     }
                     case 'update': {
                         const name = payload?.name;

package/dist/toggle.d.ts

@@ -28,4 +28,4 @@ export declare function readDisabledState(patchPath: string): Map<string, boolea
  * @param disabled - the target stance.
  * @returns the outcome; `nowDisabled` mirrors the stance or null when refused.
  */
-export declare function setDisabled(profileDir: string, id: string, disabled: boolean): Promise<ToggleResult>;
+export declare function setDisabled(profileDir: string, entryId: string, disabled: boolean): Promise<ToggleResult>;

package/dist/toggle.js

@@ -33,6 +33,17 @@ const PROTECTED_PATTERNS = [
 function isProtected(id) {
     return PROTECTED_PATTERNS.some(pattern => pattern.test(id));
 }
+/**
+ * Patch rows address a loader row by its ORIGINAL patch id, but the Loader
+ * expands `insert` children into runtime ids like `include:<id>`
+ * (2026-08-22 chinese-thinking 实证：写入 `include:chinese-thinking` 行
+ * 组合后不匹配任何行 → 禁用不生效；写入 `chinese-thinking` 即生效）。
+ * Strip the prefix so every entry we toggle writes a row the composition
+ * actually matches; non-insert rows are unaffected.
+ */
+function patchRowId(entryId) {
+    return entryId.replace(/^include:/u, '');
+}
 /** Official bundle entry ids (timer/llm/session/… from dsh-base and
  *  dsh-web-app patch inserts): disabling these breaks the core chain, so
  *  they refuse to toggle alongside the pattern-based protection above. */
@@ -89,8 +100,11 @@ let toggleChain = Promise.resolve();
  * @param disabled - the target stance.
  * @returns the outcome; `nowDisabled` mirrors the stance or null when refused.
  */
-export function setDisabled(profileDir, id, disabled) {
+export function setDisabled(profileDir, entryId, disabled) {
     const run = toggleChain.then(async () => {
+        // Loader runtime ids (include:<id>) never match patch composition —
+        // always address rows by their original patch id.
+        const id = patchRowId(entryId);
         if (isProtected(id) || officialEntryIds(profileDir).has(id)) {
             return { ok: false, detail: `"${id}" is host infrastructure and cannot be disabled`, nowDisabled: null };
         }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name":  "@max-null/dsh-plugin-center",
-    "version":  "0.2.1",
-    "description":  "Plugin center for DeepSeek Harness — installed metadata, community market, update detection, and What's New",
+    "version":  "0.2.3",
+    "description":  "Plugin center for DeepSeek Harness 閳?installed metadata, community market, update detection, and What\u0027s New",
     "license":  "MIT",
     "publishConfig":  {
                           "access":  "public"
@@ -82,4 +82,4 @@
                             "react":  "^18.2.0",
                             "typescript":  "^5.5.0"
                         }
-}
+}