dsh-remote-plugin 0.6.12 → 0.6.14

package/public/app.js

@@ -13,14 +13,16 @@ const LS = {
 }
 const CLIENT_ID = (() => {
   try {
-    let id = sessionStorage.getItem('dshRemoteClientId')
+    const key = 'dshRemoteClientIdV2'
+    let id = localStorage.getItem(key)
     if (!id) {
       id = (globalThis.crypto?.randomUUID?.() || `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`)
-      sessionStorage.setItem('dshRemoteClientId', id)
+      localStorage.setItem(key, id)
     }
     return id
   } catch { return '' }
 })()
+function clientIdHeaders() { return CLIENT_ID ? { 'x-dsh-remote-client-id': CLIENT_ID } : {} }
 
 /* 离线缓存: 会话列表 + 每会话聊天记录。只在网络失败时兜底展示, 不会替代线上数据。 */
 const CACHE = {
@@ -55,6 +57,7 @@ const state = {
   autoSelect: { '默认': true },   // 组内自动测速选优 / 手动指定
   groupActive: { '默认': '' },    // 每组当前生效的 server id(手动模式)
   serverLatency: {},      // url -> 最近一次 /health 测速毫秒数
+  gatewayHealth: {},      // url -> /health 协议版本与能力声明
   selectingServer: false, // 防重入: 测速/切换中
   sessions: [],
   sessionSort: LS.get('sessionSort', 'time') === 'workspace' ? 'workspace' : 'time',
@@ -64,11 +67,14 @@ const state = {
   hostInfo: null,
   localVersion: '',
   updateInfo: null,
+  warnedGatewayVersions: new Set(),
   announcement: null,
   announcements: [],
   approvals: [],           // 待处理审批
   questions: [],           // 待处理提问
   queues: {},              // sessionId -> queue items
+  queueSteering: {},       // sessionId:itemId -> pending steer request
+  sessionTurnTimes: {},    // sessionId -> 本轮开始/结束时间，避免中间事件推动排序
   jobs: {},                // sessionId -> jobs
   history: emptyHistory(),
   errCount: 0,
@@ -86,7 +92,8 @@ const state = {
   wbProjects: [],
   wbArchived: [],
   wbOpen: false,
-  wbOpenProjects: {}
+  wbOpenProjects: {},
+  subagentExpandedSession: ''
 }
 
 const $ = (id) => document.getElementById(id)
@@ -355,11 +362,13 @@ async function getWsTicket() {
   const token = state.token
   const server = state.server
   wsTicketPromise = (async () => {
+    if (activeGatewayCapability('wsTicket') === false) throw new Error('ws ticket unsupported')
     const res = await fetch(apiUrl('/api/ws-ticket'), {
       method: 'POST',
       headers: {
         authorization: 'Bearer ' + token,
         'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web',
+        ...clientIdHeaders(),
       }
     })
     if (!res.ok) throw new Error('ws ticket HTTP ' + res.status)
@@ -411,7 +420,7 @@ async function loadStats() {
   }
   try {
     const res = await fetch(apiUrl('/stats/summary?days=7'), {
-      headers: { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' }
+      headers: { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() }
     })
     if (res.status === 401) { authFailure(); return }
     if (!res.ok) throw new Error('HTTP ' + res.status)
@@ -477,7 +486,7 @@ function renderStats(days) {
 async function rpc(method, payload = {}, timeoutMs = 45000) {
   const opts = {
     method: 'POST',
-    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' },
+    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() },
     body: JSON.stringify({ type: 'client-request', rpcId: uuid(), method, payload })
   }
   if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
@@ -498,7 +507,7 @@ async function rpc(method, payload = {}, timeoutMs = 45000) {
 async function respond(rpcId, value) {
   const opts = {
     method: 'POST',
-    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' },
+    headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() },
     body: JSON.stringify({ type: 'client-response', rpcId, result: { ok: true, value } })
   }
   if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
@@ -621,7 +630,10 @@ async function pingServer(base) {
   const timer = setTimeout(() => ctrl.abort(), 3500)
   try {
     const res = await fetch(u + '/health?t=' + Date.now(), { signal: ctrl.signal, cache: 'no-store' })
-    return res.ok ? Math.round(performance.now() - t0) : Infinity
+    if (!res.ok) return Infinity
+    const health = await res.json().catch(() => null)
+    if (health && typeof health === 'object') state.gatewayHealth[u] = health
+    return Math.round(performance.now() - t0)
   } catch {
     return Infinity
   } finally {
@@ -629,6 +641,13 @@ async function pingServer(base) {
   }
 }
 
+function activeGatewayCapability(name) {
+  const key = String(state.server || location.origin || '').replace(/\/+$/, '')
+  const capabilities = state.gatewayHealth[key]?.capabilities
+  if (!capabilities || !Object.prototype.hasOwnProperty.call(capabilities, name)) return null
+  return Number(capabilities[name]) > 0
+}
+
 async function selectFastestServer({ silent = false, reconnect = true } = {}) {
   if (state.selectingServer) return null
   state.selectingServer = true
@@ -677,6 +696,7 @@ async function selectFastestServer({ silent = false, reconnect = true } = {}) {
       else if (chosen) toast(t('speed.manualUsing', { url: chosen, ms: Number.isFinite(ms) ? ms : '—' }), 'ok')
       else toast(t('speed.allDown'), 'err')
     }
+    await maybeWarnAppBehindGateway()
     return chosen
   } finally {
     state.selectingServer = false
@@ -1149,7 +1169,7 @@ async function pollKind(kind) {
   let res
   try {
     const signal = typeof AbortSignal?.timeout === 'function' ? AbortSignal.timeout(5000) : undefined
-    const headers = { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' }
+    const headers = { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() }
     res = signal ? await fetch(apiUrl(`/api/events.poll?kind=${kind}&since=${since}`), { signal, headers }) : await fetch(apiUrl(`/api/events.poll?kind=${kind}&since=${since}`), { headers })
   } catch { return }
   if (res.status === 401) { authFailure(); return }
@@ -1281,7 +1301,10 @@ function onHostFrame(full) {
 function onSessionEvent(sessionId, event) {
   if (!event) return
   const s = state.byId.get(sessionId)
-  if (s) s.updatedAt = Date.now()
+  if (event.type === 'turn/start' || event.type === 'turn/end') {
+    noteSessionTurnTime(sessionId, event)
+    renderSessions()
+  }
   if (event.type === 'agent/status') {
     if (s) { s.running = !!event.data?.running; s.blank = false; if (s.running) s.error = false }
     if (state.current === sessionId) { updateCancelBtn(); renderSessionSub(); updateSessionStatus() }
@@ -1343,6 +1366,10 @@ function applyProjection(sessionId, key, value, seq) {
 }
 function titleOf(s) { return proj(s, 'title') || (s?.sessionId ? short(s.sessionId) : t('session.unknown')) }
 function short(id) { return '…' + String(id).slice(-8) }
+function isTopLevelSession(session) {
+  return !!session && !session.parentSessionId && session.origin !== 'subagent'
+}
+function topLevelSessions() { return state.sessions.filter(isTopLevelSession) }
 const GOAL_TERMINAL_PHASES = new Set(['complete', 'cleared'])
 function isGoalTerminal(goal) {
   return !!goal && GOAL_TERMINAL_PHASES.has(goal.phase)
@@ -1451,7 +1478,7 @@ async function refreshWorkbench() {
   if (!state.token) return
   try {
     const res = await fetch(apiUrl('/workbench'), {
-      headers: { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' }
+      headers: { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() }
     })
     if (res.ok) {
       const value = await res.json().catch(() => null)
@@ -1523,12 +1550,12 @@ function renderWorkbench() {
   panel.innerHTML = projects.map(w => {
     const id = String(w.workspaceId || '')
     const open = !!state.wbOpenProjects[id]
-    const sessions = (w.sessionIds || []).map(sid => state.byId.get(sid)).filter(Boolean).filter(s => !archivedSet.has(s.sessionId))
+    const sessions = (w.sessionIds || []).map(sid => state.byId.get(sid)).filter(isTopLevelSession).filter(s => !archivedSet.has(s.sessionId))
     const body = open ? `<div class="wb-sessions">${sessions.length ? sessions.map(s => `
       <div class="session-swipe" data-session-swipe data-id="${esc(s.sessionId)}">
         <button class="wb-session" type="button" data-wb-session="${esc(s.sessionId)}">
           <span class="wb-session-title">${esc(titleOf(s))}</span>
-          <span class="wb-session-meta">${s.running ? esc(t('sessions.running')) : esc(fmtTime(s.updatedAt))}</span>
+          <span class="wb-session-meta">${s.running ? esc(t('sessions.running')) : esc(fmtTime(sessionSortTime(s)))}</span>
         </button>
         <button type="button" class="sc-archive-btn" data-archive-session="${esc(s.sessionId)}">${esc(t('session.archive'))}</button>
       </div>`).join('') : `<div class="wb-empty">${esc(t('wb.noSessions'))}</div>`}</div>` : ''
@@ -1558,17 +1585,26 @@ function workspaceDisplayName(label) {
   const parts = clean.split(/[\\/]/).filter(Boolean)
   return parts[parts.length - 1] || value
 }
+function sessionSortTime(s) {
+  return Math.max(Number(state.sessionTurnTimes[s?.sessionId]) || 0, Number(s?.updatedAt) || 0, Number(s?.createdAt) || 0)
+}
+function noteSessionTurnTime(sessionId, eventOrTime) {
+  const raw = typeof eventOrTime === 'object' ? eventOrTime?.time : eventOrTime
+  const time = Number(raw) > 0 ? Number(raw) : Date.now()
+  if (!sessionId || !Number.isFinite(time)) return
+  state.sessionTurnTimes[sessionId] = Math.max(Number(state.sessionTurnTimes[sessionId]) || 0, time)
+}
 function sortedSessions() {
-  const items = [...state.sessions]
+  const items = topLevelSessions()
   if (state.sessionSort === 'workspace') {
     return items.sort((a, b) => {
       const aw = sessionCwd(a) || '\uffff'
       const bw = sessionCwd(b) || '\uffff'
       const byWorkspace = aw.localeCompare(bw, undefined, { numeric: true, sensitivity: 'base' })
-      return byWorkspace || ((b.updatedAt || 0) - (a.updatedAt || 0))
+      return byWorkspace || (sessionSortTime(b) - sessionSortTime(a))
     })
   }
-  return items.sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
+  return items.sort((a, b) => sessionSortTime(b) - sessionSortTime(a))
 }
 function renderSessions() {
   const list = $('session-list')
@@ -1607,7 +1643,7 @@ function renderSessions() {
         <div class="sc-title">${esc(title)}</div>
         <div class="sc-meta">
           <span class="sc-dot ${dots.join(' ')}"></span>
-          <span>${fmtTime(s.updatedAt)}</span>
+          <span>${fmtTime(sessionSortTime(s))}</span>
           ${s.running ? '<span>' + t('sessions.running') + '</span>' : ''}
           ${badge}${queueBadge}
         </div>
@@ -1626,7 +1662,7 @@ function renderSessions() {
   const sort = $('session-sort')
   if (sort) { sort.value = state.sessionSort; syncCustomSelect(sort) }
   $('home-empty').classList.toggle('hidden', visible.length > 0)
-  const running = state.sessions.filter(s => s.running).length
+  const running = topLevelSessions().filter(s => s.running).length
   const pending = state.approvals.length + state.questions.length
   $('stat-strip').innerHTML = `
     <div class="stat running"><div class="v">${running}</div><div class="k">${t('sessions.statRunning')}</div></div>
@@ -1644,6 +1680,7 @@ async function openSession(id) {
   $('session-cards').innerHTML = ''
   renderSessionTitle(); renderSessionSub(); updateCancelBtn(); updateSessionStatus()
   $('history').innerHTML = '<div class="empty">' + t('history.loading') + '</div>'
+  renderQueue()
   restoreCachedHistory()
   await loadHistory(true)
   renderSessionCards()
@@ -1668,7 +1705,7 @@ function bindNativeBack() {
       if ($('composer-wrap')?.classList.contains('fs')) { setComposerFullscreen(false); return }
       if (customSelectCurrent) { closeCustomSelect(); return }
       const openModal = [...document.querySelectorAll('.modal')].find(m => !m.classList.contains('hidden'))
-      if (openModal) { if (openModal.id === 'modal-notes') closeNotesModal(); else if (openModal.id === 'modal-archive') closeArchiveConfirm(); else openModal.classList.add('hidden'); return }   // 先关弹窗
+      if (openModal) { if (openModal.id === 'modal-notes') closeNotesModal(); else if (openModal.id === 'modal-archive') closeArchiveConfirm(); else if (openModal.id === 'modal-app-version-warning') closeAppVersionWarning(false); else if (openModal.id === 'modal-scan-live') closeLiveScan(''); else openModal.classList.add('hidden'); return }   // 先关弹窗
       if (document.body.classList.contains('in-session')) { closeSession(); return } // 会话页 → 回主页
       if (!$('view-files').classList.contains('hidden')) {           // 文件页 → 上级目录 → 主页
         if (state.fs.path && state.fs.initial && state.fs.path !== state.fs.initial) { fsUp(); return }
@@ -1699,6 +1736,8 @@ function updateSessionStatus() {
   const s = state.byId.get(state.current)
   const head = $('session-head')
   if (!head) return
+  const composerStatus = $('composer-status')
+  if (composerStatus) composerStatus.classList.toggle('hidden', !s?.running)
   head.classList.remove('running', 'interrupted')
   const queued = (state.queues[state.current] || []).some(i => i.placement !== 'context')
   if (s?.running || queued) head.classList.add('running')
@@ -1716,8 +1755,76 @@ const HISTORY_MAX_VISIBLE = 5000  // 已加载的可显示事件上限(消息/
 function emptyHistory() {
   return {
     visible: [], seqs: new Set(), minSeq: Infinity,
-    hasMore: false, loading: false, renderStart: 0, renderEnd: 0
+    hasMore: false, loading: false, renderStart: 0, renderEnd: 0,
+    partialReasoning: new Map()
+  }
+}
+
+function reasoningStreamKey(data, index) {
+  return `${data?.turn ?? '?'}:${data?.step ?? '?'}:${index ?? '?'}`
+}
+
+/**
+ * DSH 的实时思考以 assistant/chunk 下发，历史尾页可能把增量压成
+ * reasoning-chunks。最终 assistant/message 到达后再由正式消息接管展示。
+ */
+function applyReasoningStreamEvent(event) {
+  const h = state.history
+  const data = event?.data || {}
+  let changed = false
+  if (event?.type === 'assistant/chunk') {
+    const chunk = data.chunk || {}
+    const key = reasoningStreamKey(data, chunk.index)
+    if (chunk.type === 'block-start' && chunk.blockType === 'reasoning') {
+      h.partialReasoning.set(key, { turn: data.turn, step: data.step, index: chunk.index, text: '' })
+      changed = true
+    } else if (chunk.type === 'reasoning-delta') {
+      const item = h.partialReasoning.get(key) || { turn: data.turn, step: data.step, index: chunk.index, text: '' }
+      item.text += String(chunk.text || '')
+      h.partialReasoning.set(key, item)
+      changed = true
+    } else if (chunk.type === 'block-end' && chunk.block?.type === 'reasoning') {
+      h.partialReasoning.set(key, {
+        turn: data.turn, step: data.step, index: chunk.index,
+        text: String(chunk.block.text ?? chunk.block.content ?? '')
+      })
+      changed = true
+    }
+  } else if (event?.type === 'reasoning-chunks') {
+    const key = reasoningStreamKey(data, data.index)
+    const item = h.partialReasoning.get(key) || { turn: data.turn, step: data.step, index: data.index, text: '' }
+    item.text += Array.isArray(data.texts) ? data.texts.join('') : String(data.text || '')
+    h.partialReasoning.set(key, item)
+    changed = true
+  } else if (event?.type === 'assistant/message') {
+    for (const [key, item] of h.partialReasoning) {
+      if (item.turn === data.turn && item.step === data.step) {
+        h.partialReasoning.delete(key)
+        changed = true
+      }
+    }
   }
+  return changed
+}
+
+let reasoningRenderTimer = null
+function scheduleReasoningRender() {
+  if (reasoningRenderTimer) return
+  reasoningRenderTimer = setTimeout(() => {
+    reasoningRenderTimer = null
+    if (!state.current) return
+    const box = $('history')
+    const nearBottom = box.scrollHeight - box.scrollTop - box.clientHeight < 240
+    renderHistory(false, nearBottom ? 'bottom' : 'fixed')
+  }, 80)
+}
+
+function partialReasoningHtml() {
+  return [...state.history.partialReasoning.values()]
+    .filter(item => item.text)
+    .sort((a, b) => (a.turn ?? 0) - (b.turn ?? 0) || (a.step ?? 0) - (b.step ?? 0) || (a.index ?? 0) - (b.index ?? 0))
+    .map(item => `<div class="msg assistant reasoning-live"><div class="role">${esc(t('role.dsh'))}</div><details class="tool" open><summary>${esc(t('block.thinkingLive'))}</summary><div class="tool-text">${esc(truncate(item.text, 12000))}</div></details></div>`)
+    .join('')
 }
 
 function trimVisible() {
@@ -1806,11 +1913,14 @@ async function loadHistory(reset) {
 
   const incoming = v.events || []
   let added = 0
+  if (reset) state.history.partialReasoning.clear()
   for (const entry of incoming) {
     const ev = entry?.event
     const seq = ev?.seq
+    if (ev?.type === 'turn/start' || ev?.type === 'turn/end') noteSessionTurnTime(id, ev)
+    applyReasoningStreamEvent(ev)
     if (seq == null || state.history.seqs.has(seq)) continue
-    if (!shouldShowEvent(ev.type)) continue          // chunk 等内部事件不保留
+    if (!shouldShowEvent(ev.type, ev)) continue     // chunk 与非用户上下文不保留
     state.history.seqs.add(seq)
     state.history.visible.push({ seq, event: ev, view: entry.view })
     added++
@@ -1835,8 +1945,16 @@ async function loadHistory(reset) {
 
 function insertLiveEvent(event) {
   const h = state.history
+  const reasoningChanged = applyReasoningStreamEvent(event)
+  if (event?.type === 'assistant/chunk' || event?.type === 'reasoning-chunks') {
+    if (reasoningChanged) scheduleReasoningRender()
+    return
+  }
   const seq = event?.seq
-  if (seq == null || h.seqs.has(seq) || !shouldShowEvent(event.type)) return
+  if (seq == null || h.seqs.has(seq) || !shouldShowEvent(event.type, event)) {
+    if (reasoningChanged) scheduleReasoningRender()
+    return
+  }
   h.seqs.add(seq)
   h.visible.push({ seq, event })
   h.visible.sort((a, b) => a.seq - b.seq)
@@ -1870,7 +1988,8 @@ function renderHistory(reset, mode = 'bottom') {
   const h = state.history
   const filtered = filteredEntries()
   const len = filtered.length
-  if (!len) {
+  const reasoningHtml = partialReasoningHtml()
+  if (!len && !reasoningHtml) {
     box.innerHTML = '<div class="empty">' + t('history.empty') + '</div>'
     h.renderStart = 0; h.renderEnd = 0
     updateRail()
@@ -1891,7 +2010,7 @@ function renderHistory(reset, mode = 'bottom') {
     const d = e.event.data || {}
     if (d.callId && d.name) toolNames.set(d.callId, d.name)
   }
-  box.innerHTML = filtered.slice(start, end).map(e => eventHtml(e, { toolNames })).join('')
+  box.innerHTML = filtered.slice(start, end).map(e => eventHtml(e, { toolNames })).join('') + reasoningHtml
   if (reset || mode === 'bottom') box.scrollTop = box.scrollHeight
   else if (mode === 'keep') box.scrollTop = Math.max(0, oldTop + (box.scrollHeight - oldH))
   else if (mode === 'fixed') box.scrollTop = oldTop
@@ -1972,9 +2091,24 @@ const INTERESTING_EVENTS = new Set([
   'approval/asked', 'approval/resolved',
   'session/title', 'title'
 ])
-function shouldShowEvent(type) {
-  if (INTERESTING_EVENTS.has(type)) return true
-  return false
+function messageSource(data) {
+  const source = data?.source ?? data?.message?.source
+  return source && typeof source === 'object' ? source : null
+}
+function isHumanUserMessage(event) {
+  if (event?.type !== 'user/message') return false
+  const source = messageSource(event.data || {})
+  // Older DSH events may not carry source metadata; keep those visible for compatibility.
+  return !source || source.kind === 'user'
+}
+function shouldShowEvent(type, event) {
+  if (!INTERESTING_EVENTS.has(type)) return false
+  if (type === 'user/message' && !isHumanUserMessage(event)) {
+    const data = event?.data || {}
+    const blocks = data.message?.content || data.content || []
+    return systemReminderText(blocks).length > 0
+  }
+  return true
 }
 function systemReminderText(blocks) {
   if (!Array.isArray(blocks)) return ''
@@ -1988,7 +2122,7 @@ function eventHtml(entry, ctx = {}) {
   const ev = entry.event || {}
   const data = ev.data || {}
   const type = ev.type || 'event'
-  if (!shouldShowEvent(type)) return ''
+  if (!shouldShowEvent(type, ev)) return ''
   let inner = ''
 
   if (type === 'user/message' || type === 'assistant/message') {
@@ -1998,6 +2132,8 @@ function eventHtml(entry, ctx = {}) {
     const sysText = type === 'user/message' ? systemReminderText(blocks) : ''
     if (sysText) {
       inner = `<details class="event event-detail" data-seq="${seq}"><summary>${esc(t('event.systemReminder'))}</summary><pre>${esc(truncate(sysText, 4000))}</pre></details>`
+    } else if (type === 'user/message' && !isHumanUserMessage(ev)) {
+      return ''
     } else {
       inner = `<div class="msg ${esc(role)}" data-seq="${seq}"><div class="role">${esc(role === 'user' ? t('role.me') : t('role.dsh'))}</div>${blocks.map(blockHtml).join('')}</div>`
     }
@@ -2105,13 +2241,19 @@ async function renderSessionCards() {
   const sub = await safeRpc('subagent.list', { parentSessionId: sessionId })
   if (renderGeneration !== sessionCardsRenderGeneration || state.current !== sessionId) return
   if (sub?.entries?.length) {
+    const expanded = state.subagentExpandedSession === sessionId
+    const toggleLabel = expanded ? t('subagent.collapse') : t('subagent.expand')
     const rows = sub.entries.map(e => {
       if (e.kind === 'diagnostic') return `<div class="card-row"><span class="k">${t('subagent.diagnostic')}</span><span class="v">${esc(e.reason)}</span></div>`
       const label = e.label || short(e.id)
       const running = e.activity === 'running'
       return `<div class="card-row"><span class="k">${running ? '▶ ' : ''}${esc(label)}</span><span class="v">${esc(e.mode)} ${running ? t('subagent.running') : ''}${e.mode === 'continuable' && running ? ` <button class="mini-btn" data-sub-interrupt="${esc(e.id)}">${t('subagent.interrupt')}</button>` : ''}</span></div>`
     }).join('')
-    box.insertAdjacentHTML('beforeend', `<div class="card"><div class="card-title">${t('subagent.title')}</div>${rows}</div>`)
+    box.insertAdjacentHTML('beforeend', `<div class="card subagent-card"><button type="button" class="subagent-toggle" data-subagent-toggle aria-expanded="${expanded}" aria-label="${esc(toggleLabel)}" title="${esc(toggleLabel)}"><span class="card-title">${esc(t('subagent.count', { n: sub.entries.length }))}</span><span class="subagent-toggle-icon" aria-hidden="true">${expanded ? '⌃' : '⌄'}</span></button><div class="subagent-list${expanded ? '' : ' hidden'}">${rows}</div></div>`)
+    box.querySelector('[data-subagent-toggle]')?.addEventListener('click', () => {
+      state.subagentExpandedSession = expanded ? '' : sessionId
+      renderSessionCards()
+    })
     box.querySelectorAll('[data-sub-interrupt]').forEach(btn =>
       btn.addEventListener('click', () => interruptSubagent(btn.dataset.subInterrupt)))
   }
@@ -2164,7 +2306,7 @@ async function runSlashCommand(text) {
       : undefined
     const res = await fetch(apiUrl('/remote/api/command'), {
       method: 'POST',
-      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' },
+      headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web', ...clientIdHeaders() },
       body: JSON.stringify({ sessionId: state.current, line: clean }),
       ...(signal ? { signal } : {})
     })
@@ -2291,7 +2433,12 @@ async function sendSessionContent(text, images) {
       mode: 'queue',
       content
     }, t('send.failed'))
-    if (v?.accepted) { toast(images.length ? t('send.imageSent') : (clean.startsWith('/') ? t('send.commandSent') : t('send.sent')), 'ok'); return true }
+    if (v?.accepted) {
+      noteSessionTurnTime(state.current, Date.now())
+      renderSessions()
+      toast(images.length ? t('send.imageSent') : (clean.startsWith('/') ? t('send.commandSent') : t('send.sent')), 'ok')
+      return true
+    }
     if (v?.command?.text) { toast(t('send.commandExecuted'), 'ok'); return true }
     return false
   } catch (e) {
@@ -2393,16 +2540,37 @@ function renderEffortMenu() {
   const cur = state.models.current
   const provider = (state.models.groups || []).find(g => g.id === cur?.provider)
   const model = (provider?.models || []).find(m => m.id === cur?.model)
-  const efforts = model?.reasoning?.efforts || []
-  group.classList.toggle('hidden', !efforts.length)
+  const { efforts, defaultEffort, custom } = reasoningEffortOptions(model)
+  group.classList.toggle('hidden', !cur || !efforts.length)
   box.innerHTML = efforts.map(e => {
-    const isCur = cur?.reasoningEffort === e.id || (!cur?.reasoningEffort && e.id === model.reasoning.defaultEffort)
+    const isCur = cur?.reasoningEffort === e.id || (!cur?.reasoningEffort && e.id === defaultEffort)
     return `<button class="menu-chip ${isCur ? 'current' : ''}" data-effort="${esc(e.id)}" title="${esc(e.description || '')}">${esc(e.name || e.id)}</button>`
-  }).join('')
+  }).join('') + (custom ? `<span class="effort-hint">${esc(t('models.effortCustomHint'))}</span>` : '')
   box.querySelectorAll('[data-effort]').forEach(btn =>
     btn.addEventListener('click', () => selectSessionEffort(btn.dataset.effort)))
 }
 
+function reasoningEffortOptions(model) {
+  const raw = Array.isArray(model?.reasoning?.efforts) && model.reasoning.efforts.length
+    ? model.reasoning.efforts
+    : (Array.isArray(model?.reasoningEfforts) && model.reasoningEfforts.length ? model.reasoningEfforts : null)
+  const names = {
+    low: t('models.effortLow'), high: t('models.effortHigh'), max: t('models.effortMax'), off: t('models.effortOff')
+  }
+  if (raw) {
+    return {
+      efforts: raw.map(e => typeof e === 'string' ? { id: e, name: names[e] || e } : e),
+      defaultEffort: model?.reasoning?.defaultEffort,
+      custom: !model?.reasoning?.efforts
+    }
+  }
+  return {
+    efforts: ['low', 'high', 'max'].map(id => ({ id, name: names[id] })),
+    defaultEffort: undefined,
+    custom: true
+  }
+}
+
 async function selectSessionEffort(effortId) {
   const cur = state.models.current
   if (!state.current || !cur) return
@@ -2615,8 +2783,9 @@ function renderOverview() {
     btn.addEventListener('click', () => openQuestionModal(state.questions.find(q => q.rpcId === btn.dataset.overviewQuestion)))
   })
 
-  const running = state.sessions.filter(s => s.running).length
-  const sessions = [...state.sessions].sort((a, b) => Number(b.running) - Number(a.running) || (new Date(b.updatedAt || 0) - new Date(a.updatedAt || 0))).slice(0, 4)
+  const topSessions = topLevelSessions()
+  const running = topSessions.filter(s => s.running).length
+  const sessions = topSessions.sort((a, b) => Number(b.running) - Number(a.running) || (sessionSortTime(b) - sessionSortTime(a))).slice(0, 4)
   const primary = $('overview-primary-action')
   if (primary) {
     let action = 'new'
@@ -2647,7 +2816,7 @@ function renderOverview() {
   $('overview-connection-mode').textContent = state.token ? t(state.streamMode === 'poll' ? 'overview.poll' : 'overview.ws') : '—'
   $('overview-active-count').textContent = running ? t('overview.activeCount', { n: running }) : ''
   $('overview-session-list').innerHTML = sessions.length ? sessions.map(s => `<button type="button" class="overview-session-item ${s.running ? 'running' : ''}" data-overview-session="${esc(s.sessionId)}">
-    <span class="overview-item-mark">${s.running ? '●' : '○'}</span><span class="overview-item-copy"><span class="overview-item-title">${esc(titleOf(s))}</span><span class="overview-item-desc">${s.running ? esc(t('sessions.running')) + ' · ' : ''}${esc(fmtTime(s.updatedAt))}</span></span><span class="overview-item-arrow">›</span>
+    <span class="overview-item-mark">${s.running ? '●' : '○'}</span><span class="overview-item-copy"><span class="overview-item-title">${esc(titleOf(s))}</span><span class="overview-item-desc">${s.running ? esc(t('sessions.running')) + ' · ' : ''}${esc(fmtTime(sessionSortTime(s)))}</span></span><span class="overview-item-arrow">›</span>
   </button>`).join('') : `<div class="overview-empty">${t('overview.noSession')}</div>`
   $('overview-session-list').querySelectorAll('[data-overview-session]').forEach(btn => btn.addEventListener('click', () => openSession(btn.dataset.overviewSession)))
 }
@@ -2743,11 +2912,46 @@ async function submitQuestion() {
 }
 
 /* ---------------- 后台任务 ---------------- */
+function queuePreview(item) {
+  const blocks = item?.message?.content || item?.content || []
+  const text = Array.isArray(blocks)
+    ? blocks.filter(block => block?.type === 'text').map(block => String(block.text || '')).join(' ').trim()
+    : ''
+  return text || (Array.isArray(blocks) && blocks.some(block => block?.type === 'image') ? t('queue.image') : '…')
+}
+async function steerQueueItem(itemId) {
+  const sessionId = state.current
+  const key = `${sessionId}:${itemId}`
+  const s = state.byId.get(sessionId)
+  if (!sessionId || !s?.running || state.queueSteering[key]) return
+  state.queueSteering[key] = true
+  renderQueue()
+  try {
+    const v = await safeRpc('session.updateQueue', { sessionId, itemId, action: { kind: 'steer' } }, t('queue.steerFailed', { msg: '' }).replace(/：$/, '').replace(/: $/, ''))
+    if (v?.accepted) toast(t('queue.steerSubmitted'), 'ok')
+  } finally {
+    delete state.queueSteering[key]
+    renderQueue()
+  }
+}
 function renderQueue() {
   const s = state.byId.get(state.current)
   if (!s) return
-  const items = state.queues[state.current] || []
+  const items = (state.queues[state.current] || []).filter(item => item?.placement === 'queued')
+  const box = $('queue-dock')
+  if (box) {
+    box.classList.toggle('hidden', !items.length)
+    box.innerHTML = items.length ? `<div class="queue-dock-head"><span>⌁</span><span>${esc(t('queue.title'))} · ${items.length}</span></div><div class="queue-dock-list">${items.map(item => {
+      const key = `${state.current}:${item.id}`
+      const busy = !!state.queueSteering[key]
+      return `<div class="queue-dock-item"><span class="queue-dock-preview" title="${esc(queuePreview(item))}">${esc(queuePreview(item))}</span><button type="button" class="mini-btn queue-dock-action" data-queue-steer="${esc(item.id)}" title="${esc(s.running ? t('queue.steer') : t('queue.steerUnavailable'))}" ${s.running && !busy ? '' : 'disabled'}>${busy ? '…' : esc(t('queue.steer'))}</button></div>`
+    }).join('')}</div>` : ''
+    box.querySelectorAll('[data-queue-steer]').forEach(button => {
+      button.addEventListener('click', () => steerQueueItem(button.dataset.queueSteer))
+    })
+  }
   updateCancelBtn()
+  updateSessionStatus()
   // 队列数量在会话列表已显示; 详情页不重复大 UI
   $('history-hint').textContent = items.length ? t('history.queueAndCount', { q: items.length, n: state.history.visible.length }) : t('history.countOnly', { n: state.history.visible.length })
   renderSessions()
@@ -2770,7 +2974,8 @@ function renderJobs() {
 function fsHeaders() {
   return {
     authorization: 'Bearer ' + state.token,
-    'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web'
+    'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web',
+    ...clientIdHeaders()
   }
 }
 
@@ -3140,6 +3345,7 @@ async function runFsUpload(up) {
     xhr.open('POST', fsApiUrl('/upload', params))
     xhr.setRequestHeader('authorization', 'Bearer ' + state.token)
     xhr.setRequestHeader('x-dsh-remote-client', CAP?.isNativePlatform?.() ? 'app' : 'web')
+    if (CLIENT_ID) xhr.setRequestHeader('x-dsh-remote-client-id', CLIENT_ID)
     xhr.upload.onprogress = (e) => {
       if (e.lengthComputable) {
         const loaded = up.offset + Math.min(e.loaded, e.total)
@@ -3385,6 +3591,54 @@ function cmpVersion(a, b) {
   return 0
 }
 
+function isComparableVersion(value) {
+  return /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(String(value || '').trim())
+}
+
+function isAppBehindGateway(appVersion, gatewayVersion) {
+  return isComparableVersion(appVersion) && isComparableVersion(gatewayVersion) && cmpVersion(gatewayVersion, appVersion) > 0
+}
+
+function isAppVersionWarningOpen() {
+  const modal = $('modal-app-version-warning')
+  return !!modal && !modal.classList.contains('hidden')
+}
+
+async function maybeWarnAppBehindGateway({ probe = false } = {}) {
+  if (!CAP?.isNativePlatform?.() || !state.localVersion) return false
+  const base = String(state.server || '').replace(/\/+$/, '')
+  if (!base) return false
+  let health = state.gatewayHealth[base]
+  if (!health && probe) {
+    await pingServer(base)
+    health = state.gatewayHealth[base]
+  }
+  const gatewayVersion = String(health?.version || '').trim()
+  if (!isAppBehindGateway(state.localVersion, gatewayVersion)) return false
+  const warningKey = `${state.localVersion}\u0000${gatewayVersion}`
+  if (state.warnedGatewayVersions.has(warningKey)) return false
+  const anotherModal = [...document.querySelectorAll('.modal')]
+    .some(modal => modal.id !== 'modal-app-version-warning' && !modal.classList.contains('hidden'))
+  if (anotherModal) return false
+  state.warnedGatewayVersions.add(warningKey)
+  $('app-version-current').textContent = 'v' + state.localVersion
+  $('app-version-gateway').textContent = 'v' + gatewayVersion
+  $('modal-app-version-warning').classList.remove('hidden')
+  setTimeout(() => $('app-version-update')?.focus(), 50)
+  return true
+}
+
+function closeAppVersionWarning(checkNow = false) {
+  $('modal-app-version-warning').classList.add('hidden')
+  if (checkNow) {
+    showView('view-settings')
+    showSettingsPage('about')
+    void checkUpdate(false)
+  } else {
+    scheduleStartupNotices(150)
+  }
+}
+
 function resetUpdateExpand() {
   const desc = $('update-desc')
   if (desc) desc.classList.remove('expanded')
@@ -3672,7 +3926,7 @@ function closeAnnouncement(markSeen) {
 }
 async function fetchAnnouncements() {
   const base = updateBase()
-  if (!base || !state.localVersion) return false
+  if (!base || !state.localVersion || isAppVersionWarningOpen()) return false
   try {
     const signal = typeof AbortSignal?.timeout === 'function' ? AbortSignal.timeout(8000) : undefined
     const url = base + '/announcements.json?t=' + Date.now()
@@ -3713,6 +3967,16 @@ function startAnnouncementPolling() {
   window.addEventListener('online', () => { void checkAnnouncements() })
 }
 
+let startupNoticeTimer = null
+function scheduleStartupNotices(delay = 4000) {
+  clearTimeout(startupNoticeTimer)
+  startupNoticeTimer = setTimeout(async () => {
+    if (isAppVersionWarningOpen()) return
+    const shown = await checkAnnouncements()
+    if (!shown && state.token && !isAppVersionWarningOpen()) checkUpdate(true)
+  }, delay)
+}
+
 /* ---------------- 更新内容弹窗 ---------------- */
 const NOTES_KEY = 'seenNotesVersion'
 let notesVersion = ''
@@ -4002,7 +4266,7 @@ function saveBgConfig(enabled) {
   const base = bgBase()
   const intervalMin = parseFloat($('bg-interval')?.value || '1') || 1
   const notifyTaskDone = $('opt-task-done')?.checked !== false
-  b.saveBackgroundConfig(JSON.stringify({ enabled, intervalMin, base, token: state.token || '', notifyTaskDone }))
+  b.saveBackgroundConfig(JSON.stringify({ enabled, intervalMin, base, token: state.token || '', clientId: CLIENT_ID || '', notifyTaskDone }))
   if (enabled) $('bg-auth-status')?.classList.add('hidden')
   return true
 }
@@ -4328,14 +4592,207 @@ async function decodeQrDataUrl(dataUrl) {
   return code?.data || ''
 }
 
-/** App 内扫码: 官方 Camera 拍照/相册 + jsQR 本地解码(无 Google ML Kit/GMS 依赖, 国内可用)。
- *  冗余路径 1: 系统相机扫 dshremote:// 二维码直接唤起 App(见 bindNativeLinks);
- *  冗余路径 2: 设置页手动粘贴令牌。 */
+let liveScanStream = null
+let liveScanTimer = null
+let liveScanResolve = null
+let liveScanCanvas = null
+let liveScanContext = null
+let liveScanCancelled = false
+let liveScanDetector = null
+let liveScanBusy = false
+let liveScanWorker = null
+let liveScanWorkerUrl = ''
+let liveScanWorkerResolve = null
+
+function stopLiveScanWorker() {
+  liveScanWorkerResolve?.('')
+  liveScanWorkerResolve = null
+  liveScanWorker?.terminate()
+  liveScanWorker = null
+  if (liveScanWorkerUrl) URL.revokeObjectURL(liveScanWorkerUrl)
+  liveScanWorkerUrl = ''
+}
+
+function startLiveScanWorker() {
+  if (!window.Worker || !window.Blob || !window.URL?.createObjectURL) return
+  try {
+    const sourceUrl = new URL('jsqr.min.js', document.baseURI).href
+    const workerSource = `
+      let loaded = false
+      self.onmessage = event => {
+        try {
+          if (!loaded) {
+            self.importScripts(${JSON.stringify(sourceUrl)})
+            loaded = true
+          }
+          const { data, width, height } = event.data || {}
+          const code = self.jsQR?.(data, width, height, { inversionAttempts: 'attemptBoth' })
+          self.postMessage({ raw: code?.data || '' })
+        } catch (error) {
+          self.postMessage({ raw: '', error: String(error?.message || error) })
+        }
+      }
+    `
+    liveScanWorkerUrl = URL.createObjectURL(new Blob([workerSource], { type: 'application/javascript' }))
+    liveScanWorker = new Worker(liveScanWorkerUrl)
+    liveScanWorker.onmessage = event => {
+      const resolve = liveScanWorkerResolve
+      liveScanWorkerResolve = null
+      resolve?.(event.data?.raw || '')
+    }
+    liveScanWorker.onerror = () => {
+      const resolve = liveScanWorkerResolve
+      liveScanWorkerResolve = null
+      resolve?.('')
+      stopLiveScanWorker()
+    }
+  } catch {
+    stopLiveScanWorker()
+  }
+}
+
+function closeLiveScan(result = '') {
+  liveScanCancelled = true
+  if (liveScanTimer) clearTimeout(liveScanTimer)
+  liveScanTimer = null
+  if (liveScanStream) liveScanStream.getTracks().forEach(track => track.stop())
+  liveScanStream = null
+  liveScanDetector = null
+  stopLiveScanWorker()
+  const video = $('scan-live-video')
+  if (video) video.srcObject = null
+  $('modal-scan-live')?.classList.add('hidden')
+  const resolve = liveScanResolve
+  liveScanResolve = null
+  resolve?.(result)
+}
+
+async function scanLiveFrame() {
+  if (!liveScanResolve) return
+  const video = $('scan-live-video')
+  if (!video || video.readyState < 2 || !video.videoWidth || !liveScanContext) {
+    liveScanTimer = setTimeout(scanLiveFrame, 180)
+    return
+  }
+  if (liveScanBusy) return
+  liveScanBusy = true
+  try {
+    let raw = ''
+    if (liveScanDetector) {
+      const codes = await liveScanDetector.detect(video)
+      raw = codes?.[0]?.rawValue || ''
+    } else {
+      // 只解码取景框中央区域，避免在低端手机上对整幅高分辨率画面反复二值化。
+      const side = Math.floor(Math.min(video.videoWidth, video.videoHeight) * 0.64)
+      const sx = Math.floor((video.videoWidth - side) / 2)
+      const sy = Math.floor((video.videoHeight - side) / 2)
+      const maxSide = 480
+      const scale = Math.min(1, maxSide / Math.max(1, side))
+      const w = Math.max(1, Math.round(side * scale))
+      const h = w
+      if (liveScanCanvas.width !== w || liveScanCanvas.height !== h) {
+        liveScanCanvas.width = w
+        liveScanCanvas.height = h
+      }
+      liveScanContext.drawImage(video, sx, sy, side, side, 0, 0, w, h)
+      const imageData = liveScanContext.getImageData(0, 0, w, h)
+      if (liveScanWorker) {
+        raw = await new Promise(resolve => {
+          liveScanWorkerResolve = resolve
+          liveScanWorker.postMessage({ data: imageData.data, width: w, height: h }, [imageData.data.buffer])
+        })
+      } else {
+        raw = window.jsQR?.(imageData.data, w, h, { inversionAttempts: 'attemptBoth' })?.data || ''
+      }
+    }
+    if (raw && liveScanResolve) return closeLiveScan(raw)
+  } catch {
+    // 摄像头帧在切后台或权限切换时可能暂时不可读，下一帧继续即可。
+  } finally {
+    liveScanBusy = false
+  }
+  if (liveScanResolve) liveScanTimer = setTimeout(scanLiveFrame, 180)
+}
+
+/** 打开持续取帧的本地摄像头扫码；返回 undefined 表示当前 WebView 不支持实时摄像头。 */
+async function scanPairLive() {
+  if (!navigator.mediaDevices?.getUserMedia) return undefined
+  const video = $('scan-live-video')
+  const modal = $('modal-scan-live')
+  if (!video || !modal || !window.jsQR) return undefined
+  const camera = CAP.Plugins?.Camera
+  const perm = await camera?.requestPermissions?.({ permissions: ['camera'] })
+  if (perm && perm.camera !== 'granted') throw new Error(t('scan.permissionDenied'))
+  liveScanCancelled = false
+  modal.classList.remove('hidden')
+  $('scan-live-status').textContent = t('scan.liveStarting')
+  try {
+    liveScanStream = await navigator.mediaDevices.getUserMedia({
+      audio: false,
+      video: {
+        facingMode: { ideal: 'environment' },
+        width: { ideal: 960, max: 1280 },
+        height: { ideal: 720, max: 1280 },
+        frameRate: { ideal: 24, max: 30 }
+      }
+    })
+    if (liveScanCancelled) {
+      liveScanStream.getTracks().forEach(track => track.stop())
+      liveScanStream = null
+      return ''
+    }
+    video.srcObject = liveScanStream
+    await video.play()
+    $('scan-live-status').textContent = t('scan.liveHint')
+    try {
+      if (window.BarcodeDetector) {
+        const formats = await window.BarcodeDetector.getSupportedFormats?.()
+        if (!formats || formats.includes('qr_code')) liveScanDetector = new window.BarcodeDetector({ formats: ['qr_code'] })
+      }
+    } catch { liveScanDetector = null }
+    liveScanCanvas = document.createElement('canvas')
+    liveScanContext = liveScanCanvas.getContext('2d', { willReadFrequently: true })
+    if (!liveScanContext) throw new Error(t('scan.decodeUnsupported'))
+    startLiveScanWorker()
+    return await new Promise(resolve => {
+      liveScanResolve = resolve
+      scanLiveFrame()
+    })
+  } catch (e) {
+    closeLiveScan('')
+    throw e
+  } finally {
+    liveScanCanvas = null
+    liveScanContext = null
+    liveScanDetector = null
+    liveScanBusy = false
+  }
+}
+
+/** App 内扫码优先使用实时摄像头取帧；不支持时回退到官方 Camera 拍照/相册 + jsQR。 */
 async function scanPair(source) {
   if (!CAP?.isNativePlatform?.()) {
     toast(t('scan.browserHint'), 'err')
     return
   }
+  if (source === 'CAMERA') {
+    try {
+      const liveRaw = await scanPairLive()
+      if (liveRaw !== undefined) {
+        if (!liveRaw) return toast(t('scan.cancelled'), 'ok')
+        if (applyPairUrl(liveRaw)) {
+          toast(t('scan.paired'), 'ok')
+          openStreams()
+          refreshAll()
+        } else toast(t('scan.notPair'), 'err')
+        return
+      }
+    } catch (e) {
+      const msg = String(e?.message || e || '')
+      toast(/cancel/i.test(msg) ? t('scan.cancelled') : t('scan.failed', { msg }), 'err')
+      return
+    }
+  }
   const camera = CAP.Plugins?.Camera
   if (!camera?.getPhoto) { toast(t('scan.unsupported'), 'err'); return }
   try {
@@ -4523,6 +4980,10 @@ function renderDshControlStatus(value) {
 
 async function loadDshControl() {
   if (!state.token || !$('dsh-control-desc')) return
+  if (activeGatewayCapability('dshLifecycle') === false) {
+    renderDshControlStatus({ supported: false, message: t('settings.dshUnsupported') })
+    return
+  }
   try {
     const res = await fetch(adminApiUrl('/admin/api/dsh'), { headers: { authorization: 'Bearer ' + state.token }, cache: 'no-store' })
     if (res.status === 401) return authFailure()
@@ -4775,6 +5236,7 @@ function bindUi() {
   document.addEventListener('keydown', (e) => {
     if (e.key === 'Escape' && !$('feedback-sheet').classList.contains('hidden')) { closeFeedbackSheet(); $('btn-feedback').focus() }
     else if (e.key === 'Escape' && !$('modal-feedback-success').classList.contains('hidden')) closeFeedbackSuccess()
+    else if (e.key === 'Escape' && isAppVersionWarningOpen()) closeAppVersionWarning(false)
   })
   $('btn-new-session').addEventListener('click', newSession)
   $('session-workspace-filter').addEventListener('change', (e) => {
@@ -4939,6 +5401,8 @@ function bindUi() {
   })
   $('btn-scan-camera').addEventListener('click', () => scanPair('CAMERA'))
   $('btn-scan-gallery').addEventListener('click', () => scanPair('PHOTOS'))
+  $('scan-live-cancel')?.addEventListener('click', () => closeLiveScan(''))
+  $('modal-scan-live')?.addEventListener('click', e => { if (e.target === $('modal-scan-live')) closeLiveScan('') })
   $('btn-change-token').addEventListener('click', () => {
     const input = prompt(t('token.prompt'), state.token)
     if (input && input.trim()) { state.token = input.trim(); LS.set('token', input.trim()); $('token-desc').textContent = t('token.saved'); toast(t('token.savedReconnect'), 'ok'); openStreams(); refreshAll(); syncBgConfig() }
@@ -4965,6 +5429,11 @@ function bindUi() {
   $('btn-check-update').addEventListener('click', () => checkUpdate(false))
   $('btn-download-update').addEventListener('click', downloadUpdate)
   $('btn-update-expand').addEventListener('click', toggleUpdateExpand)
+  $('app-version-later').addEventListener('click', () => closeAppVersionWarning(false))
+  $('app-version-update').addEventListener('click', () => closeAppVersionWarning(true))
+  $('modal-app-version-warning').addEventListener('click', (e) => {
+    if (e.target === $('modal-app-version-warning')) closeAppVersionWarning(false)
+  })
   $('btn-reset').addEventListener('click', () => {
     if (!confirm(t('settings.confirmReset'))) return
     LS.del('token'); LS.del('notify'); LS.del('server'); LS.del('mobileEnterAction'); LS.del(ANNOUNCEMENTS_KEY); LS.del(ANNOUNCEMENT_HISTORY_KEY); LS.del(ANNOUNCEMENT_VOTES_KEY)
@@ -5119,6 +5588,7 @@ async function boot() {
   } else {
     // 多服务器: 启动时静默测速一次, 选最快的连接(同源页面也参与比较)
     await selectFastestServer({ silent: true, reconnect: false })
+    await maybeWarnAppBehindGateway({ probe: true })
     openStreams()
     await refreshAll()
     const host = await safeRpc('host.describe', {}, '')
@@ -5128,10 +5598,7 @@ async function boot() {
   // 网关从中央 HTTPS 公告源读取并在不可达时回退内置文件。前台每 30 秒检查，
   // 回到前台或网络恢复时立即补查；公告优先，避免启动时两个弹窗重叠。
   startAnnouncementPolling()
-  setTimeout(async () => {
-    const shown = await checkAnnouncements()
-    if (!shown && state.token) checkUpdate(true)
-  }, 4000)
+  scheduleStartupNotices()
   renderPending()
 }