@stolyarovmn/dsh-ui-registry-aggregator 0.4.14 → 0.4.15

package/README.md

@@ -29,14 +29,20 @@ Search across connected sources, filter results, inspect evidence, and install a
 - **Fallback command** — installable results also expose their `dsh plugin add …` command.
 - **Responsive popularity metadata** — missing GitHub star counts are hydrated after Browse renders, so GitHub metadata cannot block the initial search result.
 
-## What's new in 0.4.14
+## What's new in 0.4.15
 
-0.4.14 is the first release published from the renamed `Stolyarovmn/dsh-ui-registry-aggregator` repository through npm Trusted Publishing. It keeps the fast Browse/search path from 0.4.13 unchanged.
+0.4.15 focuses on reliability and native DSH integration while preserving the existing Browse evidence path.
 
-- published from the canonical `dsh-ui-registry-aggregator` repository;
-- npm Trusted Publisher is wired to `.github/workflows/publish.yml`;
-- README screenshots and repository metadata point to the renamed repository;
-- search, source counts, bundle verification, and asynchronous GitHub star hydration remain unchanged from 0.4.13.
+- lightweight source health checks are separated from verified DSH bundle counts;
+- npm and GitHub counts load independently with native DSH progress indicators;
+- GitHub requests retry transient failures, while health no longer consumes Search API quota;
+- installed bundles are detected through the native Plugin Manager and duplicate installs are disabled;
+- newer discovered versions are shown as advisory `Update available` notices;
+- active installs can be cancelled through the native Plugin Manager request id;
+- npm results can be enriched with exact GitHub provenance without broad GitHub pagination;
+- search relevance is presentation-only, so GitHub stars, downloads, evidence, pagination, and explicit sorting keep their existing behavior.
+
+Tested with DSH `0.1.7-rc.2`.
 
 ## Architecture
 
@@ -167,7 +173,7 @@ The order in which criteria are enabled defines priority.
 ## Compatibility
 
 - DSH: `>=0.1.7-rc.1 <0.2.0`
-- Tested with DSH `0.1.7-rc.1`
+- Tested with DSH `0.1.7-rc.2`
 
 Exact package compatibility is read from package metadata when a publisher declares it. Installation is validated again by the native DSH Plugin Manager.
 

package/lib/client.js

@@ -12,7 +12,7 @@ window.__ModuleLoader__.load({
 			IconCopyOutlineRegular, IconShareOutlineRegular, IconTrashOutlineRegular,
 			IconDatabaseOutlineRegular, IconCordisPluginOutlineRegular, IconLinkOutlineRegular,
 			IconWarningOutlineRegular, IconSearchOutlineRegular, IconClockOutlineRegular,
-			IconDownloadOutlineRegular, IconCheckOutlineRegular, IconChevronUpOutlineRegular,
+			IconDownloadOutlineRegular, IconCheckOutlineRegular, IconCloseOutlineRegular, IconChevronUpOutlineRegular,
 			IconChevronLeftOutlineRegular, IconChevronRightOutlineRegular, IconChevronsUpDownOutlineRegular,
 			IconFlatListOutlineRegular, IconShieldOutlineRegular, IconChecklistOutlineRegular, IconCodeOutlineRegular,
 		} = require("@deepseek-ai/dsh-client-ui-primitives");
@@ -332,12 +332,16 @@ window.__ModuleLoader__.load({
 
 .pm-card{padding:11px 12px}
 .pm-card-top{display:flex;align-items:flex-start;justify-content:space-between;gap:10px}
+.pm-card-install-actions{display:flex;align-items:center;gap:6px;flex:0 0 auto}
 .pm-card-install{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;flex:0 0 30px;width:30px;height:30px;padding:0;border:.5px solid var(--dsw-alias-border-l3);border-radius:8px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-secondary);cursor:pointer}
 .pm-card-install:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-brand-primary)}
 .pm-card-install[data-state=installed]{color:var(--dsw-alias-state-success-primary)}
 .pm-card-install[data-state=failed]{color:var(--dsw-alias-state-error-primary)}
 .pm-card-install:disabled{opacity:.55;cursor:default}
 .pm-card-install svg{display:block;width:16px;height:16px}
+.pm-card-cancel{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;flex:0 0 30px;width:30px;height:30px;padding:0;border:.5px solid color-mix(in srgb,var(--pm-danger) 45%,var(--dsw-alias-border-l3));border-radius:8px;background:var(--dsw-alias-bg-layer-1);color:var(--pm-danger);cursor:pointer}
+.pm-card-cancel:hover{background:color-mix(in srgb,var(--pm-danger) 9%,var(--dsw-alias-bg-layer-1));border-color:var(--pm-danger)}
+.pm-card-cancel svg{display:block;width:14px;height:14px}
 
 .pm-card-description{position:relative;margin-top:7px;min-width:0}
 .pm-desc{margin:0;color:var(--dsw-alias-label-secondary);font-size:13px;line-height:18px}
@@ -458,16 +462,16 @@ window.__ModuleLoader__.load({
 		const en = {
 			nav: "Registry Aggregator", kicker: "Federated plugin registry", title: "Registry Aggregator", lead: "Aggregate connected plugin registries and catalogs, search them as one index, and install through the native DSH Plugin Manager.",
 			"tab.sources": "Sources", "tab.browse": "Browse", "sources.title": "Connected sources", "sources.add": "Add source", "sources.addTitle": "Add a new source", "sources.addLead": "Connect a package registry to discover and install plugins.", "sources.manage": "Manage your connected registries and discover available plugins.", "sources.empty": "No plugin sources connected", "sources.emptyHint": "Add a catalog, npm registry, or GitHub source to begin.",
-			"field.name": "Name", "field.type": "Type", "field.url": "Catalog / API URL", "field.urlHint": "Optional for npm and GitHub", "source.remove": "Remove", "source.share": "Share", "source.shared": "Copied", "source.enabled": "Enabled", "source.disabled": "Disabled", "source.checking": "Checking", "source.online": "Status: online", "source.packages": "{count} packages", "source.repositories": "{count} repositories", "source.ok": "Healthy", "source.error": "Unavailable", "source.duplicate": "A source with this id already exists.", "source.required": "Name is required.", "source.urlRequired": "This source type requires a catalog URL.",
+			"field.name": "Name", "field.type": "Type", "field.url": "Catalog / API URL", "field.urlHint": "Optional for npm and GitHub", "source.remove": "Remove", "source.share": "Share", "source.shared": "Copied", "source.enabled": "Enabled", "source.disabled": "Disabled", "source.checking": "Checking", "source.online": "Status: online", "source.packages": "{count} packages", "source.repositories": "{count} repositories", "source.countingPackages": "Counting packages…", "source.countingRepositories": "Counting repositories…", "source.ok": "Healthy", "source.error": "Unavailable", "source.duplicate": "A source with this id already exists.", "source.required": "Name is required.", "source.urlRequired": "This source type requires a catalog URL.",
 			"activation.title": "Registry Aggregator ready", "activation.body": "npm and GitHub sources are connected by default. Open Registry Aggregator to search them together or add more sources.", "activation.open": "Open Registry Aggregator", "activation.later": "Later",
-			"browse.search": "Search plugins, packages, repositories…", "browse.refresh": "Refresh", "browse.pageSize": "Per page", "browse.page": "Page {page} of {pages}", "browse.prev": "Previous", "browse.next": "Next", "browse.freshness": "Freshness", "browse.freshness.any": "Any age", "browse.freshness.30": "≤ 30 days", "browse.freshness.90": "≤ 90 days", "browse.freshness.365": "≤ 1 year", "browse.category": "Category", "browse.category.any": "All categories", "browse.dshMetadata": "DSH metadata", "browse.dshMetadata.any": "Any DSH metadata", "browse.dshMetadata.declared": "DSH declared", "browse.dshMetadata.unknown": "DSH unknown", "install": "Install", "install.confirm": "Install?", "installing": "Installing…", "install.checking": "Checking package…", "install.starting": "Starting install…", "install.running": "Installing package…", "install.runningAttempt": "Installing {index}/{total}…", "install.applying": "Applying plugin…", "installed": "Installed", "install.failed": "Install failed", "install.retry": "Retry install", "install.notBundle": "Not a DSH bundle", "install.approvalRequired": "Build-script approval required in the native Plugin Manager", "install.cancel": "Cancel", "description.more": "…", "description.expand": "Expand description", "description.less": "Less", "browse.empty": "No plugins found", "browse.sort": "Sort", "browse.sort.relevance": "Relevance", "browse.sort.stars": "Stars", "browse.sort.downloads": "Downloads", "browse.sort.freshness": "Freshest release", "browse.sort.starsDownloads": "Stars + downloads", "browse.sort.downloadsFreshness": "Downloads + freshness", "browse.sort.name": "Name", "browse.sort.priority": "Sort priority {priority}", "browse.sort.off": "Not active", "browse.sort.asc": "Ascending", "browse.sort.desc": "Descending", "browse.stableOnly": "Stable only", "browse.emptyHint": "No plugins match the current search or filters.", "browse.noSources": "No enabled registry sources. Open Sources and enable or add one.", "browse.sourcesUnavailable": "All enabled registry sources are unavailable.", "browse.loading": "Loading catalogs…", "browse.updating": "Updating results…", "browse.error": "Catalog request failed", "browse.results": "{count} results", "compat.check": "Check DSH compatibility", "compat.none": "DSH not declared", "compat.loading": "DSH …", "compat.apiPeers": "DSH API peers", "released": "released {age}", "repoUpdated": "repo {age}", "deprecated": "deprecated", "copy": "Copy command", "copied": "Copied", "copy.failed": "Could not copy", "install.warning": "Review the package and source before running this third-party install command.", "readonly": "Settings are read-only.", "unavailable": "Plugin source settings are unavailable.",
+			"browse.search": "Search plugins, packages, repositories…", "browse.refresh": "Refresh", "browse.pageSize": "Per page", "browse.page": "Page {page} of {pages}", "browse.prev": "Previous", "browse.next": "Next", "browse.freshness": "Freshness", "browse.freshness.any": "Any age", "browse.freshness.30": "≤ 30 days", "browse.freshness.90": "≤ 90 days", "browse.freshness.365": "≤ 1 year", "browse.category": "Category", "browse.category.any": "All categories", "browse.dshMetadata": "DSH metadata", "browse.dshMetadata.any": "Any DSH metadata", "browse.dshMetadata.declared": "DSH declared", "browse.dshMetadata.unknown": "DSH unknown", "install": "Install", "install.confirm": "Install?", "installing": "Installing…", "install.checking": "Checking package…", "install.starting": "Starting install…", "install.running": "Installing package…", "install.runningAttempt": "Installing {index}/{total}…", "install.applying": "Applying plugin…", "install.cancelActive": "Cancel install", "install.cancelling": "Cancelling…", "install.cancelFailed": "Cancel failed", "installed": "Installed", "installed.version": "Installed {version}", "update.available": "Update available {installed} → {available}", "install.failed": "Install failed", "install.retry": "Retry install", "install.notBundle": "Not a DSH bundle", "install.approvalRequired": "Build-script approval required in the native Plugin Manager", "install.cancel": "Cancel", "description.more": "…", "description.expand": "Expand description", "description.less": "Less", "browse.empty": "No plugins found", "browse.sort": "Sort", "browse.sort.relevance": "Relevance", "browse.sort.stars": "Stars", "browse.sort.downloads": "Downloads", "browse.sort.freshness": "Freshest release", "browse.sort.starsDownloads": "Stars + downloads", "browse.sort.downloadsFreshness": "Downloads + freshness", "browse.sort.name": "Name", "browse.sort.priority": "Sort priority {priority}", "browse.sort.off": "Not active", "browse.sort.asc": "Ascending", "browse.sort.desc": "Descending", "browse.stableOnly": "Stable only", "browse.emptyHint": "No plugins match the current search or filters.", "browse.noSources": "No enabled registry sources. Open Sources and enable or add one.", "browse.sourcesUnavailable": "All enabled registry sources are unavailable.", "browse.loading": "Loading catalogs…", "browse.updating": "Updating results…", "browse.error": "Catalog request failed", "browse.results": "{count} results", "compat.check": "Check DSH compatibility", "compat.none": "DSH not declared", "compat.loading": "DSH …", "compat.apiPeers": "DSH API peers", "released": "released {age}", "repoUpdated": "repo {age}", "deprecated": "deprecated", "copy": "Copy command", "copied": "Copied", "copy.failed": "Could not copy", "install.warning": "Review the package and source before running this third-party install command.", "readonly": "Settings are read-only.", "unavailable": "Plugin source settings are unavailable.",
 		};
 		const zh = {
 			nav: "注册源聚合器", kicker: "联合插件注册表", title: "注册源聚合器", lead: "聚合已连接的插件注册表和目录，统一搜索，并通过原生 DSH Plugin Manager 安装。",
 			"tab.sources": "来源", "tab.browse": "浏览", "sources.title": "已连接来源", "sources.add": "添加来源", "sources.addTitle": "添加新来源", "sources.addLead": "连接软件包注册表以发现和安装插件。", "sources.manage": "管理已连接的注册表并发现可用插件。", "sources.empty": "尚未连接插件源", "sources.emptyHint": "添加目录、npm 注册表或 GitHub 来源以开始。",
-			"field.name": "名称", "field.type": "类型", "field.url": "目录 / API URL", "field.urlHint": "npm 和 GitHub 可选", "source.remove": "移除", "source.share": "分享", "source.shared": "已复制", "source.enabled": "已启用", "source.disabled": "已禁用", "source.checking": "检查中", "source.online": "状态：在线", "source.packages": "{count} 个软件包", "source.repositories": "{count} 个仓库", "source.ok": "正常", "source.error": "不可用", "source.duplicate": "具有此 ID 的来源已存在。", "source.required": "名称为必填项。", "source.urlRequired": "此来源类型需要目录 URL。",
+			"field.name": "名称", "field.type": "类型", "field.url": "目录 / API URL", "field.urlHint": "npm 和 GitHub 可选", "source.remove": "移除", "source.share": "分享", "source.shared": "已复制", "source.enabled": "已启用", "source.disabled": "已禁用", "source.checking": "检查中", "source.online": "状态：在线", "source.packages": "{count} 个软件包", "source.repositories": "{count} 个仓库", "source.countingPackages": "正在统计软件包…", "source.countingRepositories": "正在统计仓库…", "source.ok": "正常", "source.error": "不可用", "source.duplicate": "具有此 ID 的来源已存在。", "source.required": "名称为必填项。", "source.urlRequired": "此来源类型需要目录 URL。",
 			"activation.title": "注册源聚合器已就绪", "activation.body": "npm 和 GitHub 来源默认已连接。打开注册源聚合器即可统一搜索或添加更多来源。", "activation.open": "打开注册源聚合器", "activation.later": "稍后",
-			"browse.search": "搜索插件、包、仓库…", "browse.refresh": "刷新", "browse.pageSize": "每页", "browse.page": "第 {page} / {pages} 页", "browse.prev": "上一页", "browse.next": "下一页", "browse.freshness": "新鲜度", "browse.freshness.any": "不限时间", "browse.freshness.30": "≤ 30 天", "browse.freshness.90": "≤ 90 天", "browse.freshness.365": "≤ 1 年", "browse.category": "类别", "browse.category.any": "全部类别", "browse.dshMetadata": "DSH 元数据", "browse.dshMetadata.any": "任意 DSH 元数据", "browse.dshMetadata.declared": "已声明 DSH", "browse.dshMetadata.unknown": "DSH 未知", "install": "安装", "install.confirm": "确认安装？", "installing": "安装中…", "installed": "已安装", "install.failed": "安装失败", "install.retry": "重试安装", "install.cancel": "取消", "description.more": "…", "description.expand": "展开描述", "description.less": "收起", "browse.empty": "未找到插件", "browse.sort": "排序", "browse.sort.relevance": "相关性", "browse.sort.stars": "星标", "browse.sort.downloads": "下载量", "browse.sort.freshness": "最新发布", "browse.sort.starsDownloads": "星标 + 下载量", "browse.sort.downloadsFreshness": "下载量 + 新鲜度", "browse.sort.name": "名称", "browse.sort.priority": "排序优先级 {priority}", "browse.sort.off": "未启用", "browse.sort.asc": "升序", "browse.sort.desc": "降序", "browse.stableOnly": "仅稳定版", "browse.emptyHint": "当前搜索或筛选条件没有匹配的插件。", "browse.noSources": "没有启用的注册源。请打开“来源”并启用或添加一个来源。", "browse.sourcesUnavailable": "所有已启用的注册源当前都不可用。", "browse.loading": "正在加载目录…", "browse.updating": "正在更新结果…", "browse.error": "目录请求失败", "browse.results": "{count} 个结果", "compat.check": "检查 DSH 兼容性", "compat.none": "未声明 DSH", "compat.loading": "DSH …", "compat.apiPeers": "DSH API 依赖", "released": "发布 {age}", "repoUpdated": "仓库 {age}", "deprecated": "已弃用", "copy": "复制命令", "copied": "已复制", "copy.failed": "复制失败", "install.warning": "运行此第三方安装命令前，请检查包和来源。", "readonly": "设置为只读。", "unavailable": "插件源设置不可用。", 
+			"browse.search": "搜索插件、包、仓库…", "browse.refresh": "刷新", "browse.pageSize": "每页", "browse.page": "第 {page} / {pages} 页", "browse.prev": "上一页", "browse.next": "下一页", "browse.freshness": "新鲜度", "browse.freshness.any": "不限时间", "browse.freshness.30": "≤ 30 天", "browse.freshness.90": "≤ 90 天", "browse.freshness.365": "≤ 1 年", "browse.category": "类别", "browse.category.any": "全部类别", "browse.dshMetadata": "DSH 元数据", "browse.dshMetadata.any": "任意 DSH 元数据", "browse.dshMetadata.declared": "已声明 DSH", "browse.dshMetadata.unknown": "DSH 未知", "install": "安装", "install.confirm": "确认安装？", "installing": "安装中…", "install.cancelActive": "取消安装", "install.cancelling": "正在取消…", "install.cancelFailed": "取消失败", "installed": "已安装", "installed.version": "已安装 {version}", "update.available": "可更新 {installed} → {available}", "install.failed": "安装失败", "install.retry": "重试安装", "install.cancel": "取消", "description.more": "…", "description.expand": "展开描述", "description.less": "收起", "browse.empty": "未找到插件", "browse.sort": "排序", "browse.sort.relevance": "相关性", "browse.sort.stars": "星标", "browse.sort.downloads": "下载量", "browse.sort.freshness": "最新发布", "browse.sort.starsDownloads": "星标 + 下载量", "browse.sort.downloadsFreshness": "下载量 + 新鲜度", "browse.sort.name": "名称", "browse.sort.priority": "排序优先级 {priority}", "browse.sort.off": "未启用", "browse.sort.asc": "升序", "browse.sort.desc": "降序", "browse.stableOnly": "仅稳定版", "browse.emptyHint": "当前搜索或筛选条件没有匹配的插件。", "browse.noSources": "没有启用的注册源。请打开“来源”并启用或添加一个来源。", "browse.sourcesUnavailable": "所有已启用的注册源当前都不可用。", "browse.loading": "正在加载目录…", "browse.updating": "正在更新结果…", "browse.error": "目录请求失败", "browse.results": "{count} 个结果", "compat.check": "检查 DSH 兼容性", "compat.none": "未声明 DSH", "compat.loading": "DSH …", "compat.apiPeers": "DSH API 依赖", "released": "发布 {age}", "repoUpdated": "仓库 {age}", "deprecated": "已弃用", "copy": "复制命令", "copied": "已复制", "copy.failed": "复制失败", "install.warning": "运行此第三方安装命令前，请检查包和来源。", "readonly": "设置为只读。", "unavailable": "插件源设置不可用。", 
 		};
 
 		function slug(value) {
@@ -595,12 +599,15 @@ window.__ModuleLoader__.load({
 			return h("div", { className: "pm-source-logo pm-source-logo-generic", "aria-hidden": true, children: h(PackageIcon, {}) });
 		}
 
-		function SourceRow({ source, health, t, busy, readOnly, onToggle, onRemove }) {
+		function SourceRow({ source, health, sourceCount, t, busy, readOnly, onToggle, onRemove }) {
 			const [open, setOpen] = react.useState(true);
 			const [copied, setCopied] = react.useState(false);
 			const status = source.enabled === false ? "off" : health?.ok === true ? "ok" : health?.ok === false ? "bad" : "wait";
 			const endpoint = sourceEndpoint(source);
-			const count = Number.isFinite(health?.count) ? health.count : 0;
+			const count = Number.isFinite(sourceCount?.count) ? sourceCount.count : Number.isFinite(health?.count) ? health.count : undefined;
+			const countLoading = status === "ok" && sourceCount?.loading === true && count === undefined;
+			const countLabel = count === undefined ? undefined : source.type === "github" ? t("source.repositories", { count }) : t("source.packages", { count });
+			const countingLabel = source.type === "github" ? t("source.countingRepositories") : t("source.countingPackages");
 			const statusText = status === "off" ? t("source.disabled") : status === "ok" ? t("source.online") : status === "bad" ? t("source.error") : t("source.checking");
 			const copyEndpoint = async () => {
 				try { await globalThis.navigator?.clipboard?.writeText?.(endpoint); setCopied(true); setTimeout(() => setCopied(false), 1400); } catch {}
@@ -613,8 +620,9 @@ window.__ModuleLoader__.load({
 							h("div", { className: "pm-source-line", children: h("span", { className: "pm-source-name", children: source.name }) }),
 							hs("div", { className: "pm-source-evidence", children: [
 								hs("span", { className: "pm-source-evidence-item", children: [h("span", { className: `pm-status pm-status-${status}`, "aria-hidden": true }), h("span", { children: statusText })] }),
-								status === "ok" ? h("span", { className: "pm-evidence-separator", "aria-hidden": true }) : null,
-								status === "ok" ? hs("span", { className: "pm-source-evidence-item", children: [h(PackageIcon, {}), h("span", { children: t(source.type === "github" ? "source.repositories" : "source.packages", { count }) })] }) : null,
+								status === "ok" && (count !== undefined || countLoading) ? h("span", { className: "pm-evidence-separator", "aria-hidden": true }) : null,
+								countLoading ? hs("span", { className: "pm-source-evidence-item", title: countingLabel, role: "status", "aria-label": countingLabel, children: [h(StateDot, { state: "ongoing", size: 14 }), h("span", { className: "pm-sr-only", children: countingLabel })] }) : null,
+								status === "ok" && count !== undefined ? hs("span", { className: "pm-source-evidence-item", children: [h(PackageIcon, {}), h("span", { children: countLabel })] }) : null,
 							] }),
 						] }),
 					] }),
@@ -632,12 +640,12 @@ window.__ModuleLoader__.load({
 						h("input", { className: "pm-source-url", value: endpoint, readOnly: true, title: endpoint }),
 						h("button", { type: "button", className: "pm-copy-url", onClick: copyEndpoint, title: copied ? t("copied") : t("copy"), "aria-label": copied ? t("copied") : t("copy"), children: copied ? h(IconCopyOutlineRegular, { size: 16 }) : h(IconCopyOutlineRegular, { size: 16 }) }),
 					] }),
-					health?.error ? h("div", { className: "pm-source-error", title: health.error, children: health.error }) : null,
+					health?.error ? h("div", { className: "pm-source-error", title: health.error, children: health.error }) : sourceCount?.error ? h("div", { className: "pm-source-error", title: sourceCount.error, children: sourceCount.error }) : null,
 				] }) : null,
 			] });
 		}
 
-		function SourcesView({ t, sources, writable, saveSources, busy, healthState, refreshHealth }) {
+		function SourcesView({ t, sources, writable, saveSources, busy, healthState, countMap, countsLoading, refreshHealth }) {
 			const [mutationError, setMutationError] = react.useState("");
 			const mutate = async (next) => {
 				setMutationError("");
@@ -652,12 +660,12 @@ window.__ModuleLoader__.load({
 						hs("div", { className: "pm-section-head-main", children: [
 							h("div", { children: [h("div", { className: "pm-section-title", children: t("sources.title") }), h("div", { className: "pm-section-lead", children: t("sources.manage") })] }),
 						] }),
-						h("button", { type: "button", className: "pm-refresh-icon", onClick: refreshHealth, disabled: healthState.loading, title: t("browse.refresh"), "aria-label": t("browse.refresh"), children: h(RefreshIcon, {}) }),
+						h("button", { type: "button", className: "pm-refresh-icon", onClick: refreshHealth, disabled: healthState.loading, title: t("browse.refresh"), "aria-label": t("browse.refresh"), children: h(RefreshIcon, { className: healthState.loading ? "pm-spin" : undefined }) }),
 					] }),
 					!writable ? h("p", { className: "pm-notice pm-connected-notice", children: t("readonly") }) : null,
 					mutationError ? h("p", { className: "pm-notice pm-notice-error pm-connected-notice", role: "alert", children: mutationError }) : null,
 					healthState.error ? h("p", { className: "pm-notice pm-notice-error pm-connected-notice", role: "alert", children: healthState.error }) : null,
-					sources.length === 0 ? h(Empty, { title: t("sources.empty"), hint: t("sources.emptyHint") }) : h("div", { className: "pm-source-list", children: sources.map((source) => h(SourceRow, { source, health: healthMap[source.id], t, busy, readOnly: !writable, onToggle: (id) => { void mutate(sources.map((row) => row.id === id ? { ...row, enabled: row.enabled === false } : row)); }, onRemove: (id) => { void mutate(sources.filter((row) => row.id !== id)); } }, source.id)) }),
+					sources.length === 0 ? h(Empty, { title: t("sources.empty"), hint: t("sources.emptyHint") }) : h("div", { className: "pm-source-list", children: sources.map((source) => h(SourceRow, { source, health: healthMap[source.id], sourceCount: countMap[source.id], t, busy, readOnly: !writable, onToggle: (id) => { void mutate(sources.map((row) => row.id === id ? { ...row, enabled: row.enabled === false } : row)); }, onRemove: (id) => { void mutate(sources.filter((row) => row.id !== id)); } }, source.id)) }),
 				] }),
 			] });
 		}
@@ -671,6 +679,99 @@ window.__ModuleLoader__.load({
 			return new Intl.NumberFormat(undefined, { notation: "compact", maximumFractionDigits: 1 }).format(value);
 		}
 
+		function parseSemver(value) {
+			const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/u.exec(String(value ?? "").trim());
+			if (!match) return undefined;
+			return {
+				core: [Number(match[1]), Number(match[2]), Number(match[3])],
+				prerelease: match[4] ? match[4].split(".") : [],
+			};
+		}
+
+		function compareSemver(left, right) {
+			const a = parseSemver(left);
+			const b = parseSemver(right);
+			if (!a || !b) return 0;
+			for (let index = 0; index < 3; index++) {
+				if (a.core[index] !== b.core[index]) return a.core[index] > b.core[index] ? 1 : -1;
+			}
+			if (!a.prerelease.length && !b.prerelease.length) return 0;
+			if (!a.prerelease.length) return 1;
+			if (!b.prerelease.length) return -1;
+			const length = Math.max(a.prerelease.length, b.prerelease.length);
+			for (let index = 0; index < length; index++) {
+				const leftPart = a.prerelease[index];
+				const rightPart = b.prerelease[index];
+				if (leftPart === undefined) return -1;
+				if (rightPart === undefined) return 1;
+				if (leftPart === rightPart) continue;
+				const leftNumeric = /^\d+$/u.test(leftPart);
+				const rightNumeric = /^\d+$/u.test(rightPart);
+				if (leftNumeric && rightNumeric) return Number(leftPart) > Number(rightPart) ? 1 : -1;
+				if (leftNumeric !== rightNumeric) return leftNumeric ? -1 : 1;
+				return leftPart > rightPart ? 1 : -1;
+			}
+			return 0;
+		}
+
+		function localSearchVariants(value) {
+			const needle = String(value ?? "").trim().toLowerCase();
+			if (!needle) return [];
+			const variants = [needle];
+			const unscoped = needle.startsWith("@") && needle.includes("/") ? needle.slice(needle.indexOf("/") + 1) : needle;
+			if (unscoped !== needle) variants.push(unscoped);
+			let shortened = unscoped;
+			for (const prefix of ["dsh-client-ui-", "dsh-ui-", "dsh-plugin-"]) {
+				if (shortened.startsWith(prefix) && shortened.length > prefix.length) {
+					shortened = shortened.slice(prefix.length);
+					variants.push(shortened);
+					break;
+				}
+			}
+			if (shortened.startsWith("dsh-") && shortened.length > 4) variants.push(shortened.slice(4));
+			const parts = shortened.split("-").filter(Boolean);
+			if (parts.length >= 2) variants.push(parts.slice(-2).join("-"));
+			return [...new Set(variants.filter((item) => item.length >= 3))].slice(0, 3);
+		}
+
+		function localRelevanceScore(plugin, query) {
+			const variants = localSearchVariants(query);
+			if (!variants.length) return 0;
+			const name = String(plugin.name ?? "").toLowerCase();
+			const packageName = String(plugin.identity?.package ?? "").toLowerCase();
+			const repository = String(plugin.identity?.repository ?? "").toLowerCase();
+			const description = String(plugin.description ?? "").toLowerCase();
+			const tags = (plugin.tags ?? []).map((tag) => String(tag).toLowerCase());
+			let best = 0;
+			for (let index = 0; index < variants.length; index += 1) {
+				const needle = variants[index];
+				const penalty = index * 25;
+				const score = Math.max(
+					packageName === needle ? 1000 : 0,
+					name === needle ? 950 : 0,
+					packageName.startsWith(needle) ? 850 : 0,
+					name.startsWith(needle) ? 800 : 0,
+					packageName.includes(needle) ? 720 : 0,
+					name.includes(needle) ? 680 : 0,
+					tags.includes(needle) ? 600 : 0,
+					tags.some((tag) => tag.includes(needle)) ? 500 : 0,
+					repository.includes(needle) ? 300 : 0,
+					description.includes(needle) ? 200 : 0,
+				) - penalty;
+				best = Math.max(best, score);
+			}
+			return Math.max(0, best);
+		}
+
+		function rankVisiblePlugins(plugins, query, sorts) {
+			if (!Array.isArray(plugins) || plugins.length < 2 || (Array.isArray(sorts) && sorts.length) || !String(query ?? "").trim()) return plugins;
+			return [...plugins].sort((left, right) => {
+				const relevance = localRelevanceScore(right, query) - localRelevanceScore(left, query);
+				if (relevance !== 0) return relevance;
+				return String(left.name ?? "").localeCompare(String(right.name ?? ""));
+			});
+		}
+
 		function repositoryEvidenceKey(value) {
 			if (typeof value !== "string" || !value.trim()) return "";
 			let raw = value.trim().replace(/^git\+/, "").replace(/^git@github\.com:/i, "https://github.com/");
@@ -815,7 +916,7 @@ window.__ModuleLoader__.load({
 			] });
 		}
 
-		function PluginCard({ plugin, t }) {
+		function PluginCard({ plugin, t, bundles }) {
 			const [copyState, setCopyState] = react.useState("");
 			const [installState, setInstallState] = react.useState("idle");
 			const [installError, setInstallError] = react.useState("");
@@ -823,6 +924,16 @@ window.__ModuleLoader__.load({
 			const [detailsState, setDetailsState] = react.useState({ status: "idle" });
 			const command = installCommand(plugin);
 			const spec = plugin.install?.spec || "";
+			const packageName = plugin.identity?.package;
+			const installedBundle = packageName ? (bundles ?? []).find((bundle) => bundle?.name === packageName) : undefined;
+			const installedVersion = typeof installedBundle?.version === "string" ? installedBundle.version : undefined;
+			const updateAvailable = Boolean(installedVersion && plugin.version && compareSemver(plugin.version, installedVersion) === 1);
+			const effectiveInstallState = installedBundle ? "installed" : installState;
+			const installedLabel = updateAvailable
+				? t("update.available", { installed: installedVersion, available: plugin.version })
+				: installedVersion ? t("installed.version", { version: installedVersion })
+					: installState === "installed" && plugin.version ? t("installed.version", { version: plugin.version })
+						: t("installed");
 			const declaredCompatibility = plugin.evidence?.dshCompatibility;
 			const loadDetails = async () => {
 				if (detailsState.status === "loading" || detailsState.status === "ready") return;
@@ -868,7 +979,7 @@ window.__ModuleLoader__.load({
 			};
 
 			const install = async () => {
-				if (!spec || !remote?.pluginManager || installState === "installing" || installState === "installed" || installState === "invalid") return;
+				if (!spec || !remote?.pluginManager || installedBundle || installState === "installing" || installState === "installed" || installState === "invalid") return;
 				setInstallState("installing");
 				setInstallError("");
 				setInstallProgress({ phase: "checking", activity: 0 });
@@ -917,7 +1028,13 @@ window.__ModuleLoader__.load({
 					};
 					const result = await remote.pluginManager.installBundle(spec, options);
 					if (!result?.ok) throw new Error(result?.error?.message || t("install.failed"));
-					if (result.value?.application === "failed" || result.value?.application === "cancelled") {
+					if (result.value?.application === "cancelled") {
+						setInstallProgress({ phase: "idle", activity: 0 });
+						setInstallState("idle");
+						setInstallError("");
+						return;
+					}
+					if (result.value?.application === "failed") {
 						const pending = result.value?.pendingBuilds;
 						if (Array.isArray(pending) && pending.length) throw new Error(`${t("install.approvalRequired")}: ${pending.join(", ")}`);
 						throw new Error(result.value?.error?.diagnostic || result.value?.packageResult?.output || t("install.failed"));
@@ -934,8 +1051,25 @@ window.__ModuleLoader__.load({
 				}
 			};
 
+			const cancelInstall = async () => {
+				const requestId = installProgress.requestId;
+				if (!requestId || installState !== "installing" || installProgress.phase === "applying" || installProgress.phase === "cancelling"
+					|| typeof remote?.pluginManager?.cancelInstall !== "function") return;
+				setInstallError("");
+				setInstallProgress((current) => ({ ...current, phase: "cancelling" }));
+				try {
+					const result = await remote.pluginManager.cancelInstall(requestId);
+					if (!result?.ok) throw new Error(result?.error?.message || t("install.cancelFailed"));
+					if (result.value?.status === "too-late") {
+						setInstallProgress((current) => ({ ...current, phase: "applying" }));
+					}
+				} catch (error) {
+					setInstallProgress((current) => ({ ...current, phase: "installing" }));
+					setInstallError(`${t("install.cancelFailed")}: ${String(error?.message ?? error)}`);
+				}
+			};
+
 			const sources = plugin.sources ?? [];
-			const primarySource = sources[0];
 			const requiresVerification = sources.some((source) => source.type === "npm" || source.type === "github");
 			const installability = detailsState.data?.installability ?? plugin.evidence?.installability ?? (requiresVerification ? "unknown" : "bundle");
 			const installAllowed = Boolean(spec) && (!requiresVerification || installability === "bundle");
@@ -947,15 +1081,20 @@ window.__ModuleLoader__.load({
 						? installProgress.attempt
 							? t("install.runningAttempt", { index: installProgress.attempt.index, total: installProgress.attempt.total })
 							: t("install.running")
-						: installProgress.phase === "applying" ? t("install.applying")
-							: t("installing");
-			const installTitle = installState === "installing" ? progressTitle
-				: installState === "installed" ? t("installed")
-					: installState === "invalid" ? t("install.notBundle")
-						: installState === "failed" ? t("install.retry") : t("install");
-			const installIcon = installState === "installing" ? h(StateDot, { state: "ongoing", size: 16 })
-				: installState === "installed" ? h(IconCheckOutlineRegular, { size: 16 })
-					: installState === "failed" || installState === "invalid" ? h(IconWarningOutlineRegular, { size: 16 })
+						: installProgress.phase === "cancelling" ? t("install.cancelling")
+							: installProgress.phase === "applying" ? t("install.applying")
+								: t("installing");
+			const canCancelInstall = effectiveInstallState === "installing"
+				&& Boolean(installProgress.requestId)
+				&& !["applying", "cancelling"].includes(installProgress.phase)
+				&& typeof remote?.pluginManager?.cancelInstall === "function";
+			const installTitle = effectiveInstallState === "installing" ? progressTitle
+				: effectiveInstallState === "installed" ? installedLabel
+					: effectiveInstallState === "invalid" ? t("install.notBundle")
+						: effectiveInstallState === "failed" ? t("install.retry") : t("install");
+			const installIcon = effectiveInstallState === "installing" ? h(StateDot, { state: "ongoing", size: 16 })
+				: effectiveInstallState === "installed" ? h(IconCheckOutlineRegular, { size: 16 })
+					: effectiveInstallState === "failed" || effectiveInstallState === "invalid" ? h(IconWarningOutlineRegular, { size: 16 })
 						: h(IconDownloadOutlineRegular, { size: 16 });
 
 			return hs("article", { className: "pm-card", children: [
@@ -977,11 +1116,15 @@ window.__ModuleLoader__.load({
 							plugin.evidence?.rating !== undefined ? hs("span", { className: "pm-signal", title: plugin.evidence.ratingCount !== undefined ? `${plugin.evidence.ratingCount} ratings` : "Source rating", children: [h("span", { className: "pm-star-icon", children: "★" }), h("span", { children: `${plugin.evidence.rating.toFixed(1)}${plugin.evidence.ratingCount !== undefined ? ` (${compactNumber(plugin.evidence.ratingCount)})` : ""}` })] }) : null,
 						] }),
 					] }),
-					installAllowed ? h("button", { type: "button", className: "pm-card-install", "data-state": installState, disabled: installState === "installing" || installState === "installed" || installState === "invalid", onClick: install, title: installTitle, "aria-label": installTitle, children: installIcon }) : null,
+					installAllowed ? hs("div", { className: "pm-card-install-actions", children: [
+						h("button", { type: "button", className: "pm-card-install", "data-state": effectiveInstallState, disabled: effectiveInstallState === "installing" || effectiveInstallState === "installed" || effectiveInstallState === "invalid", onClick: install, title: installTitle, "aria-label": installTitle, children: installIcon }),
+						canCancelInstall ? h("button", { type: "button", className: "pm-card-cancel", onClick: () => { void cancelInstall(); }, title: t("install.cancelActive"), "aria-label": t("install.cancelActive"), children: h(IconCloseOutlineRegular, { size: 14 }) }) : null,
+					] }) : null,
 				] }),
 				plugin.description ? h(ClampedDescription, { text: plugin.description, t, onExpand: loadDetails }) : null,
 				hs("div", { className: "pm-card-meta", children: [
-					primarySource ? h("span", { className: "pm-badge", children: primarySource.name }, primarySource.id) : null,
+					effectiveInstallState === "installed" ? h("span", { className: `pm-bundle-state ${updateAvailable ? "pm-bundle-state-unknown" : "pm-bundle-state-bundle"}`, title: installedLabel, children: installedLabel }) : null,
+					...sources.map((source) => h("span", { className: "pm-badge", children: source.name }, source.id)),
 					...(plugin.tags ?? []).map((tag) => h("span", { className: "pm-tag", children: tag }, tag)),
 					requiresVerification ? h("span", { className: `pm-bundle-state pm-bundle-state-${installability}`, title: bundleLabel, children: bundleLabel }) : null,
 					h("button", { type: "button", className: "pm-compat pm-compat-button", title: resolvedCompatibility ? `DSH ${resolvedCompatibility}` : peerTitle || t("compat.check"), onClick: () => { void loadDetails(); }, children: compatibilityLabel }),
@@ -994,6 +1137,7 @@ window.__ModuleLoader__.load({
 					h("button", { type: "button", className: "pm-icon-btn", onClick: copy, title: copyState === "ok" ? t("copied") : t("copy"), "aria-label": copyState === "ok" ? t("copied") : t("copy"), children: h(IconCopyOutlineRegular, { size: 16 }) }),
 				] }) : null,
 				installState === "failed" ? h("div", { className: "pm-install-status", title: installError, children: `${t("install.failed")}: ${installError}` }) : null,
+				installState === "installing" && installError ? h("div", { className: "pm-install-status", title: installError, children: installError }) : null,
 				installState === "invalid" ? h("div", { className: "pm-install-status", title: installError, children: `${t("install.notBundle")}: ${installError}` }) : null,
 				h("span", { role: "status", "aria-live": "polite", className: "pm-sr-only", children: copyState === "ok" ? t("copied") : copyState === "error" ? t("copy.failed") : installTitle }),
 			] });
@@ -1031,17 +1175,27 @@ window.__ModuleLoader__.load({
 			});
 		}
 
-		function BrowseView({ t, state, query, setQuery, refresh, sorts, setSorts, stableOnly, setStableOnly, freshnessDays, setFreshnessDays, tag, setTag, dshMetadata, setDshMetadata, page, setPage, pageSize, setPageSize }) {
+		function BrowseView({ t, state, query, setQuery, refresh, sorts, setSorts, stableOnly, setStableOnly, freshnessDays, setFreshnessDays, tag, setTag, dshMetadata, setDshMetadata, page, setPage, pageSize, setPageSize, bundles }) {
 			const plugins = state.data?.plugins ?? [];
 			const total = state.data?.total ?? 0;
 			const pageCount = state.data?.pageCount ?? 1;
 			const currentPage = state.data?.page ?? page;
+			const sourceRows = Array.isArray(state.data?.sources) ? state.data.sources : [];
+			const githubSourceRow = sourceRows.find((row) => (row?.type ?? row?.source?.type) === "github");
+			const githubSourceValue = githubSourceRow?.source ?? githubSourceRow;
+			const githubSource = githubSourceValue ? {
+				id: githubSourceValue.id,
+				name: githubSourceValue.name ?? "GitHub",
+				type: "github",
+				...(githubSourceValue.url ? { url: githubSourceValue.url } : {}),
+			} : undefined;
 			const [starEvidence, setStarEvidence] = react.useState({});
-			const starSignature = plugins.map((plugin) => `${repositoryEvidenceKey(plugin.identity?.repository)}:${plugin.evidence?.stars ?? ""}`).join("|");
+			const visiblePlugins = rankVisiblePlugins(plugins, query, sorts);
+			const starSignature = plugins.map((plugin) => `${repositoryEvidenceKey(plugin.identity?.repository)}:${plugin.evidence?.stars ?? ""}:${(plugin.sources ?? []).some((source) => source.type === "github") ? "github" : ""}`).join("|");
 			react.useEffect(() => {
 				if (state.loading || !plugins.length || !connection) return undefined;
 				const repositories = [...new Set(plugins
-					.filter((plugin) => plugin.evidence?.stars === undefined)
+					.filter((plugin) => plugin.evidence?.stars === undefined || !(plugin.sources ?? []).some((source) => source.type === "github"))
 					.map((plugin) => plugin.identity?.repository)
 					.filter((repository) => repositoryEvidenceKey(repository).startsWith("https://github.com/"))
 				)].slice(0, 20);
@@ -1053,8 +1207,12 @@ window.__ModuleLoader__.load({
 						const next = { ...current };
 						for (const row of rows) {
 							const key = repositoryEvidenceKey(row?.repository);
-							if (!key || typeof row?.stars !== "number") continue;
-							next[key] = { stars: row.stars, repositoryUpdatedAt: row.repositoryUpdatedAt };
+							if (!key) continue;
+							next[key] = {
+								...(typeof row?.stars === "number" ? { stars: row.stars } : {}),
+								...(row?.repositoryUpdatedAt ? { repositoryUpdatedAt: row.repositoryUpdatedAt } : {}),
+								discoveryEligible: row?.discoveryEligible === true,
+							};
 						}
 						return next;
 					});
@@ -1062,11 +1220,17 @@ window.__ModuleLoader__.load({
 				return () => controller.abort();
 			}, [starSignature]);
 			const pluginWithAsyncStars = (plugin) => {
-				if (plugin.evidence?.stars !== undefined) return plugin;
-				const evidence = starEvidence[repositoryEvidenceKey(plugin.identity?.repository)];
-				return evidence ? { ...plugin, evidence: { ...(plugin.evidence ?? {}), ...evidence } } : plugin;
+				const asyncEvidence = starEvidence[repositoryEvidenceKey(plugin.identity?.repository)];
+				if (!asyncEvidence) return plugin;
+				const evidence = {
+					...(plugin.evidence ?? {}),
+					...(typeof asyncEvidence.stars === "number" ? { stars: asyncEvidence.stars } : {}),
+					...(asyncEvidence.repositoryUpdatedAt ? { repositoryUpdatedAt: asyncEvidence.repositoryUpdatedAt } : {}),
+				};
+				const sources = [...(plugin.sources ?? [])];
+				if (asyncEvidence.discoveryEligible && githubSource && !sources.some((source) => source.type === "github")) sources.push(githubSource);
+				return { ...plugin, evidence, sources };
 			};
-			const sourceRows = Array.isArray(state.data?.sources) ? state.data.sources : [];
 			const failedSources = sourceRows.filter((row) => row?.health?.ok === false);
 			const hasEnabledSources = sourceRows.length > 0;
 			const allSourcesFailed = hasEnabledSources && failedSources.length === sourceRows.length;
@@ -1137,7 +1301,7 @@ window.__ModuleLoader__.load({
 						children: `${row.name ?? row.id ?? row.source?.name ?? row.source?.id ?? "source"}: ${row.health?.error ?? t("source.error")}`,
 					}, row.source?.id ?? row.source?.name)) : null,
 					!state.loading && !state.error && plugins.length === 0 ? h(Empty, { title: t("browse.empty"), hint: emptyHint }) : null,
-					plugins.length ? h("div", { className: "pm-results", "data-updating": state.loading, children: plugins.map((plugin) => h(PluginCard, { plugin: pluginWithAsyncStars(plugin), t }, plugin.identity?.package || plugin.identity?.repository || plugin.identity?.fallback)) }) : null,
+					plugins.length ? h("div", { className: "pm-results", "data-updating": state.loading, children: visiblePlugins.map((plugin) => h(PluginCard, { plugin: pluginWithAsyncStars(plugin), t, bundles }, plugin.identity?.package || plugin.identity?.repository || plugin.identity?.fallback)) }) : null,
 					plugins.length ? h("div", { className: "pm-browse-bottomline", children: bottomPager }) : null,
 				] }) : null,
 			] });
@@ -1150,7 +1314,10 @@ window.__ModuleLoader__.load({
 			const [query, setQuery] = react.useState("");
 			const [busy, setBusy] = react.useState(false);
 			const [healthState, setHealthState] = react.useState({ loading: false });
+			const [countMap, setCountMap] = react.useState({});
+			const [countsLoading, setCountsLoading] = react.useState(false);
 			const [browseState, setBrowseState] = react.useState({ loading: false });
+			const [bundleState, setBundleState] = react.useState({ loading: false, data: [] });
 			const [browseRevision, setBrowseRevision] = react.useState(0);
 			const [sorts, setSorts] = react.useState([]);
 			const [stableOnly, setStableOnly] = react.useState(false);
@@ -1194,6 +1361,56 @@ window.__ModuleLoader__.load({
 				return () => controller.abort();
 			}, [tab, signature, healthRevision, connectionRevision]);
 
+			react.useEffect(() => {
+				if (tab !== "browse" || typeof remote?.pluginManager?.listBundles !== "function") return undefined;
+				let disposed = false;
+				setBundleState((current) => ({ ...current, loading: true, error: undefined }));
+				Promise.resolve(remote.pluginManager.listBundles()).then(
+					(result) => {
+						if (disposed) return;
+						if (!result?.ok) {
+							setBundleState({ loading: false, data: [], error: String(result?.error?.message ?? t("browse.error")) });
+							return;
+						}
+						setBundleState({ loading: false, data: Array.isArray(result.value) ? result.value : [] });
+					},
+					(error) => { if (!disposed) setBundleState({ loading: false, data: [], error: String(error?.message ?? error) }); },
+				);
+				return () => { disposed = true; };
+			}, [tab, connectionRevision]);
+
+			react.useEffect(() => {
+				if (tab !== "sources" || !connection || healthState.loading || !healthState.data) return undefined;
+				const healthRows = healthState.data.sources ?? [];
+				const healthyIds = new Set(healthRows.filter((row) => row?.health?.ok === true).map((row) => row.source?.id).filter(Boolean));
+				const targets = sources.filter((source) => source.enabled !== false && healthyIds.has(source.id));
+				if (!targets.length) { setCountsLoading(false); return undefined; }
+				const controller = new AbortController();
+				let active = true;
+				setCountsLoading(true);
+				setCountMap((current) => {
+					const next = { ...current };
+					for (const source of targets) next[source.id] = { ...(next[source.id] ?? {}), loading: true, error: undefined };
+					return next;
+				});
+				let pending = targets.length;
+				for (const source of targets) {
+					rpc("counts", { sourceId: source.id }, controller.signal).then((data) => {
+						if (!active) return;
+						const row = data?.sources?.[0];
+						setCountMap((current) => ({ ...current, [source.id]: row ? { ...row, loading: false } : { source, loading: false, error: "source count unavailable" } }));
+					}, (error) => {
+						if (!active || error?.name === "AbortError") return;
+						setCountMap((current) => ({ ...current, [source.id]: { source, loading: false, error: String(error?.message ?? error) } }));
+					}).finally(() => {
+						if (!active) return;
+						pending -= 1;
+						if (pending === 0) setCountsLoading(false);
+					});
+				}
+				return () => { active = false; controller.abort(); setCountsLoading(false); };
+			}, [tab, signature, healthRevision, connectionRevision, healthState.loading, healthState.data]);
+
 			react.useEffect(() => {
 				if (tab !== "browse" || !connection) return undefined;
 				const controller = new AbortController();
@@ -1213,7 +1430,7 @@ window.__ModuleLoader__.load({
 			return h("div", { className: "pm-root", children: hs("section", { className: "pm-shell", "aria-labelledby": "pm-title", children: [
 				h("p", { className: "pm-kicker", children: t("kicker") }), h("h2", { id: "pm-title", className: "pm-title", children: t("title") }), h("p", { className: "pm-lead", children: t("lead") }),
 				hs("div", { className: "pm-tabs", role: "tablist", "aria-label": t("title"), children: [h("button", { id: "pm-tab-sources", type: "button", className: "pm-tab", role: "tab", tabIndex: tab === "sources" ? 0 : -1, "aria-controls": "pm-panel-sources", "aria-selected": tab === "sources", "data-active": tab === "sources", onKeyDown: tabKey, onClick: () => selectTab("sources"), children: hs("span", { className: "pm-tab-content", children: [h(DatabaseIcon, {}), h("span", { children: t("tab.sources") })] }) }), h("button", { id: "pm-tab-browse", type: "button", className: "pm-tab", role: "tab", tabIndex: tab === "browse" ? 0 : -1, "aria-controls": "pm-panel-browse", "aria-selected": tab === "browse", "data-active": tab === "browse", onKeyDown: tabKey, onClick: () => selectTab("browse"), children: hs("span", { className: "pm-tab-content", children: [h(GridIcon, {}), h("span", { children: t("tab.browse") })] }) })] }),
-				h("div", { id: `pm-panel-${tab}`, role: "tabpanel", "aria-labelledby": `pm-tab-${tab}`, children: tab === "sources" ? h(SourcesView, { t, sources, writable, saveSources, busy, healthState, refreshHealth: () => setHealthRevision((value) => value + 1) }) : h(BrowseView, { t, state: browseState, query, setQuery, refresh: () => setBrowseRevision((value) => value + 1), sorts, setSorts, stableOnly, setStableOnly, freshnessDays, setFreshnessDays, tag, setTag, dshMetadata, setDshMetadata, page, setPage, pageSize, setPageSize }) }),
+				h("div", { id: `pm-panel-${tab}`, role: "tabpanel", "aria-labelledby": `pm-tab-${tab}`, children: tab === "sources" ? h(SourcesView, { t, sources, writable, saveSources, busy, healthState, countMap, countsLoading, refreshHealth: () => setHealthRevision((value) => value + 1) }) : h(BrowseView, { t, state: browseState, query, setQuery, refresh: () => setBrowseRevision((value) => value + 1), sorts, setSorts, stableOnly, setStableOnly, freshnessDays, setFreshnessDays, tag, setTag, dshMetadata, setDshMetadata, page, setPage, pageSize, setPageSize, bundles: bundleState.data ?? [] }) }),
 			] }) });
 		}
 

package/lib/core.js

@@ -7,6 +7,10 @@ const DEFAULT_TIMEOUT_MS = 10_000;
 const DEFAULT_MAX_RESPONSE_BYTES = 2 * 1024 * 1024;
 const DEFAULT_MAX_PLUGINS = 2_000;
 const DEFAULT_MAX_REDIRECTS = 3;
+const GITHUB_MAX_ATTEMPTS = 3;
+const GITHUB_RETRY_BASE_DELAY_MS = 250;
+const GITHUB_RETRY_TIMEOUT_MS = 5_000;
+const RETRYABLE_HTTP_STATUSES = new Set([408, 429, 500, 502, 503, 504]);
 const EVIDENCE_CACHE_TTL_MS = 10 * 60 * 1000;
 const METADATA_CACHE_TTL_MS = 30 * 60 * 1000;
 const npmDownloadCache = new Map();
@@ -62,6 +66,23 @@ export const GITHUB_DISCOVERY_QUERIES = Object.freeze([
 	"topic:deepseek-harness topic:dsh-plugins",
 ]);
 
+function githubRepositoryMatchesDiscovery(repository) {
+	const topics = new Set((Array.isArray(repository?.topics) ? repository.topics : [])
+		.map((topic) => String(topic).trim().toLowerCase()).filter(Boolean));
+	return topics.has("deepseek-harness-plugin")
+		|| (topics.has("deepseek-harness") && (topics.has("dsh-plugin") || topics.has("dsh-plugins")));
+}
+
+function githubHealthUrl(source) {
+	const url = new URL(source?.url ?? "https://api.github.com/");
+	url.search = "";
+	url.hash = "";
+	let path = url.pathname.replace(/\/+$/u, "");
+	path = path.replace(/\/search\/repositories$/u, "");
+	url.pathname = `${path || ""}/rate_limit`;
+	return url;
+}
+
 function text(value) {
 	return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
@@ -474,11 +495,52 @@ async function readResponseBytes(response, maxBytes) {
 	return joined;
 }
 
-export async function fetchJson(urlInput, source, options = {}) {
+function retryableSourceError(message, details = {}) {
+	const error = new Error(message);
+	error.retryable = true;
+	if (details.status !== undefined) error.status = details.status;
+	if (details.retryAfterMs !== undefined) error.retryAfterMs = details.retryAfterMs;
+	return error;
+}
+
+function githubRateLimitRetryMs(response) {
+	if (response.status !== 403) return undefined;
+	const retryAfterHeader = response.headers.get("retry-after");
+	if (retryAfterHeader !== null) {
+		const retryAfter = Number(retryAfterHeader);
+		if (Number.isFinite(retryAfter) && retryAfter >= 0) return Math.min(retryAfter * 1000, GITHUB_RETRY_TIMEOUT_MS);
+	}
+	if (response.headers.get("x-ratelimit-remaining") !== "0") return undefined;
+	const resetHeader = response.headers.get("x-ratelimit-reset");
+	if (resetHeader === null) return undefined;
+	const resetSeconds = Number(resetHeader);
+	if (!Number.isFinite(resetSeconds)) return undefined;
+	const delayMs = Math.max(0, resetSeconds * 1000 - Date.now());
+	return delayMs <= GITHUB_RETRY_TIMEOUT_MS ? delayMs : undefined;
+}
+
+function waitForRetry(delayMs, signal) {
+	if (delayMs <= 0) return Promise.resolve();
+	if (signal?.aborted) return Promise.reject(new Error("source request aborted"));
+	return new Promise((resolve, reject) => {
+		const timer = setTimeout(done, delayMs);
+		function done() {
+			signal?.removeEventListener("abort", aborted);
+			resolve();
+		}
+		function aborted() {
+			clearTimeout(timer);
+			signal?.removeEventListener("abort", aborted);
+			reject(new Error("source request aborted"));
+		}
+		signal?.addEventListener("abort", aborted, { once: true });
+	});
+}
+
+async function fetchJsonAttempt(urlInput, source, options, timeoutMs) {
 	const fetchImpl = options.fetchImpl ?? globalThis.fetch;
 	if (typeof fetchImpl !== "function") throw new Error("Host fetch is unavailable");
 	const resolveHost = options.resolveHost ?? defaultResolveHost;
-	const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 	const maxBytes = options.maxResponseBytes ?? DEFAULT_MAX_RESPONSE_BYTES;
 	const maxRedirects = options.maxRedirects ?? DEFAULT_MAX_REDIRECTS;
 	const authToken = text(options.authToken);
@@ -499,9 +561,9 @@ export async function fetchJson(urlInput, source, options = {}) {
 				try {
 					response = await fetchImpl(url, { method: "GET", headers, redirect: "manual", signal: controller.signal, dispatcher });
 				} catch (error) {
-					if (timedOut) throw new Error("source request timed out");
+					if (timedOut) throw retryableSourceError("source request timed out");
 					if (options.signal?.aborted) throw new Error("source request aborted");
-					throw new Error(`source request failed: ${String(error?.message ?? error)}`);
+					throw retryableSourceError(`source request failed: ${String(error?.message ?? error)}`);
 				}
 				if ([301, 302, 303, 307, 308].includes(response.status)) {
 					const location = response.headers.get("location");
@@ -514,14 +576,18 @@ export async function fetchJson(urlInput, source, options = {}) {
 					continue;
 				}
 				if (!response.ok) {
+					const rateLimitRetryMs = source?.type === "github" ? githubRateLimitRetryMs(response) : undefined;
 					await response.body?.cancel?.();
-					throw new Error(`source returned HTTP ${response.status}`);
+					const message = `source returned HTTP ${response.status}`;
+					if (RETRYABLE_HTTP_STATUSES.has(response.status)) throw retryableSourceError(message, { status: response.status });
+					if (rateLimitRetryMs !== undefined) throw retryableSourceError(message, { status: response.status, retryAfterMs: rateLimitRetryMs });
+					throw new Error(message);
 				}
 				let bytes;
 				try {
 					bytes = await readResponseBytes(response, maxBytes);
 				} catch (error) {
-					if (timedOut) throw new Error("source request timed out");
+					if (timedOut) throw retryableSourceError("source request timed out");
 					if (options.signal?.aborted) throw new Error("source request aborted");
 					throw error;
 				}
@@ -536,7 +602,7 @@ export async function fetchJson(urlInput, source, options = {}) {
 		}
 		throw new Error("source redirected too many times");
 	} catch (error) {
-		if (timedOut) throw new Error("source request timed out");
+		if (timedOut) throw retryableSourceError("source request timed out");
 		if (options.signal?.aborted) throw new Error("source request aborted");
 		throw error;
 	} finally {
@@ -545,6 +611,29 @@ export async function fetchJson(urlInput, source, options = {}) {
 	}
 }
 
+export async function fetchJson(urlInput, source, options = {}) {
+	const configuredAttempts = Number.isInteger(options.githubRetryAttempts) ? options.githubRetryAttempts : GITHUB_MAX_ATTEMPTS;
+	const maxAttempts = source?.type === "github" ? Math.min(Math.max(1, configuredAttempts), GITHUB_MAX_ATTEMPTS) : 1;
+	const firstTimeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+	const retryTimeoutMs = Math.min(firstTimeoutMs, options.githubRetryTimeoutMs ?? GITHUB_RETRY_TIMEOUT_MS);
+	const baseDelayMs = Number.isFinite(options.githubRetryDelayMs) ? Math.max(0, options.githubRetryDelayMs) : GITHUB_RETRY_BASE_DELAY_MS;
+	let lastError;
+
+	for (let attempt = 0; attempt < maxAttempts; attempt++) {
+		if (options.signal?.aborted) throw new Error("source request aborted");
+		try {
+			const timeoutMs = attempt === 0 ? firstTimeoutMs : retryTimeoutMs;
+			return await fetchJsonAttempt(urlInput, source, options, timeoutMs);
+		} catch (error) {
+			lastError = error;
+			if (options.signal?.aborted || error?.retryable !== true || attempt + 1 >= maxAttempts) throw error;
+			const retryDelayMs = Math.max(baseDelayMs * (2 ** attempt), Number(error?.retryAfterMs) || 0);
+			await waitForRetry(Math.min(retryDelayMs, GITHUB_RETRY_TIMEOUT_MS), options.signal);
+		}
+	}
+	throw lastError;
+}
+
 function catalogRows(manifest) {
 	if (Array.isArray(manifest)) return manifest;
 	if (manifest && typeof manifest === "object") {
@@ -742,11 +831,22 @@ export function createAdapter(sourceInput, options = {}) {
 		async health() {
 			const started = Date.now();
 			try {
-				let plugins = await list();
-				if ((source.type === "npm" || source.type === "github") && shouldVerifyRegistryBundles(options)) {
-					plugins = await enrichInstallability(plugins, options);
-					plugins = plugins.filter((plugin) => plugin.evidence?.installability === "bundle");
+				if (source.type === "npm") {
+					const base = source.url && /\/-\/v1\/search\/?$/u.test(new URL(source.url).pathname)
+						? source.url
+						: new URL("-/v1/search", npmRegistryBase(source.url)).toString();
+					const url = new URL(base);
+					url.searchParams.set("text", `keywords:${NPM_DISCOVERY_KEYWORDS[0]}`);
+					url.searchParams.set("size", "1");
+					npmRows(await request(url), { requireDiscoveryKeyword: true });
+					return { ok: true, latencyMs: Date.now() - started };
+				}
+				if (source.type === "github") {
+					const value = await request(githubHealthUrl(source));
+					if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("GitHub health response is malformed");
+					return { ok: true, latencyMs: Date.now() - started };
 				}
+				const plugins = await list();
 				return { ok: true, latencyMs: Date.now() - started, count: plugins.length };
 			} catch (error) {
 				return { ok: false, latencyMs: Date.now() - started, error: String(error?.message ?? error) };
@@ -789,6 +889,24 @@ export async function healthSources(sourceInputs, options = {}) {
 	}));
 }
 
+export async function countSources(sourceInputs, options = {}) {
+	const sources = validatedSources(sourceInputs, options);
+	return mapConcurrent(sources, options.concurrency ?? 4, async (source) => {
+		const attribution = sourceAttribution(source);
+		if (!source.enabled) return { source: attribution, disabled: true };
+		try {
+			let plugins = await createAdapter(source, options).list();
+			if ((source.type === "npm" || source.type === "github") && shouldVerifyRegistryBundles(options)) {
+				plugins = await enrichInstallability(plugins, options);
+				plugins = plugins.filter((plugin) => plugin.evidence?.installability === "bundle");
+			}
+			return { source: attribution, count: plugins.length };
+		} catch (error) {
+			return { source: attribution, error: String(error?.message ?? error) };
+		}
+	});
+}
+
 async function enrichNpmDownloads(plugins, options = {}) {
 	const packages = [...new Set(plugins.map((plugin) => plugin.identity?.package).filter(Boolean))].slice(0, options.maxEvidencePackages ?? 100);
 	if (!packages.length || options.enrichDownloads === false) return plugins;
@@ -911,6 +1029,7 @@ export async function githubRepositoryStats(repositories, options = {}) {
 			const stats = {
 				...(finiteNumber(value?.stargazers_count) !== undefined ? { stars: finiteNumber(value.stargazers_count) } : {}),
 				...(isoDate(value?.pushed_at ?? value?.updated_at) ? { repositoryUpdatedAt: isoDate(value.pushed_at ?? value.updated_at) } : {}),
+				discoveryEligible: githubRepositoryMatchesDiscovery(value),
 			};
 			cacheValue(githubStatsCache, key, stats);
 			return { repository, ...stats };

package/lib/index.js

@@ -1,5 +1,5 @@
 import z from "@deepseek-ai/schemastery";
-import { browseSources, FILTER_TAGS, githubPluginDetails, githubRepositoryStats, healthSources, npmPluginDetails, SOURCE_TYPES } from "./core.js";
+import { browseSources, countSources, FILTER_TAGS, githubPluginDetails, githubRepositoryStats, healthSources, npmPluginDetails, SOURCE_TYPES } from "./core.js";
 
 export const NAMESPACE = "registry-aggregator";
 export const name = "registry-aggregator";
@@ -169,6 +169,14 @@ export function apply(ctx, config = {}) {
 					const value = { sources: await healthSources(sources, requestOptions), generatedAt: new Date().toISOString() };
 					return { ok: true, value: limitRpcValue(value, maxRpcBytes) };
 				}
+				if (endpoint === "counts") {
+					const sourceId = payload?.sourceId;
+					if (sourceId !== undefined && (typeof sourceId !== "string" || !sourceId.trim() || sourceId.length > 64)) throw new TypeError("sourceId must be a non-empty source id");
+					const selectedSources = sourceId === undefined ? sources : sources.filter((source) => source?.id === sourceId.trim());
+					if (sourceId !== undefined && selectedSources.length === 0) throw new RangeError("unknown sourceId");
+					const value = { sources: await countSources(selectedSources, requestOptions), generatedAt: new Date().toISOString() };
+					return { ok: true, value: limitRpcValue(value, maxRpcBytes) };
+				}
 				if (endpoint === "details") {
 					const request = detailsRequestFrom(payload);
 					const value = request.kind === "npm"
@@ -207,6 +215,7 @@ export function apply(ctx, config = {}) {
 		}
 		rpcCtx.connection.fetch.register(route("health"));
 		rpcCtx.connection.fetch.register(route("browse"));
+		rpcCtx.connection.fetch.register(route("counts"));
 		rpcCtx.connection.fetch.register(route("details"));
 		rpcCtx.connection.fetch.register(route("stars"));
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@stolyarovmn/dsh-ui-registry-aggregator",
 	"description": "Federated plugin registry aggregator for DeepSeek Harness: combine trusted sources, search one index, and install through the native Plugin Manager.",
-	"version": "0.4.14",
+	"version": "0.4.15",
 	"author": {
 		"name": "Stolyarovmn",
 		"url": "https://github.com/Stolyarovmn"