dsh-panel-control 0.8.3 → 0.9.1

package/docs/renaming-panels.md

@@ -0,0 +1,74 @@
+# 重命名与包名标签
+
+侧栏入口名由插件自己注册，通常是包名或英文短名。面板管理允许把这层显示改成你熟悉的叫法，同时在行尾留一枚插件包名标签，避免过几天忘了它是谁。
+
+## 只改显示层
+
+宿主拥有侧栏 DOM，插件注册的 `id`、`order`、`label` 都不该被另一个插件改写。重命名因此只覆盖三处显示：
+
+- 面板按钮的 `span.panelTitle` 文本；
+- 按钮的 `aria-label`（屏幕阅读器与工具提示读它）；
+- 行尾的 `span.dpc-nameTag`，内容是**插件包名**（见下一节），不是注册时的显示名。
+
+按钮上的 `data-dpc-label` 保存原名，供引擎下一轮把自己映射回同一条注册；入口 id 和宿主数据不变。
+
+## 包名从哪来
+
+`sidebar.panellist` 条目只有 `id/order/label/registrant`，没有包名字段；`registrant` 是 Cordis fiber 名，运行时大多数插件共享同一个 fiber，无法拿去区分插件。包名只存在于宿主自己的模块图里，所以：
+
+1. 客户端把当前面板 id 与桥接设置页 id 发给 Host 的 `packages` RPC；
+2. Host 用 `clientModules.graph().entries` 拿到模块 id（即包名）与 `clientModules.clientPath(id)` 返回的 bundle 路径；
+3. 逐个 bundle 查找槽字面量 `sidebar.panellist` / `settings.section`，并优先接受紧邻 `id:` / `key:`（或赋值）的该 id；没有注册字段时只接受距离 400 字符以内的提及，避免把注释里顺带提到的通用词当成归属；
+4. 命中的模块 id 就是包名，按模块图 revision 缓存。
+
+标签文本会去掉 scope 与 `dsh-` 前缀，再退掉 `client-ui-`：
+
+| 模块 id | 标签 |
+| --- | --- |
+| `dsh-panel-control` | `panel-control` |
+| `@furongjun1999/dsh-memory` | `memory` |
+| `dshmarket` | `market` |
+| `@deepseek-ai/dsh-client-ui-plugin-manager` | `plugin-manager` |
+
+Host 尚未返回或确实找不到时，回退到入口 id 本身（同样去 `dsh-` 前缀），所以标签绝不会空白。
+
+## 映射回原条目
+
+每一轮扫描都会先读 `data-dpc-label`，没有才退回 `aria-label`：
+
+1. 按原名唯一匹配注册项；
+2. 名称重复时，如果待匹配的注册项与未匹配的按钮数量相同、且顺序上名称逐项一致，按位置匹配；
+3. 仍无法判断的按钮不接管，避免把顺序写到错误的面板上。
+
+因此改名后的行在宿主重渲染、分组重排或侧栏重挂载后仍能找回自己的注册项。图标条模式没有标题文本，只更新 `aria-label`，不显示标签。
+
+## 配置
+
+`prefs.json` 里新增两个字段：
+
+```jsonc
+{
+  "names": { "billion-context": "上下文百科" },
+  "tags": true
+}
+```
+
+- `names`：入口 id → 显示名。保存时去控制字符、压空白、`trim`，最多 40 字符；最多保留 200 条。
+- `tags`：是否显示包名标签，默认 `true`。关掉只影响标签，不影响已保存的名称。
+
+设置页「侧栏布局」卡片里有「包名标签」开关；每行的铅笔按钮打开行内输入：
+
+- `Enter` 或失焦保存；
+- `Esc` 取消；
+- 清空并保存即删除自定义名称，恢复注册名。
+
+## 边界
+
+- 只覆盖显示，不改变插件加载、入口 id 或插件自己的配置；停用本插件后宿主标题原样恢复。
+- 包名识别依赖 Host 的模块图接口与 bundle 内容。接口不存在、模块读不到或代码里没有可识别的注册字面量时，标签退化为入口 id；不会影响改名本身。
+- 宿主大改版若移除 `span.panelTitle` 或改写按钮结构，重命名会退化为只改 `aria-label`；找不到对应行时该行保持原样，不会报错。
+- 标签 `pointer-events: none`，不参与点击与拖拽；分组下拉菜单铺了不透明底色，避免透出下面的行。
+
+## 验证
+
+`scripts/names-smoke.mjs` 用迷你 DOM 驱动真实引擎，覆盖改名、关标签、清空恢复、窄侧栏、重复名称映射、包名标签、未知包回退与 `dispose` 还原；`npm run check` 会运行它。

package/index.js

@@ -486,6 +486,7 @@ async function handle(scope, request) {
     if (method === 'load') return reply(rpcId, await loadPreferences());
     if (method === 'save') return reply(rpcId, await savePreferences(call.payload));
     if (method === 'inventory') return reply(rpcId, inventorySnapshot(scope));
+    if (method === 'packages') return reply(rpcId, await packageMap(scope, call.payload));
     if (method === 'report') {
       const detail = isRecord(call.payload) ? call.payload : {};
       const text = JSON.stringify(detail).slice(0, 4_000);
@@ -536,6 +537,126 @@ function inventorySnapshot(scope) {
   };
 }
 
+/**
+ * Which package serves each panel / settings section.
+ *
+ * A slot entry carries no package field: `registrant` is the fiber that ran the
+ * registration, and the client runner applies most plugins inside one shared
+ * fiber. The package name exists only in the Host's module graph, so this maps
+ * an entry id to its module id by reading each module's served bundle and
+ * looking for the registration site: the slot literal plus the id as a quoted
+ * string. Constant-style registrations keep the two strings close together;
+ * an id is only accepted from a module that contains both.
+ */
+const PACKAGE_SCAN_LIMIT = 8 * 1024 * 1024;
+const PACKAGE_CACHE_KEPT = 4;
+const packageCache = new Map();
+
+/**
+ * How strongly one bundle looks like the registration of `id` in `slot`.
+ *
+ * `strong` means the quoted id sits immediately after an `id:` / `key:` field
+ * (or an `id =` / `key =` assignment), which is the shape of a slot
+ * registration. Everything else is only a distance guess and must be close;
+ * a long comment can mention both words without registering anything.
+ */
+function slotMatch(text, slot, id) {
+  const slots = [];
+  let at = text.indexOf(slot);
+  while (at !== -1) {
+    slots.push(at);
+    at = text.indexOf(slot, at + slot.length);
+  }
+  if (slots.length === 0) return null;
+  let strong = Infinity;
+  let weak = Infinity;
+  for (const needle of [`'${id}'`, `"${id}"`, '`' + id + '`']) {
+    let pos = text.indexOf(needle);
+    while (pos !== -1) {
+      let distance = Infinity;
+      for (const slotAt of slots) distance = Math.min(distance, Math.abs(pos - slotAt));
+      const before = text.slice(Math.max(0, pos - 48), pos);
+      if (/(?:^|[\s,{;])(?:id|key)\s*[:=]\s*$/.test(before)) strong = Math.min(strong, distance);
+      else weak = Math.min(weak, distance);
+      pos = text.indexOf(needle, pos + needle.length);
+    }
+  }
+  if (Number.isFinite(strong)) return { strong: true, distance: strong };
+  if (weak <= 400) return { strong: false, distance: weak };
+  return null;
+}
+
+async function readModuleText(modules, id, texts) {
+  if (texts.has(id)) return texts.get(id);
+  let text = null;
+  try {
+    const file = modules.clientPath(id);
+    if (file) {
+      const stat = await fs.stat(file);
+      if (stat.isFile() && stat.size <= PACKAGE_SCAN_LIMIT) text = await fs.readFile(file, 'utf8');
+    }
+  } catch {
+    text = null;
+  }
+  texts.set(id, text);
+  return text;
+}
+
+async function packageMap(scope, payload) {
+  const modules = clientModules || serviceOf(scope, 'clientModules');
+  if (!modules || typeof modules.graph !== 'function' || typeof modules.clientPath !== 'function') {
+    return refusal('packages-unavailable', 'The Host module graph does not expose client paths.');
+  }
+  const graph = modules.graph();
+  if (!graph || !Array.isArray(graph.entries)) {
+    return refusal('packages-unavailable', 'The Host module graph is not readable.');
+  }
+  const requested = [];
+  const seen = new Set();
+  for (const raw of Array.isArray(payload && payload.ids) ? payload.ids : []) {
+    if (!isRecord(raw)) continue;
+    const id = typeof raw.id === 'string' ? raw.id.trim() : '';
+    const slot = raw.slot === 'settings.section' ? 'settings.section' : 'sidebar.panellist';
+    if (!id || id.length > 120 || seen.has(slot + ':' + id)) continue;
+    seen.add(slot + ':' + id);
+    requested.push({ id, slot });
+  }
+  if (requested.length === 0) return { ok: true, value: { packages: {}, rev: graph.rev || null } };
+  // Stable order makes two calls for the same set share the cache entry.
+  requested.sort((left, right) => (left.slot + ':' + left.id).localeCompare(right.slot + ':' + right.id));
+  const key = String(graph.rev || '') + '|' + requested.map((row) => row.slot + ':' + row.id).join(',');
+  if (packageCache.has(key)) return { ok: true, value: packageCache.get(key) };
+
+  const packages = {};
+  const best = new Map();
+  const texts = new Map();
+  for (const entry of graph.entries) {
+    const moduleId = entry && typeof entry.id === 'string' ? entry.id : '';
+    if (!moduleId) continue;
+    const text = await readModuleText(modules, moduleId, texts);
+    if (!text) continue;
+    for (const want of requested) {
+      if (!text.includes(want.slot)) continue;
+      // A bundle may mention a generic id (the plugin manager's id is also a
+      // dictionary word). A real registration field wins over a mere mention,
+      // and within the same tier the closest match wins over graph order.
+      const match = slotMatch(text, want.slot, want.id);
+      if (!match) continue;
+      const previous = best.get(want.id);
+      if (previous) {
+        if (previous.strong && !match.strong) continue;
+        if (previous.strong === match.strong && previous.distance <= match.distance) continue;
+      }
+      best.set(want.id, { moduleId, strong: match.strong, distance: match.distance });
+    }
+  }
+  for (const [id, match] of best) packages[id] = match.moduleId;
+  const value = { packages, rev: typeof graph.rev === 'string' ? graph.rev : null };
+  packageCache.set(key, value);
+  while (packageCache.size > PACKAGE_CACHE_KEPT) packageCache.delete(packageCache.keys().next().value);
+  return { ok: true, value };
+}
+
 /**
  * Write one line per apply that answers the only question a cold start leaves
  * open: did this package even reach the Host's plugin graph?
@@ -649,8 +770,8 @@ function logBatchPlacement(scope) {
  * gets the bytes it needs; everything else passes straight through, and the
  * patch is undone on teardown.
  */
-// Off by default: rewriting the shared bundle service is a whole-page change that
-// other plugins pay for. It stays available as an explicit escape hatch only.
+// Off by default: rewriting the shared bundle service is a whole-page change that
+// other plugins pay for. It stays available as an explicit escape hatch only.
 const SERVE_CURRENT = String(process.env.DPC_SERVE_CURRENT || '').toLowerCase() === 'on';
 let servePatched = null;
 let serveLoggedAt = 0;

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "dsh-panel-control",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "type": "module",
+  "engines": {
+    "dsh": ">=0.2.1-rc.3"
+  },
   "description": "Manage the global panel navigation at the top of the DSH sidebar: reorder, hide and group every entry, with the layout persisted per installation.",
   "keywords": [
     "dsh",
@@ -50,7 +53,7 @@
     "url": "https://github.com/QIUZAIYOU/dsh-panel-control/issues"
   },
   "scripts": {
-    "check": "node --check index.js && node --check client.js && node scripts/host-smoke.mjs && node scripts/layout-smoke.mjs && node scripts/bridge-smoke.mjs",
+    "check": "node --check index.js && node --check client.js && node scripts/host-smoke.mjs && node scripts/layout-smoke.mjs && node scripts/bridge-smoke.mjs && node scripts/names-smoke.mjs",
     "smoke": "node scripts/host-smoke.mjs",
     "doctor": "node scripts/profile-doctor.mjs",
     "enable": "node scripts/enable-local.mjs"

package/scripts/host-smoke.mjs

@@ -56,8 +56,24 @@ function check(name, ok, detail) {
 
 // The registry currently holds revision "rev-now" for this package; the page
 // below asks for "rev-old", which is the 404 that silently drops a plugin.
+const PKG_DIR = path.join(STATE, 'pkg-scan');
+await fs.mkdir(PKG_DIR, { recursive: true });
+const pkgFile = (name, body) => {
+  const file = path.join(PKG_DIR, name);
+  return fs.writeFile(file, body).then(() => file);
+};
+const pkgPaths = {
+  'dsh-panel-control': await pkgFile(
+    'panel.js',
+    "const SLOT = 'sidebar.panellist';\nconst KEY = 'panel-control';\nregister({ name: SLOT, id: KEY });\n",
+  ),
+  dshmarket: await pkgFile('market.js', "register({ name: 'sidebar.panellist', id: 'dsh-market' });\n"),
+  'billion-context': await pkgFile('bili.js', "register({ name: 'settings.section', id: 'bili' });\n"),
+};
+
 const clientModulesStub = {
   served: [],
+  clientPath: (id) => pkgPaths[id] || null,
   graph: () => ({
     rev: 'rev-test',
     release: 'rel',
@@ -65,6 +81,8 @@ const clientModulesStub = {
       { id: 'a' },
       { id: 'b' },
       { id: 'dsh-panel-control', rev: 'rev-now', url: 'plugins/??dsh-panel-control/client.js&rev=rev-now' },
+      { id: 'dshmarket', rev: 'rev-now', url: 'plugins/??dshmarket/client.js&rev=rev-now' },
+      { id: 'billion-context', rev: 'rev-now', url: 'plugins/??billion-context/client.js&rev=rev-now' },
       // The plugin that sits next to this one in the real profile: it carries no
       // fallback of its own, so a retired revision used to drop it silently
       // while the manager still reported it running.
@@ -185,11 +203,11 @@ if (route) {
     text: async () => JSON.stringify(payload),
     json: async () => payload,
   });
-  const envelope = (method) => ({
+  const envelope = (method, payload = {}) => ({
     type: 'client-request',
     rpcId: 'r1',
     method: 'dsh-panel-control/classify',
-    payload: { method, payload: {} },
+    payload: { method, payload },
   });
   try {
     const response = await route.fetch(request(envelope('inventory')));
@@ -247,9 +265,27 @@ if (route) {
     check(
       'inventory ids',
       Array.isArray(body.result.value.ids) &&
-        body.result.value.ids.join() === 'a,b,dsh-panel-control,dsh-workspace-control',
+        body.result.value.ids.join() === 'a,b,dsh-panel-control,dshmarket,billion-context,dsh-workspace-control',
       body.result.value && body.result.value.ids.join(),
     );
+    const pkgResponse = await route.fetch(
+      request(
+        envelope('packages', {
+          ids: [
+            { id: 'panel-control', slot: 'sidebar.panellist' },
+            { id: 'dsh-market', slot: 'sidebar.panellist' },
+            { id: 'bili', slot: 'settings.section' },
+            { id: 'nobody', slot: 'sidebar.panellist' },
+          ],
+        }),
+      ),
+    );
+    const pkgBody = await pkgResponse.json();
+    const packages = (pkgBody.result && pkgBody.result.value && pkgBody.result.value.packages) || {};
+    check('packages maps panel id', packages['panel-control'] === 'dsh-panel-control', JSON.stringify(packages));
+    check('packages maps market id', packages['dsh-market'] === 'dshmarket', JSON.stringify(packages));
+    check('packages maps settings id', packages.bili === 'billion-context', JSON.stringify(packages));
+    check('packages leaves unknown ids unmapped', !packages.nobody, JSON.stringify(packages));
   } catch (error) {
     check('inventory answers', false, error.message);
   }

package/scripts/layout-smoke.mjs

@@ -30,6 +30,10 @@ for (const marker of [
   'layoutBridge',
   'dpc-bridgeBar',
   'registrantOf',
+  'dpc-nameTag',
+  'data-dpc-label',
+  'applyNames',
+  'layoutTags',
 ]) {
   expect(client.includes(marker), 'client.js lost ' + marker);
 }
@@ -46,6 +50,13 @@ expect(
 );
 expect(/\.dpc-bridgeBar\{[^}]*min-height:40px/.test(client), 'the bridge bar lost its 40px row height');
 
+// A renamed row keeps its host label addressable while the visible title changes;
+// the original-name tag is opt-out, and the group menu must not sit on transparency.
+expect(client.includes('out.tags = raw.tags !== false'), 'the original-name tag switch is not persisted');
+expect(/\.dpc-nameTag\{[^}]*pointer-events:none/.test(client), 'the original-name tag can intercept clicks');
+expect(/\.dpc-menu\{[^}]*background-color:var\(--dsw-alias-bg-layer-2/.test(client), 'the group menu lost its opaque base');
+expect(pkg.scripts && String(pkg.scripts.check).includes('names-smoke'), 'npm run check no longer runs the names gate');
+
 expect(client.includes("const BUILD_STAMP = 'dsh-panel-control/" + pkg.version + "'"), 'BUILD_STAMP and package.json version disagree');
 expect(pkg.scripts && String(pkg.scripts.check).includes('layout-smoke'), 'npm run check no longer runs this gate');
 expect(pkg.scripts && String(pkg.scripts.check).includes('bridge-smoke'), 'npm run check no longer runs the bridge gate');