dsh-model-doctor 0.4.0 → 0.4.1

package/lib/client/index.js

@@ -181,6 +181,10 @@ window.__ModuleLoader__.load({
     /** 模型名/ID -> 候选条目索引；15 秒内复用。 */
     let tokenIndex = null
     let tokenIndexAt = 0
+    /** 预编译的 token 正则（先粗筛文本节点，避免对每个节点做全量比对）。 */
+    let tokenRegex = null
+    /** [token, entries] 按 token 长度降序：优先匹配更具体的名字。 */
+    let tokenPairs = []
 
     function ensureTokenIndex() {
       if (tokenIndex !== null && Date.now() - tokenIndexAt < 15000) return tokenIndex
@@ -203,6 +207,10 @@ window.__ModuleLoader__.load({
       }
       tokenIndex = index
       tokenIndexAt = Date.now()
+      tokenPairs = Array.from(index.entries()).sort((a, b) => b[0].length - a[0].length)
+      tokenRegex = tokenPairs.length === 0
+        ? null
+        : new RegExp(tokenPairs.map(([token]) => token.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&')).join('|'), 'u')
       return index
     }
 
@@ -253,24 +261,25 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 在一个候选根容器里找出模型行：对每个文本节点做已知模型名命中，
-     * 向上取最近的可点击祖先；若某「行」文本里出现过两个以上不同模型，则它是容器，排除。
+     * 全文档找出「命中了已知模型名」的最小行容器。
+     * 不再依赖任何菜单根选择器：先用预编译正则粗筛文本节点，再逐一确认 token 命中，
+     * 然后向上取最近的可点击祖先。
      */
-    function genericRowsIn(root) {
+    function minimalMatches(root) {
       const index = ensureTokenIndex()
-      if (index.size === 0) return []
       const found = new Map()
+      if (index.size === 0 || tokenRegex === null) return found
       const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT)
       let node = walker.nextNode()
       while (node !== null) {
         const raw = node.nodeValue
-        if (raw !== null && raw.length > 0 && raw.length <= 200) {
+        if (raw !== null && raw.length > 1 && raw.length <= 200) {
           const text = normText(raw)
-          if (text.length >= 2) {
+          if (text.length >= 2 && tokenRegex.test(text)) {
             const anchor = node.parentElement
             if (anchor !== null) {
-              for (const [token, entries] of index) {
-                if (!text.includes(token)) continue
+              for (const [token, entries] of tokenPairs) {
+                if (token.length > text.length || !text.includes(token)) continue
                 const row = clickableRow(anchor, root)
                 if (row === null) continue
                 const current = found.get(row)
@@ -285,16 +294,69 @@ window.__ModuleLoader__.load({
       }
       // 排除「容器型行」：行文本里出现两个以上不同模型 → 它装的是列表，不是单行。
       for (const [row] of Array.from(found.entries())) {
-        const rowText = normText(row.textContent)
-        const distinct = new Set()
-        for (const [token, entries] of index) {
-          if (!rowText.includes(token)) continue
-          for (const entry of entries) distinct.add(`${entry.providerId}::${entry.modelId}`)
-          if (distinct.size > 1) break
+        if (countDistinctModels(row, index) > 1) found.delete(row)
+      }
+      return found
+    }
+
+    /** 一个元素里出现了几个不同模型（>1 说明它是容器）。 */
+    function countDistinctModels(el, index) {
+      const text = normText(el.textContent)
+      const distinct = new Set()
+      for (const [token, entries] of index) {
+        if (!text.includes(token)) continue
+        for (const entry of entries) distinct.add(`${entry.providerId}::${entry.modelId}`)
+        if (distinct.size > 1) return distinct.size
+      }
+      return distinct.size
+    }
+
+    /** 容器是否像弹层（绝对定位或带菜单语义），用于排除正文里碰巧出现的模型名。 */
+    function isPopoverish(el) {
+      let node = el
+      let depth = 0
+      while (node !== null && node !== document.body && depth < 4) {
+        const role = typeof node.getAttribute === 'function' ? node.getAttribute('role') : null
+        if (typeof role === 'string' && /^(menu|listbox|dialog|alertdialog)$/u.test(role)) return true
+        try {
+          const position = window.getComputedStyle(node).position
+          if (position === 'absolute' || position === 'fixed') return true
+        } catch { /* 忽略计算样式失败 */ }
+        node = node.parentElement
+        depth += 1
+      }
+      return false
+    }
+
+    /** 把命中的行按容器聚类：同一父节点下 ≥2 行才算一个菜单。 */
+    function clusterRows(found) {
+      const byParent = new Map()
+      for (const [row, hit] of found.entries()) {
+        const parent = row.parentElement ?? document.body
+        const list = byParent.get(parent) ?? []
+        list.push({ row, ...hit })
+        byParent.set(parent, list)
+      }
+      const clusters = []
+      const orphans = []
+      for (const [parent, list] of byParent.entries()) {
+        if (list.length >= 2) clusters.push({ host: parent, rows: list })
+        else orphans.push(...list)
+      }
+      // 行被分组标题/包装层隔开时，退一级按祖父容器聚合
+      if (orphans.length >= 2) {
+        const byGrand = new Map()
+        for (const hit of orphans) {
+          const grand = hit.row.parentElement?.parentElement ?? document.body
+          const list = byGrand.get(grand) ?? []
+          list.push(hit)
+          byGrand.set(grand, list)
+        }
+        for (const [grand, list] of byGrand.entries()) {
+          if (list.length >= 2) clusters.push({ host: grand, rows: list })
         }
-        if (distinct.size > 1) found.delete(row)
       }
-      return Array.from(found.entries()).map(([row, hit]) => ({ row, ...hit }))
+      return clusters.filter((cluster) => isPopoverish(cluster.host))
     }
 
     /** 根容器是否可见（不可见的弹层跳过，避免误伤收起的菜单）。 */
@@ -698,52 +760,70 @@ window.__ModuleLoader__.load({
 
     /**
      * 通用路径：任何菜单渲染器（官方原生 / dsh-effort-slider / 其他弹层）。
-     * 依据「已知模型名」定位行，向上取可点击祖先。
+     * 依据「已知模型名」在全文定位行，按容器聚类成菜单，再逐行增强。
      */
     function enhanceGeneric(legacyWired) {
-      const roots = Array.from(document.querySelectorAll(MENU_ROOT_SEL))
-        .filter((root) => isVisible(root))
-        .filter((root) => root.closest('.dmd-allbar') === null)
-        .filter((root) => !root.classList.contains('dmd-allbar'))
-      const samples = roots.slice(0, 6).map(describe)
+      const index = ensureTokenIndex()
+      const roots = Array.from(document.querySelectorAll(MENU_ROOT_SEL)).filter((root) => isVisible(root))
+      const hits = minimalMatches(document.body)
+      const clusters = clusterRows(hits)
       let wired = 0
-      const rootStats = []
-      for (const root of roots) {
-        const hits = genericRowsIn(root)
-        rootStats.push({ root: describe(root), rows: hits.length })
-        if (hits.length < MIN_GENERIC_ROWS) continue
-        let containerWired = 0
-        for (const hit of hits) {
+      let registered = 0
+      let unmatched = 0
+      const clusterStats = []
+      for (const cluster of clusters) {
+        let newlyWired = 0
+        for (const hit of cluster.rows) {
           const entry = pickEntry(hit.entries, hit.row)
-          if (entry === undefined) continue
+          if (entry === undefined) {
+            unmatched += 1
+            continue
+          }
+          const isNew = hit.row.querySelector('.dmd-actions') === null
           rowAnchor.set(hit.row, hit.anchor)
           enhanceRow(hit.row, entry.providerId, { id: entry.modelId, name: entry.modelName })
-          containerWired += 1
+          registered += 1
+          if (isNew) newlyWired += 1
         }
-        if (containerWired > 0) {
-          wired += containerWired
-          const barHost = hits[0].row.parentElement ?? root
+        clusterStats.push({
+          host: describe(cluster.host),
+          rows: cluster.rows.length,
+          wired: newlyWired,
+        })
+        if (cluster.rows.length >= MIN_GENERIC_ROWS) {
+          const first = cluster.rows[0]
           let hint = ''
           if (directory === null) {
             hint = directoryFailedAt !== 0
               ? `模型医生：目录获取失败 · ${directoryError || '与宿主半通信异常'}`
               : '模型医生：目录获取中…'
+          } else if (newlyWired === 0 && first.row.querySelector('.dmd-actions') === null) {
+            hint = '模型医生：模型行未匹配上目录'
           }
-          ensureAllBar(barHost, hint, hits[0].row)
+          const barHost = first.row.parentElement ?? cluster.host
+          ensureAllBar(barHost, hint, first.row)
         }
       }
       lastDiagnostics = {
         at: Date.now(),
         mode: legacyWired > 0 ? 'legacy+generic' : 'generic',
-        tokens: ensureTokenIndex().size,
+        href: window.location.href.slice(0, 120),
+        tokens: index.size,
         providerCount: directory?.providers?.length ?? 0,
         modelCount: (directory?.providers ?? []).reduce((sum, p) => sum + p.models.length, 0),
+        directoryError,
         legacyWired,
         genericWired: wired,
-        roots: rootStats.slice(0, 8),
-        samples,
+        registered,
+        unmatched,
+        hitCount: hits.size,
+        visibleRoots: roots.length,
+        roots: clusterStats.slice(0, 8),
+        samples: roots.slice(0, 5).map(describe),
+        barCount: document.querySelectorAll('.dmd-allbar').length,
+        actionCount: document.querySelectorAll('.dmd-actions').length,
       }
-      return wired
+      return registered > 0 ? Math.max(1, wired) : 0
     }
 
     function enhance() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-doctor",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "模型医生：在对话输入区的模型选择菜单里，为每个模型选项追加「连通检测」与「删除」按钮——不依赖任何菜单渲染插件（官方原生菜单即可），检测直连各网关探测连通性/欠费/额度，删除直接从 llm-pi-ai 配置移除模型（自动备份配置文档）。",
   "keywords": [
     "deepseek",