dsh-m 0.9.67 → 0.9.68

package/CHANGELOG.md

@@ -8,6 +8,16 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.9.68 性能：合并市场物化——同身份免重付 5MB 解析 + 适配 + 合并（ADR-0016）
+
+- **问题（性能架构审查旗舰项，三轮评审闭环）**：领域概念「合并市场（Merged Market）」在 GLOSSARY 有名无主——装配逻辑内联在 `communityOutcome`，每个市场请求（缓存全命中的快路径也在内）都重付磁盘读 5.36MB 社区目录 + JSON.parse（实测 30–55ms）→ 目录适配层重建 4,400 条（30–90ms）→ 合并排序（5–35ms）；且全部是**同步 JS、阻塞宿主事件循环**——市场每翻一页/每提交一次搜索，宿主的 SSE 对话流与工具调用停摆 65–400ms。搜索评分因归一化 WeakMap 跨请求永不命中再加 ~330ms（冷）。
+- **两级 memo，各持天然安全键（ADR-0016 决策 1）**：L1——community.ts `readCache` 按不可变 version-pin 文件名缓存已解析目录（cap=2，meta 每次实读保 checkedAt 新鲜，失败路径不入 memo）；L2——新模块 `src/core/merged-market.ts` 物化适配→合并→匹配索引（cap=4），身份键 = (namespace, profile, registry 身份, 目录 version+pin+开关)。
+- **探测驱动换代 + 同步临界区（决策 3）**：每请求照常走廉价快路径（registry ~10KB + meta 141B ≈1–2ms）以返回身份字段查代；全部 await 位于键派生前、临界区全同步——并发同键天然只建一次，`builds` 计数断言哨兵。**summary 永不入代**每调用现算（status/checkedAt/errors 永远新鲜，SWR 与⑫同版本短路零漂移）；deadline/unavailable/disabled/task=null 透传不落代；communityTask reject 透传（安装侧窄 catch 吞为 miss）。
+- **双索引保安装语义（R2-3）**：merged 域 `lookupInstalled` 服务读路径；全量域 `findById`/`lookupInstalledAll`（[primary…, adapt 全量] 含 displaced 让位条目）服务安装/升级三处（resolveRegistryEntry / upgradePlugin / profile-ops desktop 升级）——id-让位条目今日可装可升，语义零变化；主清单优先短路保留（社区异常不阻断主清单命中）。
+- **解环 + score-once**：合并层六符号自 market.ts 迁入 merged-market.ts、23 条分类标签自 community.ts 随迁（原位 re-export 保 cli/tools 零改动）——market↔community import 环三方向断开；listMarket 评分段单遍化（类别短路先行、rank 查表），tie-break 与 0.9.67 逐点一致。
+- **行为零变化承诺**：ADR-0003/0006/0008/0012/0013 全部不动；golden 等价基线（七维度 capture，含分页/搜索/排序/探测徽标）全程逐字节绿。
+- **验证**：1305 项测试全绿、typecheck 零错误；实测本机 4,460 条真实目录首次 319ms → 同身份第二次 65ms，搜索评分冷 330ms → 同代热 8ms（40×）。实施经三轮独立评审闭环（计划评审 16 项 + 执行评审 7 项，全部「已修复并复核通过」；含一次修复脚本静默 no-op 的虚报，被评审 `git diff` 核对抓出并以真实 diff 补正）。实施计划与 ADR-0016 v3 在案（`docs/plans/`、`docs/adr/`）。
+
 ### 0.9.67 修复：操作记录卡移动端字号失控——显式入 12px 家族 + 折行自洽
 
 - **根因（用户手机截图反馈）**：操作记录行 `.dsvm-oprow` 从不声明 `font-size`——桌面宿主基础字号下无感，移动端浏览器基础字号（≈15-16px）下整行被放大近一倍，与同屏设置卡的 12px 家族（`dsvm-kv` 配置地址行、`dshm-hint`、`dsvm-fold`）明显脱节，观感突兀。
@@ -495,6 +505,16 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### Performance in 0.9.68 — materialized merged market: skip the 5MB parse + adapt + merge for repeat identities (ADR-0016)
+
+- **Problem (flagship item of the performance architecture review, closed over three review rounds)**: the domain concept "Merged Market" existed in the GLOSSARY without an owning module - assembly logic lived inline in `communityOutcome`, so every market request (including fully cache-hit fast paths) re-paid a 5.36MB community catalog disk read + JSON.parse (measured 30-55ms) → adapter rebuild of 4,400 entries (30-90ms) → merge + sort (5-35ms). All of it is **synchronous JS blocking the host event loop** - every page turn / committed search froze the host's SSE streams and tool calls for 65-400ms. Search scoring added ~330ms cold because the normalization WeakMap never survived across requests.
+- **Two-level memo, each with a naturally safe key (ADR-0016 decision 1)**: L1 - community.ts `readCache` memoizes the parsed catalog keyed by the immutable version-pinned body filename (cap=2; meta re-read every time so `checkedAt` stays fresh; failure paths never enter the memo); L2 - new module `src/core/merged-market.ts` materializes adapt→merge→match-index (cap=4), keyed by identity = (namespace, profile, registry identity, catalog version+pin+flag).
+- **Probe-driven generations + synchronous critical section (decision 3)**: every request still walks the cheap fast path (registry ~10KB + meta 141B ≈1-2ms) and probes the store with the returned identity fields; all awaits happen before key derivation and the critical section (derive→check→adapt→merge→index→set) is fully synchronous - concurrent same-key callers naturally build once, asserted by a `builds` counter sentinel. **Summaries never enter the generation**: they are computed per call from the current state (status/checkedAt/errors always fresh; zero drift across SWR and the ⑫ same-version short-circuit). deadline/unavailable/disabled/task=null pass through without landing; communityTask rejections propagate (install-side narrow catches swallow them into a miss).
+- **Dual indexes preserve install semantics (R2-3)**: the merged-domain `lookupInstalled` serves read paths; the full-domain `findById`/`lookupInstalledAll` ([primary…, full adapt set] including displaced entries) serves the three install/upgrade sites (resolveRegistryEntry / upgradePlugin / profile-ops desktop upgrade) - id-displaced entries remain installable and upgradable, byte-for-byte semantics. Primary-first short-circuits preserved (community failures never block primary hits).
+- **Cycle dissolved + score-once**: six merge-layer symbols moved from market.ts into merged-market.ts, the 23 category labels moved from community.ts (re-exported in place so cli/tools stay untouched) - the market↔community import cycle is broken in all three directions; listMarket's scoring is single-pass (category short-circuit first, rank reads the table) with tie-breaks byte-identical to 0.9.67.
+- **Zero behavior change pledge**: ADR-0003/0006/0008/0012/0013 untouched; a golden equivalence baseline (seven capture dimensions incl. paging/search/sort/probe badges) stayed byte-identical throughout.
+- **Verification**: 1305 tests green, typecheck clean; measured on this machine against the real 4,460-entry catalog: first call 319ms → second same-identity call 65ms; search scoring 330ms cold → 8ms warm within a generation (40×). Implementation closed through three independent review rounds (16 plan-review + 7 execution-review findings, all "fixed and re-verified"; including one silent no-op fix caught by the reviewer's `git diff` discipline and corrected with a real diff). Implementation plan and ADR-0016 v3 on record (`docs/plans/`, `docs/adr/`).
+
 ### Fixed in 0.9.67 — operations card font blows up on mobile: join the 12px family + wrap self-consistency
 
 - **Root cause (user phone screenshot)**: the operations rows `.dsvm-oprow` never declared a `font-size` — invisible on the desktop host base size, but on mobile browsers (base ≈15-16px) the whole row rendered nearly twice the size of the settings cards around it, clashing with the 12px family (`dsvm-kv` config rows, `dshm-hint`, `dsvm-fold`) on the same screen.

package/lib/core/community.js

@@ -11,42 +11,15 @@ import { isAbsolute, join, relative } from 'node:path';
 import { cacheRoot } from './env.js';
 import { decodeUtf8Fatal, fetchBytesLimited, describeFetchFailure } from './httpx.js';
 import { isExactVersion, npmLatest } from './versions.js';
-import { communityOutcome } from './market.js';
+import { communityOutcome } from './merged-market.js';
 export const COMMUNITY_NPM_PACKAGE = 'dsh-plugin-catalog';
 export const MAX_COMMUNITY_BYTES = 32 * 1024 * 1024;
 export const MAX_COMMUNITY_ENTRIES = 30_000;
 export const CATALOG_BODY_TIMEOUT_MS = 15_000;
 export const COMMUNITY_CHAIN_BUDGET_MS = 30_000;
-/**
- * 上游 23 个分类 id 的全量中文标签（以 fixture `categories` 键为准逐条核对）。
- * 0.7.0 Task 4 改名导出 + 作为标签单一事实源：summary 层附带（communitySummary）、
- * GUI zoneChips 消费服务端数据，客户端内嵌副本（market-state.js）随 Task 8 删除。
- */
-export const COMMUNITY_CATEGORY_LABELS = {
-    agi: 'AGI 架构探索',
-    ui: 'UI 增强',
-    usage: '用量与计费',
-    theme: '主题与外观',
-    model: '模型与账号接入',
-    identity: '身份与通信',
-    session: '会话与消息',
-    memory: '记忆',
-    tools: '工具与能力',
-    wsl: 'WSL 与 Windows 互操作',
-    browser: '浏览器与网页',
-    vision: '视觉与多模态',
-    voice: '语音与音频',
-    docs: '文档与渲染',
-    skill: '技能包',
-    workflow: '工作流与自动化',
-    git: 'Git 与代码评审',
-    notify: '通知与集成',
-    dev: '开发与运行时',
-    security: '安全与权限',
-    remote: '远程与移动端',
-    market: '插件市场与管理',
-    fun: '娱乐',
-};
+// 0.9.68（ADR-0016 R1-2）：COMMUNITY_CATEGORY_LABELS 随 communitySummary 迁入 merged-market.ts
+// （标签单一事实源不变，原位 re-export 保 cli.ts/tools.ts 既有 import 零改动）。
+export { COMMUNITY_CATEGORY_LABELS } from './merged-market.js';
 const TOP_LEVEL_KEYS = new Set(['name', 'url', 'source', 'updated', 'count', 'categories', 'plugins']);
 /**
  * 容器层严格校验（条目层由适配层负责）：
@@ -120,6 +93,31 @@ async function atomicWrite(path, text) {
     await writeFile(tmp, text);
     await rename(tmp, path);
 }
+// ---------- ADR-0016 决策 1 L1：已解析目录 body memo ----------
+// body 文件名 version-pin 不可变（catalog-{version}.json，atomicWrite 新版本写新文件），
+// 同 (dir, version) 即同字节——memo 键即身份，零失效逻辑。cap=2（身份组合常态 ≤2；
+// 每条 ≈15-20MB 解析对象，最坏 ≈40MB）。失败路径（parse/validate 失败）不写 memo。
+const bodyMemo = new Map();
+const BODY_MEMO_CAP = 2;
+let communityBodyReads = 0;
+function rememberBody(dir, version, catalog) {
+    const key = `${dir}§${version}`;
+    if (!bodyMemo.has(key) && bodyMemo.size >= BODY_MEMO_CAP) {
+        const oldest = bodyMemo.keys().next().value;
+        if (oldest !== undefined)
+            bodyMemo.delete(oldest);
+    }
+    bodyMemo.set(key, catalog);
+}
+/** 测试钩子：readCache 对 body 文件的实读次数（memo 命中不计；命名先例 _waitForCommunityBackgroundForTests）。 */
+export function _communityBodyReadsForTests() {
+    return communityBodyReads;
+}
+/** 测试钩子：清 body memo 与计数（测试隔离用，latest-cache resetLatestCacheForTest 同款）。 */
+export function _resetCommunityBodyMemoForTests() {
+    bodyMemo.clear();
+    communityBodyReads = 0;
+}
 /** 读取顺序（v8 定稿）：meta 结构校验 → isExactVersion(meta.version) → body containment → 才读正文；损坏文件清理。 */
 async function readCache(dir, pin) {
     const metaPath = join(dir, pin ? metaPinName(pin) : META_LATEST);
@@ -149,6 +147,11 @@ async function readCache(dir, pin) {
     const bodyPath = join(dir, bodyName(meta.version));
     if (!contained(dir, bodyPath))
         return null;
+    // L1 快路径：meta 每次实读（checkedAt 会更新），body 命中 memo 即免 5MB 级 parse+校验
+    const memoHit = bodyMemo.get(`${dir}§${meta.version}`);
+    if (memoHit)
+        return { meta, catalog: memoHit };
+    communityBodyReads += 1;
     let data;
     try {
         data = JSON.parse(await readFile(bodyPath, 'utf8'));
@@ -162,6 +165,7 @@ async function readCache(dir, pin) {
         await rm(bodyPath, { force: true }).catch(() => undefined);
         return null;
     }
+    rememberBody(dir, meta.version, v.catalog);
     return { meta, catalog: v.catalog };
 }
 async function writeMeta(dir, pin, meta) {

package/lib/core/market.js

@@ -10,7 +10,7 @@
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { dshHome, webProfileDir } from './env.js';
+import { dshHome, webProfileDir, WEB_PROFILE } from './env.js';
 import { runProfileTransaction, makeNpmWarmPackument, TransactionError, } from './profile-transaction.js';
 import { listInstalledPlugins as defaultListInstalledPlugins, } from './installed.js';
 import { loaderHost } from './live-plugin.js';
@@ -18,8 +18,12 @@ import { precheckNpmCompat, IncompatibleError } from './compat-check.js';
 import { PROTECTED_MODULES, composeEnablement } from './enablement.js';
 import { readProfileOverrides } from './patch-yaml.js';
 import { loadRegistry as defaultLoadRegistry, } from './registry.js';
-import { COMMUNITY_CATEGORY_LABELS, fetchCommunityCatalog as defaultFetchCommunityCatalog, } from './community.js';
-import { adaptCommunityCatalog } from './community-adapter.js';
+import { fetchCommunityCatalog as defaultFetchCommunityCatalog, } from './community.js';
+// 0.9.68（ADR-0016）：合并层迁入 merged-market.ts（communityOutcome/mergeRegistries/communitySummary/
+// deadlineRace/matchInstalledByEntry/isCommunityEntry/COMMUNITY_CATEGORY_LABELS）——market↔community
+// import 环自此断开；re-export 保既有消费方（tools.ts 的类型、profile-ops 的 matchInstalledByEntry）零改动。
+import { communityOutcome, communityTimeoutSummary, withFallbackLookups, deadlineRace, isCommunityEntry, matchInstalledByEntry, mergedOutcome, } from './merged-market.js';
+export { communityOutcome, matchInstalledByEntry } from './merged-market.js';
 import { normalizeSearchText, relevanceScore, tokenizeSearchText } from './search-relevance.js';
 import { GithubBudgetExhaustedError, createGithubRequestBudget, isExactVersion } from './versions.js';
 import { classifyUpgradeActivation } from './activation.js';
@@ -128,18 +132,6 @@ function timeoutRegistryState(cfg) {
         count: 0,
     };
 }
-function deadlineRace(task, ms) {
-    return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => resolve('deadline'), Math.max(0, ms));
-        task.then((value) => {
-            clearTimeout(timer);
-            resolve(value);
-        }, (err) => {
-            clearTimeout(timer);
-            reject(err);
-        });
-    });
-}
 // ---------- latest TTL cache ----------
 // 0.9.20：纯内存 TTL 缓存（ADR-0006，推翻 0.9.14 的落盘跨重启存活——重启即失效是特性）；
 // mutation 成功后的定向失效走 invalidateLatestForEntry（只失效不回写）。
@@ -194,144 +186,6 @@ function classifyLatestError(err) {
         return 'rate-limited';
     return 'network-error';
 }
-/** 0.9.8 导出（原模块私有）：desktopUpgrade 的「已装 ↔ 收录条目」匹配与 web upgradePlugin 同语义。 */
-export function matchInstalledByEntry(entry, installed) {
-    return installed.find((it) => {
-        if (entry.npm && it.pkg === entry.npm)
-            return true;
-        if (entry.npm && it.name === entry.npm)
-            return true;
-        if (entry.github && it.source === 'github') {
-            const m = /^github:([^#]+)/.exec(it.spec);
-            if (m && m[1] === entry.github)
-                return true;
-        }
-        return false;
-    });
-}
-/**
- * 合并去重（Q41）：社区条目依次与主清单的 npm 名集 / github owner-repo 集 / id 集比对，
- * 任一相撞即让位（每条只计一次）；社区内部 npm 名重复同样让位（首条优先）。
- * 主清单恒优先——让位只影响社区条目，主条目原样保留。
- */
-export function mergeRegistries(primary, community) {
-    const primaryNpm = new Set(primary.filter((e) => e.npm).map((e) => e.npm));
-    const primaryGithub = new Set(primary.filter((e) => e.github).map((e) => e.github));
-    const primaryIds = new Set(primary.map((e) => e.id));
-    const displaced = [];
-    const kept = [];
-    const seenNpm = new Set();
-    for (const c of community) {
-        if (c.npm !== undefined) {
-            if (primaryNpm.has(c.npm) || seenNpm.has(c.npm)) {
-                displaced.push(c.id);
-                continue;
-            }
-            seenNpm.add(c.npm);
-        }
-        if ((c.github !== undefined && primaryGithub.has(c.github)) || primaryIds.has(c.id)) {
-            displaced.push(c.id);
-            continue;
-        }
-        kept.push(c);
-    }
-    // Q45：主清单置顶（组内原顺序）+ 社区按 30 天下载量降序（无数据按名称）
-    const sorted = [...kept].sort((a, b) => {
-        const da = a.downloads ?? -1;
-        const db = b.downloads ?? -1;
-        if (da !== db)
-            return db - da;
-        return a.name.localeCompare(b.name);
-    });
-    const warnings = displaced.length > 0 ? [`${displaced.length} 条社区条目与主清单重复，已让位（主清单恒优先）`] : [];
-    return { items: [...primary, ...sorted], displaced: displaced.length, warnings };
-}
-function communitySummary(state, counts, extraWarnings, categoryLabelsEn) {
-    const unavailableLike = state.status === 'disabled' || state.status === 'unavailable';
-    return {
-        enabled: state.enabled,
-        status: state.status,
-        version: state.version,
-        checkedAt: state.checkedAt,
-        fetchedAt: state.fetchedAt,
-        route: state.route,
-        acceptedCount: unavailableLike ? 0 : (counts.acceptedCount ?? 0),
-        upstreamCount: unavailableLike ? (state.status === 'disabled' ? null : 0) : (counts.upstreamCount ?? state.count),
-        displaced: unavailableLike ? 0 : (counts.displaced ?? 0),
-        skippedDirty: unavailableLike ? 0 : (counts.skippedDirty ?? 0),
-        skippedSubpathNoNpm: unavailableLike ? 0 : (counts.skippedSubpathNoNpm ?? 0),
-        errors: [...state.errors],
-        warnings: [...state.warnings, ...extraWarnings],
-        // 标签单一事实源（0.7.0 Task 4）：disabled/skipped 下无社区数据语义，不携带；
-        // EN 标签（i18n）随行携带，仅在调用方传入非空映射时出现（缺省 = 上游无 categories 数据）
-        ...(state.status !== 'disabled' && state.status !== 'skipped'
-            ? {
-                categoryLabels: { ...COMMUNITY_CATEGORY_LABELS },
-                ...(categoryLabelsEn && Object.keys(categoryLabelsEn).length > 0
-                    ? { categoryLabelsEn: { ...categoryLabelsEn } }
-                    : {}),
-            }
-            : {}),
-    };
-}
-function disabledCommunitySummary() {
-    return communitySummary({ enabled: false, status: 'disabled', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: [], warnings: [] }, {}, []);
-}
-/** 查询层主动跳过（0.7.0 Task 2：source='primary'）：本次未加载社区层，非配置关闭、非故障。 */
-function skippedCommunitySummary() {
-    return communitySummary({ enabled: true, status: 'skipped', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: [], warnings: [] }, {}, []);
-}
-function communityTimeoutSummary() {
-    return communitySummary({ enabled: true, status: 'unavailable', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: ['社区目录状态获取超时，可稍后刷新'], warnings: [] }, {}, []);
-}
-/**
- * 社区 loader waiter 收敛（v9/v10 waiter-scoped 契约）：共享 flight 不接收调用者 deadline，
- * 本函数作为 waiter 用剩余 deadline race 自己的等待；到点只结束本 waiter（summary 标超时），
- * 共享 flight 照常继续。source='primary'/未启用 → loader 零调用（task 传 null → skipped；
- * 配置关闭走真任务的 disabled 分支，与跳过语义分离）。
- * 导出供 community.ts getCommunitySummary 复用（summary 组装单一产地）。
- */
-export async function communityOutcome(task, deadlineAt, primary) {
-    if (!task)
-        return { summary: skippedCommunitySummary(), merged: primary };
-    let loaded;
-    try {
-        loaded = await deadlineRace(task, deadlineAt - Date.now());
-    }
-    finally {
-        // race 输出后共享 promise 若仍悬挂（deadline 先到），收尾防 unhandled rejection
-        void task.catch(() => undefined);
-    }
-    if (loaded === 'deadline')
-        return { summary: communityTimeoutSummary(), merged: primary };
-    const state = loaded.state;
-    if (state.status === 'disabled')
-        return { summary: disabledCommunitySummary(), merged: primary };
-    if (state.status === 'unavailable' || !loaded.catalog) {
-        return {
-            summary: communitySummary(state, { acceptedCount: 0, upstreamCount: 0, displaced: 0, skippedDirty: 0, skippedSubpathNoNpm: 0 }, []),
-            merged: primary,
-        };
-    }
-    const adapted = adaptCommunityCatalog(loaded.catalog);
-    const merge = mergeRegistries(primary, adapted.entries);
-    // EN 分类标签（i18n）：直接取上游目录 categories.en——上游新增分类自动跟进，
-    // 缺 en 的 id 不进映射（客户端按语言取用并回退中文标签，不在此处手养第二张表）
-    const categoryLabelsEn = Object.fromEntries(Object.entries(loaded.catalog.categories)
-        .map(([id, c]) => [id, typeof c?.en === 'string' && c.en !== '' ? c.en : ''])
-        .filter(([, en]) => en !== ''));
-    const summary = communitySummary(state, {
-        acceptedCount: adapted.entries.length,
-        upstreamCount: loaded.catalog.plugins.length,
-        displaced: merge.displaced,
-        skippedDirty: adapted.skippedDirty,
-        skippedSubpathNoNpm: adapted.skippedSubpathNoNpm,
-    }, [...adapted.warnings, ...merge.warnings], categoryLabelsEn);
-    return { summary, merged: merge.items };
-}
-function isCommunityEntry(entry) {
-    return entry.descriptionEn !== undefined;
-}
 /** 旁路数值/日期读取（RegistryEntry 无这些键 → null/''；0.7.0 Task 2 排序用）。 */
 function dlOf(e) {
     const v = e.downloads;
@@ -469,7 +323,16 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
     const installedComplete = installed !== null && installed.complete === true;
     const installedItems = installed?.items ?? [];
     // 社区 waiter 收敛：主 unavailable 时 merged = 存活社区条目（Q42 出页不返空）；两层皆不可用 → 空页契约
-    const community = await communityOutcome(communityTask, deadlineAt, loaded.registry.plugins);
+    // 0.9.68（ADR-0016）：改经物化合并市场——同身份（registry 代 + 目录 version）命中即免 adapt+merge，
+    // summary 仍由当次 state 现算；失败/deadline/unavailable/disabled/task=null 形态透传不落代。
+    const community = await mergedOutcome({
+        namespace,
+        profile: opts.profile ?? WEB_PROFILE,
+        cfg,
+        registry: loaded,
+        communityTask,
+        deadlineAt,
+    });
     // 分区过滤 + 全量统计 + query/category 过滤 + 分页（同步，极轻；0.7.0 Task 2）：
     // categoryCounts = 分区集合（不含 query/category 过滤——chips 需要全区计数）；
     // total = 分区 ∩ query ∩ category。
@@ -493,19 +356,27 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
     // 相关性搜索（0.7.0 Task 3）：归一化分词 + 字段加权评分；0 分不返回；
     // id 整串精确匹配保证命中（收藏 stale 检测依赖）。
     const terms = tokenizeSearchText(normalizeSearchText(opts.query ?? ''));
+    // 0.9.68（ADR-0016 决策 7，score-once）：类别不匹配先短路（不付评分成本），terms 非空时
+    // 单遍评分并记入 scoreByEntry——rank 阶段查表，不再对每条目二次调用 relevanceScore。
+    // tie-break 取 afterSort 之后的位置，与 0.9.67 语义逐点一致（评审 R1-4）。
+    const scoreByEntry = new Map();
     const filtered = zoned.filter((entry) => {
         const also = entry.alsoCategories ?? [];
         if (cat && entry.category !== cat && !also.includes(cat))
             return false;
         if (terms.length === 0)
             return true;
-        return relevanceScore(entry, terms) > 0;
+        const score = relevanceScore(entry, terms);
+        if (score <= 0)
+            return false;
+        scoreByEntry.set(entry, score);
+        return true;
     });
     // 排序：显式 sort 先行；query 命中时相关性优先（稳定 tie-break 回到既有序——merged 现序或用户排序）
     const afterSort = opts.sort ? sortEntries(filtered, opts.sort) : filtered;
     const ranked = terms.length > 0
         ? afterSort
-            .map((entry, idx) => ({ entry, score: relevanceScore(entry, terms), idx }))
+            .map((entry, idx) => ({ entry, score: scoreByEntry.get(entry), idx }))
             .sort((a, b) => b.score - a.score || a.idx - b.idx)
             .map((s) => s.entry)
         : afterSort;
@@ -590,8 +461,14 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
             }
         }
         // outdated 判定统一在 probe 后进行（0.9.45：cache-only 也执行——暖缓存不丢「可升级」徽标）
+        // 0.9.68（ADR-0016 决策 5 / 评审 R1-7）：pkg→installed 查表，页内 O(1) 取代逐项 find
+        // first-wins：与旧 installedItems.find 逐点一致（正常枚举无重复 pkg，理论边界防御）
+        const instByPkg = new Map();
+        for (const inst of installedItems)
+            if (!instByPkg.has(inst.pkg))
+                instByPkg.set(inst.pkg, inst);
         for (const item of items) {
-            const inst = item.installedPkg !== undefined ? installedItems.find((i) => i.pkg === item.installedPkg) : undefined;
+            const inst = item.installedPkg !== undefined ? instByPkg.get(item.installedPkg) : undefined;
             if (!inst)
                 continue;
             if (item.latestVersion !== undefined && inst.version) {
@@ -653,7 +530,18 @@ export async function listInstalledWithMeta(cfg = {}, opts = {}, deps = {}) {
     catch {
         loaded = 'deadline';
     }
-    const community = await communityOutcome(communityTask, deadlineAt, loaded === 'deadline' ? [] : loaded.registry.plugins);
+    // 0.9.68（ADR-0016）：registry 正常时经物化合并市场（同身份免 adapt+merge + 匹配查表）；
+    // registry deadline 降级路径身份残缺（primary=[]、fetchedAt 未知），走无 memo 的 communityOutcome，不进 L2。
+    const community = loaded === 'deadline'
+        ? withFallbackLookups(await communityOutcome(communityTask, deadlineAt, []))
+        : await mergedOutcome({
+            namespace,
+            profile: opts.profile ?? WEB_PROFILE,
+            cfg,
+            registry: loaded,
+            communityTask,
+            deadlineAt,
+        });
     if (loaded === 'deadline' || loaded.status === 'unavailable') {
         // registry 不可用：不做 matching/探测（原行为），但社区 summary 照常携带（CLI outdated 双源判定）
         const registryState = loaded === 'deadline' ? timeoutRegistryState(cfg) : stateOf(loaded);
@@ -661,21 +549,22 @@ export async function listInstalledWithMeta(cfg = {}, opts = {}, deps = {}) {
         return { items, others: installed.others, profileDir: installed.profileDir, registryState, community: community.summary };
     }
     const registryState = stateOf(loaded);
-    matchInstalled(items, community.merged);
+    matchInstalled(items, community.merged, community.lookupInstalled);
     // 两段加载（ADR-0008）：probeMode 控制探测段——缺省 'full' 行为不变；'none' 面板快列表跳过探测；
     // 'only' 面板第二段 ttlMin=0 永远新鲜（readLatestCache(key,0) 先删共享条目再重探：host ns 下浏览页/
     // 工具的 TTL 命中被刷新为更新值，预算消耗速率上升、上限不变，超限走 latestError 降级）。
     if ((opts.probeMode ?? 'full') !== 'none') {
         // 0.9.20：latest 缓存纯内存（ADR-0006）——探测段前仅一次性清扫 0.9.14 遗留磁盘信封
         await ensureLatestCacheSwept({ namespace, profile: opts.profile });
-        await probeLatest(items, { merged: community.merged, registryAddress: loaded.configuredAddress, ttlMin: opts.probeMode === 'only' ? 0 : Math.max(0, cfg.cacheTtlMin ?? 60) }, d, { namespace, signal, githubBudget, remaining, timeoutMs: cfg.timeoutMs ?? 20_000 });
+        await probeLatest(items, { merged: community.merged, lookup: community.lookupInstalled, registryAddress: loaded.configuredAddress, ttlMin: opts.probeMode === 'only' ? 0 : Math.max(0, cfg.cacheTtlMin ?? 60) }, d, { namespace, signal, githubBudget, remaining, timeoutMs: cfg.timeoutMs ?? 20_000 });
     }
     return { items, others: installed.others, profileDir: installed.profileDir, registryState, community: community.summary };
 }
 /** matching（主+社区合并条目）：命中主条目或社区条目都写 registryId；社区命中再标 community。 */
-function matchInstalled(items, merged) {
+function matchInstalled(items, merged, lookup) {
     for (const item of items) {
-        const entry = merged.find((e) => matchInstalledByEntry(e, [item]));
+        // 0.9.68（ADR-0016 决策 5）：mergedOutcome.lookupInstalled 查表 O(I)；缺省回退线性扫描保旧调用面
+        const entry = lookup ? lookup(item) : merged.find((e) => matchInstalledByEntry(e, [item]));
         if (!entry)
             continue;
         item.registryId = entry.id;
@@ -688,7 +577,7 @@ function matchInstalled(items, merged) {
 /** 已装页 latest 探测（Q46 已装页豁免，但 GitHub 计入 request 预算 + 宿主滚动窗口）。 */
 async function probeLatest(items, ctx, d, rt) {
     await mapWithConcurrency(items, LATEST_WORKERS, async (item) => {
-        const entry = ctx.merged.find((e) => matchInstalledByEntry(e, [item]));
+        const entry = ctx.lookup ? ctx.lookup(item) : ctx.merged.find((e) => matchInstalledByEntry(e, [item]));
         // latest 探测沿用 listMarket 的 TTL cache；npm-only 条目（不在收录清单的已装包）也走
         // latestCacheKey 归一格式（0.9.14：否则首段非 host/cli 会被落盘层静默跳过）
         const cacheKey = entry
@@ -756,11 +645,31 @@ export async function resolveRegistryEntry(id, cfg = {}, opts = {}, deps) {
     if (loaded.status === 'unavailable') {
         throw new Error(`收录清单不可用，无法安装 ${id}；请检查 registry 配置或网络后重试`);
     }
-    const entry = loaded.registry.plugins.find((e) => e.id === id) ??
-        (await findCommunityInstallEntry(id, cfg, opts, deps));
-    if (!entry)
-        throw new Error(`registry 中没有该条目: ${id}`);
-    return entry;
+    // 主清单优先短路（今日语义原样）：primary 命中不触碰社区——社区异常不阻断主清单条目安装。
+    const primaryEntry = loaded.registry.plugins.find((e) => e.id === id);
+    if (primaryEntry)
+        return primaryEntry;
+    // 0.9.68（ADR-0016 / R2-3）：主清单 miss 时经物化合并市场取全量域 findById（[primary..., adapt 全量...]
+    // 含 displaced 让位条目——id-让位条目今日可装，语义零变化）；同身份命中免每装机 4,400 条重 adapt。
+    // communityTask reject 透传，由窄 catch 吞为 miss（与旧 findCommunityInstallEntry 同构 →「没有该条目」）。
+    try {
+        const communityTask = (deps?.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
+        const outcome = await mergedOutcome({
+            namespace: opts.namespace ?? 'host',
+            profile: opts.profile ?? WEB_PROFILE,
+            cfg,
+            registry: loaded,
+            communityTask,
+            deadlineAt: Date.now() + DEFAULT_DEADLINE_MS,
+        });
+        const entry = outcome.findById(id);
+        if (entry)
+            return entry;
+    }
+    catch {
+        /* 社区失败/异常吞为 miss（今日语义） */
+    }
+    throw new Error(`registry 中没有该条目: ${id}`);
 }
 export async function installFromRegistry(id, cfg = {}, opts = {}, deps) {
     const entry = await resolveRegistryEntry(id, cfg, opts, deps);
@@ -1323,10 +1232,27 @@ async function upgradePluginLocked(pkg, cfg = {}, opts = {}, deps) {
     const target = installed.find((it) => it.pkg === pkg);
     if (!target)
         throw new Error(`web profile 未安装该插件: ${pkg}`);
+    // 0.5.1：合并市场安装的社区条目同样可升级——主清单优先，miss 时查社区目录。
+    // 0.9.68（ADR-0016 / R2-3）：社区兜底经物化合并市场全量域 lookupInstalledAll（含 displaced 让位条目，
+    // min-ord 胜者 = 今日「先主清单 find 后社区 adapt 全量 find」合成语义）；reject 透传由窄 catch 吞为 miss。
     let entry = loaded.registry.plugins.find((e) => matchInstalledByEntry(e, [target]));
-    // 0.5.1：合并市场安装的社区条目同样可升级——主清单 miss 时查社区目录
-    if (!entry)
-        entry = await findCommunityUpgradeEntry(target, cfg, opts, deps);
+    try {
+        if (!entry) {
+            const communityTask = (deps?.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
+            const outcome = await mergedOutcome({
+                namespace: opts.namespace ?? 'host',
+                profile: opts.profile ?? WEB_PROFILE,
+                cfg,
+                registry: loaded,
+                communityTask,
+                deadlineAt: Date.now() + DEFAULT_DEADLINE_MS,
+            });
+            entry = outcome.lookupInstalledAll(target);
+        }
+    }
+    catch {
+        entry = undefined;
+    }
     if (!entry)
         throw new Error(`「${pkg}」不是经 dsh-m 收录的插件；直接升级请用 dsh plugin update 或先在 registry 收录它`);
     // 0.5.1 修复：直调 installEntryLocked——upgradePlugin 已在 mutation session 区间内，
@@ -1352,33 +1278,6 @@ async function upgradePluginLocked(pkg, cfg = {}, opts = {}, deps) {
  * （owner--name 等），主清单 miss 时按同一 id 查社区目录。社区清单未启用/不可用/加载
  * 异常/未命中 → undefined，由调用方统一报「registry 中没有该条目」。
  */
-async function findCommunityInstallEntry(id, cfg, opts, deps) {
-    try {
-        const loaded = await (deps?.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
-        if (!loaded.catalog)
-            return undefined;
-        return adaptCommunityCatalog(loaded.catalog).entries.find((e) => e.id === id);
-    }
-    catch {
-        return undefined;
-    }
-}
-/**
- * 社区条目升级查找（0.5.1）：主清单 miss 时按同一 matchInstalledByEntry 语义查社区目录。
- * 社区清单未启用/不可用/加载异常/未命中 → undefined，由调用方统一报「不是经 dsh-m 收录」。
- */
-async function findCommunityUpgradeEntry(target, cfg, opts, deps) {
-    try {
-        const loaded = await (deps?.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
-        if (!loaded.catalog)
-            return undefined;
-        const adapted = adaptCommunityCatalog(loaded.catalog);
-        return adapted.entries.find((e) => matchInstalledByEntry(e, [target]));
-    }
-    catch {
-        return undefined;
-    }
-}
 /** 自升级（0.5.0 收编：host-api 直调事务的旁路封死）：npmLatest + integrity fail-closed + installEntryLocked（session/守卫经 installEntry）。 */
 export async function selfUpgrade(pkgName, currentVersion, cfg = {}, opts = {}, deps) {
     return withMutationSession(async () => {

package/lib/core/merged-market.js

@@ -0,0 +1,356 @@
+import { adaptCommunityCatalog } from './community-adapter.js';
+// ---------- 迁入：COMMUNITY_CATEGORY_LABELS（标签单一事实源，0.7.0 Task 4） ----------
+/**
+ * 上游 23 个分类 id 的全量中文标签（以 fixture `categories` 键为准逐条核对）。
+ * 0.7.0 Task 4 改名导出 + 作为标签单一事实源：summary 层附带（communitySummary）、
+ * GUI zoneChips 消费服务端数据，客户端内嵌副本（market-state.js）随 Task 8 删除。
+ * 0.9.68 随 communitySummary 迁入本模块（ADR-0016 R1-2：不迁则环只是从
+ * market↔community 平移为 merged-market↔community）；community.ts 原位 re-export。
+ */
+export const COMMUNITY_CATEGORY_LABELS = {
+    agi: 'AGI 架构探索',
+    ui: 'UI 增强',
+    usage: '用量与计费',
+    theme: '主题与外观',
+    model: '模型与账号接入',
+    identity: '身份与通信',
+    session: '会话与消息',
+    memory: '记忆',
+    tools: '工具与能力',
+    wsl: 'WSL 与 Windows 互操作',
+    browser: '浏览器与网页',
+    vision: '视觉与多模态',
+    voice: '语音与音频',
+    docs: '文档与渲染',
+    skill: '技能包',
+    workflow: '工作流与自动化',
+    git: 'Git 与代码评审',
+    notify: '通知与集成',
+    dev: '开发与运行时',
+    security: '安全与权限',
+    remote: '远程与移动端',
+    market: '插件市场与管理',
+    fun: '娱乐',
+};
+// ---------- 迁入：deadlineRace（communityOutcome 的唯一 await 依赖；market.ts 反向值导入） ----------
+export function deadlineRace(task, ms) {
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => resolve('deadline'), Math.max(0, ms));
+        task.then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timer);
+            reject(err);
+        });
+    });
+}
+// ---------- 迁入：matchInstalledByEntry（0.9.8 导出：desktopUpgrade 与 web upgradePlugin 同语义） ----------
+/** 「已装 ↔ 收录条目」匹配三准则：npm 名对 pkg / npm 名对 name / github spec 前缀（source 守卫）。 */
+export function matchInstalledByEntry(entry, installed) {
+    return installed.find((it) => {
+        if (entry.npm && it.pkg === entry.npm)
+            return true;
+        if (entry.npm && it.name === entry.npm)
+            return true;
+        if (entry.github && it.source === 'github') {
+            const m = /^github:([^#]+)/.exec(it.spec);
+            if (m && m[1] === entry.github)
+                return true;
+        }
+        return false;
+    });
+}
+/**
+ * 合并去重（Q41）：社区条目依次与主清单的 npm 名集 / github owner-repo 集 / id 集比对，
+ * 任一相撞即让位（每条只计一次）；社区内部 npm 名重复同样让位（首条优先）。
+ * 主清单恒优先——让位只影响社区条目，主条目原样保留。
+ */
+export function mergeRegistries(primary, community) {
+    const primaryNpm = new Set(primary.filter((e) => e.npm).map((e) => e.npm));
+    const primaryGithub = new Set(primary.filter((e) => e.github).map((e) => e.github));
+    const primaryIds = new Set(primary.map((e) => e.id));
+    const displaced = [];
+    const kept = [];
+    const seenNpm = new Set();
+    for (const c of community) {
+        if (c.npm !== undefined) {
+            if (primaryNpm.has(c.npm) || seenNpm.has(c.npm)) {
+                displaced.push(c.id);
+                continue;
+            }
+            seenNpm.add(c.npm);
+        }
+        if ((c.github !== undefined && primaryGithub.has(c.github)) || primaryIds.has(c.id)) {
+            displaced.push(c.id);
+            continue;
+        }
+        kept.push(c);
+    }
+    // Q45：主清单置顶（组内原顺序）+ 社区按 30 天下载量降序（无数据按名称）
+    const sorted = [...kept].sort((a, b) => {
+        const da = a.downloads ?? -1;
+        const db = b.downloads ?? -1;
+        if (da !== db)
+            return db - da;
+        return a.name.localeCompare(b.name);
+    });
+    const warnings = displaced.length > 0 ? [`${displaced.length} 条社区条目与主清单重复，已让位（主清单恒优先）`] : [];
+    return { items: [...primary, ...sorted], displaced: displaced.length, warnings };
+}
+function communitySummary(state, counts, extraWarnings, categoryLabelsEn) {
+    const unavailableLike = state.status === 'disabled' || state.status === 'unavailable';
+    return {
+        enabled: state.enabled,
+        status: state.status,
+        version: state.version,
+        checkedAt: state.checkedAt,
+        fetchedAt: state.fetchedAt,
+        route: state.route,
+        acceptedCount: unavailableLike ? 0 : (counts.acceptedCount ?? 0),
+        upstreamCount: unavailableLike ? (state.status === 'disabled' ? null : 0) : (counts.upstreamCount ?? state.count),
+        displaced: unavailableLike ? 0 : (counts.displaced ?? 0),
+        skippedDirty: unavailableLike ? 0 : (counts.skippedDirty ?? 0),
+        skippedSubpathNoNpm: unavailableLike ? 0 : (counts.skippedSubpathNoNpm ?? 0),
+        errors: [...state.errors],
+        warnings: [...state.warnings, ...extraWarnings],
+        // 标签单一事实源（0.7.0 Task 4）：disabled/skipped 下无社区数据语义，不携带；
+        // EN 标签（i18n）随行携带，仅在调用方传入非空映射时出现（缺省 = 上游无 categories 数据）
+        ...(state.status !== 'disabled' && state.status !== 'skipped'
+            ? {
+                categoryLabels: { ...COMMUNITY_CATEGORY_LABELS },
+                ...(categoryLabelsEn && Object.keys(categoryLabelsEn).length > 0
+                    ? { categoryLabelsEn: { ...categoryLabelsEn } }
+                    : {}),
+            }
+            : {}),
+    };
+}
+function disabledCommunitySummary() {
+    return communitySummary({ enabled: false, status: 'disabled', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: [], warnings: [] }, {}, []);
+}
+/** 查询层主动跳过（0.7.0 Task 2：source='primary'）：本次未加载社区层，非配置关闭、非故障。 */
+function skippedCommunitySummary() {
+    return communitySummary({ enabled: true, status: 'skipped', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: [], warnings: [] }, {}, []);
+}
+function communityTimeoutSummary() {
+    return communitySummary({ enabled: true, status: 'unavailable', version: null, checkedAt: null, fetchedAt: null, route: null, count: 0, errors: ['社区目录状态获取超时，可稍后刷新'], warnings: [] }, {}, []);
+}
+/** 导出（0.9.68 迁移配套）：market.ts 的 registry-deadline 分支直接取超时 summary（该分支社区 task 未启动）。 */
+export { communityTimeoutSummary };
+// ---------- 迁入：isCommunityEntry ----------
+export function isCommunityEntry(entry) {
+    return entry.descriptionEn !== undefined;
+}
+/** 单域首现索引：每键取序最前（min-ord）条目——等价于在该域上 find(matchInstalledByEntry) 的「第一条任一准则命中」。 */
+function buildMatchIndex(domain) {
+    const byNpm = new Map();
+    const byGithub = new Map();
+    const byId = new Map();
+    domain.forEach((entry, ord) => {
+        const slot = { entry, ord };
+        if (entry.npm !== undefined && !byNpm.has(entry.npm))
+            byNpm.set(entry.npm, slot);
+        if (entry.github !== undefined && !byGithub.has(entry.github))
+            byGithub.set(entry.github, slot);
+        if (!byId.has(entry.id))
+            byId.set(entry.id, slot);
+    });
+    return { byNpm, byGithub, byId };
+}
+const GITHUB_SPEC_RE = /^github:([^#]+)/;
+/** 三候选（npm[pkg] / npm[name] / github[spec]（仅 source==='github'））取域序最前者胜——与 matchInstalledByEntry 逐点等价。 */
+function lookupInIndex(index, installed) {
+    const candidates = [];
+    const byPkg = index.byNpm.get(installed.pkg);
+    if (byPkg)
+        candidates.push(byPkg);
+    const byName = index.byNpm.get(installed.name);
+    if (byName)
+        candidates.push(byName);
+    if (installed.source === 'github') {
+        const m = GITHUB_SPEC_RE.exec(installed.spec);
+        const byRepo = m ? index.byGithub.get(m[1]) : undefined;
+        if (byRepo)
+            candidates.push(byRepo);
+    }
+    if (candidates.length === 0)
+        return undefined;
+    let best = candidates[0];
+    for (let i = 1; i < candidates.length; i++) {
+        if (candidates[i].ord < best.ord)
+            best = candidates[i];
+    }
+    return best.entry;
+}
+const generations = new Map();
+const GENERATION_CAP = 4;
+const mergedStats = { builds: 0, hits: 0, evictions: 0 };
+/** 测试钩子：清 L2 store 与 stats（latest-cache resetLatestCacheForTest 同款先例；测试隔离用）。 */
+export function _resetMergedMarketForTests() {
+    generations.clear();
+    Object.assign(mergedStats, { builds: 0, hits: 0, evictions: 0 });
+}
+/** 测试钩子：builds/hits/evictions 计数（验收断言①②③的机器可断言信号）。 */
+export function _mergedMarketStatsForTests() {
+    return { ...mergedStats };
+}
+function rememberGeneration(key, gen) {
+    if (!generations.has(key) && generations.size >= GENERATION_CAP) {
+        const oldest = generations.keys().next().value;
+        if (oldest !== undefined) {
+            generations.delete(oldest);
+            mergedStats.evictions += 1;
+        }
+    }
+    generations.set(key, gen);
+}
+/**
+ * 身份键派生（探测驱动，R1-12 等价性：configuredAddress 即规范化地址，registry cacheKey
+ * 是它的纯函数——default→DEFAULT_CACHE_KEY、否则 stableKey(url)）。调用点必须在
+ * 全部 await 完成之后（同步临界区起点）。
+ */
+function identityKey(namespace, profile, cfg, registry, state) {
+    const pin = typeof cfg.communityCatalogPin === 'string' ? cfg.communityCatalogPin.trim() : '';
+    return [
+        namespace,
+        profile,
+        registry.configuredAddress,
+        registry.fetchedAt ?? 'never',
+        state.version ?? 'off',
+        pin,
+        cfg.communityCatalog === false ? 'off' : 'on',
+    ].join('§');
+}
+/** 建代（全同步——adapt → merge → 双域索引；禁止引入 await：同步临界区不变量）。 */
+function buildGeneration(primary, catalog) {
+    const adapted = adaptCommunityCatalog(catalog);
+    const merge = mergeRegistries(primary, adapted.entries);
+    const categoryLabelsEn = Object.fromEntries(Object.entries(catalog.categories)
+        .map(([id, c]) => [id, typeof c?.en === 'string' && c.en !== '' ? c.en : ''])
+        .filter(([, en]) => en !== ''));
+    return {
+        merged: merge.items,
+        counts: {
+            acceptedCount: adapted.entries.length,
+            upstreamCount: catalog.plugins.length,
+            displaced: merge.displaced,
+            skippedDirty: adapted.skippedDirty,
+            skippedSubpathNoNpm: adapted.skippedSubpathNoNpm,
+        },
+        adaptWarnings: [...adapted.warnings, ...merge.warnings],
+        categoryLabelsEn,
+        mergedIndex: buildMatchIndex(merge.items),
+        fullIndex: buildMatchIndex([...primary, ...adapted.entries]),
+    };
+}
+// ---------- 迁入：communityOutcome（原样、无 memo；getCommunitySummary 与 registry-deadline 降级路径专用） ----------
+/**
+ * 社区 loader waiter 收敛（v9/v10 waiter-scoped 契约）：共享 flight 不接收调用者 deadline，
+ * 本函数作为 waiter 用剩余 deadline race 自己的等待；到点只结束本 waiter（summary 标超时），
+ * 共享 flight 照常继续。source='primary'/未启用 → loader 零调用（task 传 null → skipped；
+ * 配置关闭走真任务的 disabled 分支，与跳过语义分离）。
+ * 0.9.68 自 market.ts 迁入（ADR-0016）：签名与行为原样；community.ts getCommunitySummary
+ * 与 listInstalledWithMeta 的 registry-deadline 降级路径继续消费本无 memo 形态。
+ */
+export async function communityOutcome(task, deadlineAt, primary) {
+    if (!task)
+        return { summary: skippedCommunitySummary(), merged: primary };
+    let loaded;
+    try {
+        loaded = await deadlineRace(task, deadlineAt - Date.now());
+    }
+    finally {
+        // race 输出后共享 promise 若仍悬挂（deadline 先到），收尾防 unhandled rejection
+        void task.catch(() => undefined);
+    }
+    if (loaded === 'deadline')
+        return { summary: communityTimeoutSummary(), merged: primary };
+    const state = loaded.state;
+    if (state.status === 'disabled')
+        return { summary: disabledCommunitySummary(), merged: primary };
+    if (state.status === 'unavailable' || !loaded.catalog) {
+        return {
+            summary: communitySummary(state, { acceptedCount: 0, upstreamCount: 0, displaced: 0, skippedDirty: 0, skippedSubpathNoNpm: 0 }, []),
+            merged: primary,
+        };
+    }
+    const adapted = adaptCommunityCatalog(loaded.catalog);
+    const merge = mergeRegistries(primary, adapted.entries);
+    // EN 分类标签（i18n）：直接取上游目录 categories.en——上游新增分类自动跟进，
+    // 缺 en 的 id 不进映射（客户端按语言取用并回退中文标签，不在此处手养第二张表）
+    const categoryLabelsEn = Object.fromEntries(Object.entries(loaded.catalog.categories)
+        .map(([id, c]) => [id, typeof c?.en === 'string' && c.en !== '' ? c.en : ''])
+        .filter(([, en]) => en !== ''));
+    const summary = communitySummary(state, {
+        acceptedCount: adapted.entries.length,
+        upstreamCount: loaded.catalog.plugins.length,
+        displaced: merge.displaced,
+        skippedDirty: adapted.skippedDirty,
+        skippedSubpathNoNpm: adapted.skippedSubpathNoNpm,
+    }, [...adapted.warnings, ...merge.warnings], categoryLabelsEn);
+    return { summary, merged: merge.items };
+}
+/** 导出（0.9.68 接线配套）：给无 memo 的 communityOutcome 结果挂兜底 lookup（线性扫描，今日语义原样）——供降级路径（registry-deadline / settings 摘要等冷路径）取得与 mergedOutcome 同形的返回值。 */
+export function withFallbackLookups(outcome) {
+    return outcomeWithLookups(outcome, null, null);
+}
+// ↑ 兜底域 = outcome.merged（透传形态下为 primary-only，不含 displaced 让位条目）——只保证读路径
+// lookupInstalled 等价；不得用于安装/升级路径（那里需要 findById/lookupInstalledAll 的全量域语义）。
+// 现状唯一消费点 listInstalledWithMeta 的 registry-deadline 臂在消费 lookups 前即早返回，零行为影响。
+function outcomeWithLookups(outcome, mergedIndex, fullIndex) {
+    return {
+        ...outcome,
+        lookupInstalled: (installed) => (mergedIndex ? lookupInIndex(mergedIndex, installed) : matchInstalledByEntryFallback(outcome.merged, installed)),
+        findById: (id) => (fullIndex ? fullIndex.byId.get(id)?.entry : outcome.merged.find((e) => e.id === id)),
+        lookupInstalledAll: (installed) => (fullIndex ? lookupInIndex(fullIndex, installed) : matchInstalledByEntryFallback(outcome.merged, installed)),
+    };
+}
+/** 透传形态（无代）的兜底：线性扫描（今日语义原样；仅 primary-only 域，量小）。 */
+function matchInstalledByEntryFallback(domain, installed) {
+    return domain.find((e) => matchInstalledByEntry(e, [installed]) !== undefined);
+}
+/**
+ * memoized 主入口：内部 resolve communityTask → 派生身份键 → 查/建代。
+ * 落代/读代：仅 community 正常 resolve 且 catalog 在场（ready|stale——同 version 内容恒等）；
+ * deadline 逃逸 / unavailable / disabled / task=null → 透传现算（不读不写 store）。
+ * reject 语义：透传（与 communityOutcome 同构），不做内部吞咽。
+ */
+export async function mergedOutcome(input) {
+    const { registry, communityTask, deadlineAt } = input;
+    const primary = registry.registry.plugins;
+    if (!communityTask) {
+        // source='primary'：loader 零调用，透传（今日语义）；主清单域小，索引免建
+        return outcomeWithLookups(await communityOutcome(null, deadlineAt, primary), null, null);
+    }
+    let loaded;
+    try {
+        loaded = await deadlineRace(communityTask, deadlineAt - Date.now());
+    }
+    finally {
+        void communityTask.catch(() => undefined);
+    }
+    // ---- 以下透传形态：不读不写 store ----
+    if (loaded === 'deadline') {
+        return outcomeWithLookups({ summary: communityTimeoutSummary(), merged: primary }, null, null);
+    }
+    const state = loaded.state;
+    if (state.status === 'disabled') {
+        return outcomeWithLookups({ summary: disabledCommunitySummary(), merged: primary }, null, null);
+    }
+    if (state.status === 'unavailable' || !loaded.catalog) {
+        return outcomeWithLookups({ summary: communitySummary(state, { acceptedCount: 0, upstreamCount: 0, displaced: 0, skippedDirty: 0, skippedSubpathNoNpm: 0 }, []), merged: primary }, null, null);
+    }
+    // ---- 同步临界区起点：键派生 → 查 store → 建代 → set（禁止 await） ----
+    const key = identityKey(input.namespace, input.profile, input.cfg, registry, state);
+    const hit = generations.get(key);
+    if (hit) {
+        mergedStats.hits += 1;
+        return outcomeWithLookups({ summary: communitySummary(state, hit.counts, hit.adaptWarnings, hit.categoryLabelsEn), merged: hit.merged }, hit.mergedIndex, hit.fullIndex);
+    }
+    const gen = buildGeneration(primary, loaded.catalog);
+    mergedStats.builds += 1;
+    rememberGeneration(key, gen);
+    return outcomeWithLookups({ summary: communitySummary(state, gen.counts, gen.adaptWarnings, gen.categoryLabelsEn), merged: gen.merged }, gen.mergedIndex, gen.fullIndex);
+    // ---- 同步临界区终点 ----
+}

package/lib/core/profile-ops.js

@@ -22,9 +22,10 @@
  * 不写 allowBuilds、不跑 dsh-m 自实现 pnpm 编排、服务缺席一律结构化拒绝。
  */
 import { withMutationSession, resolveRegistryEntry, matchInstalledByEntry } from './market.js';
+import { mergedOutcome } from './merged-market.js';
+import { WEB_PROFILE } from './env.js';
 import { loadRegistry as defaultLoadRegistry } from './registry.js';
 import { fetchCommunityCatalog as defaultFetchCommunityCatalog } from './community.js';
-import { adaptCommunityCatalog } from './community-adapter.js';
 import { listInstalledPlugins as defaultListInstalled } from './installed.js';
 import { precheckNpmCompat, IncompatibleError } from './compat-check.js';
 import { npmLatest as defaultNpmLatest, githubLatestTag as defaultGithubLatestTag } from './versions.js';
@@ -32,6 +33,8 @@ import { classifyUpgradeActivation } from './activation.js';
 import { togglePlugin, ToggleError } from './toggle.js';
 import { describeReleaseAgeFailure, releaseAgePrecheck } from './release-age.js';
 import { governExcludeBlock, registerExclusion } from './exclude-governance.js';
+/** desktop 升级社区兜底的等待上限（对齐 market.ts DEFAULT_DEADLINE_MS 量级；仅本路径使用）。 */
+const DEFAULT_COMMUNITY_DEADLINE_MS = 60_000;
 // 0.9.19：等待期失败翻译移入 release-age.ts（describeReleaseAgeFailure）——全量违规解析 +
 // 目标/旁包分述。0.9.10 版只取第一条违规并把旁包名字当成本次目标、给「改用 DSH Web」的
 // 失配指引（本机 quota-watch 0.1.15 事件实证：被拦的是旁包 dsh-m@0.9.18，文案却让用户等
@@ -411,12 +414,20 @@ async function desktopUpgradeLocked(pkg, cfg, opts, deps) {
         throw new DesktopOpsError('install-refused', `desktop profile 未安装该插件: ${pkg}（升级目标必须是已装插件）`);
     let entry = loaded.registry.plugins.find((e) => matchInstalledByEntry(e, [target]));
     if (!entry) {
-        // 0.5.1 同语义：主清单 miss 查社区目录（合并市场安装的社区条目同样可升级）
+        // 0.5.1 同语义：主清单 miss 查社区目录（合并市场安装的社区条目同样可升级）。
+        // 0.9.68（ADR-0016 / R2-3）：经物化合并市场全量域 lookupInstalledAll（含 displaced 让位条目，
+        // min-ord = 今日「先主清单后社区 adapt 全量」合成语义）；reject 透传由窄 catch 吞为 miss。
         try {
-            const community = await (deps.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
-            entry = community.catalog
-                ? adaptCommunityCatalog(community.catalog).entries.find((e) => matchInstalledByEntry(e, [target]))
-                : undefined;
+            const communityTask = (deps.fetchCommunityCatalog ?? defaultFetchCommunityCatalog)(cfg, { namespace: opts.namespace ?? 'host', signal: opts.signal, profile: opts.profile });
+            const outcome = await mergedOutcome({
+                namespace: opts.namespace ?? 'host',
+                profile: opts.profile ?? WEB_PROFILE,
+                cfg,
+                registry: loaded,
+                communityTask,
+                deadlineAt: Date.now() + DEFAULT_COMMUNITY_DEADLINE_MS,
+            });
+            entry = outcome.lookupInstalledAll(target);
         }
         catch {
             entry = undefined;

package/package.json

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

package/registry.json

@@ -225,6 +225,17 @@
       "npm": "dsh-chat-manager",
       "github": "WSL043/dsh-chat-manager",
       "homepage": "https://github.com/WSL043/dsh-chat-manager"
+    },
+    {
+      "id": "dsh-mermaid",
+      "name": "DSH Mermaid",
+      "description": "Mermaid 图表渲染：代码块转 SVG，支持源码切换、全屏缩放与导出。",
+      "category": "watchlist",
+      "tags": ["图表", "可视化", "流程图", "SVG"],
+      "source": "npm",
+      "npm": "dsh-mermaid",
+      "github": "MrmoLabs/dsh-mermaid",
+      "homepage": "https://github.com/MrmoLabs/dsh-mermaid"
     }
   ]
 }