dsh-whale-widget 0.2.6 → 0.2.8

package/README.md

@@ -43,38 +43,54 @@ dsh-whale-widget/
 
 ## 安装
 
-### 方式 A：本地开发安装（当前项目）
+### 方式 A：本地安装（推荐，从当前仓库）
 
-在项目根目录（`DeepSeek-Balance-Whale-Widget-main`）执行：
+在**仓库根目录**（`DeepSeek-Balance-Whale-Widget`，即 `package.json` 所在目录）执行：
 
 ```powershell
-dsh plugin --profile web add link:.\dsh-whale-widget
+dsh plugin --profile web add link:.
 ```
 
 说明：
 
 - `dsh plugin` 会把参数转发给 pnpm，并在成功后自动把 `dsh-whale-widget` 加入 `dsh.profile.bundles`
-- 使用 `link:` 会在 profile 的 `node_modules` 里链接到当前源码目录，方便继续改代码
-- 安装完成后重启 `dsh web`，再 F5 刷新浏览器
-- **如果之后移动了源码目录**，必须重新到新的项目根目录执行一次：
+- **`link:.` 表示链接当前目录**（仓库根目录本身就是插件包）。如果你复制了仓库到别处，用绝对路径：
   ```powershell
-  dsh plugin --profile web add link:.\dsh-whale-widget
+  dsh plugin --profile web add link:D:\你的路径\DeepSeek-Balance-Whale-Widget
   ```
-  因为 `link:` 记录的是源目录的绝对路径；移动后旧链接会失效。若提示已存在/冲突，可先 `dsh plugin --profile web remove dsh-whale-widget` 再重新 add。
+- ⚠️ 不要用 `link:.\dsh-whale-widget`——仓库里**没有** `dsh-whale-widget/` 子目录，这样会安装成普通依赖而非插件，重启后挂件不出现
+- 安装完成后重启 `dsh web`，再 F5 刷新浏览器
+- **如果之后移动了源码目录**，必须重新执行一次 `dsh plugin --profile web add link:.<新路径>`。若提示已存在/冲突，先 `dsh plugin --profile web remove dsh-whale-widget` 再重新 add
 
 ### 方式 B：发布到 npm 后安装
 
-如果你把这个包发布到 npm：
-
 ```powershell
-cd dsh-whale-widget
-npm publish
+dsh plugin --profile web add dsh-whale-widget
 ```
 
-然后任意机器上安装：
+### 给 AI 的安装说明（用 dsh 辅助安装时，直接复制给 AI）
 
-```powershell
-dsh plugin --profile web add dsh-whale-widget
+如果你希望让另一个 DSH / AI 助手帮你安装，把下面这段发给它即可：
+
+```
+请帮我安装插件 dsh-whale-widget，来源是 GitHub 仓库 MeteorNOX/DeepSeek-Balance-Whale-Widget。
+
+步骤：
+1. 确保 pnpm 可用（没有就先：npm install -g pnpm）
+2. 在 Web profile 安装：
+   dsh plugin --profile web add dsh-whale-widget
+   如果要从本地仓库链接安装（例如本地克隆的仓库根目录），则用：
+   dsh plugin --profile web add link:.<仓库绝对路径>
+   （注意：仓库根目录就是插件包，不要写成 link:.\dsh-whale-widget 这种带子目录的路径）
+3. 如果报 pnpm 阻止构建脚本（allowBuilds 相关），在 C:\Users\<用户名>\.dsh\profiles\web\pnpm-workspace.yaml 的 allowBuilds 下加对应的包 key，然后重跑
+4. 重启 dsh web，然后 F5 刷新浏览器
+
+安装后验证：
+- dsh --profile web --dump-config 应该能看到 dsh-whale-widget 在 bundles 里
+- curl http://127.0.0.1:3080/dsh-whale/balance.json 应返回 200 JSON（含 totalBalance）
+- curl http://127.0.0.1:3080/dsh-whale/widget.js 应返回 200 JS
+
+另外请检查 DSH 凭据里是否配置了 DEEPSEEK_API_KEY（没有就提示用户配置；DEEPSEEK_PLATFORM_TOKEN 可选，不配也能用默认的记账模式）。
 ```
 
 ### 关于令牌（安装后必读）

package/lib/index.js

@@ -69,11 +69,14 @@ const PEAK_HOURS = [
   [14, 18],
 ]
 const BASE_PRICE = { hit: [0.05, 0.1], miss: [1.5, 3.0], out: [4.5, 9.0] }
+// deepseek-v4-pro 为 flash 的 3 倍价（官方 2026-08-17 生效）；vision-exp 与 flash 同价
+const PRO_PRICE = { hit: [0.15, 0.3], miss: [4.5, 9.0], out: [13.5, 27.0] }
 const PRICING = {
+  'deepseek-v4-flash-vision-exp': BASE_PRICE,
+  'deepseek-v4-flash': BASE_PRICE,
+  'deepseek-v4-pro': PRO_PRICE,
   'deepseek-chat': BASE_PRICE,
   'deepseek-reasoner': BASE_PRICE,
-  'deepseek-v4-flash': BASE_PRICE,
-  'deepseek-v4-pro': BASE_PRICE,
   _default: BASE_PRICE,
 }
 function priceFor(model) {
@@ -151,16 +154,17 @@ var css = [
   '.dshwv-menu-btn.dshwv-menu-btn-visible{opacity:1}',
   '.dshwv-menu-btn span{display:block;width:14px;height:2px;background:#fff;border-radius:1px}',
   '.dshwv-menu-btn:hover{background:#203170}',
-  '.dshwv-menu{position:fixed;min-width:172px;background:rgba(255,255,255,.92);border:1px solid rgba(32,49,112,.35);border-radius:10px;padding:10px 12px;opacity:0;transform:scale(.92) translateY(-4px);transform-origin:top right;transition:opacity .18s ease,transform .2s cubic-bezier(.34,1.56,.64,1);pointer-events:none;z-index:10000;box-shadow:0 6px 18px rgba(0,0,0,.18);color-scheme:light}',
+  '.dshwv-menu{position:fixed;min-width:196px;background:rgba(255,255,255,.92);border:1px solid rgba(32,49,112,.35);border-radius:10px;padding:10px 12px;opacity:0;transform:scale(.92) translateY(-4px);transform-origin:top right;transition:opacity .18s ease,transform .2s cubic-bezier(.34,1.56,.64,1);pointer-events:none;z-index:10000;box-shadow:0 6px 18px rgba(0,0,0,.18);color-scheme:light}',
   '.dshwv-menu.dshwv-menu-open{opacity:1;transform:scale(1) translateY(0);pointer-events:auto}',
   '.dshwv-menu-row{display:flex;align-items:center;gap:8px;margin:5px 0;color:#203170;font-size:12px;white-space:nowrap}',
   '.dshwv-range{flex:1;min-width:0;accent-color:#203170}',
-  '.dshwv-number{width:46px;border:1px solid rgba(32,49,112,.4);border-radius:6px;padding:2px 4px;font-size:12px;color:#203170;background:#fff}',
+  '.dshwv-number{width:44px;border:1px solid rgba(32,49,112,.4);border-radius:6px;padding:2px 4px;font-size:12px;color:#203170;background:#fff;box-sizing:border-box}',
+  '.dshwv-number:disabled{opacity:.4;background:rgba(32,49,112,.06);cursor:not-allowed}',
   '.dshwv-sound{flex:1;border:1px solid rgba(32,49,112,.4);border-radius:6px;background:rgba(32,49,112,.08);color:#203170;font-size:12px;padding:3px 0;cursor:pointer}',
   '.dshwv-sound:hover{background:rgba(32,49,112,.16)}',
   '.dshwv-check{width:16px;height:16px;accent-color:#203170;cursor:pointer;flex:0 0 auto}',
   '.dshwv-menu-sep{height:1px;background:rgba(32,49,112,.25);margin:6px 0}',
-  '.dshwv-volpct{width:36px;text-align:right;color:#203170;font-size:12px}'
+  '.dshwv-volpct{width:44px;text-align:right;color:#203170;font-size:12px}'
 ].join('\\n')
 
 var styleEl = document.createElement('style')
@@ -212,6 +216,13 @@ scaleNumber.value = '10'
 scaleInput.addEventListener('pointerdown', function () { root.style.transition = 'none' })
 scaleInput.addEventListener('input', function () { setScale(scaleInput.value) })
 scaleInput.addEventListener('change', function () { root.style.transition = '' })
+scaleNumber.addEventListener('focus', function () { root.style.transition = 'none' })
+scaleNumber.addEventListener('blur', function () { root.style.transition = '' })
+scaleNumber.addEventListener('input', function () {
+  var v = Math.round(Number(scaleNumber.value))
+  var s = MIN_SCALE + Math.max(0, Math.min(20, v) - 1) * (MAX_SCALE - MIN_SCALE) / 19
+  setScale(s)
+})
 scaleNumber.addEventListener('change', function () {
   var v = Math.round(Number(scaleNumber.value))
   var s = MIN_SCALE + Math.max(0, Math.min(20, v) - 1) * (MAX_SCALE - MIN_SCALE) / 19
@@ -258,8 +269,26 @@ turnCostCloseInput.min = '0'
 turnCostCloseInput.step = '1'
 turnCostCloseInput.className = 'dshwv-number'
 turnCostCloseInput.value = '5'
+turnCostCloseInput.disabled = false // 跟随「每轮消耗提示」开关
 turnCostCloseInput.title = '填 0 表示不自动关闭，需手动点击关闭'
+turnCostCloseInput.addEventListener('input', function () { setTurnCostClose(turnCostCloseInput.value) })
 turnCostCloseInput.addEventListener('change', function () { setTurnCostClose(turnCostCloseInput.value) })
+var scrollGapToggle = document.createElement('input')
+scrollGapToggle.type = 'checkbox'
+scrollGapToggle.className = 'dshwv-check'
+scrollGapToggle.checked = false
+scrollGapToggle.title = '开启后挂件右侧按设定像素避开滚动条；关闭则贴边（盖住滚动条）'
+scrollGapToggle.addEventListener('change', function () { setScrollGapOn(scrollGapToggle.checked) })
+var scrollGapInput = document.createElement('input')
+scrollGapInput.type = 'number'
+scrollGapInput.min = '0'
+scrollGapInput.step = '1'
+scrollGapInput.className = 'dshwv-number'
+scrollGapInput.value = '17'
+scrollGapInput.disabled = true // 默认避让关 → 宽度不可修改，勾选后启用
+scrollGapInput.title = '避让滚动条的像素宽度，填 0 表示贴边'
+scrollGapInput.addEventListener('input', function () { setScrollGapPx(scrollGapInput.value) })
+scrollGapInput.addEventListener('change', function () { setScrollGapPx(scrollGapInput.value) })
 var row1 = menuRow()
 row1.appendChild(menuLabel('大小'))
 row1.appendChild(scaleInput)
@@ -294,21 +323,26 @@ row6.appendChild(bubbleToggle)
 var menuSep1 = document.createElement('div')
 menuSep1.className = 'dshwv-menu-sep'
 var row7 = menuRow()
-row7.appendChild(menuLabel('每轮消耗'))
+row7.appendChild(menuLabel('每轮消耗提示'))
 row7.appendChild(turnCostToggle)
-var row8 = menuRow()
-row8.appendChild(menuLabel('自动关闭时间'))
-row8.appendChild(turnCostCloseInput)
-row8.appendChild(menuLabel('秒'))
+row7.appendChild(menuLabel('自动关闭'))
+row7.appendChild(turnCostCloseInput)
+row7.appendChild(menuLabel('秒'))
+var row9 = menuRow()
+row9.appendChild(menuLabel('避让滚动条'))
+row9.appendChild(scrollGapToggle)
+row9.appendChild(menuLabel('宽度'))
+row9.appendChild(scrollGapInput)
+row9.appendChild(menuLabel('px'))
 menuBox.appendChild(row1)
 menuBox.appendChild(row2)
 menuBox.appendChild(row3)
 menuBox.appendChild(row4)
 menuBox.appendChild(row5)
 menuBox.appendChild(row6)
-menuBox.appendChild(menuSep1)
 menuBox.appendChild(row7)
-menuBox.appendChild(row8)
+menuBox.appendChild(menuSep1)
+menuBox.appendChild(row9)
 
 var textBox = document.createElement('div')
 textBox.className = 'dshwv-text'
@@ -351,10 +385,13 @@ bubbleBox.addEventListener('click', function (e) {
     // 再次点击：关闭
     hideBubble()
   } else {
-    // 首次点击：切到随机台词段（不延长总显示时长）
+    // 首次点击：切到随机台词段，并重置自动关闭计时——
+    // 保证第二段台词有完整停留时间（否则第 4 秒点击只看到 0.5 秒）
     bubbleRandomActive = true
     bubbleRandomLines = pickRandomLines()
     swapBubbleContent(function () { applyBubbleLines(bubbleRandomLines) })
+    if (bubbleTimer) { clearTimeout(bubbleTimer); bubbleTimer = null }
+    bubbleTimer = setTimeout(hideBubble, BUBBLE_MS)
   }
 })
 
@@ -613,9 +650,10 @@ function viewport() {
   }
 }
 function rightGap() {
-  var sw = window.innerWidth - document.documentElement.clientWidth
-  if (sw < 8) sw = 10 // 悬浮滚动条测量为0时兜底
-  return sw + 2 // 滚动条宽度 + 2px
+  // 开关关闭：贴边（不避让滚动条）
+  if (!scrollGapOn) return 0
+  // 开启：用用户填写的像素；填 0 也贴边
+  return scrollGapPx > 0 ? scrollGapPx : 0
 }
 function fmt(balance, currency) {
   var num = Number(balance)
@@ -694,8 +732,7 @@ function settle() {
     state.left = state.hOff
   } else {
     state.left = clamp(state.left, 0, Math.max(0, vp.w - w - rightGap()))
-  }
-  if (state.v === 'bottom') {
+  }  if (state.v === 'bottom') {
     state.top = Math.max(0, vp.h - h - state.vOff)
   } else if (state.v === 'top') {
     state.top = state.vOff
@@ -778,9 +815,13 @@ var bubbleOn = true
 var turnCostOn = true
 var turnCostCloseMs = 5000
 var costBubbleActive = false
+var scrollGapOn = false
+var scrollGapPx = 17
 function saveConfig() {
   try {
-    fetch(SIZE_URL, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ scale: state.scale, sound: soundOn, vol: soundVol, soundSet: soundSet, usageMode: usageMode, peakMode: peakMode, bubbleOn: bubbleOn, turnCostOn: turnCostOn, turnCostCloseMs: turnCostCloseMs }) })
+    fetch(SIZE_URL, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ scale: state.scale, sound: soundOn, vol: soundVol, soundSet: soundSet, usageMode: usageMode, peakMode: peakMode, bubbleOn: bubbleOn, turnCostOn: turnCostOn, turnCostCloseMs: turnCostCloseMs, scrollGapOn: scrollGapOn, scrollGapPx: scrollGapPx }) })
+    // 锚点位置记忆：记录相对边框的离边距离，窗口 resize 后保持（localStorage）。
+    // v:2 = 净距离格式（剥离避让距离），v:1 旧格式含避让距离，恢复时废弃旧格式。
     var vp = viewport()
     var w = root.offsetWidth || root.getBoundingClientRect().width || 0
     var h = root.offsetHeight || root.getBoundingClientRect().height || 0
@@ -788,9 +829,13 @@ function saveConfig() {
     var rightDist = vp.w - state.left - w
     var topDist = state.top
     var bottomDist = vp.h - state.top - h
+    var hAnchor = leftDist <= rightDist ? 'left' : 'right'
+    var hDistRaw = Math.round(Math.min(leftDist, rightDist))
+    var hDist = hAnchor === 'right' && scrollGapOn ? Math.max(0, hDistRaw - rightGap()) : hDistRaw
     localStorage.setItem('dshw-pos', JSON.stringify({
-      hAnchor: leftDist <= rightDist ? 'left' : 'right',
-      hDist: Math.round(Math.min(leftDist, rightDist)),
+      v: 2,
+      hAnchor: hAnchor,
+      hDist: hDist,
       vAnchor: topDist <= bottomDist ? 'top' : 'bottom',
       vDist: Math.round(Math.min(topDist, bottomDist))
     }))
@@ -817,20 +862,41 @@ function setBubbleOn(v) {
 function setTurnCostOn(v) {
   turnCostOn = !!v
   turnCostToggle.checked = turnCostOn
+  turnCostCloseInput.disabled = !turnCostOn
   saveConfig()
   if (!turnCostOn) hideCostBubble()
 }
 function setTurnCostClose(v) {
+  if (!turnCostOn) return
   var n = Math.max(0, Math.round(Number(v) || 0))
   turnCostCloseMs = n * 1000
   turnCostCloseInput.value = String(n)
   saveConfig()
 }
+function setScrollGapOn(v) {
+  scrollGapOn = !!v
+  scrollGapToggle.checked = scrollGapOn
+  scrollGapInput.disabled = !scrollGapOn
+  saveConfig()
+  settle()
+}
+function setScrollGapPx(v) {
+  if (!scrollGapOn) return
+  var n = Math.max(0, Math.round(Number(v) || 0))
+  scrollGapPx = n
+  scrollGapInput.value = String(n)
+  saveConfig()
+  settle()
+}
 function scaleToDisplay(s) {
   return Math.round((s - MIN_SCALE) / ((MAX_SCALE - MIN_SCALE) / 19)) + 1
 }
 function setScale(v) {
   var next = Math.round(Math.min(MAX_SCALE, Math.max(MIN_SCALE, Number(v))) * 10) / 10
+  // 缩放测量需要 left/top 立即到位：临时禁用过渡（滚轮/数字框路径没有
+  // 滑块 pointerdown 的 transition:none，否则 r2 测的是过渡起点导致错锚点）
+  var prevTrans = root.style.transition
+  root.style.transition = 'none'
   var rect = root.getBoundingClientRect()
   // fixed point: the whale's corner — bottom-right when unflipped, bottom-left
   // when flipped. Growing extends the widget up-left / up-right from that
@@ -854,6 +920,12 @@ function setScale(v) {
   }
   state.top = Math.min(Math.max(fy - r2.height, 0), Math.max(0, vp.h - r2.height))
   express()
+  // 恢复过渡必须延迟到下一帧：本帧 left/top 已在 none 下设置并提交，
+  // 立即恢复会让浏览器对「刚改过的 left/top」重新评估并播放过渡动画
+  // （翻转时叠加 transform .3s 更明显，表现为抽搐）。
+  requestAnimationFrame(function () {
+    root.style.transition = prevTrans
+  })
 }
 function setVol(v) {
   var next = Math.round(Math.min(1, Math.max(0, Number(v))) * 100) / 100
@@ -1079,7 +1151,6 @@ function onDocPointerDown(e) {
   document.addEventListener('pointermove', onDocPointerMove, true)
   document.addEventListener('pointerup', onDocPointerUp, true)
   document.addEventListener('pointercancel', onDocPointerCancel, true)
-  document.addEventListener('click', onDocClickStopper, true)
 }
 function onDocPointerMove(e) {
   if (!drag || !drag.active) return
@@ -1093,12 +1164,21 @@ function onDocPointerMove(e) {
   state.top = clamp(drag.origTop + dy, 0, Math.max(0, drag.vp.h - drag.h))
   express()
 }
-function onDocPointerUp(e) { endDrag(e, true) }
+function onDocPointerUp(e) {
+  // 拦截鲸鱼区域内的 pointerup：防止下方元素（如文件行）监听 pointerup 穿透误触发
+  try { if (isWhaleHit(e)) { e.preventDefault(); e.stopPropagation() } } catch (err) {}
+  endDrag(e, true)
+}
 function onDocPointerCancel(e) { endDrag(e, false) }
 function onDocClickStopper(e) {
+  // 只在鲸鱼命中区域拦截 click（保持透明区 pass-through）。
+  // 持久注册（不随 endDrag 移除）——click 在 pointerup 之后派发，
+  // 若在 endDrag 移除会导致 click 穿透到下方元素（如误打开文件）。
+  if (!isWhaleHit(e)) return
   try { e.preventDefault(); e.stopPropagation() } catch (err) {}
 }
 document.addEventListener('pointerdown', onDocPointerDown, true)
+document.addEventListener('click', onDocClickStopper, true)
 
 var widgetCursor = ''
 function setWidgetCursor(v) {
@@ -1128,7 +1208,6 @@ function endDrag(e, clickAllowed) {
   document.removeEventListener('pointermove', onDocPointerMove, true)
   document.removeEventListener('pointerup', onDocPointerUp, true)
   document.removeEventListener('pointercancel', onDocPointerCancel, true)
-  document.removeEventListener('click', onDocClickStopper, true)
   pressUp()
   root.classList.remove('dshwv-dragging')
   setWidgetCursor(isWhaleHit(e) ? 'grab' : '')
@@ -1162,23 +1241,29 @@ function endDrag(e, clickAllowed) {
   state.left = left
   state.top = top
   settle()
+  // 拖拽结束立即保存锚点位置（否则刷新/关闭后位置回退到上次改菜单时）
+  saveConfig()
 }
 // 窗口尺寸变化时：自由位置的鲸鱼按相对边框锚点重算（保持离边距离，窗口恢复原状即回原位）；
 // 贴边吸附的鲸鱼走 settle()（保持贴边）
 function applyAnchorPos() {
   try {
     var a = JSON.parse(localStorage.getItem('dshw-pos') || 'null')
-    if (!a || (a.hAnchor !== 'left' && a.hAnchor !== 'right') || typeof a.hDist !== 'number' ||
+    if (!a || a.v !== 2 || (a.hAnchor !== 'left' && a.hAnchor !== 'right') || typeof a.hDist !== 'number' ||
         (a.vAnchor !== 'top' && a.vAnchor !== 'bottom') || typeof a.vDist !== 'number') return false
     var vp = viewport()
     var w = root.offsetWidth || root.getBoundingClientRect().width || 0
     var h = root.offsetHeight || root.getBoundingClientRect().height || 0
-    var l = a.hAnchor === 'left' ? a.hDist : vp.w - a.hDist - w
+    // 与加载恢复一致：锚点存净距离，右锚点按当前避让开关叠加
+    var effectiveRightDist = a.hAnchor === 'right' ? a.hDist + (scrollGapOn ? rightGap() : 0) : a.hDist
+    var l = a.hAnchor === 'left' ? a.hDist : vp.w - effectiveRightDist - w
     var t = a.vAnchor === 'top' ? a.vDist : vp.h - a.vDist - h
     state.left = clamp(l, 0, Math.max(0, vp.w - w))
     state.top = clamp(t, 0, Math.max(0, vp.h - h))
-    state.h = null
-    state.v = null
+    state.h = a.hAnchor
+    state.hOff = 0
+    state.v = a.vAnchor
+    state.vOff = 0
     express()
     return true
   } catch (err) { return false }
@@ -1235,25 +1320,43 @@ fetch(SIZE_URL, { cache: 'no-store' })
     if (d && typeof d.turnCostOn === 'boolean') {
       turnCostOn = d.turnCostOn
       turnCostToggle.checked = turnCostOn
+      turnCostCloseInput.disabled = !turnCostOn
     }
     if (d && typeof d.turnCostCloseMs === 'number') {
       turnCostCloseMs = d.turnCostCloseMs > 0 ? d.turnCostCloseMs : 0
       turnCostCloseInput.value = String(Math.round(turnCostCloseMs / 1000))
     }
-    // 相对边框恢复（localStorage 锚点）：窗口变化后保持离边距离
+    if (d && typeof d.scrollGapOn === 'boolean') {
+      scrollGapOn = d.scrollGapOn
+      scrollGapToggle.checked = scrollGapOn
+      scrollGapInput.disabled = !scrollGapOn
+    }
+    if (d && typeof d.scrollGapPx === 'number') {
+      scrollGapPx = d.scrollGapPx > 0 ? Math.round(d.scrollGapPx) : 0
+      scrollGapInput.value = String(scrollGapPx)
+    }
+    // 相对边框恢复（localStorage 锚点）：窗口变化后保持离边距离。
+    // 仅认 v:2 净距离格式；旧格式（含避让距离）废弃，挂件保持默认右下角吸附。
+    // 恢复时还原吸附状态（hAnchor/vAnchor → state.h/v），避免挂件变自由位置
+    // 导致避让调节不实时（settle 自由分支只 clamp 不重算位置）。
     try {
       var a = JSON.parse(localStorage.getItem('dshw-pos') || 'null')
-      if (a && (a.hAnchor === 'left' || a.hAnchor === 'right') && typeof a.hDist === 'number' &&
+      if (a && a.v === 2 && (a.hAnchor === 'left' || a.hAnchor === 'right') && typeof a.hDist === 'number' &&
           (a.vAnchor === 'top' || a.vAnchor === 'bottom') && typeof a.vDist === 'number') {
         var vpA = viewport()
         var wA = root.offsetWidth || root.getBoundingClientRect().width || 0
         var hA = root.offsetHeight || root.getBoundingClientRect().height || 0
-        var lA = a.hAnchor === 'left' ? a.hDist : vpA.w - a.hDist - wA
+        // 锚点存的是净距离：右锚点按当前避让开关叠加避让距离
+        var effectiveRightDist = a.hAnchor === 'right' ? a.hDist + (scrollGapOn ? rightGap() : 0) : a.hDist
+        var lA = a.hAnchor === 'left' ? a.hDist : vpA.w - effectiveRightDist - wA
         var tA = a.vAnchor === 'top' ? a.vDist : vpA.h - a.vDist - hA
         state.left = clamp(lA, 0, Math.max(0, vpA.w - wA))
         state.top = clamp(tA, 0, Math.max(0, vpA.h - hA))
-        state.h = null // 恢复为自由位置，避免 settle() 重新吸附覆盖
-        state.v = null
+        // 按锚点还原吸附状态（贴边锚点 → 吸附；自由位锚点 → 自由）
+        state.h = a.hAnchor
+        state.hOff = 0
+        state.v = a.vAnchor
+        state.vOff = 0
         settle()
       }
     } catch (err) {}
@@ -1300,59 +1403,64 @@ function apply(ctx) {
     let balanceCache = null
     let balanceInFlight = null
     let gifBytes = null
-    // 每轮对话消耗统计：turn -> 聚合中的成本/分词；完成后写入 lastTurn
-    let turnAgg = null // { turn, cost, tokens, lastTs }
+    // 每轮对话消耗统计：按 (session.id, turn) 分桶聚合，完成后写入 lastTurn。
+    // 用 Map 分桶避免主会话与子代理（spawn/fork）并行时串账。
+    let turnAggs = new Map() // sessionId -> { turn, cost, tokens, lastTs }
     let lastTurn = null // { turn, amount, tokens, ts }
     let lastTurnSeq = 0
     const disposers = []
 
-    function resetTurnAgg() {
-      turnAgg = null
-    }
-    function finalizeTurn() {
-      if (turnAgg && turnAgg.cost > 0) {
-        lastTurn = { turn: turnAgg.turn, amount: turnAgg.cost, tokens: turnAgg.tokens, ts: turnAgg.lastTs }
+    function finalizeTurn(sessionId) {
+      const agg = turnAggs.get(sessionId)
+      if (agg && agg.cost > 0) {
+        lastTurn = { turn: agg.turn, amount: agg.cost, tokens: agg.tokens, ts: agg.lastTs }
         lastTurnSeq++
       }
-      turnAgg = null
+      turnAggs.delete(sessionId)
     }
-    // 监听会话事件流：assistant/message 携带每步真实 usage，按 turn 聚合；
-    // turn/end 时结算本轮并写入 lastTurn
-    function handleSessionEvent(event) {
+    // 监听会话事件流：assistant/message 携带每步真实 usage，按 (session,turn) 聚合；
+    // turn/end 时结算该会话本轮并写入 lastTurn
+    function handleSessionEvent(sessionId, event) {
       try {
         const type = event && event.type
         const d = event && event.data
         if (!d || typeof d !== 'object') return
         if (type === 'turn/end') {
-          // 一轮对话结束：结算并清空聚合
-          finalizeTurn()
+          finalizeTurn(sessionId)
           return
         }
         if (type !== 'assistant/message') return
         const turn = Number(d.turn)
         const usage = d.usage
         if (!usage || typeof usage !== 'object' || !isFinite(turn)) return
-        if (!turnAgg || turnAgg.turn !== turn) {
-          if (turnAgg && turnAgg.turn !== turn) finalizeTurn()
-          if (!turnAgg || turnAgg.turn !== turn) turnAgg = { turn, cost: 0, tokens: 0, lastTs: Date.now() }
+        let agg = turnAggs.get(sessionId)
+        if (!agg || agg.turn !== turn) {
+          if (agg) finalizeTurn(sessionId)
+          agg = { turn, cost: 0, tokens: 0, lastTs: Date.now() }
+          turnAggs.set(sessionId, agg)
         }
         const input = Number(usage.inputTokens) || 0
         const cache = Number(usage.cacheReadTokens) || 0
         const output = Number(usage.outputTokens) || 0
         const reasoning = Number(usage.reasoningTokens) || 0
-        turnAgg.tokens += input + cache + output + reasoning
+        agg.tokens += input + cache + output + reasoning
         // 定价换算（CNY/百万 token；缓存命中=输入价，其余按各自档位）
         const model = d.message && d.message.source ? d.message.source.model : ''
         const p = priceFor(model)
         const off = isPeakTime(Math.floor(Date.now() / 1000)) ? 1 : 0
-        turnAgg.cost += (cache / 1e6) * p.hit[off] + (input / 1e6) * p.miss[off] + ((output + reasoning) / 1e6) * p.out[off]
-        turnAgg.lastTs = Date.now()
+        agg.cost += (cache / 1e6) * p.hit[off] + (input / 1e6) * p.miss[off] + ((output + reasoning) / 1e6) * p.out[off]
+        agg.lastTs = Date.now()
       } catch (err) {}
     }
 
-    // 监听所有会话的追加事件；turn/end 时结算本轮
+    // 监听所有会话的追加事件；按会话 id 分桶，turn/end 时结算该会话本轮
     disposers.push(ctx.on('session/event', (session, event) => {
-      handleSessionEvent(event)
+      const sid = session && session.id ? session.id : 'default'
+      handleSessionEvent(sid, event)
+    }))
+    // 会话销毁时清理残留聚合，避免内存泄漏
+    disposers.push(ctx.on('session/disposed', (session) => {
+      if (session && session.id) turnAggs.delete(session.id)
     }))
 
     function loadGif() {
@@ -1640,6 +1748,8 @@ function apply(ctx) {
               bubbleOn: parsed.bubbleOn !== false,
               turnCostOn: parsed.turnCostOn !== false,
               turnCostCloseMs: typeof parsed.turnCostCloseMs === 'number' ? parsed.turnCostCloseMs : 5000,
+              scrollGapOn: parsed.scrollGapOn === true,
+              scrollGapPx: typeof parsed.scrollGapPx === 'number' ? Math.round(parsed.scrollGapPx) : 17,
             }
           }
         } catch (err) {}
@@ -1647,13 +1757,14 @@ function apply(ctx) {
       return null
     }
 
-    function writeSizeConfig(scale, sound, vol, soundSet, usageMode, peakMode, bubbleOn, turnCostOn, turnCostCloseMs) {
+    function writeSizeConfig(scale, sound, vol, soundSet, usageMode, peakMode, bubbleOn, turnCostOn, turnCostCloseMs, scrollGapOn, scrollGapPx) {
       const um = normalizeUsageMode(usageMode)
       const pm = peakMode === 'liangwen' || peakMode === 'qiangqiang' ? peakMode : 'default'
       const bo = bubbleOn !== false
       const tco = turnCostOn !== false
-      // 0 是合法值（不自动关闭），只有缺失/非法时才回落默认 5 秒
-      const tcc = typeof turnCostCloseMs === 'number' && turnCostCloseMs >= 0 ? turnCostCloseMs : 5000
+      const tcc = typeof turnCostCloseMs === 'number' ? (turnCostCloseMs > 0 ? turnCostCloseMs : 0) : 5000
+      const sgo = scrollGapOn === true
+      const sgp = typeof scrollGapPx === 'number' && scrollGapPx > 0 ? Math.round(scrollGapPx) : 0
       const body = JSON.stringify({
         scale: scale,
         sound: sound !== false,
@@ -1664,6 +1775,8 @@ function apply(ctx) {
         bubbleOn: bo,
         turnCostOn: tco,
         turnCostCloseMs: tcc,
+        scrollGapOn: sgo,
+        scrollGapPx: sgp,
         updatedAt: new Date().toISOString(),
       })
       for (const p of SIZE_FILE_CANDIDATES) {
@@ -1680,6 +1793,8 @@ function apply(ctx) {
             bubbleOn: bo,
             turnCostOn: tco,
             turnCostCloseMs: tcc,
+            scrollGapOn: sgo,
+            scrollGapPx: sgp,
           }
         } catch (err) {}
       }
@@ -1791,7 +1906,7 @@ function apply(ctx) {
                 balanceCache = null
               }
             }
-            const result = writeSizeConfig(scale, parsed.sound !== false, parsed.vol, parsed.soundSet, parsed.usageMode, parsed.peakMode, parsed.bubbleOn, parsed.turnCostOn, parsed.turnCostCloseMs)
+            const result = writeSizeConfig(scale, parsed.sound !== false, parsed.vol, parsed.soundSet, parsed.usageMode, parsed.peakMode, parsed.bubbleOn, parsed.turnCostOn, parsed.turnCostCloseMs, parsed.scrollGapOn, parsed.scrollGapPx)
             res.writeHead(result.ok ? 200 : 500, JSON_HEADERS)
             res.end(JSON.stringify(result))
           } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-whale-widget",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "DSH Web 界面右下角的 DeepSeek 余额小鲸鱼挂件（含今日已用、峰谷定价、随机台词、音效与每轮消耗统计）",
   "keywords": [
     "dsh",