dsh-m 0.9.67 → 0.9.69

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 () => {