dsh-model-doctor 0.4.0 → 0.5.0

package/lib/client/index.js

@@ -38,6 +38,13 @@ window.__ModuleLoader__.load({
       '[role="dialog"]',
       '[data-state="open"][aria-modal]',
     ].join(',')
+    /** 官方菜单（@deepseek-ai/dsh-client-ui-model-selection）：类名是 CSS Module 哈希
+     *  （形如 `wq12jW_option wq12jW_modelOption`），但局部名稳定，用后缀匹配；
+     *  模型行是 `button[role="menuitemradio"]`，且 `title` 属性就是模型名。 */
+    const OFFICIAL_ROW_SEL = '[role="menuitemradio"]'
+    const OFFICIAL_MENU_SUFFIX = '_menu'
+    const OFFICIAL_OPTION_SUFFIX = 'modelOption'
+    const OFFICIAL_NAME_SUFFIX = 'modelName'
     const DIRECTORY_TTL_MS = 30000
     const DIRECTORY_RETRY_MS = 10000
     /** 一个菜单里至少要有这么多个模型行，才认定它是模型菜单（防误伤其他弹层）。 */
@@ -139,6 +146,10 @@ window.__ModuleLoader__.load({
     let rowAnchor = new WeakMap()
     /** 本次扫描的通用路径诊断信息（上报给宿主，便于远程定位 DOM 结构）。 */
     let lastDiagnostics = null
+    /** 通用（文本聚类）路径统计。 */
+    let lastGenericStats = null
+    /** 官方路径统计。 */
+    let lastOfficialStats = null
 
     /** 本页会话内已删除的模型键，防目录未刷新时行又冒出来。 */
     const deletedKeys = new Set()
@@ -178,9 +189,49 @@ window.__ModuleLoader__.load({
       return String(value ?? '').replace(/\s+/gu, ' ').trim().toLowerCase()
     }
 
+    /** 折叠文本：去掉一切非字母数字（含空格、连字符、点），用于宽松名字比对。
+     *  「gpt-4o mini」与「gpt-4o-mini」折叠后同为 gpt4omini。 */
+    function foldText(value) {
+      return String(value ?? '').toLowerCase().replace(/[^0-9a-z\u4e00-\u9fff]+/gu, '')
+    }
+
+    /** 元素类名里是否含某个局部名（CSS Module 哈希前缀无关）。 */
+    function hasClassToken(el, token) {
+      const cls = typeof el.className === 'string' ? el.className : ''
+      return cls.toLowerCase().includes(token.toLowerCase())
+    }
+
+    /** 目录里按 名字/ID 找模型：先精确原名，再折叠名。 */
+    function findModelsByName(name) {
+      const raw = normText(name)
+      const folded = foldText(name)
+      const hits = []
+      if (raw.length === 0) return hits
+      for (const provider of directory?.providers ?? []) {
+        for (const model of provider.models) {
+          const exact = normText(model.name) === raw || normText(model.id) === raw
+          const loose = !exact
+            && folded.length >= 3
+            && (foldText(model.name) === folded || foldText(model.id) === folded)
+          if (!exact && !loose) continue
+          hits.push({
+            providerId: provider.id,
+            providerName: provider.name,
+            modelId: model.id,
+            modelName: model.name,
+          })
+        }
+      }
+      return hits
+    }
+
     /** 模型名/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 +254,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,48 +308,117 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 在一个候选根容器里找出模型行：对每个文本节点做已知模型名命中，
-     * 向上取最近的可点击祖先；若某「行」文本里出现过两个以上不同模型，则它是容器，排除。
+     * 全文档找出「命中了已知模型名」的最小行容器。
+     * 不再依赖任何菜单根选择器：先用预编译正则粗筛文本节点，再逐一确认 token 命中，
+     * 然后向上取最近的可点击祖先。
      */
-    function genericRowsIn(root) {
+    function minimalMatches(root) {
       const index = ensureTokenIndex()
-      if (index.size === 0) return []
       const found = new Map()
-      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) {
-          const text = normText(raw)
-          if (text.length >= 2) {
-            const anchor = node.parentElement
-            if (anchor !== null) {
-              for (const [token, entries] of index) {
-                if (!text.includes(token)) continue
-                const row = clickableRow(anchor, root)
-                if (row === null) continue
-                const current = found.get(row)
-                if (current === undefined || token.length > current.token.length) {
-                  found.set(row, { token, entries, anchor })
+      if (index.size === 0 || tokenRegex === null) return found
+      const record = (row, token, entries, anchor) => {
+        const current = found.get(row)
+        if (current === undefined || token.length > current.token.length) {
+          found.set(row, { token, entries, anchor })
+        }
+      }
+      const scan = (pairs, folded) => {
+        const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT)
+        let node = walker.nextNode()
+        while (node !== null) {
+          const raw = node.nodeValue
+          if (raw !== null && raw.length > 1 && raw.length <= 200) {
+            const text = folded ? foldText(raw) : normText(raw)
+            if (text.length >= 2 && (folded || tokenRegex.test(text))) {
+              const anchor = node.parentElement
+              if (anchor !== null) {
+                for (const [token, entries] of pairs) {
+                  if (token.length > text.length || !text.includes(token)) continue
+                  const row = clickableRow(anchor, root)
+                  if (row === null) continue
+                  record(row, token, entries, anchor)
                 }
               }
             }
           }
+          node = walker.nextNode()
         }
-        node = walker.nextNode()
+      }
+      scan(tokenPairs, false)
+      // 原名对不上时（菜单显示名与目录写法不同，如空格 vs 连字符）再做一遍折叠匹配
+      if (found.size < 2) {
+        const foldedPairs = []
+        for (const [token, entries] of tokenPairs) {
+          const folded = foldText(token)
+          if (folded.length >= 3) foldedPairs.push([folded, entries])
+        }
+        foldedPairs.sort((a, b) => b[0].length - a[0].length)
+        if (foldedPairs.length > 0) scan(foldedPairs, true)
       }
       // 排除「容器型行」：行文本里出现两个以上不同模型 → 它装的是列表，不是单行。
       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 >= 1) clusters.push({ host: parent, rows: list })
+        else orphans.push(...list)
+      }
+      if (orphans.length >= 1) {
+        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 >= 1) 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
     }
 
     /** 根容器是否可见（不可见的弹层跳过，避免误伤收起的菜单）。 */
@@ -630,13 +754,16 @@ window.__ModuleLoader__.load({
       return { tag: el.tagName, role: el.getAttribute('role') ?? '', cls, text }
     }
 
-    function reportDiagnostics(state) {
+    function reportDiagnostics(state, force = false) {
       if (doctor === null) return
-      const signature = JSON.stringify(state)
-      if (signature === reportSignature) return
-      if (Date.now() - reportAt < 1200) return
+      const { at, ...rest } = state
+      const signature = JSON.stringify(rest)
+      const now = Date.now()
+      // 状态没变时：菜单开着也最多 5 秒写一次，避免刷屏
+      if (signature === reportSignature && now - reportAt < (force ? 5000 : 1200)) return
+      if (now - reportAt < 400) return
       reportSignature = signature
-      reportAt = Date.now()
+      reportAt = now
       void doctor.clientReport(state)
     }
 
@@ -644,7 +771,65 @@ window.__ModuleLoader__.load({
     /* 菜单增强主逻辑                                                    */
     /* ---------------------------------------------------------------- */
 
-    /** 兼容路径：dsh-reasoning-effort 的 `.re-model-menu` 结构。 */
+    /** 官方模型行的名字：优先 title 属性（官方就是 model.name），再 _modelName 文本。 */
+    function officialRowName(row) {
+      const title = row.getAttribute('title')
+      if (typeof title === 'string' && title.trim().length > 0) return title.trim()
+      const nameEl = row.querySelector(`[class*="${OFFICIAL_NAME_SUFFIX}"]`)
+      const text = nameEl?.textContent?.trim()
+      if (text !== undefined && text.length > 0) return text
+      return (row.textContent ?? '').trim()
+    }
+
+    /**
+     * 官方路径（首选）：直接按官方 DOM 契约定位模型行，不靠文本猜。
+     * 行 = `button[role="menuitemradio"]`（类名含 modelOption，或名字能对上目录）；
+     * 名字取 `title` 属性 → 与权威目录比对得到 provider/model。
+     */
+    function enhanceOfficial() {
+      const rows = Array.from(document.querySelectorAll(OFFICIAL_ROW_SEL)).filter((row) => {
+        if (hasClassToken(row, OFFICIAL_OPTION_SUFFIX)) return true
+        // 没有 modelOption 类时（契约变化）退一步：名字能对上目录才算模型行，
+        // 这样 effort（力度）面板里的 menuitemradio 不会被误加按钮。
+        return findModelsByName(officialRowName(row)).length > 0
+      })
+      if (rows.length === 0) return { rows: 0, wired: 0, samples: [], menuFound: false }
+      const samples = []
+      let wired = 0
+      let unmatched = 0
+      for (const row of rows) {
+        const name = officialRowName(row)
+        const hits = findModelsByName(name)
+        if (samples.length < 8) {
+          samples.push({ cls: String(row.className ?? '').slice(0, 70), title: name.slice(0, 40), hits: hits.length })
+        }
+        if (hits.length === 0) {
+          unmatched += 1
+          continue
+        }
+        const entry = pickEntry(hits, row)
+        const isNew = row.querySelector('.dmd-actions') === null
+        rowAnchor.set(row, row.querySelector(`[class*="${OFFICIAL_NAME_SUFFIX}"]`) ?? row)
+        enhanceRow(row, entry.providerId, { id: entry.modelId, name: entry.modelName })
+        if (isNew) wired += 1
+      }
+      // 状态条插到菜单顶层（一次），而不是每个供应商分组各插一条
+      const menuRoot = rows[0].closest(`[class*="${OFFICIAL_MENU_SUFFIX}"]`)
+        ?? rows[0].closest('[role="menu"]')
+        ?? rows[0].parentElement
+      let hint = ''
+      if (directory === null) {
+        hint = directoryFailedAt !== 0
+          ? `模型医生：目录获取失败 · ${directoryError || '与宿主半通信异常'}`
+          : '模型医生：目录获取中…'
+      } else if (unmatched > 0) {
+        hint = `模型医生：${unmatched} 个模型未匹配上目录`
+      }
+      ensureAllBar(menuRoot, hint, menuRoot?.firstChild ?? null)
+      return { rows: rows.length, wired, samples, unmatched, menuFound: true }
+    }
+
+    /** 官方路径：dsh-reasoning-effort 的 `.re-model-menu` 结构。 */
     function enhanceLegacy(menu) {
       let wired = 0
       const panes = menu.querySelectorAll(PANE_SEL)
@@ -698,56 +883,105 @@ 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,
-        providerCount: directory?.providers?.length ?? 0,
-        modelCount: (directory?.providers ?? []).reduce((sum, p) => sum + p.models.length, 0),
+      lastGenericStats = {
         legacyWired,
         genericWired: wired,
-        roots: rootStats.slice(0, 8),
-        samples,
+        registered,
+        unmatched,
+        hitCount: hits.size,
+        visibleRoots: roots.length,
+        clusters: clusterStats.slice(0, 8),
+        samples: roots.slice(0, 5).map(describe),
       }
-      return wired
+      return registered > 0 ? Math.max(1, wired) : 0
+    }
+
+    /** 菜单结构快照（仅菜单可见时生成，便于远程确认 DOM 契约是否变化）。 */
+    function dumpMenu() {
+      const menuRoot = document.querySelector(`[class*="${OFFICIAL_MENU_SUFFIX}"]`)
+        ?? document.querySelector(MENU_SEL)
+        ?? document.querySelector('[role="menu"]')
+      if (menuRoot === null || !isVisible(menuRoot)) return null
+      const nodes = []
+      const walk = (el, depth) => {
+        if (nodes.length >= 40 || depth > 4) return
+        nodes.push({
+          d: depth,
+          tag: el.tagName,
+          cls: (typeof el.className === 'string' ? el.className : '').slice(0, 70),
+          role: el.getAttribute('role') ?? '',
+          title: (el.getAttribute('title') ?? '').slice(0, 40),
+          text: normText(el.textContent).slice(0, 36),
+        })
+        for (const child of Array.from(el.children).slice(0, 12)) walk(child, depth + 1)
+      }
+      walk(menuRoot, 0)
+      return { root: describe(menuRoot), nodes }
     }
 
     function enhance() {
       if (disposed) return
+      try {
+        enhanceInner()
+      } catch (error) {
+        // 任何异常都要留痕：否则菜单开着时崩在中间，诊断文件会一直停留在旧状态
+        reportDiagnostics({
+          at: Date.now(),
+          mode: 'error',
+          error: error instanceof Error ? error.message : String(error),
+          stack: error instanceof Error
+            ? String(error.stack ?? '').split('\n').slice(0, 5).join(' | ').slice(0, 500)
+            : '',
+          href: window.location.href.slice(0, 120),
+        }, true)
+      }
+    }
+
+    function enhanceInner() {
       if (directory === null || Date.now() - directoryAt >= DIRECTORY_TTL_MS) {
         void fetchDirectory()
       }
@@ -755,18 +989,34 @@ window.__ModuleLoader__.load({
       rowByModel.clear()
       rowAnchor = new WeakMap()
 
+      // ① 官方路径（首选，按官方 DOM 契约精确取行）
+      const official = enhanceOfficial()
+      lastOfficialStats = official
+      // ② 兼容路径（dsh-reasoning-effort）
       const menu = document.querySelector(MENU_SEL)
       const legacyWired = menu === null ? 0 : enhanceLegacy(menu)
-      const genericWired = enhanceGeneric(legacyWired)
+      // ③ 通用兜底（未知渲染器）：前两条都没命中时才跑全文文本聚类
+      const genericWired = official.menuFound || legacyWired > 0 ? 0 : enhanceGeneric(legacyWired)
+      if (official.menuFound || legacyWired > 0) lastGenericStats = null
 
-      if (legacyWired + genericWired > 0) paintLastRun('上次结果：')
-      if (lastDiagnostics !== null) {
-        reportDiagnostics({
-          ...lastDiagnostics,
-          barCount: document.querySelectorAll('.dmd-allbar').length,
-          actionCount: document.querySelectorAll('.dmd-actions').length,
-        })
-      }
+      const wired = official.wired + legacyWired + genericWired
+      if (wired > 0) paintLastRun('上次结果：')
+
+      const menuVisible = official.menuFound || menu !== null
+      reportDiagnostics({
+        at: Date.now(),
+        href: window.location.href.slice(0, 120),
+        tokens: ensureTokenIndex().size,
+        providerCount: directory?.providers?.length ?? 0,
+        modelCount: (directory?.providers ?? []).reduce((sum, p) => sum + p.models.length, 0),
+        directoryError,
+        official: lastOfficialStats,
+        legacyWired,
+        generic: lastGenericStats,
+        menuDump: dumpMenu(),
+        barCount: document.querySelectorAll('.dmd-allbar').length,
+        actionCount: document.querySelectorAll('.dmd-actions').length,
+      }, menuVisible)
     }
 
     function scheduleEnhance() {

package/package.json

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