dsh-m 0.9.24 → 0.9.25

package/CHANGELOG.md

@@ -8,6 +8,13 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.9.25 变更：跨区搜索——浏览分区、搜索全局（社区 + 精选一并命中）
+
+- **跨区搜索**：任一分区（社区/精选）的搜索框升级为全局——`query` 非空时底层查询切 `source=all`，两分区条目统一相关性排序；清空关键词回到本区浏览态。分区制浏览（ADR-0004）与 `dshm_search`/CLI 三端同序不动；服务端唯一增量是 `MarketResult.sourceCounts` 分桶计数。
+- **搜索态呈现**：摘要行「⭐ 精选 N · 社区 M」精确计数（`!loading` 门控防旧数字闪现）；精选命中页内置顶分组（段头各自仅在对应段非空时渲染，跨两列 grid）；非社区卡补「精选」徽章；分类 chips 搜索态隐藏、「筛选」按钮随摘要行保留（搜索态只剩页大小组，排序被相关性优先覆盖）；翻页回顶锚点随态切换。
+- **修复**：分区 tab 计数改从恒定字段推导（社区 = `acceptedCount - displaced`、精选 = `registryState.count`），不再随查询变化（此前读「最近一次查询的 total」，跨区搜索会污染计数）；搜索提交时清空激活分类（chips 已隐藏，残留分类会成为不可见过滤）。
+- **降级**：`sourceCounts` 缺失/畸形时摘要行整体不渲染，列表行为不变；旧快照/旧宿主响应形状漂移免疫。
+
 ### 0.9.24 变更：排除条目代管——供应链等待期从「提前拒绝」到「治理 + 登记」（ADR-0009）
 
 - **问题（实机 2026-10-03 实证）**：0.9.19 的委派前预检把「目标版本未满 24h 等待期」预测成"官方管理器必拦"并提前拒绝——同目标 dsh-market 却能装上（copilot-auth@1.2.4 发布 8 分钟、quota-watch@0.1.21 两例）。pnpm 11.7 默认非严格策略对显式点名的新版本本来就放行并自动登记排除条目，预检的墙并不存在。
@@ -256,6 +263,13 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### Changed in 0.9.25 — cross-zone search: browsing stays zoned, searching goes global (community + curated together)
+
+- **Cross-zone search**: either zone's (Community/Curated) search box now searches globally — with a non-empty `query` the underlying query switches to `source=all` and both zones' entries are ranked by the shared relevance pipeline; clearing the keyword returns to the zone's own browse state. The zoned browsing model (ADR-0004) and the `dshm_search`/CLI shared ordering are untouched; the only server-side addition is the `MarketResult.sourceCounts` bucket count.
+- **Search-mode presentation**: a summary line "⭐ Curated N · Community M" with exact per-zone counts (`!loading`-gated so stale numbers never flash); curated hits grouped on top within the page (section headers render only when their section is non-empty, spanning both grid columns); non-community cards gain a "Curated" badge; category chips hide during search while the Filter button moves onto the summary line (page-size group only — relevance outranks sort while searching); the pagination scroll anchor follows the mode.
+- **Fixes**: zone tab counts now derive from stable fields (community = `acceptedCount - displaced`, curated = `registryState.count`) instead of "the last query's total" — cross-zone searches no longer pollute them; committing a search clears the active category (chips are hidden, so a leftover category would act as an invisible filter).
+- **Degradation**: a missing/malformed `sourceCounts` hides the summary line entirely; list behavior unchanged; old snapshots/old host responses stay shape-drift immune.
+
 ### Changed in 0.9.24 — release-age exclusion governance: from pre-flight refusal to govern + register (ADR-0009)
 
 - **Problem (observed live 2026-10-03)**: the 0.9.19 pre-flight precheck predicted "the official manager will block a target inside the 24h release-age window" and refused up front — while dsh-market installed the very same targets (copilot-auth@1.2.4 published 8 minutes prior; quota-watch@0.1.21). pnpm 11.7's default non-strict policy admits explicitly named fresh releases and auto-registers their exclusion entries; the wall the precheck predicted did not exist.

package/README.en.md

@@ -60,7 +60,7 @@ Version history is not expanded on this page — see [`CHANGELOG.md`](https://gi
 
 | View | Capabilities |
 |---|---|
-| **Market** | Community (4,000+ entries) / Curated / Favorites zones, each keeping its own category, search, sort, and pagination state; cards open a detail modal with install progress and results shown in place. |
+| **Market** | Community (4,000+ entries) / Curated / Favorites zones; browsing state (category, sort, pagination) is kept per zone, while search is global across zones (community + curated hits together); cards open a detail modal with install progress and results shown in place. |
 | **Operations** | Installs, upgrades, uninstalls, and toggles flow through one global operation log — state lives off cards and resumes automatically after host reloads. |
 | **Installed** | What the current profile actually has: source annotation, live phase badge, one-click toggle, upgrade, and two-step confirmed uninstall. |
 | **Settings** | Curated registry configuration and status, community catalog toggle, dsh-m self-update. |
@@ -121,7 +121,7 @@ When the registry is unavailable, `registry` / `search` / `outdated` print the c
 
 - **Fetch chain**: dist-tags probe → jsDelivr pinned fetch → npmmirror → unpkg fallback; unchanged versions are not re-fetched, probes are skipped within TTL. Latest-version probes use a memory-only cache: it is dropped on every DSH restart (publish a new version, restart, and the new version shows up), and a plugin's cached entry is invalidated immediately after a successful install/upgrade/uninstall via dsh-m. On failure it falls back to the runtime cache under `<cache dir>/awesome/` and **explicitly labels it "cached snapshot"** — stale data never masquerades as fresh.
 - **Switch & pin**: `communityCatalog` toggle in Settings (default on, live), `communityCatalogPin` to lock the catalog version (exact semver); CLI opt-out with `DSHM_COMMUNITY_CATALOG=0`, pin with `DSHM_COMMUNITY_CATALOG_PIN`.
-- **Categories & search**: community categories are an open set (23 known categories with bilingual labels — Chinese maintained in-repo as the single source of truth, English from the upstream catalog, served per UI language); search runs a relevance-weighted pipeline (Chinese + English); the community zone offers a sort switch (downloads/stars/added × asc/desc, default downloads-desc; missing downloads ≠ zero downloads).
+- **Categories & search**: community categories are an open set (23 known categories with bilingual labels — Chinese maintained in-repo as the single source of truth, English from the upstream catalog, served per UI language); search runs a relevance-weighted pipeline (Chinese + English) and is **global across zones** — either zone's search box hits community and curated listings together (browsing stays zoned; a summary line reports exact per-zone hit counts with curated hits grouped on top); the community zone offers a sort switch (downloads/stars/added × asc/desc, default downloads-desc; missing downloads ≠ zero downloads).
 - **Install semantics**: community entries go through the same install path as curated entries (npm exact version / GitHub pinned commit SHA); the browse page probes npm entries only — GitHub entries are not probed at page level (anonymous 60 req/h quota is uncontrollable).
 - **Installed-page budget (best-effort)**: update checks for GitHub-sourced plugins are capped at ≤25 wire requests per run and ≤50 per rolling hour per host process (passive checks only; active install/upgrade unaffected); capped items are honestly labeled "check incomplete" instead of "all up to date". A standalone CLI process does not share the host budget and makes no guarantee under concurrency.
 - **Capability disclosure**: capabilities/red lines appear only in the detail fold (**absent = not scanned ≠ not detected**), never as card badges; screenshots load only in the detail layer and pass a client-side allowlist.

package/README.md

@@ -60,7 +60,7 @@ dsh-m 是 DeepSeek Harness（DSH）的插件市场：**收录 · 安装 · 卸
 
 | 视图 | 能力 |
 |---|---|
-| **市场** | 社区（4,000+ 条）/ 精选 / 收藏三分区，各分区独立保留分类、搜索、排序与分页状态；卡片点开详情 Modal，安装进度与结果就地显示。 |
+| **市场** | 社区（4,000+ 条）/ 精选 / 收藏三分区；浏览态各分区独立保留分类、排序与分页状态，搜索为跨区全局（社区 + 精选一并命中）；卡片点开详情 Modal，安装进度与结果就地显示。 |
 | **操作记录** | 安装、升级、卸载、开关统一进入全局操作日志，状态不挂卡片；宿主重载后自动恢复未完成操作。 |
 | **已装** | 当前 profile 实装列表：来源标注、运行相位徽标、一键开关、升级与两段式确认卸载。 |
 | **设置** | 精选清单配置与状态、社区目录开关、dsh-m 自更新。 |
@@ -121,7 +121,7 @@ dshm restart --yes
 
 - **数据获取**：dist-tags 探测最新版本 → jsDelivr 按精确版本直取 → npmmirror → unpkg 三线路兜底；版本未变不重拉正文，TTL 内跳过探测。「最新版本」探测结果为纯内存缓存：**重启 DSH 即失效**（发版后重启即可看到新版本），经 dsh-m 安装/升级/卸载成功后该条目缓存立即作废。失败回落 `<缓存目录>/awesome/` 运行时缓存先展示（先回缓存、后台自愈）——过期数据绝不冒充最新；缓存状态（缓存快照/目录版本/获取线路/更新时间）在**设置页**可见，浏览页不打扰。
 - **开关与锁定**：设置页 `communityCatalog` 开关（默认开，live 生效）、`communityCatalogPin` 可锁定目录版本（精确 semver）；CLI 用 `DSHM_COMMUNITY_CATALOG=0` 退出、`DSHM_COMMUNITY_CATALOG_PIN` 锁版本。
-- **分类与搜索**：社区分类是开放集（已知 23 个分类带中英双语标签：中文由包内单一事实源维护、英文取上游目录，按界面语言下发）；搜索走相关性加权管线（中英文双匹配）；社区区排序可切（下载量/Star/收录日期 × 升降，默认下载量降序，无下载量 ≠ 0 下载）。
+- **分类与搜索**：社区分类是开放集（已知 23 个分类带中英双语标签：中文由包内单一事实源维护、英文取上游目录，按界面语言下发）；搜索走相关性加权管线（中英文双匹配），且为**跨区全局**——任一分区的搜索框同时命中社区与精选（浏览保持分区，摘要行报两分区精确命中数、精选命中置顶分组）；社区区排序可切（下载量/Star/收录日期 × 升降，默认下载量降序，无下载量 ≠ 0 下载）。
 - **安装语义**：社区条目与精选条目走同一安装链路（npm 锁精确版本 / GitHub 锁 commit SHA）；市场浏览页只对 npm 条目做更新探测，GitHub 条目不做页面级探测（匿名配额 60 次/小时不可控）。
 - **已装页预算（best-effort）**：已装页对 GitHub 来源插件做更新检查，单次请求 ≤25 个、宿主进程滚动 1 小时 ≤50 个（仅被动检查；主动安装/升级不受限）；超限条目如实标注「检查未完成」而不冒充「全部最新」。独立 CLI 进程不共享宿主内预算，并发场景不承诺 60 次/小时绝不耗尽。
 - **能力披露**：社区条目的 capabilities/红线只出现在详情折叠区（**缺省 = 未扫描 ≠ 未检出**），卡片不打标；截图仅在详情层加载并经客户端白名单校验。

package/docs/DESIGN.md

@@ -81,13 +81,13 @@
 > 本节只动**展示层与三端契约**；数据层（§2.5 获取链、适配层、校验、降级、缓存）与 Profile 变更事务（§3）不变。参考实现：`.dsh-research/dsh-market-clone/`（同一上游目录的原生市场应用，**结构级借鉴其浏览体验，不借鉴其安装链路**——dsh-m 的差异化 = 策展精选层 + 三端同源 + Profile 变更事务）。
 
 - **定位升级**：dsh-m 从「个人自用」转向**面向大众发布**（§1 定位句同步改写）。
-- **分区制（修订 §2.5 Q45）**：市场面板改为分区 tab——**「社区」为默认落地页**（全量社区条目）、**「精选」在后**（主清单条目，单页、策展顺序即排序）、**「收藏」第三**（本地收藏）。各区**独立状态实例**：分类、搜索、排序、分页互不重置。「只看主清单」chip 退役；Q40 的共享过滤桶退役（各区分类独立：精选区 5 chips、社区区全量 chips），「分类保留原生值不转译」仍成立。社区区**排除与主清单重复的条目**（displaced 数据现成）。**数据层 `mergeRegistries` 去重不变**（ADR-0003 架构不动）——「合并市场」的合并收敛为数据层语义，展示层分区。
+- **分区制（修订 §2.5 Q45）**：市场面板改为分区 tab——**「社区」为默认落地页**（全量社区条目）、**「精选」在后**（主清单条目，单页、策展顺序即排序）、**「收藏」第三**（本地收藏）。各区**独立状态实例**：分类、搜索、排序、分页互不重置。**搜索例外（0.9.25 修订）**：搜索为跨区全局——任一分区的搜索框同时命中社区与精选（社区 + 精选一并命中，浏览保持分区），各区状态实例独立性不因搜索态改变。「只看主清单」chip 退役；Q40 的共享过滤桶退役（各区分类独立：精选区 5 chips、社区区全量 chips），「分类保留原生值不转译」仍成立。社区区**排除与主清单重复的条目**（displaced 数据现成）。**数据层 `mergeRegistries` 去重不变**（ADR-0003 架构不动）——「合并市场」的合并收敛为数据层语义，展示层分区。
 - **社区区浏览设施**（dsh-market 结构级借鉴）：
   - 分类 chips：两行折叠 + 实测裁剪（渲染后逐 chip 测量可容纳数）+ 收起时激活分类置前 + 滚动吸顶自动收缩（不改写用户开合选择）；分类标签**单一事实源**（core 提供标签表，杀掉客户端内嵌副本）。
   - 排序：`downloads | stars | added × asc/desc`，默认 `downloads-desc`；**无下载量（github-only）≠ 0 下载**（永远排在有真实计数条目之后，彼此按 stars 排）；时间窗过滤明确不做（`added` 排序覆盖「找最新」诉求）。
   - 卡片 byline：`owner / downloads / ★stars`（旁路数据已透传，Tooltip 给精确数）；`deprecated` 徽章 + 详情内 replacement 替代链接（适配层补透传原生字段）。
   - 分页：页码窗口化（`1 … n-1 n n+1 … total`，≤7 页全显）+ 页大小 24/48/96 + 筛选变化重置页 1 + 翻页回顶；仅 prev/next 的旧分页退役。
-  - 搜索：相关性加权管线——NFKC 归一化 + 中西文边界插空格 + 字段权重（name/npm > owner > 描述 > 分类）+ 命中类型加分 + 按条目缓存归一化结果；输入 250ms debounce + IME composition 全程处理 + draft/已提交 query 分离。
+  - 搜索：相关性加权管线——NFKC 归一化 + 中西文边界插空格 + 字段权重（name/npm > owner > 描述 > 分类）+ 命中类型加分 + 按条目缓存归一化结果；输入 250ms debounce + IME composition 全程处理 + draft/已提交 query 分离。**0.9.25 起搜索跨区全局**（两分区搜索框同语义）：摘要行报两分区精确命中数（`sourceCounts`），结果页内按精选段置顶分组，分类 chips 搜索态隐藏、「筛选」按钮随摘要行保留（页大小组）。
   - 描述 5 行钳制（真实溢出才显示展开钮）；**数据层双语**——描述按 UI 语言取 zh/en（数据现成），UI 完整双语字典列 backlog。
 - **详情 = Modal 且为卡片超集**（「detail 显示少于摘要就是倒退」）：byline / 分类 / 收录日期 / 下载量窗口三要素（计数 + 窗口 + 核对时间）/ 描述全文 / 截图灯箱（←→/Esc、**禁自动轮播**）/ 能力披露 + 红线（**默认收起**）/ 安装命令折叠行（0.9.14 起按上下文显隐：desktop 上下文与已安装条目整行隐藏——命令两来源恒为 `--profile web` 语义，desktop 装机走弹窗内安装按钮）/ deprecated 替代链接；精选条目超集另加 verified 与 tags。**安装确认走 Modal**。安装信息就地显示（0.9.15）：进行中进度行与终态结果行挂 Modal 内、底层同源进度行让位——展示派生自全局操作记录，§2.6「状态不挂卡片」所有权模型不变。卡片瘦身：能力披露、截图、安装命令全部迁出卡片（Q44 精神「只在详情层、默认收起」不变，载体升级）。
 - **全局操作记录**：每个变更操作一条 record（`queued / running / input=冲突待决 / done / warned / failed`），**状态不挂卡片**——翻页、搜索、切 tab 不丢；**localStorage 持久化队列**，宿主重载恢复时逐条校验「此刻仍成立才执行，否则报告」；覆盖安装、升级、卸载、开关。已装侧跟随一致化：「全部更新 (N)」批量入口 + tab 更新红点 + 卡片视觉与发现侧同体系；组管理、个人备注列 backlog。
@@ -163,7 +163,7 @@ npm 安装 / GitHub 安装 / 升级 / 自升级 / 卸载是**同一个事务模
 
 3 个视图，**中文优先**，跟随 DSH Web 深色主题（0.7.0：卡片展开式详情已由 Modal 取代）：
 
-1. **市场页**（默认）：**分区制**（0.7.0 §2.6）——社区/精选/收藏三分区，各分区独立分类/搜索/排序/分页状态；搜索/分类/排序为**服务端处理**（Host 强制 `withLatest=true`、limit clamp 1..96 缺省 24，探测仅当前页）；`MarketPanel` 是市场/已装数据唯一 owner（请求 generation + AbortController 丢弃旧响应）；安装/卸载/升级完成后通过统一协调器同时刷新市场与已装快照，不要求关闭并重新打开面板；页码窗口化分页（24/48/96）+ 默认/自定义/缓存/不可用短提示（不含本地路径；0.5.0 的「超过 200 条性能提示」随分区退役）；详情 Modal 保留 README markdown 预览与 npm/GitHub 官方外链。
+1. **市场页**（默认）：**分区制**（0.7.0 §2.6）——社区/精选/收藏三分区，各分区独立分类/排序/分页状态（**搜索自 0.9.25 起为跨区全局**，社区 + 精选一并命中）；搜索/分类/排序为**服务端处理**（Host 强制 `withLatest=true`、limit clamp 1..96 缺省 24，探测仅当前页）；`MarketPanel` 是市场/已装数据唯一 owner（请求 generation + AbortController 丢弃旧响应）；安装/卸载/升级完成后通过统一协调器同时刷新市场与已装快照，不要求关闭并重新打开面板；页码窗口化分页（24/48/96）+ 默认/自定义/缓存/不可用短提示（不含本地路径；0.5.0 的「超过 200 条性能提示」随分区退役）；详情 Modal 保留 README markdown 预览与 npm/GitHub 官方外链。
 2. **已装页**：profile 实际安装列表，标注来源（市场/非市场/未知）；registry 不可用时仍列出已装并标记；「可升级 → x.y.z」徽标 +「升级」；「卸载」。两段加载（ADR-0008）：列表不等待探测（`probe:false`），更新提示由 `installedUpdates`（TTL=0）就地补上。
 3. **设置页**：registry 地址草稿 +「校验并应用」（先校验候选再写 settings，失败不落盘）/「恢复默认」/「下载默认 registry.json」（不改当前配置）/「检查条目可达性」（probe 统计 + 最多 100 条 issue，只读不改配置）；同时展示配置地址、当前生效配置、生效来源与 configStatus（含 rejected/回滚原因与维护性 warnings）；完整本地路径仅在此页显示。registry 配置为 **live 生效，不出现安装类重启横幅**；安装/卸载/升级仍保留重启横幅。
 

package/lib/client.js

@@ -35,6 +35,7 @@ __export(market_state_exports, {
   pageItems: () => pageItems,
   registryNotice: () => registryNotice,
   resetPageOnFilterChange: () => resetPageOnFilterChange,
+  searchSourceOf: () => searchSourceOf,
   zoneChips: () => zoneChips
 });
 function toSafeInt(value, fallback, min, max) {
@@ -70,6 +71,11 @@ function normalizeMarketQuery(input, zone = "community") {
   }
   return { zone: z, source: z, query, category, sort, offset, limit };
 }
+function searchSourceOf(query) {
+  const q = query && typeof query === "object" ? query : {};
+  if (typeof q.query === "string" && q.query !== "") return "all";
+  return q.source === "primary" ? "primary" : "community";
+}
 function resetPageOnFilterChange(previous, next) {
   const prev = previous && typeof previous === "object" ? previous : {};
   const merged = { ...next };
@@ -103,6 +109,13 @@ function normalizeMarketResponse(raw) {
       if (typeof value === "number" && Number.isFinite(value)) categoryCounts[key] = value;
     }
   }
+  let sourceCounts;
+  const sc = body.sourceCounts;
+  if (sc && typeof sc === "object" && !Array.isArray(sc)) {
+    if (typeof sc.primary === "number" && Number.isFinite(sc.primary) && typeof sc.community === "number" && Number.isFinite(sc.community)) {
+      sourceCounts = { primary: sc.primary, community: sc.community };
+    }
+  }
   const rs = body.registryState && typeof body.registryState === "object" && !Array.isArray(body.registryState) ? body.registryState : {};
   const registryState = {
     ...FALLBACK_REGISTRY_STATE,
@@ -131,6 +144,7 @@ function normalizeMarketResponse(raw) {
     offset,
     limit,
     categoryCounts,
+    ...sourceCounts ? { sourceCounts } : {},
     registryState,
     community,
     installedComplete: body.installedComplete === true,
@@ -1208,7 +1222,7 @@ var h = React.createElement;
 var { useState, useEffect, useLayoutEffect, useCallback, useMemo, useRef } = React;
 var PLUGIN_ID = "dsh-m";
 var API = "/dshm";
-var { DEFAULT_PAGE_SIZE: DEFAULT_PAGE_SIZE2, MARKET_PAGE_SIZES: MARKET_PAGE_SIZES2, pageItems: pageItems2, createZoneState: createZoneState2, normalizeMarketQuery: normalizeMarketQuery2, resetPageOnFilterChange: resetPageOnFilterChange2, normalizeMarketResponse: normalizeMarketResponse2, registryNotice: registryNotice2, zoneChips: zoneChips2, marketNotice: marketNotice2 } = (init_market_state(), __toCommonJS(market_state_exports));
+var { DEFAULT_PAGE_SIZE: DEFAULT_PAGE_SIZE2, MARKET_PAGE_SIZES: MARKET_PAGE_SIZES2, pageItems: pageItems2, createZoneState: createZoneState2, normalizeMarketQuery: normalizeMarketQuery2, resetPageOnFilterChange: resetPageOnFilterChange2, normalizeMarketResponse: normalizeMarketResponse2, registryNotice: registryNotice2, zoneChips: zoneChips2, marketNotice: marketNotice2, searchSourceOf: searchSourceOf2 } = (init_market_state(), __toCommonJS(market_state_exports));
 var { readMarketSnapshot: readMarketSnapshot2, writeMarketSnapshot: writeMarketSnapshot2, isDefaultFirstPageQuery: isDefaultFirstPageQuery2 } = (init_market_snapshot(), __toCommonJS(market_snapshot_exports));
 var { createMarkdown: createMarkdown2 } = (init_markdown(), __toCommonJS(markdown_exports));
 var { ExtLink, MdImg, renderMarkdown } = createMarkdown2(h);
@@ -1275,7 +1289,7 @@ var ZH = {
   "fav.add": "\u6536\u85CF",
   "fav.remove": "\u53D6\u6D88\u6536\u85CF",
   "common.clear": "\u6E05\u7A7A",
-  "search.ph": "\u641C\u7D22\u540D\u79F0 / \u63CF\u8FF0 / \u6807\u7B7E\u2026",
+  "search.ph": "\u641C\u7D22\u540D\u79F0 / \u63CF\u8FF0 / \u6807\u7B7E\uFF08\u793E\u533A + \u7CBE\u9009\uFF09\u2026",
   "common.refresh": "\u5237\u65B0",
   "common.close": "\u5173\u95ED",
   "common.later": "\u7A0D\u540E",
@@ -1389,6 +1403,7 @@ var ZH = {
   "market.page.info": "\u7B2C {page} / {pages} \u9875 \xB7 \u5171 {total} \u6761",
   "notice.toolview.err": "\u6536\u5F55\u6E05\u5355\u6682\u4E0D\u53EF\u7528",
   "badge.community": "\u793E\u533A\u6536\u5F55",
+  "search.summary": "\u2B50 \u7CBE\u9009 {n} \xB7 \u793E\u533A {m}",
   "community.fallback": "\u6536\u5F55\u6E05\u5355\u4E0D\u53EF\u7528\uFF0C\u5F53\u524D\u5C55\u793A\u793E\u533A\u6E05\u5355\u6761\u76EE",
   "detail.capabilities": "\u80FD\u529B\u62AB\u9732",
   "detail.capabilities.unscanned": "\u672A\u626B\u63CF \u2260 \u672A\u68C0\u51FA",
@@ -1537,7 +1552,7 @@ var EN = {
   "fav.add": "Bookmark",
   "fav.remove": "Remove bookmark",
   "common.clear": "Clear",
-  "search.ph": "Search name, description, tags\u2026",
+  "search.ph": "Search all plugins \u2014 name, description, tags\u2026",
   "common.refresh": "Refresh",
   "common.close": "Close",
   "common.later": "Later",
@@ -1651,6 +1666,7 @@ var EN = {
   "market.page.info": "Page {page} / {pages} \xB7 {total} listings",
   "notice.toolview.err": "Registry temporarily unavailable",
   "badge.community": "Community",
+  "search.summary": "\u2B50 Curated {n} \xB7 Community {m}",
   "community.fallback": "Registry unavailable \u2014 showing community listings",
   "detail.capabilities": "Capabilities",
   "detail.capabilities.unscanned": "Not scanned \u2260 not detected",
@@ -1886,6 +1902,8 @@ var CSS = `
 .dsvm-favbtn.on{color:#e0a33c}
 .dsvm-reddot{display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--dsw-alias-state-error-primary,#ef4444);margin-left:5px;vertical-align:middle}
 .dshm-cards{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}
+.dsvm-searchmeta{display:flex;align-items:center;gap:8px;color:var(--dsw-alias-label-caption,#6b7280);font-size:12px;line-height:18px;margin:2px 0}
+.dsvm-grouphead{grid-column:1/-1;color:var(--dsw-alias-label-caption,#6b7280);font-size:11px;line-height:16px;margin:2px 0 0;font-weight:600;letter-spacing:.02em}
 @media (max-width:680px){.dshm-cards{grid-template-columns:1fr}}
 .dshm-card{display:flex;gap:12px;align-items:flex-start;background:var(--dsw-alias-bg-layer-2,rgba(38,49,72,.04));border:1px solid var(--dsw-alias-border-l2,#e5e7eb);border-radius:12px;padding:12px;cursor:pointer;text-align:left;width:100%;box-sizing:border-box;min-width:0;font:inherit;color:var(--dsw-alias-label-primary,inherit);transition:border-color .16s,background .16s}
 .dshm-card:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(38,49,72,.06));border-color:var(--dsw-alias-label-dimmed,#c7d2fe)}
@@ -2070,7 +2088,8 @@ function useMarketData(zone = "community") {
     const params = {
       query: nextQuery.query || void 0,
       category: nextQuery.category || void 0,
-      source: nextQuery.source || "community",
+      // 0.9.25 跨区搜索：query 非空 → source=all（社区+精选一并命中），浏览态维持本区 source
+      source: searchSourceOf2(nextQuery),
       ...nextQuery.sort ? { sort: nextQuery.sort } : {},
       offset: nextQuery.offset,
       limit: nextQuery.limit,
@@ -2578,6 +2597,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
   const [zone, setZone] = useState("community");
   const market = zone === "favorites" ? null : markets[zone];
   const { data, loading, error, reload, query, updateQuery } = market || {};
+  const searching = Boolean(query && query.query);
   const [detailId, setDetailId] = useState(null);
   const [compatConfirm, setCompatConfirm] = useState(null);
   useModalDepth(compatConfirm != null);
@@ -2607,7 +2627,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
   const gotoPage = (p) => {
     updateQuery({ offset: Math.max(0, (p - 1) * limit) });
     if (typeof document !== "undefined") {
-      const el = document.querySelector(".dsvm-chipswrap");
+      const el = document.querySelector(searching ? ".dsvm-searchmeta" : ".dsvm-chipswrap");
       if (el && el.scrollIntoView) el.scrollIntoView({ block: "start" });
     }
   };
@@ -2624,7 +2644,9 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
     "div",
     { className: "dshm-chips" },
     ...ZONE_TABS.map((z) => {
-      const zCount = z.id === "community" ? markets.community.data && markets.community.data.total || 0 : z.id === "primary" ? markets.primary.data && markets.primary.data.total || 0 : favorites && favorites.list.length;
+      const cd = markets.community.data;
+      const pd = markets.primary.data;
+      const zCount = z.id === "community" ? cd && cd.community.status !== "disabled" && cd.community.status !== "unavailable" ? Math.max(0, cd.community.acceptedCount - cd.community.displaced) : 0 : z.id === "primary" ? pd && pd.registryState.count || 0 : favorites && favorites.list.length;
       return h(
         "button",
         {
@@ -2640,7 +2662,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
   const searchRow = market ? h(
     "div",
     { className: "dsvm-searchrow" },
-    h(SearchBox, { key: zone, placeholder: lookup("search.ph"), initial: query.query, onCommit: (v) => updateQuery({ query: v }) })
+    h(SearchBox, { key: zone, placeholder: lookup("search.ph"), initial: query.query, onCommit: (v) => updateQuery(v ? { query: v, category: null } : { query: v }) })
   ) : null;
   const zoneBar = zoneChips3;
   const installResultText = (res) => lookup("notify.installed", { pkg: res.pkg, version: res.version ? ` v${res.version}` : "" }) + (res.buildApprovals && res.buildApprovals.length ? lookup("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup("notify.builds.fallback") : "") + (res.bundleWarning === "no-patch-layer" ? lookup("notify.bundlewarning") : "");
@@ -2773,18 +2795,20 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
   const filterPop = zone === "community" && filterOpen ? h(
     "div",
     { className: "dsvm-filterpop", onClick: (e) => e.stopPropagation() },
-    h(
-      "div",
-      { className: "dsvm-filtergroup" },
-      h("div", { className: "dsvm-filtergt" }, lookup("filter.sortfield")),
-      ...[["downloads", "filter.field.downloads"], ["stars", "filter.field.stars"], ["added", "filter.field.added"]].map(([f, key]) => optRow(lookup(key), curSortField === f, () => updateQuery({ sort: { field: f, dir: curSortDir } })))
-    ),
-    h(
-      "div",
-      { className: "dsvm-filtergroup" },
-      h("div", { className: "dsvm-filtergt" }, lookup("filter.sortdir")),
-      ...[["desc", "filter.dir.desc"], ["asc", "filter.dir.asc"]].map(([d, key]) => optRow(lookup(key), curSortDir === d, () => updateQuery({ sort: { field: curSortField, dir: d } })))
-    ),
+    ...searching ? [] : [
+      h(
+        "div",
+        { className: "dsvm-filtergroup" },
+        h("div", { className: "dsvm-filtergt" }, lookup("filter.sortfield")),
+        ...[["downloads", "filter.field.downloads"], ["stars", "filter.field.stars"], ["added", "filter.field.added"]].map(([f, key]) => optRow(lookup(key), curSortField === f, () => updateQuery({ sort: { field: f, dir: curSortDir } })))
+      ),
+      h(
+        "div",
+        { className: "dsvm-filtergroup" },
+        h("div", { className: "dsvm-filtergt" }, lookup("filter.sortdir")),
+        ...[["desc", "filter.dir.desc"], ["asc", "filter.dir.asc"]].map(([d, key]) => optRow(lookup(key), curSortDir === d, () => updateQuery({ sort: { field: curSortField, dir: d } })))
+      )
+    ],
     h(
       "div",
       { className: "dsvm-filtergroup" },
@@ -2805,6 +2829,77 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
     ),
     filterPop
   ) : null;
+  const sc = data && data.sourceCounts;
+  const summaryRow = searching && sc && !loading && !error ? h(
+    "div",
+    { className: "dsvm-searchmeta" },
+    h("span", null, lookup("search.summary", { n: sc.primary, m: sc.community })),
+    filterTrigger
+  ) : null;
+  const cardOf = (it) => Card({
+    key: it.id,
+    icon: h(Icon, { entry: it }),
+    name: it.name,
+    badges: [
+      activeInstallTarget === it.id ? h(
+        "button",
+        {
+          className: "dshm-badge warn",
+          key: "busy",
+          title: lookup("op.panel.jump"),
+          onClick: (e) => {
+            e.stopPropagation();
+            if (typeof document !== "undefined") {
+              const el = document.querySelector(".dsvm-ops");
+              if (el && el.scrollIntoView) el.scrollIntoView({ block: "center", behavior: "smooth" });
+            }
+          }
+        },
+        lookup("op.status.running")
+      ) : null,
+      it.deprecated === true ? h("span", { className: "dshm-badge warn", key: "dep" }, lookup("badge.deprecated")) : null,
+      it.community !== true && Array.isArray(it.verified) && it.verified.length ? h("span", { className: "dshm-badge", key: "v", title: it.verified.join("\u3001") }, lookup("badge.verified")) : null,
+      it.outdated ? h("span", { className: "dshm-badge warn", key: "u" }, lookup("badge.update")) : null,
+      it.installed ? h("span", { className: "dshm-badge", key: "i" }, lookup("badge.installed")) : null,
+      it.community === true ? h("span", { className: "dshm-badge info", key: "c" }, lookup("badge.community")) : null,
+      searching && it.community !== true ? h("span", { className: "dshm-badge", key: "cz" }, lookup("zone.primary")) : null,
+      h("span", { className: "dshm-badge info", key: "s" }, it.source === "npm" ? "npm" : "github")
+    ],
+    byline: it.community === true ? [
+      it.owner ? { text: `by ${it.owner}` } : null,
+      typeof it.downloads === "number" ? { text: `${compactCount(it.downloads)} \u2193`, title: String(it.downloads) } : null,
+      typeof it.stars === "number" ? { text: `${compactCount(it.stars)} \u2605`, title: String(it.stars) } : null
+    ].filter(Boolean) : (it.tags || []).map((t) => ({ text: `#${t}` })),
+    desc: browserLang() === "en" && typeof it.descriptionEn === "string" && it.descriptionEn !== "" ? it.descriptionEn : it.description,
+    clampLines: it.community === true ? 5 : 2,
+    sub: [
+      it.latestVersion ? lookup("sub.latest", { v: it.latestVersion }) : it.latestTag ? it.latestTag : it.latestSha ? lookup("sub.head", { sha: it.latestSha.slice(0, 7) }) : null,
+      it.installedVersion ? lookup("sub.installed", { v: it.installedVersion }) : null,
+      it.latestError ? it.version ? lookup("sub.snapshot", { v: it.version }) : lookup("version.failed") : null
+    ].filter(Boolean).join(" \xB7 "),
+    links: h(LinksRow, { npm: it.npm, github: it.github, homepage: it.homepage }),
+    onToggle: () => setDetailId(it.id),
+    topRight: favorites ? h(
+      "button",
+      {
+        className: `dsvm-favbtn${favorites.list.some((f) => f.id === it.id) ? " on" : ""}`,
+        title: favorites.list.some((f) => f.id === it.id) ? lookup("fav.remove") : lookup("fav.add"),
+        onClick: (e) => {
+          e.stopPropagation();
+          favorites.toggle(snapshotOf(it));
+        }
+      },
+      favorites.list.some((f) => f.id === it.id) ? "\u2605" : "\u2606"
+    ) : null
+  });
+  const curatedHits = searching ? items.filter((it) => it.community !== true) : [];
+  const communityHits = searching ? items.filter((it) => it.community === true) : [];
+  const marketCards = searching && curatedHits.length > 0 ? [
+    h("div", { className: "dsvm-grouphead", key: "gh-c" }, `\u2B50 ${lookup("zone.primary")}`),
+    ...curatedHits.map(cardOf),
+    ...communityHits.length > 0 ? [h("div", { className: "dsvm-grouphead", key: "gh-m" }, lookup("zone.community"))] : [],
+    ...communityHits.map(cardOf)
+  ] : items.map(cardOf);
   return h(
     React.Fragment,
     null,
@@ -2813,7 +2908,9 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
     searchRow,
     notice && notice.notice ? h("div", { className: "dshm-err" }, lookup(notice.notice.key)) : null,
     notice && notice.communityFallback ? h("div", { className: "dshm-hint" }, lookup("community.fallback")) : null,
-    h(ZoneChips, {
+    // 0.9.25 跨区搜索：搜索态隐藏分类 chips（两套分类法跨区口径失义）、「筛选」随摘要行保留；浏览态照旧
+    summaryRow,
+    searching ? null : h(ZoneChips, {
       zone,
       counts,
       labels: communityLabels(data),
@@ -2830,61 +2927,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind })
       h(
         "div",
         { className: "dshm-cards" },
-        items.map((it) => Card({
-          key: it.id,
-          icon: h(Icon, { entry: it }),
-          name: it.name,
-          badges: [
-            activeInstallTarget === it.id ? h(
-              "button",
-              {
-                className: "dshm-badge warn",
-                key: "busy",
-                title: lookup("op.panel.jump"),
-                onClick: (e) => {
-                  e.stopPropagation();
-                  if (typeof document !== "undefined") {
-                    const el = document.querySelector(".dsvm-ops");
-                    if (el && el.scrollIntoView) el.scrollIntoView({ block: "center", behavior: "smooth" });
-                  }
-                }
-              },
-              lookup("op.status.running")
-            ) : null,
-            it.deprecated === true ? h("span", { className: "dshm-badge warn", key: "dep" }, lookup("badge.deprecated")) : null,
-            it.community !== true && Array.isArray(it.verified) && it.verified.length ? h("span", { className: "dshm-badge", key: "v", title: it.verified.join("\u3001") }, lookup("badge.verified")) : null,
-            it.outdated ? h("span", { className: "dshm-badge warn", key: "u" }, lookup("badge.update")) : null,
-            it.installed ? h("span", { className: "dshm-badge", key: "i" }, lookup("badge.installed")) : null,
-            it.community === true ? h("span", { className: "dshm-badge info", key: "c" }, lookup("badge.community")) : null,
-            h("span", { className: "dshm-badge info", key: "s" }, it.source === "npm" ? "npm" : "github")
-          ],
-          byline: it.community === true ? [
-            it.owner ? { text: `by ${it.owner}` } : null,
-            typeof it.downloads === "number" ? { text: `${compactCount(it.downloads)} \u2193`, title: String(it.downloads) } : null,
-            typeof it.stars === "number" ? { text: `${compactCount(it.stars)} \u2605`, title: String(it.stars) } : null
-          ].filter(Boolean) : (it.tags || []).map((t) => ({ text: `#${t}` })),
-          desc: browserLang() === "en" && typeof it.descriptionEn === "string" && it.descriptionEn !== "" ? it.descriptionEn : it.description,
-          clampLines: it.community === true ? 5 : 2,
-          sub: [
-            it.latestVersion ? lookup("sub.latest", { v: it.latestVersion }) : it.latestTag ? it.latestTag : it.latestSha ? lookup("sub.head", { sha: it.latestSha.slice(0, 7) }) : null,
-            it.installedVersion ? lookup("sub.installed", { v: it.installedVersion }) : null,
-            it.latestError ? it.version ? lookup("sub.snapshot", { v: it.version }) : lookup("version.failed") : null
-          ].filter(Boolean).join(" \xB7 "),
-          links: h(LinksRow, { npm: it.npm, github: it.github, homepage: it.homepage }),
-          onToggle: () => setDetailId(it.id),
-          topRight: favorites ? h(
-            "button",
-            {
-              className: `dsvm-favbtn${favorites.list.some((f) => f.id === it.id) ? " on" : ""}`,
-              title: favorites.list.some((f) => f.id === it.id) ? lookup("fav.remove") : lookup("fav.add"),
-              onClick: (e) => {
-                e.stopPropagation();
-                favorites.toggle(snapshotOf(it));
-              }
-            },
-            favorites.list.some((f) => f.id === it.id) ? "\u2605" : "\u2606"
-          ) : null
-        }))
+        ...marketCards
       ),
       pages > 1 ? h(
         "div",

package/lib/core/market.js

@@ -455,6 +455,7 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
             offset: 0,
             limit: maxLimit,
             categoryCounts: zeroCounts(),
+            sourceCounts: { primary: 0, community: 0 },
             registryState: timeoutRegistryState(cfg),
             installedComplete: false,
             latestComplete: false,
@@ -509,6 +510,9 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
             .map((s) => s.entry)
         : afterSort;
     const total = ordered.length;
+    // sourceCounts 分桶（0.9.25 跨区搜索摘要行）：filtered（分区 ∩ query ∩ category）计数，与排序/分页无关
+    const communityHitCount = filtered.reduce((n, entry) => n + (isCommunityEntry(entry) ? 1 : 0), 0);
+    const sourceCounts = { primary: filtered.length - communityHitCount, community: communityHitCount };
     const limit = clampLimit(opts.limit, maxLimit);
     let offset = normalizeOffset(opts.offset);
     if (total > 0 && offset >= total)
@@ -584,6 +588,7 @@ export async function listMarket(cfg = {}, opts = {}, deps = {}) {
         offset,
         limit,
         categoryCounts: counts,
+        sourceCounts,
         registryState,
         installedComplete,
         latestComplete,

package/package.json

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