dsh-remote-plugin 0.6.17 → 0.6.18

package/public/desktop/desktop.html

@@ -303,8 +303,12 @@
       </div>
       <div class="ds-drawer-body">
         <div class="ds-stat-grid" id="stats-cards"></div>
+        <div class="ds-stats-chart-title" data-i18n="ds.statsCostTrend">费用趋势</div>
         <div id="stats-legend" class="ds-stats-legend"></div>
         <div id="stats-chart" class="ds-stats-chart"></div>
+        <div class="ds-stats-chart-title" data-i18n="ds.statsTokenTrend">Token 量趋势</div>
+        <div id="stats-token-legend" class="ds-stats-legend"></div>
+        <div id="stats-token-chart" class="ds-stats-chart"></div>
         <div id="stats-note" class="ds-stats-note"></div>
       </div>
     </div>
@@ -462,7 +466,7 @@
         'ds.fsUp': '上级', 'ds.fsRoot': '允许根目录', 'ds.fsNewWorkspace': '新建工作区', 'ds.fsRefresh': '刷新', 'ds.fsEmpty': '目录为空',
         'ds.workspaceCreateTitle': '新建工作区', 'ds.workspaceCreateDesc': '将在当前文件目录下创建文件夹，并自动打开新会话。', 'ds.workspaceParent': '父目录', 'ds.workspaceNamePlaceholder': '例如：my-project', 'ds.workspaceCreate': '创建并打开', 'ds.cancel': '取消', 'ds.workspaceNameRequired': '请输入工作区名称', 'ds.workspaceExists': '该目录已存在', 'ds.workspaceInvalidName': '名称不能包含路径分隔符', 'ds.workspaceCreateFailed': '创建工作区失败', 'ds.workspaceCreated': '工作区已创建', 'ds.workspaceCreatedNoSession': '工作区已创建，但新会话未能打开',
         'ds.groupGeneral': '通用', 'ds.groupGeneralDesc': '工具调用、预设提示词',
-        'ds.groupServers': '服务器', 'ds.groupServersDesc': '服务器地址',
+        'ds.groupServers': '服务器', 'ds.groupServersDesc': '服务器地址与令牌',
         'ds.groupNotify': '通知', 'ds.groupNotifyDesc': '通知与提醒',
         'ds.groupTheme': '皮肤', 'ds.groupThemeDesc': '配色主题',
         'ds.groupAbout': '关于', 'ds.groupAboutDesc': '版本信息',
@@ -498,18 +502,18 @@
         'ds.approvalBody': '{tool} · {server}', 'ds.approvalReason': '原因：{reason}',
         'ds.allowed': '已允许', 'ds.rejected': '已拒绝', 'ds.ignored': '已忽略',
         'ds.stale': '请求已失效', 'ds.pendingSubmitFailed': '提交失败：{msg}',
-        'ds.statsTodayTokens': '今日 Token', 'ds.statsTodayCost': '今日费用', 'ds.statsPeakShare': '高峰占比',
+        'ds.statsTodayTokens': '今日 Token', 'ds.statsTodayCost': '今日费用', 'ds.statsPeakShare': '高峰占比', 'ds.statsCostTrend': '费用趋势', 'ds.statsTokenTrend': 'Token 量趋势', 'ds.statsTokenTotal': 'Token 总量',
         'ds.statsInput': '未缓存输入', 'ds.statsCacheRead': '缓存命中', 'ds.statsCacheWrite': '缓存写入', 'ds.statsOutput': '输出',
         'ds.statsPeak': '高峰', 'ds.statsOff': '空闲', 'ds.statsDays': '近 {n} 天',
         'ds.statsGatewayDown': '统计需要网关运行', 'ds.statsEmpty': '暂无统计',
-        'ds.statsNote': '注：本数据仅在使用 DeepSeek 官方 API 时估算；基于 token 计算，与官网账单可能有出入，一切以官网为准。统计自 2026-08-17 定价生效日起。',
-        'ds.serversEmpty': '未添加备用服务器', 'ds.serversUntested': '未测速', 'ds.serversCurrent': ' · 当前',
+        'ds.statsNote': '注：Token 量按 DSH usage 事件记录，第三方 provider 需提供 usage 才能计入；费用仅对已知 DeepSeek 模型估算，与官网账单可能有出入，一切以官网为准。统计自 2026-08-17 定价生效日起。',
+        'ds.serversEmpty': '未添加备用服务器', 'ds.serversUntested': '未测速', 'ds.serversCurrent': ' · 当前', 'ds.serversTokenSet': '令牌已配置', 'ds.serversTokenMissing': '未配置令牌',
         'ds.serversUnreachable': '不可达', 'ds.serversDelete': '删除', 'ds.serversEdit': '编辑',
         'ds.serversNeedAddress': '请输入服务器地址', 'ds.serversBadProtocol': '地址需以 http:// 或 https:// 开头',
-        'ds.serversDuplicate': '该地址已存在', 'ds.serversAdded': '已添加', 'ds.serversEdited': '已更新',
+        'ds.serversDuplicate': '相同地址和令牌已存在', 'ds.serversAdded': '已添加', 'ds.serversEdited': '已更新',
         'ds.serversRemovedActive': '已删除当前服务器，重新测速…',
         'ds.serversCurrentDesc': '当前：{group} · {url}（{ms}）',
-        'ds.serversPromptNote': '服务器备注（可留空）：', 'ds.serversPromptEditUrl': '编辑服务器地址：',
+        'ds.serversPromptNote': '服务器备注（可留空）：', 'ds.serversPromptEditUrl': '编辑服务器地址：', 'ds.serversPromptEditToken': '编辑服务器令牌（留空保持不变）：',
         'ds.serversPromptEditNote': '编辑备注（{url}）：', 'ds.serversPromptEditGroup': '所属组：',
         'ds.serversManualSelected': '已切换至：{url}',
         'ds.speedTesting': '正在测速…', 'ds.speedSwitched': '已切换到：{url}（{ms}ms）',
@@ -564,7 +568,7 @@
         'ds.fsUp': 'Up', 'ds.fsRoot': 'Allowed root', 'ds.fsNewWorkspace': 'New workspace', 'ds.fsRefresh': 'Refresh', 'ds.fsEmpty': 'Empty directory',
         'ds.workspaceCreateTitle': 'New workspace', 'ds.workspaceCreateDesc': 'Create a folder in the current file directory and open a new session there.', 'ds.workspaceParent': 'Parent folder', 'ds.workspaceNamePlaceholder': 'For example: my-project', 'ds.workspaceCreate': 'Create & open', 'ds.cancel': 'Cancel', 'ds.workspaceNameRequired': 'Enter a workspace name', 'ds.workspaceExists': 'That folder already exists', 'ds.workspaceInvalidName': 'The name cannot contain path separators', 'ds.workspaceCreateFailed': 'Could not create workspace', 'ds.workspaceCreated': 'Workspace created', 'ds.workspaceCreatedNoSession': 'Workspace created, but the new session could not be opened',
         'ds.groupGeneral': 'General', 'ds.groupGeneralDesc': 'Tool calls, prompt presets',
-        'ds.groupServers': 'Servers', 'ds.groupServersDesc': 'Server address',
+        'ds.groupServers': 'Servers', 'ds.groupServersDesc': 'Server address and token',
         'ds.groupNotify': 'Notifications', 'ds.groupNotifyDesc': 'Notifications & reminders',
         'ds.groupTheme': 'Theme', 'ds.groupThemeDesc': 'Color themes',
         'ds.groupAbout': 'About', 'ds.groupAboutDesc': 'Version info',
@@ -600,18 +604,18 @@
         'ds.approvalBody': '{tool} · {server}', 'ds.approvalReason': 'Reason: {reason}',
         'ds.allowed': 'Allowed', 'ds.rejected': 'Rejected', 'ds.ignored': 'Ignored',
         'ds.stale': 'Request is stale', 'ds.pendingSubmitFailed': 'Submit failed: {msg}',
-        'ds.statsTodayTokens': 'Tokens today', 'ds.statsTodayCost': 'Cost today', 'ds.statsPeakShare': 'Peak share',
+        'ds.statsTodayTokens': 'Tokens today', 'ds.statsTodayCost': 'Cost today', 'ds.statsPeakShare': 'Peak share', 'ds.statsCostTrend': 'Cost trend', 'ds.statsTokenTrend': 'Token volume trend', 'ds.statsTokenTotal': 'Total tokens',
         'ds.statsInput': 'Uncached input', 'ds.statsCacheRead': 'Cache read', 'ds.statsCacheWrite': 'Cache write', 'ds.statsOutput': 'Output',
         'ds.statsPeak': 'Peak', 'ds.statsOff': 'Off-peak', 'ds.statsDays': 'Last {n} days',
         'ds.statsGatewayDown': 'Stats require the gateway', 'ds.statsEmpty': 'No stats yet',
-        'ds.statsNote': 'Note: estimates assume the official DeepSeek API. Token-based calculation may differ from the official bill; always defer to deepseek.com. Stats start from the 2026-08-17 pricing date.',
-        'ds.serversEmpty': 'No backup servers', 'ds.serversUntested': 'Untested', 'ds.serversCurrent': ' · current',
+        'ds.statsNote': 'Note: token volume uses DSH usage events; a third-party provider must expose usage to be counted. Costs are estimates for known DeepSeek models and may differ from the official bill; always defer to deepseek.com. Stats start from the 2026-08-17 pricing date.',
+        'ds.serversEmpty': 'No backup servers', 'ds.serversUntested': 'Untested', 'ds.serversCurrent': ' · current', 'ds.serversTokenSet': 'Token set', 'ds.serversTokenMissing': 'No token',
         'ds.serversUnreachable': 'Unreachable', 'ds.serversDelete': 'Delete', 'ds.serversEdit': 'Edit',
         'ds.serversNeedAddress': 'Enter a server address', 'ds.serversBadProtocol': 'Address must start with http:// or https://',
-        'ds.serversDuplicate': 'Address already exists', 'ds.serversAdded': 'Added', 'ds.serversEdited': 'Updated',
+        'ds.serversDuplicate': 'The same address and token already exist', 'ds.serversAdded': 'Added', 'ds.serversEdited': 'Updated',
         'ds.serversRemovedActive': 'Removed active server, re-testing…',
         'ds.serversCurrentDesc': 'Current: {group} · {url} ({ms})',
-        'ds.serversPromptNote': 'Server note (optional):', 'ds.serversPromptEditUrl': 'Edit server URL:',
+        'ds.serversPromptNote': 'Server note (optional):', 'ds.serversPromptEditUrl': 'Edit server URL:', 'ds.serversPromptEditToken': 'Edit server token (blank keeps the current token):',
         'ds.serversPromptEditNote': 'Edit note ({url}):', 'ds.serversPromptEditGroup': 'Group:',
         'ds.serversManualSelected': 'Switched to: {url}',
         'ds.speedTesting': 'Testing servers…', 'ds.speedSwitched': 'Switched to: {url} ({ms}ms)',

package/public/desktop/desktop.js

@@ -57,12 +57,12 @@ const state = {
   token: LS.get('token', ''),
   wsTicket: { token: '', server: '', value: '', expiresAt: 0 },
   server: '',
-  servers: [],
+  servers: [], // { id, url, note, group, token }; connection identity = URL + token
   groups: ['默认'],
   activeGroup: '默认',
   autoSelect: { '默认': true },
   groupActive: { '默认': '' },
-  serverLatency: {},
+  serverLatency: {}, // URL + token -> latest /health latency
   gatewayHealth: {},
   selectingServer: false,
   sessions: [],
@@ -661,6 +661,27 @@ function ensureGroup(name) {
 }
 function groupServers(g) { return state.servers.filter(s => s.group === g) }
 function activeServers() { return groupServers(state.activeGroup) }
+function normalizedServerToken(token) { return typeof token === 'string' ? token.trim() : '' }
+function serverIdentity(url, token) {
+  return `${String(url || '').replace(/\/+$/, '')}\u0000${normalizedServerToken(token)}`
+}
+function serverKey(server) { return serverIdentity(server?.url ?? server, server?.token) }
+function serverToken(server) { return normalizedServerToken(server?.token) }
+function currentServerEntry() {
+  return state.servers.find(s => s.url === state.server && serverToken(s) === state.token)
+    || state.servers.find(s => s.url === state.server)
+    || null
+}
+function setCurrentAccessToken(value) {
+  const token = normalizedServerToken(value)
+  if (!token) return false
+  const current = currentServerEntry()
+  if (current) current.token = token
+  state.token = token
+  LS.set('token', token)
+  saveServers()
+  return true
+}
 
 function migrateServersV1() {
   if (LS.get('servers-v2', null) !== null) return
@@ -671,7 +692,7 @@ function migrateServersV1() {
     arr = legacy ? [legacy] : []
   }
   const urls = arr.map(s => String(s || '').trim().replace(/\/+$/, '')).filter(s => /^https?:\/\//i.test(s))
-  state.servers = urls.map((url, i) => ({ id: 's' + (i + 1), url, note: '', group: '默认' }))
+  state.servers = urls.map((url, i) => ({ id: 's' + (i + 1), url, note: '', group: '默认', token: normalizedServerToken(state.token) }))
   state.groups = ['默认']; state.activeGroup = '默认'
   state.autoSelect = { '默认': true }; state.groupActive = { '默认': '' }
   const active = LS.get('activeServer', '')
@@ -687,7 +708,8 @@ function loadServers() {
   let data = null
   try { data = JSON.parse(LS.get('servers-v2', '')) } catch {}
   if (!data || !Array.isArray(data.servers)) { migrateServersV1(); return }
-  state.servers = data.servers.filter(s => s && typeof s.url === 'string').map(s => ({ id: s.id || newServerId(), url: s.url.replace(/\/+$/, ''), note: s.note || '', group: s.group || '默认' }))
+  const legacyToken = normalizedServerToken(state.token || LS.get('token', ''))
+  state.servers = data.servers.filter(s => s && typeof s.url === 'string').map(s => ({ id: s.id || newServerId(), url: s.url.replace(/\/+$/, ''), note: s.note || '', group: s.group || '默认', token: s.token == null ? legacyToken : normalizedServerToken(s.token) }))
   state.groups = Array.isArray(data.groups) && data.groups.length ? data.groups : ['默认']
   state.activeGroup = state.groups.includes(data.activeGroup) ? data.activeGroup : '默认'
   state.autoSelect = data.autoSelect || {}
@@ -696,7 +718,12 @@ function loadServers() {
   for (const s of state.servers) ensureGroup(s.group)
   const manual = state.groupActive[state.activeGroup]
   const manualSrv = manual ? state.servers.find(s => s.id === manual) : null
-  state.server = manualSrv ? manualSrv.url : (activeServers()[0]?.url || '')
+  const selected = manualSrv || activeServers()[0]
+  state.server = selected?.url || ''
+  if (selected) {
+    state.token = serverToken(selected)
+    LS.set('token', state.token)
+  }
 }
 function saveServers() {
   LS.set('servers-v2', JSON.stringify({
@@ -705,8 +732,8 @@ function saveServers() {
   }))
 }
 function serverCandidates() {
-  const list = activeServers().map(s => s.url)
-  if (location.origin && !list.includes(location.origin)) list.push(location.origin)
+  const list = activeServers().map(s => ({ ...s, token: serverToken(s) }))
+  if (location.origin && !list.some(s => s.url === location.origin)) list.push({ id: 'origin', url: location.origin, token: state.token, origin: true })
   return list
 }
 async function pingServer(base) {
@@ -749,36 +776,47 @@ async function selectFastestServer({ silent = false, reconnect = true } = {}) {
     if (!silent) toast(t('ds.speedTesting'))
     const candidates = serverCandidates()
     let chosen = ''
+    let chosenToken = state.token
     let best = null
     let ms = Infinity
     if (state.autoSelect[state.activeGroup] !== false) {
-      const measured = await Promise.all(candidates.map(async (u) => [u, await pingServer(u)]))
-      for (const [u, latency] of measured) state.serverLatency[u] = latency
-      best = candidates.filter(u => Number.isFinite(state.serverLatency[u])).sort((a, b) => state.serverLatency[a] - state.serverLatency[b])[0] || null
-      chosen = best || (state.server || '')
-      ms = best ? state.serverLatency[best] : Infinity
+      const measured = await Promise.all(candidates.map(async (server) => [server, await pingServer(server.url)]))
+      for (const [server, latency] of measured) state.serverLatency[serverKey(server)] = latency
+      best = candidates.filter(server => Number.isFinite(state.serverLatency[serverKey(server)])).sort((a, b) => state.serverLatency[serverKey(a)] - state.serverLatency[serverKey(b)])[0] || null
+      const sameOrigin = best?.url === location.origin && best.origin
+      chosen = best ? (sameOrigin ? '' : best.url) : (state.server || '')
+      chosenToken = best ? serverToken(best) : state.token
+      ms = best ? state.serverLatency[serverKey(best)] : Infinity
     } else {
       const manual = state.groupActive[state.activeGroup]
       const manualSrv = manual ? state.servers.find(s => s.id === manual) : null
       chosen = manualSrv ? manualSrv.url : (activeServers()[0]?.url || '')
-      if (chosen) { state.serverLatency[chosen] = await pingServer(chosen); ms = state.serverLatency[chosen] }
+      chosenToken = manualSrv ? serverToken(manualSrv) : state.token
+      if (chosen) {
+        const key = serverKey(manualSrv || { url: chosen, token: state.token })
+        state.serverLatency[key] = await pingServer(chosen)
+        ms = state.serverLatency[key]
+      }
     }
     renderServers()
-    if (chosen !== state.server) {
+    if (chosen !== state.server || chosenToken !== state.token) {
       state.hostInfo = null
       hostDescribeFailures = 0
       if (hostDescribeRetryTimer) clearTimeout(hostDescribeRetryTimer)
       hostDescribeRetryTimer = null
       resetFsForServerDesktop()
       state.server = chosen
-      if (best) { const srv = state.servers.find(s => s.url === best); if (srv) state.groupActive[state.activeGroup] = srv.id }
+      state.token = chosenToken
+      LS.set('token', state.token)
+      if (best) { const srv = state.servers.find(s => s.id === best.id); if (srv) state.groupActive[state.activeGroup] = srv.id }
       saveServers()
+      renderServers()
       if (!silent) {
         if (chosen) toast(t('ds.speedSwitched', { url: chosen, ms: Number.isFinite(ms) ? ms : 0 }), 'ok')
       }
       if (reconnect && state.token) { openStreams(); refreshSessions() }
     } else if (!silent) {
-      if (best) toast(t('ds.speedAlreadyBest', { url: chosen, ms: state.serverLatency[best] }), 'ok')
+      if (best) toast(t('ds.speedAlreadyBest', { url: chosen, ms: state.serverLatency[serverKey(best)] }), 'ok')
       else if (chosen) toast(t('ds.speedManualUsing', { url: chosen, ms: Number.isFinite(ms) ? ms : '—' }), 'ok')
       else toast(t('ds.speedAllDown'), 'err')
     }
@@ -818,13 +856,14 @@ function renderServers() {
       </div>
       <div class="ds-srv-body ${g === state.activeGroup ? '' : 'hidden'}">
         ${list.map(s => {
-          const ms = state.serverLatency[s.url]
+          const ms = state.serverLatency[serverKey(s)]
           let badge = `<span class="ds-server-badge">${t('ds.serversUntested')}</span>`
-          if (Number.isFinite(ms)) badge = `<span class="ds-server-badge ${s.url === state.server ? 'good' : ''}">${ms}ms${s.url === state.server ? t('ds.serversCurrent') : ''}</span>`
+          const active = s.url === state.server && serverToken(s) === state.token
+          if (Number.isFinite(ms)) badge = `<span class="ds-server-badge ${active ? 'good' : ''}">${ms}ms${active ? t('ds.serversCurrent') : ''}</span>`
           else if (ms !== undefined) badge = `<span class="ds-server-badge bad">${t('ds.serversUnreachable')}</span>`
-          const activeInGroup = auto ? s.url === state.server : s.id === activeManual
+          const activeInGroup = auto ? active : s.id === activeManual
           return `<div class="ds-server-row ${activeInGroup ? 'active' : ''}" data-use-server="${esc(s.id)}">
-            <span class="ds-server-main"><span class="ds-server-note">${esc(serverTitle(s))}</span>${s.note ? `<span class="ds-server-url">${esc(s.url)}</span>` : ''}</span>${badge}
+            <span class="ds-server-main"><span class="ds-server-note">${esc(serverTitle(s))}</span>${s.note ? `<span class="ds-server-url">${esc(s.url)}</span>` : ''}<span class="ds-server-token-badge">${s.token ? t('ds.serversTokenSet') : t('ds.serversTokenMissing')}</span></span>${badge}
             <button class="ds-mini" data-edit-server="${esc(s.id)}" title="${t('ds.serversEdit')}">✎</button>
             <button class="ds-mini" data-del-server="${esc(s.id)}" title="${t('ds.serversDelete')}">✕</button>
           </div>`
@@ -857,15 +896,17 @@ function renderServers() {
     state.activeGroup = s.group
     if (state.server !== s.url) resetFsForServerDesktop()
     state.server = s.url
+    state.token = serverToken(s)
+    LS.set('token', state.token)
     saveServers()
     renderServers()
     toast(t('ds.serversManualSelected', { url: serverTitle(s) }), 'ok')
     if (state.token) { openStreams(); refreshSessions() }
   }))
-  const cur = state.servers.find(s => s.url === state.server)
+  const cur = currentServerEntry()
   const curGroup = cur ? cur.group : state.activeGroup
   const curLabel = cur ? (cur.note || cur.url) : (state.server || t('ds.origin'))
-  const curMs = state.serverLatency[state.server]
+  const curMs = cur ? state.serverLatency[serverKey(cur)] : undefined
   $('server-desc').textContent = t('ds.serversCurrentDesc', { group: curGroup, url: curLabel, ms: Number.isFinite(curMs) ? curMs + 'ms' : '—' })
   updateConn()
 }
@@ -876,9 +917,10 @@ async function addServer() {
   if (!raw) return toast(t('ds.serversNeedAddress'), 'err')
   try { const u = new URL(raw); if (u.protocol !== 'http:' && u.protocol !== 'https:') throw new Error('bad') }
   catch { return toast(t('ds.serversBadProtocol'), 'err') }
-  if (state.servers.some(s => s.url === raw)) return toast(t('ds.serversDuplicate'), 'err')
+  const token = normalizedServerToken(state.token)
+  if (state.servers.some(s => serverIdentity(s.url, serverToken(s)) === serverIdentity(raw, token))) return toast(t('ds.serversDuplicate'), 'err')
   const note = (prompt(t('ds.serversPromptNote')) || '').trim()
-  state.servers.push({ id: newServerId(), url: raw, note, group: state.activeGroup })
+  state.servers.push({ id: newServerId(), url: raw, note, group: state.activeGroup, token })
   saveServers()
   if (input) input.value = ''
   renderServers()
@@ -892,17 +934,22 @@ function editServer(id) {
   if (!raw) return
   try { const u = new URL(raw); if (u.protocol !== 'http:' && u.protocol !== 'https:') throw new Error('bad') }
   catch { return toast(t('ds.serversBadProtocol'), 'err') }
-  if (state.servers.some(x => x.id !== id && x.url === raw)) return toast(t('ds.serversDuplicate'), 'err')
+  const tokenInput = prompt(t('ds.serversPromptEditToken'), '')
+  if (tokenInput === null) return
+  const token = normalizedServerToken(tokenInput) || serverToken(s)
+  if (state.servers.some(x => x.id !== id && serverIdentity(x.url, serverToken(x)) === serverIdentity(raw, token))) return toast(t('ds.serversDuplicate'), 'err')
   const note = prompt(t('ds.serversPromptEditNote', { url: raw }), s.note || '')
   if (note === null) return
   const group = prompt(t('ds.serversPromptEditGroup'), s.group || '默认')
   if (group === null) return
-  const wasActive = state.server === s.url
+  const wasActive = state.server === s.url && state.token === serverToken(s)
   const changedActiveUrl = wasActive && state.server !== raw
-  s.url = raw; s.note = note.trim(); s.group = ensureGroup(group.trim() || '默认')
+  s.url = raw; s.note = note.trim(); s.group = ensureGroup(group.trim() || '默认'); s.token = token
   if (wasActive) {
     if (changedActiveUrl) resetFsForServerDesktop()
     state.server = raw
+    state.token = token
+    LS.set('token', token)
   }
   saveServers(); renderServers(); toast(t('ds.serversEdited'), 'ok')
   if (wasActive && state.token) selectFastestServer({ silent: true })
@@ -911,7 +958,7 @@ function removeServer(id) {
   const s = state.servers.find(x => x.id === id)
   if (!s) return
   state.servers = state.servers.filter(x => x.id !== id)
-  const wasActive = state.server === s.url
+  const wasActive = state.server === s.url && state.token === serverToken(s)
   for (const g of state.groups) if (state.groupActive[g] === id) state.groupActive[g] = ''
   saveServers(); renderServers()
   if (wasActive) { toast(t('ds.serversRemovedActive')); selectFastestServer({ silent: true }) }
@@ -1924,7 +1971,7 @@ function renderQueue() {
 
 /* ---------------- 审批/提问通知卡片栈 ---------------- */
 function serverLabel() {
-  const cur = state.servers.find(s => s.url === state.server)
+  const cur = currentServerEntry()
   return cur ? (cur.note || cur.url) : (state.server || location.host)
 }
 function renderNotifStack() {
@@ -2518,6 +2565,8 @@ function toggleStatsDrawer() {
 async function loadStats() {
   if (!state.token) {
     $('stats-cards').innerHTML = `<div class="ds-empty">${t('ds.statsGatewayDown')}</div>`
+    $('stats-token-chart').innerHTML = ''
+    $('stats-token-legend').innerHTML = ''
     return
   }
   try {
@@ -2527,11 +2576,15 @@ async function loadStats() {
     renderStats(json.days || [])
   } catch {
     $('stats-cards').innerHTML = `<div class="ds-empty">${t('ds.statsGatewayDown')}</div>`
+    $('stats-token-chart').innerHTML = ''
+    $('stats-token-legend').innerHTML = ''
   }
 }
 function renderStats(days) {
   if (!days.length) {
     $('stats-cards').innerHTML = `<div class="ds-empty">${t('ds.statsEmpty')}</div>`
+    $('stats-token-chart').innerHTML = ''
+    $('stats-token-legend').innerHTML = ''
     return
   }
   const today = days[days.length - 1]
@@ -2551,6 +2604,7 @@ function renderStats(days) {
     <div class="ds-stat-card"><div class="v">${fmtCost(totalCost)}</div><div class="k">${t('ds.statsTodayCost')}<br>${t('ds.statsPeak')} ${fmtCost(peakCost)} / ${t('ds.statsOff')} ${fmtCost(offCost)}</div></div>
     <div class="ds-stat-card"><div class="v">${peakShare}%</div><div class="k">${t('ds.statsPeakShare')}<br>${t('ds.statsDays', { n: days.length })}</div></div>`
   $('stats-legend').innerHTML = `<span class="sw peak"></span>${t('ds.statsPeak')} <span class="sw off"></span>${t('ds.statsOff')}`
+  $('stats-token-legend').innerHTML = `<span class="sw token"></span>${t('ds.statsTokenTotal')}`
   $('stats-note').textContent = t('ds.statsNote')
   const maxCost = Math.max(...days.map(d => (d.total.cost || 0)), 0.0001)
   $('stats-chart').innerHTML = days.map(d => {
@@ -2565,6 +2619,17 @@ function renderStats(days) {
       <div class="lbl">${d.date.slice(5)}</div>
     </div>`
   }).join('')
+  const maxTokens = Math.max(...days.map(d => bucketTokens(d.total)), 1)
+  $('stats-token-chart').innerHTML = days.map(d => {
+    const tokens = bucketTokens(d.total)
+    const totalH = tokens > 0 ? Math.max(3, Math.round(tokens / maxTokens * 100)) : 0
+    const tip = `${d.date}\n${t('ds.statsTokenTotal')} ${fmtTokens(tokens)}\n${t('ds.statsInput')} ${fmtTokens(d.total.input)} · ${t('ds.statsOutput')} ${fmtTokens(d.total.output)}`
+    return `<div class="ds-stats-bar" data-tip="${esc(tip)}">
+      <div class="bars token" style="height:${totalH}%"></div>
+      <div class="val">${tokens > 0 ? fmtTokens(tokens) : ''}</div>
+      <div class="lbl">${d.date.slice(5)}</div>
+    </div>`
+  }).join('')
 }
 
 /* ---------------- 视图与连接状态 ---------------- */
@@ -2700,7 +2765,7 @@ function updateConn() {
   const el = $('conn-badge')
   // 双实时通道可能按任意顺序打开，连接刷新必须同时刷新系统总览。
   renderOverviewDesktop()
-  const cur = state.servers.find(s => s.url === state.server)
+  const cur = currentServerEntry()
   const group = cur ? cur.group : state.activeGroup
   const label = cur ? (cur.note || cur.url) : (state.server || t('ds.origin'))
   const serverText = t('ds.currentServer', { group, url: label })
@@ -2901,6 +2966,11 @@ function bindUi() {
     if (bar && bar.dataset.tip) showTip(bar.dataset.tip, bar.getBoundingClientRect())
   })
   $('stats-chart').addEventListener('mouseleave', hideTip)
+  $('stats-token-chart').addEventListener('mouseover', (e) => {
+    const bar = e.target.closest('.ds-stats-bar')
+    if (bar && bar.dataset.tip) showTip(bar.dataset.tip, bar.getBoundingClientRect())
+  })
+  $('stats-token-chart').addEventListener('mouseleave', hideTip)
 
   $('view-settings').addEventListener('click', (e) => {
     const group = e.target.closest('[data-settings-group]')
@@ -2946,11 +3016,23 @@ function bindUi() {
 }
 
 async function start() {
+  const urlToken = new URLSearchParams(location.search).get('token')?.trim() || ''
+  if (urlToken) {
+    state.token = urlToken
+    LS.set('token', urlToken)
+    history.replaceState(null, '', location.pathname)
+  }
   loadServers()
   renderServers()
   showView('view-overview')
-  const urlToken = new URLSearchParams(location.search).get('token')
-  if (urlToken) { state.token = urlToken; LS.set('token', urlToken); history.replaceState(null, '', location.pathname) }
+  if (urlToken) {
+    state.token = urlToken
+    const currentId = state.groupActive[state.activeGroup]
+    const current = state.servers.find(s => s.id === currentId) || state.servers.find(s => s.url === state.server)
+    if (current) current.token = urlToken
+    LS.set('token', urlToken)
+    saveServers()
+  }
   if (!state.token) {
     const input = prompt(t('ds.tokenTitle'))
     if (input && input.trim()) { state.token = input.trim(); LS.set('token', state.token) }

package/public/index.html

@@ -229,12 +229,47 @@
     </section>
 
     <!-- Token 统计 -->
-    <section id="view-stats" class="view hidden">
-      <div class="section-head"><span data-i18n="statsPage.title">Token 统计</span><span id="stats-sub" class="muted"></span></div>
+    <section id="view-stats" class="view hidden stats-view" aria-labelledby="stats-page-title">
+      <header class="stats-page-head">
+        <div class="stats-page-copy">
+          <div class="stats-eyebrow" data-i18n="statsPage.eyebrow">USAGE OVERVIEW</div>
+          <h1 id="stats-page-title" data-i18n="statsPage.title">Token 统计</h1>
+          <p class="stats-page-subtitle" data-i18n="statsPage.subtitle">按日查看 Token 用量与费用估算</p>
+        </div>
+        <div class="stats-date-wrap">
+          <span class="stats-date-label" data-i18n="statsPage.latest">最新日期</span>
+          <span id="stats-sub" class="stats-date">—</span>
+        </div>
+      </header>
+      <div class="stats-toolbar">
+        <span class="stats-toolbar-label" data-i18n="statsPage.chartMetric">图表指标</span>
+        <div id="stats-mode-picker" class="stats-mode-picker" role="group" data-i18n-aria="statsPage.chartMetric">
+          <button type="button" class="stats-mode-btn active" data-stats-mode="token" aria-pressed="true" data-i18n="statsPage.modeTokens">Token 数</button>
+          <button type="button" class="stats-mode-btn" data-stats-mode="cost" aria-pressed="false" data-i18n="statsPage.modeCost">费用（官方）</button>
+        </div>
+      </div>
       <div class="stats-cards" id="stats-cards"></div>
-      <div id="stats-legend" class="stats-legend"></div>
-      <div id="stats-chart" class="stats-chart"></div>
-      <div id="stats-note" class="stats-note"></div>
+      <section class="stats-panel" data-stats-panel="cost" aria-labelledby="stats-cost-title">
+        <div class="stats-panel-head">
+          <div>
+            <div class="stats-panel-kicker" data-i18n="statsPage.costKicker">ESTIMATED COST</div>
+            <h2 id="stats-cost-title" class="stats-panel-title" data-i18n="statsPage.costTrend">费用趋势</h2>
+          </div>
+          <div id="stats-legend" class="stats-legend"></div>
+        </div>
+        <div id="stats-chart" class="stats-chart" role="list" aria-live="polite" data-i18n-aria="statsPage.costChartLabel"></div>
+      </section>
+      <section class="stats-panel" data-stats-panel="token" aria-labelledby="stats-token-title">
+        <div class="stats-panel-head">
+          <div>
+            <div class="stats-panel-kicker" data-i18n="statsPage.tokenKicker">TOKEN VOLUME</div>
+            <h2 id="stats-token-title" class="stats-panel-title" data-i18n="statsPage.tokenTrend">Token 量趋势</h2>
+          </div>
+          <div id="stats-token-legend" class="stats-legend"></div>
+        </div>
+        <div id="stats-token-chart" class="stats-chart" role="list" aria-live="polite" data-i18n-aria="statsPage.tokenChartLabel"></div>
+      </section>
+      <p id="stats-note" class="stats-note"></p>
     </section>
 
     <!-- 设置 -->
@@ -877,12 +912,14 @@
         'overview.action.openSession': '打开最近会话', 'overview.action.newSession': '新建会话', 'overview.action.attention': '处理待办', 'overview.action.connect': '去设置连接', 'overview.action.refresh': '重新检查连接',
         'overview.communityEyebrow': 'COMMUNITY BOARD', 'overview.communityTitle': '公告与投票', 'overview.communityHistory': '历史公告', 'overview.communityEmpty': '暂无未读公告',
         'overview.communityPoll': '投票', 'overview.communityNotice': '公告', 'overview.communityNew': '新', 'overview.communityVote': '参与投票', 'overview.communityView': '查看公告', 'overview.communityVoted': '已参与',
-        'statsPage.title': 'Token 统计',
-        'statsPage.todayTokens': '今日 Token', 'statsPage.todayCost': '今日费用', 'statsPage.peakShare': '高峰占比',
+        'statsPage.eyebrow': '使用概览', 'statsPage.title': 'Token 统计', 'statsPage.subtitle': '按日查看 Token 用量与费用估算', 'statsPage.latest': '最新日期', 'statsPage.chartMetric': '图表指标', 'statsPage.modeTokens': 'Token 数', 'statsPage.modeCost': '费用（官方）',
+        'statsPage.costKicker': 'ESTIMATED COST', 'statsPage.tokenKicker': 'TOKEN VOLUME', 'statsPage.costChartLabel': '近 7 天费用趋势', 'statsPage.tokenChartLabel': '近 7 天 Token 用量趋势',
+        'statsPage.today': '今日', 'statsPage.tokenUnit': 'Tokens', 'statsPage.breakdown': '今日用量构成', 'statsPage.estimated': '估算费用', 'statsPage.peakShareLabel': '高峰费用占比 {n}%',
+        'statsPage.todayTokens': '今日 Token', 'statsPage.todayCost': '今日费用', 'statsPage.peakShare': '高峰占比', 'statsPage.costTrend': '费用趋势', 'statsPage.tokenTrend': 'Token 量趋势', 'statsPage.tokenTotal': 'Token 总量',
         'statsPage.input': '未缓存输入', 'statsPage.cacheRead': '缓存命中', 'statsPage.cacheWrite': '缓存写入', 'statsPage.output': '输出',
         'statsPage.peak': '高峰', 'statsPage.off': '空闲', 'statsPage.days': '近 {n} 天',
         'statsPage.gatewayDown': '统计需要网关运行', 'statsPage.empty': '暂无统计，产生会话后自动聚合',
-        'statsPage.note': '注：本数据仅在使用 DeepSeek 官方 API 时估算；基于 token 计算，与官网账单可能有出入，一切以官网为准。统计自 2026-08-17 定价生效日起。',
+        'statsPage.note': '注：Token 量按 DSH usage 事件记录，第三方 provider 需提供 usage 才能计入；费用仅对已知 DeepSeek 模型估算，与官网账单可能有出入，一切以官网为准。统计自 2026-08-17 定价生效日起。',
         'home.newSession': '＋ 新会话', 'home.newWorkspace': '＋ 工作区', 'home.empty': '暂无会话', 'home.createFailed': '新建会话失败', 'home.created': '会话已创建',
         'wb.unbound': '未绑定工作台', 'wb.bound': '绑定 {title}', 'wb.noProjects': '暂无项目', 'wb.noSessions': '暂无会话', 'wb.newSession': '新会话', 'wb.orderSaved': '顺序已保存到当前设备', 'wb.flatHidden': '工作台会话已收起（{n} 个）', 'wb.archivedHidden': '------隐藏已归档会话------', 'wb.archivedShown': '------显示已归档会话------',
         'workspace.createTitle': '新建工作区', 'workspace.createDesc': '将在当前文件目录下创建文件夹，并自动打开新会话。', 'workspace.parent': '父目录', 'workspace.namePlaceholder': '例如：my-project', 'workspace.cancel': '取消', 'workspace.create': '创建并打开', 'workspace.nameRequired': '请输入工作区名称', 'workspace.exists': '该目录已存在', 'workspace.invalidName': '名称不能包含路径分隔符', 'workspace.createFailed': '创建工作区失败：{msg}', 'workspace.created': '工作区已创建', 'workspace.createdNoSession': '工作区已创建，但新会话未能打开',
@@ -903,13 +940,13 @@
         'speed.switched': '已切换到最快服务器：{url}（{ms}ms）', 'speed.alreadyBest': '当前已是最快：{url}（{ms}ms）',
         'speed.allDown': '全部服务器不可达',
         'servers.empty': '未添加备用服务器 · 默认使用当前页面地址', 'servers.untested': '未测速',
-        'servers.current': ' · 当前', 'servers.unreachable': '不可达', 'servers.delete': '删除服务器',
+        'servers.current': ' · 当前', 'servers.unreachable': '不可达', 'servers.delete': '删除服务器', 'servers.tokenSet': '令牌已配置', 'servers.tokenMissing': '未配置令牌',
         'servers.currentDesc': '当前: {url}', 'servers.notSet': '未设置服务器', 'servers.defaultDesc': '默认 = 当前页面地址',
         'servers.needAddress': '请输入服务器地址', 'servers.badProtocol': '地址需以 http:// 或 https:// 开头',
-        'servers.duplicate': '该地址已在列表中', 'servers.added': '已添加服务器', 'servers.removedActive': '已删除当前服务器，重新测速…',
+        'servers.duplicate': '相同地址和令牌已在列表中', 'servers.added': '已添加服务器', 'servers.removedActive': '已删除当前服务器，重新测速…',
         'servers.currentDescGroup': '当前：{group} · {url}（{ms}）',
         'servers.edit': '编辑', 'servers.manualSelected': '已切换至：{url}',
-        'servers.promptNote': '服务器备注（可留空）：', 'servers.promptEditNote': '编辑备注（{url}）：',
+        'servers.promptNote': '服务器备注（可留空）：', 'servers.promptEditNote': '编辑备注（{url}）：', 'servers.promptEditToken': '编辑服务器令牌（留空保持不变）：',
         'servers.promptEditUrl': '编辑服务器地址：', 'servers.promptEditGroup': '所属组：', 'servers.edited': '服务器已更新',
         'speed.switchedOrigin': '已切换到当前页面（同源）', 'speed.manualUsing': '手动模式：{url}（{ms}）',
         'groups.current': '当前组', 'groups.add': '+ 组', 'groups.noServer': '组内暂无服务器',
@@ -1004,7 +1041,7 @@
         'settings.groupGeneral': '通用', 'settings.groupGeneralDesc': '显示工具调用、预设提示词',
         'settings.groupModel': '模型', 'settings.groupModelDesc': '提供方、API 密钥和模型目录',
         'settings.groupTests': '功能测试', 'settings.groupTestsDesc': '验证 Android 和 DSH 原生能力',
-        'settings.groupServers': '服务器', 'settings.groupServersDesc': '服务器地址、扫码连接',
+        'settings.groupServers': '服务器', 'settings.groupServersDesc': '服务器地址、令牌与扫码连接',
         'settings.groupNotify': '通知', 'settings.groupNotifyDesc': '通知、提醒、后台轮询',
         'settings.groupTheme': '皮肤', 'settings.groupThemeDesc': '配色主题',
         'settings.groupAbout': '关于', 'settings.groupAboutDesc': 'DSH 状态、检查更新',
@@ -1104,12 +1141,14 @@
         'overview.action.openSession': 'Open recent session', 'overview.action.newSession': 'New session', 'overview.action.attention': 'Review pending', 'overview.action.connect': 'Set up connection', 'overview.action.refresh': 'Check connection',
         'overview.communityEyebrow': 'COMMUNITY BOARD', 'overview.communityTitle': 'Announcements & polls', 'overview.communityHistory': 'History', 'overview.communityEmpty': 'No unread announcements',
         'overview.communityPoll': 'Poll', 'overview.communityNotice': 'Notice', 'overview.communityNew': 'New', 'overview.communityVote': 'Vote now', 'overview.communityView': 'View notice', 'overview.communityVoted': 'Voted',
-        'statsPage.title': 'Token stats',
-        'statsPage.todayTokens': 'Tokens today', 'statsPage.todayCost': 'Cost today', 'statsPage.peakShare': 'Peak share',
+        'statsPage.eyebrow': 'USAGE OVERVIEW', 'statsPage.title': 'Token stats', 'statsPage.subtitle': 'Daily token volume and estimated costs', 'statsPage.latest': 'Latest date', 'statsPage.chartMetric': 'Chart metric', 'statsPage.modeTokens': 'Token count', 'statsPage.modeCost': 'Cost (official)',
+        'statsPage.costKicker': 'ESTIMATED COST', 'statsPage.tokenKicker': 'TOKEN VOLUME', 'statsPage.costChartLabel': 'Cost trend for the last 7 days', 'statsPage.tokenChartLabel': 'Token volume trend for the last 7 days',
+        'statsPage.today': 'Today', 'statsPage.tokenUnit': 'Tokens', 'statsPage.breakdown': 'Today’s usage breakdown', 'statsPage.estimated': 'Estimated cost', 'statsPage.peakShareLabel': 'Peak cost share {n}%',
+        'statsPage.todayTokens': 'Tokens today', 'statsPage.todayCost': 'Cost today', 'statsPage.peakShare': 'Peak share', 'statsPage.costTrend': 'Cost trend', 'statsPage.tokenTrend': 'Token volume trend', 'statsPage.tokenTotal': 'Total tokens',
         'statsPage.input': 'Uncached input', 'statsPage.cacheRead': 'Cache read', 'statsPage.cacheWrite': 'Cache write', 'statsPage.output': 'Output',
         'statsPage.peak': 'Peak', 'statsPage.off': 'Off-peak', 'statsPage.days': 'Last {n} days',
         'statsPage.gatewayDown': 'Stats require the gateway', 'statsPage.empty': 'No stats yet — they aggregate as sessions happen',
-        'statsPage.note': 'Note: estimates assume the official DeepSeek API. Token-based calculation may differ from the official bill; always defer to deepseek.com. Stats start from the 2026-08-17 pricing date.',
+        'statsPage.note': 'Note: token volume uses DSH usage events; a third-party provider must expose usage to be counted. Costs are estimates for known DeepSeek models and may differ from the official bill; always defer to deepseek.com. Stats start from the 2026-08-17 pricing date.',
         'home.newSession': '＋ New session', 'home.newWorkspace': '＋ Workspace', 'home.empty': 'No sessions yet', 'home.createFailed': 'Failed to create session', 'home.created': 'Session created',
         'wb.unbound': 'No workbench bound', 'wb.bound': 'Bound {title}', 'wb.noProjects': 'No projects', 'wb.noSessions': 'No sessions', 'wb.newSession': 'New session', 'wb.orderSaved': 'Order saved on this device', 'wb.flatHidden': 'Workbench sessions folded ({n})', 'wb.archivedHidden': '------ Hide archived ------', 'wb.archivedShown': '------ Show archived ------',
         'workspace.createTitle': 'New workspace', 'workspace.createDesc': 'Create a folder in the current file directory and open a new session there.', 'workspace.parent': 'Parent folder', 'workspace.namePlaceholder': 'For example: my-project', 'workspace.cancel': 'Cancel', 'workspace.create': 'Create & open', 'workspace.nameRequired': 'Enter a workspace name', 'workspace.exists': 'That folder already exists', 'workspace.invalidName': 'The name cannot contain path separators', 'workspace.createFailed': 'Could not create workspace: {msg}', 'workspace.created': 'Workspace created', 'workspace.createdNoSession': 'Workspace created, but the new session could not be opened',
@@ -1130,13 +1169,13 @@
         'speed.switched': 'Switched to fastest server: {url} ({ms}ms)', 'speed.alreadyBest': 'Already on fastest: {url} ({ms}ms)',
         'speed.allDown': 'All servers unreachable',
         'servers.empty': 'No backup servers · using the current page URL', 'servers.untested': 'Untested',
-        'servers.current': ' · current', 'servers.unreachable': 'Unreachable', 'servers.delete': 'Remove server',
+        'servers.current': ' · current', 'servers.unreachable': 'Unreachable', 'servers.delete': 'Remove server', 'servers.tokenSet': 'Token set', 'servers.tokenMissing': 'No token',
         'servers.currentDesc': 'Current: {url}', 'servers.notSet': 'No server set', 'servers.defaultDesc': 'Default = current page URL',
         'servers.needAddress': 'Enter a server address', 'servers.badProtocol': 'Address must start with http:// or https://',
-        'servers.duplicate': 'This address is already in the list', 'servers.added': 'Server added', 'servers.removedActive': 'Removed active server, re-testing…',
+        'servers.duplicate': 'The same address and token is already in the list', 'servers.added': 'Server added', 'servers.removedActive': 'Removed active server, re-testing…',
         'servers.currentDescGroup': 'Current: {group} · {url} ({ms})',
         'servers.edit': 'Edit', 'servers.manualSelected': 'Switched to: {url}',
-        'servers.promptNote': 'Server note (optional):', 'servers.promptEditNote': 'Edit note ({url}):',
+        'servers.promptNote': 'Server note (optional):', 'servers.promptEditNote': 'Edit note ({url}):', 'servers.promptEditToken': 'Edit server token (blank keeps the current token):',
         'servers.promptEditUrl': 'Edit server URL:', 'servers.promptEditGroup': 'Group:', 'servers.edited': 'Server updated',
         'speed.switchedOrigin': 'Switched to current page (same origin)', 'speed.manualUsing': 'Manual mode: {url} ({ms})',
         'groups.current': 'Current group', 'groups.add': '+ Group', 'groups.noServer': 'No servers in this group',
@@ -1231,7 +1270,7 @@
         'settings.groupGeneral': 'General', 'settings.groupGeneralDesc': 'Tool calls, prompt presets',
         'settings.groupModel': 'Models', 'settings.groupModelDesc': 'Providers, API keys, and model catalogs',
         'settings.groupTests': 'Feature tests', 'settings.groupTestsDesc': 'Check Android and DSH native capabilities',
-        'settings.groupServers': 'Servers', 'settings.groupServersDesc': 'Server address, scan to pair',
+        'settings.groupServers': 'Servers', 'settings.groupServersDesc': 'Server address, token, and scan to pair',
         'settings.groupNotify': 'Notifications', 'settings.groupNotifyDesc': 'Notifications, reminders, background polling',
         'settings.groupTheme': 'Theme', 'settings.groupThemeDesc': 'Color themes',
         'settings.groupAbout': 'About', 'settings.groupAboutDesc': 'DSH status, updates',