dsh-lighthouse 0.3.3 → 0.3.4

package/bin/dsh-lighthouse.mjs

@@ -110,7 +110,9 @@ async function main() {
       const bits = [];
       bits.push(local.available === true ? `本地 ${local.version ?? '?'}` : '本地 读不到');
       bits.push(github.exists === true ? `star ${github.stars}` : 'GitHub 无/读不到');
-      bits.push(market.listed === true ? `市场已收录（${market.downloads} 下载）` : (market.available === true ? '市场未收录' : '市场读不到'));
+      bits.push(market.listed !== true
+        ? (market.available === true ? '市场未收录' : '市场读不到')
+        : (market.downloads === null || market.downloads === undefined ? '市场已收录（下载数暂无）' : `市场已收录（${market.downloads} 下载）`));
       if (github.pr) bits.push(`PR #${github.pr.number} ${github.pr.mergedAt ? '已合并' : github.pr.state}`);
       console.log(`  · ${work.name}：${bits.join('｜')}`);
     }

package/client.js

@@ -160,7 +160,7 @@ window.__ModuleLoader__.load({ id: "dsh-lighthouse", factory: (require) => {
       released ? "✅ 已发布" : (gh.exists === false ? "❌ 仓库不存在" : "❌ 读不到仓库")))
     stateLine.push(h("span", { key: "mk", className: "lh-state" },
       listed
-        ? "✅ 市场已收录" + (market.downloads !== undefined ? "（下载 " + market.downloads + "）" : "")
+        ? "✅ 市场已收录" + (market.downloads === null || market.downloads === undefined ? "（下载数暂无）" : "（下载 " + market.downloads + "）")
         : (market.available === true ? "⏳ 收录中" : "❌ 市场读不到")))
     if (pr) {
       const waited = (Date.now() - Date.parse(pr.createdAt)) / 3600000

package/lib/collect.js

@@ -245,10 +245,14 @@ export function marketFactOf(registry, name) {
   const hit = list.find((item) => item?.name === name);
   if (!hit) return { available: true, listed: false, registryUpdated: registry.updated ?? null, registryCount: registry.count ?? list.length };
   const categories = Array.isArray(hit.category) ? hit.category : [];
-  const downloads = Number(hit.downloads ?? 0);
+  // 市场的 downloads 只统计发到 npm 的包；没发 npm 的条目字段是缺的（不是 0）。
+  // 把"没有数据"当成 0 会把它排到真有包但没人用的后面，也会显示成"下载 0"。
+  const toCount = (v) => (v === null || v === undefined || v === '' || Number.isNaN(Number(v)) ? null : Number(v));
+  const downloads = toCount(hit.downloads);
   const sameCat = list
     .filter((item) => Array.isArray(item?.category) && categories.some((c) => item.category.includes(c)))
-    .map((item) => Number(item.downloads ?? 0))
+    .map((item) => toCount(item.downloads))
+    .filter((v) => v !== null)
     .sort((a, b) => b - a);
   return {
     available: true,
@@ -265,7 +269,7 @@ export function marketFactOf(registry, name) {
     /** 市场条目页（可以点进去看的那个）—— 没收录时没有。 */
     page: typeof hit.page === 'string' && hit.page !== '' ? hit.page : null,
     descriptionZh: typeof hit.description?.zh === 'string' ? hit.description.zh : null,
-    rankInCategory: sameCat.indexOf(downloads) + 1,
+    rankInCategory: downloads === null ? null : sameCat.indexOf(downloads) + 1,
     categorySize: sameCat.length,
   };
 }
@@ -435,13 +439,15 @@ export async function collectAll(fleet, deps = {}) {
     const [local, github, npm] = await Promise.all([
       collectLocal(work),
       collectGitHub(work, { owner: fleet.owner, token, fetchImpl, prIndex }),
-      includeNpm ? collectNpm(work.name, { fetchImpl }) : Promise.resolve({ available: false, reason: '已跳过' }),
+      // npm 包名可以和目录/GitHub 仓库名不同（例：仓库 dsh-tool-gate，npm 包 dsh-ctx-gate）。
+      // 名册里给了 work.npm 就用它，否则退回 work.name。
+      includeNpm ? collectNpm(work.npm ?? work.name, { fetchImpl }) : Promise.resolve({ available: false, reason: '已跳过' }),
     ]);
     const market = marketFactOf(registry, work.name);
     // 直达链接：名册显式给的优先；否则 GitHub 仓库；npm 与市场页面能确定才给（不确定就不编）。
     const links = {
       github: work.url ?? `https://github.com/${fleet.owner}/${work.repo}`,
-      npm: `https://www.npmjs.com/package/${work.name}`,
+      npm: `https://www.npmjs.com/package/${work.npm ?? work.name}`,
       market: market.listed === true ? market.page : null,
     };
     return { work, local, github, market, npm, links };
@@ -469,7 +475,7 @@ export async function collectAll(fleet, deps = {}) {
       works: works.length,
       published: works.filter((w) => w.github.exists === true).length,
       listed: works.filter((w) => w.market?.listed === true).length,
-      totalDownloads: works.reduce((sum, w) => sum + (w.market?.listed === true ? Number(w.market.downloads ?? 0) : 0), 0),
+      totalDownloads: works.reduce((sum, w) => sum + (w.market?.listed === true && w.market.downloads !== null && w.market.downloads !== undefined ? Number(w.market.downloads) : 0), 0),
       totalStars: works.reduce((sum, w) => sum + Number(w.github.stars ?? 0), 0),
       openPrs: waiting.length,
       longestWaitHours: waiting.length > 0 ? Math.max(...waiting) : null,

package/lib/fleet.js

@@ -86,6 +86,8 @@ export function validateFleet(data) {
         nameZh: typeof work.nameZh === 'string' && work.nameZh.trim() !== '' ? work.nameZh.trim() : null,
         /** 直达链接（不填就按 owner/repo 生成 GitHub 地址）。 */
         url: typeof work.url === 'string' && work.url.trim() !== '' ? work.url.trim() : null,
+        /** npm 包名（仓库名与包名不一定一样，例：仓库 dsh-tool-gate → 包 dsh-ctx-gate）。不填就用 name 查。 */
+        npm: typeof work.npm === 'string' && work.npm.trim() !== '' ? work.npm.trim() : null,
         /** 额外的发布源（例如 Gitee / GitLab / npm），形如 { platform, url }。 */
         mirrors: Array.isArray(work.mirrors)
           ? work.mirrors

package/lib/index.js

@@ -359,7 +359,7 @@ export function apply(ctx, config) {
     /* 没有 web server 的表面（例如纯 CLI）：观察区缺席，其它能力不受影响 */
   }
 
-  if (cfg.announceToAgent !== false && ctx.systemPrompt !== undefined
+  if (cfg.announceToAgent === true && ctx.systemPrompt !== undefined
     && typeof ctx.systemPrompt.section === 'function') {
     disposers.push(ctx.systemPrompt.section({
       name: 'plugin:lighthouse',

package/lib/render.js

@@ -124,7 +124,10 @@ export function renderText(report) {
     bits.push(local.available === true ? `本地 ${local.version ?? '?'} / ${local.files ?? '?'} 文件${local.hasSmoke ? ' / 有自测' : ''}` : `本地 **读不到**（${local.reason ?? '?'}）`);
     bits.push(github.exists === true ? `GitHub star ${github.stars} / 最后推送 ${shortTime(github.pushedAt)}` : (github.exists === false ? 'GitHub **没有仓库**' : `GitHub **读不到**（${github.reason ?? '?'}）`));
     if (market.listed === true) {
-      bits.push(`市场 **已收录**（下载 ${market.downloads}${market.rankInCategory ? `，同类第 ${market.rankInCategory}/${market.categorySize}` : ''}）`);
+      // 没下载数 ≠ 没发 npm：下载字段市场侧可能不统计。npm 发没发看下面那行 npm 事实，不在这里推。
+      bits.push(market.downloads === null || market.downloads === undefined
+        ? '市场 **已收录**（没有下载数据）'
+        : `市场 **已收录**（下载 ${market.downloads}${market.rankInCategory ? `，同类第 ${market.rankInCategory}/${market.categorySize}` : ''}）`);
     } else if (market.available === true) {
       bits.push('市场 **未收录**');
     } else {
@@ -147,7 +150,10 @@ export function renderText(report) {
 
     if (compact) {
       // 一行一个：名字（中文） · 版本 · star · 市场/PR 状态（详情与链接看卡片）
-      const marketText = market.listed === true ? `已收录 ${market.downloads}↓` : (market.available === true ? '未收录' : '市场读不到');
+      const dl = market.downloads === null || market.downloads === undefined ? '下载数暂无' : `${market.downloads}↓`;
+      const marketText = market.listed !== true
+        ? (market.available === true ? '未收录' : '市场读不到')
+        : (npm?.published === true ? `已收录 · ${dl}` : (npm?.available === true ? `已收录 · ${dl} · npm 未发` : `已收录 · ${dl}`));
       const prShort = github.pr
         ? (github.pr.mergedAt ? `#${github.pr.number} 已合并` : (github.pr.state === 'open' ? `#${github.pr.number} 等 ${hoursText((Date.now() - Date.parse(github.pr.createdAt)) / 3600000)}` : `#${github.pr.number} ${github.pr.state}`))
         : '无 PR';
@@ -183,7 +189,7 @@ function dot(kind) {
  */
 function renderGrid(ordered) {
   const rows = ordered.map((item) => {
-    const { work, local, github, market } = item;
+    const { work, local, github, market, npm } = item;
     const key = urgencyOf(item);
     const pr = github?.pr;
     const prText = pr
@@ -193,9 +199,12 @@ function renderGrid(ordered) {
           ? `${dot('warn')} #${pr.number} 等 ${hoursText((Date.now() - Date.parse(pr.createdAt)) / 3600000)}`
           : `#${pr.number} ${esc(pr.state)}`))
       : '<span class="bad">没有 PR</span>';
-    const marketText = market.listed === true
-      ? `${dot('good')} 已收录 · ${market.downloads}↓`
-      : (market.available === true ? `${dot('warn')} 未收录` : '<span class="bad">读不到</span>');
+    const dlGrid = market.downloads === null || market.downloads === undefined ? '下载数暂无' : `${market.downloads}↓`;
+    const marketText = market.listed !== true
+      ? (market.available === true ? `${dot('warn')} 未收录` : '<span class="bad">读不到</span>')
+      : (npm?.available === true && npm.published !== true
+        ? `${dot('warn')} 已收录 · ${dlGrid} · npm 未发`
+        : `${dot('good')} 已收录 · ${dlGrid}`);
     const ghText = github.exists === true
       ? `${dot('idle')} star ${github.stars}`
       : (github.exists === false ? '<span class="bad">仓库不存在</span>' : '<span class="bad">读不到</span>');
@@ -253,7 +262,9 @@ export function renderHtml(report) {
 
     rows.push(`<div class="row"><span class="k">市场</span><span class="v">${
       listed
-        ? `${dot('good')} 已收录 · 下载 <b>${market.downloads}</b>${market.rankInCategory ? ` · 同类 ${market.rankInCategory}/${market.categorySize}` : ''}`
+        ? (market.downloads === null || market.downloads === undefined
+          ? `${dot('warn')} 已收录 · 下载数暂无`
+          : `${dot('good')} 已收录 · 下载 <b>${market.downloads}</b>${market.rankInCategory ? ` · 同类 ${market.rankInCategory}/${market.categorySize}` : ''}`)
         : (market.available === true ? `${dot('warn')} 还没收录` : `<span class="bad">读不到（${esc(market.reason ?? '')}）</span>`)
     }</span></div>`);
 
@@ -272,6 +283,10 @@ export function renderHtml(report) {
 
     if (npm?.published === true) {
       rows.push(`<div class="row"><span class="k">npm</span><span class="v">${dot('good')} 有包 ${esc(npm.version ?? '')}</span></div>`);
+    } else if (npm?.available === true) {
+      rows.push(`<div class="row"><span class="k">npm</span><span class="v">${dot('warn')} registry 上没有这个包</span></div>`);
+    } else if (npm?.reason) {
+      rows.push(`<div class="row"><span class="k">npm</span><span class="v">${dot('idle')} 没查到（${esc(npm.reason)}）</span></div>`);
     }
 
     const head = listed ? 'listed' : (github.exists === true ? 'shipped' : 'local');

package/package.json

@@ -1,93 +1,93 @@
-{
-  "name": "dsh-lighthouse",
-  "version": "0.3.3",
-  "description": "一屏看清每个作品现在什么样：本地版本、GitHub star、市场收没收、下载量和同类排名，还能落一张可截图的卡片。 One screen for every work you have shipped: local version, GitHub stars, market listing, downloads and category rank, plus a ready-to-screenshot card.",
-  "type": "module",
-  "main": "lib/index.js",
-  "bin": {
-    "dsh-lighthouse": "bin/dsh-lighthouse.mjs"
-  },
-  "exports": {
-    ".": "./lib/index.js",
-    "./fleet": "./lib/fleet.js",
-    "./collect": "./lib/collect.js",
-    "./render": "./lib/render.js",
-    "./status-route": "./lib/status-route.js",
-    "./client": "./client.js",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "bin",
-    "client.js",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE"
-  ],
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "dashboard",
-    "release-tracker",
-    "market-registry",
-    "downloads",
-    "watchers",
-    "pull-request",
-    "observability",
-    "作品看板",
-    "观察区"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "test": "node test/smoke.mjs"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/7gzgn/dsh-lighthouse.git"
-  },
-  "homepage": "https://github.com/7gzgn/dsh-lighthouse#readme",
-  "bugs": {
-    "url": "https://github.com/7gzgn/dsh-lighthouse/issues"
-  },
-  "dsh": {
-    "compatibility": {
-      "dshReleases": {
-        "0.2.0-rc.2": "compatible",
-        "0.2.1-rc.2": "compatible"
-      }
-    },
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.4 <5.0.0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.0-rc.2 <0.3.0-0",
-    "@deepseek-ai/dsh-system-prompt": ">=0.2.0-rc.2 <0.3.0-0",
-    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2 <0.3.0-0"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/dsh-client-ui-slots": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-system-prompt": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-tools": {
-      "optional": true
-    }
-  }
-}
+{
+  "name": "dsh-lighthouse",
+  "version": "0.3.4",
+  "description": "一屏看清每个作品现在什么样：本地版本、GitHub star、市场收没收、下载量和同类排名，还能落一张可截图的卡片。 One screen for every work you have shipped: local version, GitHub stars, market listing, downloads and category rank, plus a ready-to-screenshot card.",
+  "type": "module",
+  "main": "lib/index.js",
+  "bin": {
+    "dsh-lighthouse": "bin/dsh-lighthouse.mjs"
+  },
+  "exports": {
+    ".": "./lib/index.js",
+    "./fleet": "./lib/fleet.js",
+    "./collect": "./lib/collect.js",
+    "./render": "./lib/render.js",
+    "./status-route": "./lib/status-route.js",
+    "./client": "./client.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "bin",
+    "client.js",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "dashboard",
+    "release-tracker",
+    "market-registry",
+    "downloads",
+    "watchers",
+    "pull-request",
+    "observability",
+    "作品看板",
+    "观察区"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "scripts": {
+    "test": "node test/smoke.mjs"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/7gzgn/dsh-lighthouse.git"
+  },
+  "homepage": "https://github.com/7gzgn/dsh-lighthouse#readme",
+  "bugs": {
+    "url": "https://github.com/7gzgn/dsh-lighthouse/issues"
+  },
+  "dsh": {
+    "compatibility": {
+      "dshReleases": {
+        "0.2.0-rc.2": "compatible",
+        "0.2.1-rc.2": "compatible"
+      }
+    },
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-slots"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": ">=4.0.4 <5.0.0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-system-prompt": ">=0.2.0-rc.2 <0.3.0-0",
+    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2 <0.3.0-0"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-client-ui-slots": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-system-prompt": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-tools": {
+      "optional": true
+    }
+  }
+}