dsh-model-doctor 0.5.0 → 0.5.2

package/lib/client/index.js

@@ -80,7 +80,7 @@ window.__ModuleLoader__.load({
 .dmd-chip.is-warn{color:#d08700;background:color-mix(in srgb,#d08700 16%,transparent)}
 .dmd-allbar{display:flex;align-items:center;gap:8px;padding:6px 12px;margin:2px 6px;font-size:11px;border-radius:8px;background:color-mix(in srgb,currentColor 6%,transparent)}
 .dmd-allbar button{font:inherit;font-size:11px;line-height:16px;padding:2px 9px;border-radius:6px;border:1px solid color-mix(in srgb,currentColor 25%,transparent);background:transparent;color:inherit;cursor:pointer}
-.dmd-allbar button:disabled{opacity:.45;cursor:default}
+.dmd-allbar button:disabled,.dmd-allbar button.is-busy{opacity:.45;cursor:default}
 .dmd-allbar .dmd-status{opacity:.65}
 .dmd-allbar .dmd-balance{color:#2fa96e}
 `
@@ -560,8 +560,17 @@ window.__ModuleLoader__.load({
           if (result && result.ok === true) {
             deletedKeys.add(keyOf(provider, model))
             const section = row.closest('section')
+            // 焦点若在被删行上，移除后焦点会落到 body → 官方 onBlur 会关闭菜单，
+            // 所以先把焦点转移到相邻的模型行再移除。
+            const hadFocus = row === document.activeElement
+            const neighbour = row.nextElementSibling ?? row.previousElementSibling
             row.remove()
             if (section !== null && section.querySelectorAll(ROW_SEL).length === 0) section.remove()
+            if (hadFocus) {
+              const target = (neighbour !== null && neighbour.isConnected ? neighbour : null)
+                ?? document.querySelector('[role="menuitemradio"]')
+              if (target !== null && typeof target.focus === 'function') target.focus()
+            }
             fetchDirectory(true)
           } else {
             const message = result && typeof result.error === 'string' ? result.error : '删除失败'
@@ -683,11 +692,21 @@ window.__ModuleLoader__.load({
       status.className = 'dmd-status'
       const balance = document.createElement('span')
       balance.className = 'dmd-balance'
+      // 忙碌用标记而不是 disabled：被禁用的聚焦元素会把焦点丢给 body，
+      // 而官方菜单在根节点上监听 onBlur（portal 的事件仍走 React 树冒泡），
+      // 焦点一离开菜单就会 setOpen(false) —— 表现就是「点全部检测菜单被关掉」。
+      let busy = false
+      const setBusy = (value) => {
+        busy = value
+        button.classList.toggle('is-busy', value)
+        button.setAttribute('aria-busy', value ? 'true' : 'false')
+        button.style.pointerEvents = value ? 'none' : ''
+      }
       button.addEventListener('click', (event) => {
         event.stopPropagation()
         event.preventDefault()
-        if (doctor === null || button.disabled) return
-        button.disabled = true
+        if (doctor === null || busy) return
+        setBusy(true)
         barBusy = true
         status.textContent = '探测中…'
         balance.textContent = ''
@@ -696,7 +715,7 @@ window.__ModuleLoader__.load({
         })
         doctor.checkAll().then((result) => {
           if (disposed) return
-          button.disabled = false
+          setBusy(false)
           barBusy = false
           if (!result || result.ok === false || !isRecord(result.results)) {
             status.textContent = `失败：${result && typeof result.error === 'string' ? result.error : '通道异常'}`
@@ -726,7 +745,12 @@ window.__ModuleLoader__.load({
           }
         })
       })
-      button.addEventListener('mousedown', (event) => event.stopPropagation())
+      // preventDefault 阻止焦点转移到本按钮：焦点一旦离开菜单，官方 onBlur 就会关闭菜单
+      button.addEventListener('mousedown', (event) => {
+        event.preventDefault()
+        event.stopPropagation()
+      })
+      button.addEventListener('pointerdown', (event) => event.stopPropagation())
       bar.appendChild(button)
       bar.appendChild(status)
       bar.appendChild(balance)
@@ -746,6 +770,8 @@ window.__ModuleLoader__.load({
 
     let reportSignature = ''
     let reportAt = 0
+    /** 最近一次写入的报告是否包含「菜单已打开」的现场。 */
+    let lastReportHadMenu = false
 
     function describe(el) {
       if (el === null || el === undefined) return null
@@ -754,16 +780,19 @@ window.__ModuleLoader__.load({
       return { tag: el.tagName, role: el.getAttribute('role') ?? '', cls, text }
     }
 
-    function reportDiagnostics(state, force = false) {
+    function reportDiagnostics(state, menuVisible = false) {
       if (doctor === null) return
       const { at, ...rest } = state
       const signature = JSON.stringify(rest)
       const now = Date.now()
-      // 状态没变时：菜单开着也最多 5 秒写一次，避免刷屏
-      if (signature === reportSignature && now - reportAt < (force ? 5000 : 1200)) return
+      const isError = typeof state.error === 'string'
+      // 报告里已经留下「菜单打开」的现场时，不要被随后「菜单关闭」的空扫描覆盖（错误除外）
+      if (!menuVisible && !isError && lastReportHadMenu) return
+      if (!isError && signature === reportSignature && now - reportAt < (menuVisible ? 5000 : 1200)) return
       if (now - reportAt < 400) return
       reportSignature = signature
       reportAt = now
+      lastReportHadMenu = menuVisible
       void doctor.clientReport(state)
     }
 

package/package.json

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