dsh-remote-plugin 0.6.11 → 0.6.13

package/public/app.js

@@ -55,6 +55,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,7 +65,9 @@ const state = {
   hostInfo: null,
   localVersion: '',
   updateInfo: null,
+  warnedGatewayVersions: new Set(),
   announcement: null,
+  announcements: [],
   approvals: [],           // 待处理审批
   questions: [],           // 待处理提问
   queues: {},              // sessionId -> queue items
@@ -272,6 +275,14 @@ function openFeedbackModal() {
   setTimeout(() => $('fb-msg').focus(), 50)
 }
 function closeFeedbackModal() { $('modal-feedback').classList.add('hidden') }
+function openFeedbackSuccess() {
+  $('modal-feedback-success').classList.remove('hidden')
+  setTimeout(() => $('feedback-success-confirm').focus(), 50)
+}
+function closeFeedbackSuccess() {
+  $('modal-feedback-success').classList.add('hidden')
+  $('btn-feedback')?.focus()
+}
 async function submitFeedback() {
   const type = state.feedbackType || 'bug'
   const message = $('fb-msg').value.trim()
@@ -290,7 +301,7 @@ async function submitFeedback() {
     })
     let json = {}
     try { json = await res.json() } catch {}
-    if (res.ok && json.ok) { toast(t('feedback.submitted'), 'ok'); closeFeedbackModal() }
+    if (res.ok && json.ok) { closeFeedbackModal(); openFeedbackSuccess() }
     else if (res.status === 429) { toast(json.retryAfter ? t('feedback.rateLimitedAt', { n: json.retryAfter }) : t('feedback.rateLimited'), 'err') }
     else { toast(t('feedback.submitFailed', { msg: json.error || res.status }), 'err') }
   } catch {
@@ -346,6 +357,7 @@ 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: {
@@ -612,7 +624,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 {
@@ -620,6 +635,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
@@ -668,6 +690,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
@@ -1334,6 +1357,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)
@@ -1382,12 +1409,17 @@ function workspaceItems() {
 function workspaceById(workspaceId) {
   return workspaceItems().find(w => w.workspaceId === workspaceId) || null
 }
+function workspaceOwnsSession(workspace, session) {
+  if (!workspace || !session?.sessionId) return false
+  if (String(session.workspaceId || '') === workspace.workspaceId) return true
+  if (Array.isArray(workspace.sessionIds) && workspace.sessionIds.some(id => String(id) === String(session.sessionId))) return true
+  const cwdKey = wbPathKey(sessionCwd(session))
+  const workspaceKey = wbPathKey(workspace.path)
+  return !!cwdKey && !!workspaceKey && (cwdKey === workspaceKey || cwdKey.startsWith(workspaceKey.endsWith('/') ? workspaceKey : workspaceKey + '/'))
+}
 function workspaceForSession(session) {
   if (!session) return null
-  const byMembership = workspaceItems().find(w => Array.isArray(w.sessionIds) && w.sessionIds.includes(session.sessionId))
-  if (byMembership) return byMembership
-  const cwdKey = wbPathKey(sessionCwd(session))
-  return cwdKey ? workspaceItems().find(w => wbPathKey(w.path) === cwdKey) || null : null
+  return workspaceItems().find(workspace => workspaceOwnsSession(workspace, session)) || null
 }
 function workspaceName(workspace) {
   return String(workspace?.title || wbBaseName(workspace?.path) || workspace?.path || '').trim()
@@ -1411,7 +1443,10 @@ function renderWorkspaceNavigation() {
     LS.del('workspaceFilterV1')
   }
   const sessionSelect = $('session-workspace-filter')
-  if (sessionSelect) sessionSelect.innerHTML = workspaceOptionsHtml({ all: true, ungrouped: true, selected: state.workspaceFilter })
+  if (sessionSelect) {
+    sessionSelect.innerHTML = workspaceOptionsHtml({ all: true, ungrouped: true, selected: state.workspaceFilter })
+    syncCustomSelect(sessionSelect)
+  }
   const selectedWorkspace = workspaceById(state.workspaceFilter)
   const pathBox = $('session-workspace-path')
   if (pathBox) pathBox.textContent = selectedWorkspace?.path || (state.workspaceFilter === WORKSPACE_UNGROUPED ? t('workspace.ungrouped') : t('workspace.allPath'))
@@ -1423,7 +1458,10 @@ function renderWorkspaceNavigation() {
     LS.del('fsWorkspaceIdV1')
   }
   const fsSelect = $('fs-workspace')
-  if (fsSelect) fsSelect.innerHTML = workspaceOptionsHtml({ root: true, selected: state.fs.workspaceId })
+  if (fsSelect) {
+    fsSelect.innerHTML = workspaceOptionsHtml({ root: true, selected: state.fs.workspaceId })
+    syncCustomSelect(fsSelect)
+  }
   if ($('modal-new-session') && !$('modal-new-session').classList.contains('hidden')) renderNewSessionWorkspace()
   return items
 }
@@ -1503,7 +1541,7 @@ 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)}">
@@ -1539,7 +1577,7 @@ function workspaceDisplayName(label) {
   return parts[parts.length - 1] || value
 }
 function sortedSessions() {
-  const items = [...state.sessions]
+  const items = topLevelSessions()
   if (state.sessionSort === 'workspace') {
     return items.sort((a, b) => {
       const aw = sessionCwd(a) || '\uffff'
@@ -1556,9 +1594,8 @@ function renderSessions() {
   const archivedSet = new Set(state.wbArchived || [])
   const visible = allItems.filter(s => {
     if (!state.workspaceFilter) return true
-    const workspace = workspaceForSession(s)
-    if (state.workspaceFilter === WORKSPACE_UNGROUPED) return !workspace
-    return workspace?.workspaceId === state.workspaceFilter
+    if (state.workspaceFilter === WORKSPACE_UNGROUPED) return !workspaceForSession(s)
+    return workspaceOwnsSession(workspaceById(state.workspaceFilter), s)
   })
   const archived = visible.filter(s => archivedSet.has(s.sessionId))
   const main = visible.filter(s => !archivedSet.has(s.sessionId))
@@ -1607,7 +1644,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>
@@ -1649,7 +1686,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 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 }
@@ -1697,10 +1734,78 @@ 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() {
   const h = state.history
   if (h.visible.length <= HISTORY_MAX_VISIBLE) return
@@ -1787,9 +1892,11 @@ 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
+    applyReasoningStreamEvent(ev)
     if (seq == null || state.history.seqs.has(seq)) continue
     if (!shouldShowEvent(ev.type)) continue          // chunk 等内部事件不保留
     state.history.seqs.add(seq)
@@ -1816,8 +1923,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)) {
+    if (reasoningChanged) scheduleReasoningRender()
+    return
+  }
   h.seqs.add(seq)
   h.visible.push({ seq, event })
   h.visible.sort((a, b) => a.seq - b.seq)
@@ -1851,7 +1966,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()
@@ -1872,7 +1988,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
@@ -2374,16 +2490,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
@@ -2433,7 +2570,9 @@ function renderNewSessionWorkspace(preferredId = '') {
   const current = workspaceById(preferredId || select.value)?.workspaceId || items[0]?.workspaceId || ''
   select.innerHTML = workspaceOptionsHtml({ selected: current })
   select.disabled = !items.length
+  syncCustomSelect(select)
   const workspace = workspaceById(select.value)
+  $('new-session-workspace-name').textContent = workspace ? workspaceName(workspace) : ''
   $('new-session-workspace-path').textContent = workspace?.path || ''
   $('new-session-empty').classList.toggle('hidden', !!items.length)
   $('new-session-create').disabled = !workspace
@@ -2594,8 +2733,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) || (new Date(b.updatedAt || 0) - new Date(a.updatedAt || 0))).slice(0, 4)
   const primary = $('overview-primary-action')
   if (primary) {
     let action = 'new'
@@ -3364,6 +3504,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')
@@ -3397,6 +3585,10 @@ async function loadLocalVersion() {
 const ANNOUNCEMENTS_KEY = 'seenAnnouncementsV1'
 const ANNOUNCEMENT_HISTORY_KEY = 'announcementHistoryV1'
 const ANNOUNCEMENT_VOTES_KEY = 'announcementVotesV1'
+const ANNOUNCEMENTS_POLL_MS = 30 * 1000
+let announcementCheckPromise = null
+let announcementPollTimer = null
+let announcementPollingStarted = false
 function readSeenAnnouncements() {
   try {
     const value = JSON.parse(LS.get(ANNOUNCEMENTS_KEY, '{}'))
@@ -3413,6 +3605,7 @@ function markAnnouncementSeen(id) {
     for (const key of keys.slice(0, keys.length - 100)) delete seen[key]
   }
   LS.set(ANNOUNCEMENTS_KEY, JSON.stringify(seen))
+  renderAnnouncementBoard()
 }
 function readAnnouncementVotes() {
   try {
@@ -3432,6 +3625,7 @@ function storeAnnouncementVote(announcementId, pollId, optionId) {
     for (const key of keys.slice(0, keys.length - 100)) delete votes[key]
   }
   LS.set(ANNOUNCEMENT_VOTES_KEY, JSON.stringify(votes))
+  renderAnnouncementBoard()
 }
 function announcementVote(item) {
   if (!item?.poll?.id) return null
@@ -3453,6 +3647,36 @@ function storeAnnouncementHistory(items) {
   LS.set(ANNOUNCEMENT_HISTORY_KEY, JSON.stringify(list))
   return list
 }
+function announcementBoardItems() {
+  const seen = readSeenAnnouncements()
+  const merged = new Map(readAnnouncementHistory().map(item => [item.id, item]))
+  for (const item of state.announcements) if (item?.id) merged.set(item.id, item)
+  return [...merged.values()]
+    .filter(item => !seen[item.id])
+    .sort((a, b) => Number(b.publishedAt || 0) - Number(a.publishedAt || 0))
+    .slice(0, 1)
+}
+function renderAnnouncementBoard() {
+  const box = $('overview-announcement-list')
+  if (!box) return
+  const items = announcementBoardItems()
+  if (!items.length) {
+    box.innerHTML = `<div class="overview-empty">${esc(t('overview.communityEmpty'))}</div>`
+    return
+  }
+  box.innerHTML = items.map(item => {
+    const poll = !!item.poll
+    const vote = announcementVote(item)
+    const date = Number(item.publishedAt) > 0 ? fmtFullTime(item.publishedAt) : t('announcement.noDate')
+    const action = poll ? (vote ? t('overview.communityVoted') : t('overview.communityVote')) : t('overview.communityView')
+    return `<button class="overview-announcement-card ${poll ? 'poll' : 'notice'}" type="button" data-home-announcement="${esc(item.id)}">
+      <span class="overview-announcement-meta"><span class="overview-announcement-badge">${esc(t(poll ? 'overview.communityPoll' : 'overview.communityNotice'))}</span><span class="overview-announcement-new">${esc(t('overview.communityNew'))}</span><span class="overview-announcement-date">${esc(date)}</span></span>
+      <span class="overview-announcement-title">${esc(item.title)}</span>
+      <span class="overview-announcement-copy">${esc(item.content)}</span>
+      <span class="overview-announcement-footer"><span>${esc(action)}</span><span aria-hidden="true">›</span></span>
+    </button>`
+  }).join('')
+}
 function renderAnnouncementHistory() {
   const box = $('announcement-history-list')
   if (!box) return
@@ -3613,9 +3837,9 @@ function closeAnnouncement(markSeen) {
   state.announcement = null
   $('modal-announcement').classList.add('hidden')
 }
-async function checkAnnouncements() {
+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()
@@ -3626,16 +3850,46 @@ async function checkAnnouncements() {
     const data = JSON.parse(raw)
     const source = Array.isArray(data) ? data : (Array.isArray(data?.items) ? data.items : [data])
     const normalized = source.map(item => normalizeAnnouncement(item, base)).filter(Boolean)
+    state.announcements = normalized.sort((a, b) => Number(b.publishedAt || 0) - Number(a.publishedAt || 0))
     storeAnnouncementHistory(normalized)
+    renderAnnouncementBoard()
     const seen = readSeenAnnouncements()
     const items = normalized.filter(item => !seen[item.id])
       .sort((a, b) => b.publishedAt - a.publishedAt)
-    if (!items.length) return false
+    if (!items.length || state.announcement) return false
     openAnnouncementModal(items[0])
     return true
   } catch { return false }
 }
 
+function checkAnnouncements() {
+  if (announcementCheckPromise) return announcementCheckPromise
+  announcementCheckPromise = fetchAnnouncements().finally(() => { announcementCheckPromise = null })
+  return announcementCheckPromise
+}
+
+function startAnnouncementPolling() {
+  if (announcementPollingStarted) return
+  announcementPollingStarted = true
+  announcementPollTimer = setInterval(() => {
+    if (!document.hidden) void checkAnnouncements()
+  }, ANNOUNCEMENTS_POLL_MS)
+  document.addEventListener('visibilitychange', () => {
+    if (!document.hidden) void checkAnnouncements()
+  })
+  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 = ''
@@ -4321,36 +4575,159 @@ function initToken() {
   $('server-desc').textContent = state.server || t('servers.defaultDesc')
 }
 
-function renderDshControlStatus(v) {
-  const desc = $('dsh-control-desc')
-  if (!desc || !v) return
+let dshControlPollPromise = null
+
+function dshControlButtonsBusy(busy, supported = true) {
   const buttons = [$('btn-dsh-start'), $('btn-dsh-restart')].filter(Boolean)
-  if (v.supported === false) {
-    desc.textContent = v.message || t('settings.dshUnsupported')
-    buttons.forEach(b => { b.disabled = true; b.classList.add('hidden') })
+  buttons.forEach(button => {
+    button.disabled = busy || !supported
+    button.classList.toggle('hidden', !supported)
+  })
+}
+
+function dshControlFailureText(value) {
+  const key = {
+    SERVICE_NOT_FOUND: 'settings.dshErrorServiceNotFound',
+    INVALID_SERVICE: 'settings.dshErrorInvalidService',
+    SYSTEMCTL_NOT_FOUND: 'settings.dshErrorSystemctlNotFound',
+    SYSTEMD_UNAVAILABLE: 'settings.dshErrorSystemdUnavailable',
+    PERMISSION_DENIED: 'settings.dshErrorPermissionDenied',
+    COMMAND_TIMEOUT: 'settings.dshErrorCommandTimeout',
+    COMMAND_FAILED: 'settings.dshErrorCommandFailed',
+    SERVICE_FAILED: 'settings.dshErrorServiceFailed',
+    SERVICE_TIMEOUT: 'settings.dshErrorServiceTimeout',
+    UPSTREAM_TIMEOUT: 'settings.dshErrorUpstreamTimeout',
+    EVENTS_TIMEOUT: 'settings.dshErrorEventsTimeout',
+    OPERATION_NOT_FOUND: 'settings.dshErrorOperationNotFound',
+    OPERATION_IN_PROGRESS: 'settings.dshErrorOperationProgress',
+  }[value?.code]
+  return key
+    ? t(key, { service: value?.service || value?.status?.service || 'dsh-web' })
+    : t('settings.dshErrorGeneric', { msg: value?.error || value?.message || value?.code || t('conn.off') })
+}
+
+function dshControlStageText(operation, step = operation) {
+  const seconds = Math.max(0, Math.round(Number(step?.elapsedMs ?? operation?.elapsedMs ?? 0) / 1000))
+  const action = operation?.action === 'start' ? t('settings.dshStart') : t('settings.dshRestart')
+  const service = operation?.service || operation?.status?.service || 'dsh-web'
+  if (step?.stage === 'queued') return t('settings.dshStageQueued')
+  if (step?.stage === 'checking') return t('settings.dshStageChecking', { service })
+  if (step?.stage === 'command') return t('settings.dshStageCommand', { action })
+  if (step?.stage === 'waiting-service') return t('settings.dshStageWaitingService', { seconds })
+  if (step?.stage === 'waiting-upstream') return t('settings.dshStageWaitingUpstream', { seconds })
+  if (step?.stage === 'waiting-events') return t('settings.dshStageWaitingEvents', { seconds })
+  if (step?.stage === 'complete') {
+    if (operation?.code === 'ALREADY_RUNNING') return t('settings.dshAlreadyRunning', { pid: operation?.status?.mainPid || '—' })
+    return t('settings.dshSuccessDetail', {
+      action,
+      pid: operation?.status?.mainPid || '—',
+      status: operation?.upstream?.status || '—',
+      seconds: Math.max(0, Math.round(Number(operation?.elapsedMs || step?.elapsedMs || 0) / 1000)),
+    })
+  }
+  if (step?.stage === 'failed') return dshControlFailureText(operation)
+  return step?.message || operation?.message || '—'
+}
+
+function renderDshControlOperation(operation) {
+  const desc = $('dsh-control-desc')
+  const box = $('dsh-control-steps')
+  if (!desc || !box || !operation) return
+  const failed = operation.stage === 'failed' || operation.done && operation.ok === false
+  desc.textContent = failed ? t('settings.dshFailed', { msg: dshControlFailureText(operation) }) : dshControlStageText(operation)
+  const steps = Array.isArray(operation.steps) && operation.steps.length
+    ? operation.steps
+    : [{ stage: operation.stage || 'queued', elapsedMs: operation.elapsedMs || 0, message: operation.message || '' }]
+  box.classList.remove('hidden')
+  box.innerHTML = steps.map((step, index) => {
+    const current = !operation.done && index === steps.length - 1
+    const isFailed = step.stage === 'failed'
+    const success = step.stage === 'complete'
+    const mark = isFailed ? '×' : success ? '✓' : current ? '…' : '✓'
+    const cls = isFailed ? 'failed' : success ? 'success' : current ? 'current' : ''
+    const detail = isFailed && operation.detail
+      ? `<span class="dsh-control-step-detail">${esc(t('settings.dshErrorDetail', { detail: operation.detail }))}</span>`
+      : ''
+    return `<div class="dsh-control-step ${cls}"><span class="dsh-control-step-mark" aria-hidden="true">${mark}</span><span>${esc(dshControlStageText(operation, step))}</span>${detail}</div>`
+  }).join('')
+  dshControlButtonsBusy(!operation.done, true)
+}
+
+async function readDshControlResponse(res) {
+  const text = await res.text()
+  if (!text) return {}
+  try { return JSON.parse(text) } catch { return { error: `HTTP ${res.status}`, detail: text.slice(0, 500) } }
+}
+
+async function pollDshControlOperation(operationId, initial) {
+  let value = initial
+  while (true) {
+    renderDshControlOperation(value)
+    if (value.done) return value
+    await new Promise(resolvePromise => setTimeout(resolvePromise, 700))
+    const res = await fetch(adminApiUrl(`/admin/api/dsh?operation=${encodeURIComponent(operationId)}`), {
+      headers: { authorization: 'Bearer ' + state.token }, cache: 'no-store'
+    })
+    if (res.status === 401) { authFailure(); throw Object.assign(new Error('unauthorized'), { auth: true }) }
+    const next = await readDshControlResponse(res)
+    if (!res.ok) throw Object.assign(new Error(next.error || next.message || `HTTP ${res.status}`), { dshPayload: { ...next, httpStatus: res.status } })
+    value = next
+  }
+}
+
+function renderDshControlStatus(value) {
+  const desc = $('dsh-control-desc')
+  const box = $('dsh-control-steps')
+  if (!desc || !value) return
+  if (value.supported === false) {
+    desc.textContent = value.code ? dshControlFailureText(value) : value.message || t('settings.dshUnsupported')
+    dshControlButtonsBusy(false, false)
+    return
+  }
+  if (value.ok === false) {
+    desc.textContent = t('settings.dshStatusFailed', { msg: dshControlFailureText(value) })
+    dshControlButtonsBusy(false, false)
     return
   }
-  buttons.forEach(b => { b.disabled = false; b.classList.remove('hidden') })
-  desc.textContent = `${t(v.running ? 'settings.dshRunning' : 'settings.dshStopped')} · ${v.service || 'dsh-web'}`
+  dshControlButtonsBusy(false, true)
+  if (box && !dshControlPollPromise) box.classList.add('hidden')
+  const service = value.service || 'dsh-web'
+  const serviceState = `${value.activeState || value.state || 'unknown'}/${value.subState || 'unknown'}`
+  desc.textContent = value.running
+    ? t('settings.dshRunningDetail', { service, pid: value.mainPid || '—', state: serviceState })
+    : t('settings.dshStoppedDetail', { service, state: serviceState })
 }
 
 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 } })
+    const res = await fetch(adminApiUrl('/admin/api/dsh'), { headers: { authorization: 'Bearer ' + state.token }, cache: 'no-store' })
     if (res.status === 401) return authFailure()
-    renderDshControlStatus(await res.json())
-  } catch {
-    $('dsh-control-desc').textContent = t('settings.dshFailed', { msg: t('conn.off') })
+    const value = await readDshControlResponse(res)
+    if (!res.ok) throw Object.assign(new Error(value.error || value.message || `HTTP ${res.status}`), { dshPayload: value })
+    renderDshControlStatus(value)
+    if (value.operation?.operationId && !value.operation.done && !dshControlPollPromise) {
+      dshControlPollPromise = pollDshControlOperation(value.operation.operationId, value.operation)
+        .then(renderDshControlOperation)
+        .catch(error => {
+          if (!error?.auth) $('dsh-control-desc').textContent = t('settings.dshFailed', { msg: error?.dshPayload ? dshControlFailureText(error.dshPayload) : t('settings.dshResultUnknown') })
+        })
+        .finally(() => { dshControlPollPromise = null; dshControlButtonsBusy(false, true) })
+    }
+  } catch (error) {
+    $('dsh-control-desc').textContent = t('settings.dshStatusFailed', { msg: error?.dshPayload ? dshControlFailureText(error.dshPayload) : t('conn.off') })
   }
 }
 
 async function controlDsh(action) {
+  if (dshControlPollPromise) return
   const label = action === 'start' ? t('settings.dshStart') : t('settings.dshRestart')
-  const buttons = [$('btn-dsh-start'), $('btn-dsh-restart')].filter(Boolean)
-  buttons.forEach(b => { b.disabled = true })
-  const desc = $('dsh-control-desc')
-  if (desc) desc.textContent = t('settings.dshStarting', { action: label })
+  dshControlButtonsBusy(true, true)
+  renderDshControlOperation({ action, service: 'dsh-web', accepted: true, done: false, stage: 'queued', elapsedMs: 0, steps: [] })
   try {
     const res = await fetch(adminApiUrl('/admin/api/dsh'), {
       method: 'POST',
@@ -4358,15 +4735,33 @@ async function controlDsh(action) {
       body: JSON.stringify({ action }),
     })
     if (res.status === 401) return authFailure()
-    const v = await res.json().catch(() => ({}))
-    if (!res.ok || v.ok === false) throw new Error(v.error || v.message || `HTTP ${res.status}`)
+    let v = await readDshControlResponse(res)
+    if (res.status === 409 && v.operation?.operationId) v = v.operation
+    else if (!res.ok) throw Object.assign(new Error(v.error || v.message || `HTTP ${res.status}`), { dshPayload: { ...v, httpStatus: res.status } })
+
+    if (v.accepted && v.operationId) {
+      dshControlPollPromise = pollDshControlOperation(v.operationId, v)
+      v = await dshControlPollPromise
+      if (!v.ok) throw Object.assign(new Error(dshControlFailureText(v)), { dshPayload: v })
+      renderDshControlOperation(v)
+      toast(dshControlStageText(v), 'ok')
+      return
+    }
+
+    // 兼容旧网关：它会在单个 POST 中直接返回最终状态。
+    if (v.ok === false) throw Object.assign(new Error(v.error || v.message || `HTTP ${res.status}`), { dshPayload: v })
     renderDshControlStatus(v)
     toast(t('settings.dshStarted', { action: label }), 'ok')
-  } catch (e) {
-    if (desc) desc.textContent = t('settings.dshFailed', { msg: e?.message || e })
-    toast(t('settings.dshFailed', { msg: e?.message || e }), 'err')
+  } catch (error) {
+    if (error?.auth) return
+    const payload = error?.dshPayload
+    const message = payload ? dshControlFailureText(payload) : t('settings.dshResultUnknown')
+    if (payload) renderDshControlOperation({ action, service: payload.service || 'dsh-web', done: true, ok: false, stage: 'failed', steps: payload.steps || [], ...payload })
+    else $('dsh-control-desc').textContent = t('settings.dshFailed', { msg: message })
+    toast(t('settings.dshFailed', { msg: message }), 'err')
   } finally {
-    buttons.forEach(b => { b.disabled = false })
+    dshControlPollPromise = null
+    dshControlButtonsBusy(false, true)
   }
 }
 
@@ -4427,6 +4822,7 @@ function bindUi() {
     renderServers()
     renderSessions()
     renderWorkbench()
+    renderAnnouncementBoard()
     renderPending(); renderQueue(); renderJobs()
     updateConn()
     if (state.current) { renderSessionTitle(); renderSessionSub(); renderSessionCards(); renderHistory(true) }
@@ -4526,6 +4922,11 @@ function bindUi() {
   $('btn-stats').addEventListener('click', () => { renderSessionCards(); $('modal-stats').classList.remove('hidden') })
   $('stats-close').addEventListener('click', () => $('modal-stats').classList.add('hidden'))
   $('btn-refresh').addEventListener('click', () => { toast(t('common.refreshing')); openStreams(); refreshAll() })
+  $('overview-refresh').addEventListener('click', () => {
+    toast(t('common.refreshing'))
+    openStreams()
+    void Promise.all([refreshAll(), checkAnnouncements()])
+  })
   // 反馈
   $('btn-feedback').addEventListener('click', (e) => { e.stopPropagation(); toggleFeedbackSheet() })
   $('feedback-backdrop').addEventListener('click', closeFeedbackSheet)
@@ -4540,6 +4941,10 @@ function bindUi() {
   $('btn-write-feedback').addEventListener('click', () => { closeFeedbackSheet(); openFeedbackModal() })
   $('fb-cancel').addEventListener('click', closeFeedbackModal)
   $('fb-submit').addEventListener('click', submitFeedback)
+  $('feedback-success-confirm').addEventListener('click', closeFeedbackSuccess)
+  $('modal-feedback-success').addEventListener('click', (e) => {
+    if (e.target === $('modal-feedback-success')) closeFeedbackSuccess()
+  })
   document.querySelectorAll('#fb-chips .fb-chip').forEach(btn =>
     btn.addEventListener('click', () => {
       state.feedbackType = btn.dataset.fbType
@@ -4550,6 +4955,8 @@ 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) => {
@@ -4699,6 +5106,13 @@ function bindUi() {
   $('modal-announcement-history').addEventListener('click', (e) => {
     if (e.target === $('modal-announcement-history')) closeAnnouncementHistory()
   })
+  $('overview-announcement-history').addEventListener('click', openAnnouncementHistory)
+  $('overview-announcement-list').addEventListener('click', (e) => {
+    const button = e.target.closest('[data-home-announcement]')
+    if (!button) return
+    const item = announcementBoardItems().find(entry => entry.id === button.dataset.homeAnnouncement)
+    if (item) openAnnouncementModal(item)
+  })
   // 设置
   $('view-settings').addEventListener('click', (e) => {
     const group = e.target.closest('[data-settings-group]')
@@ -4733,6 +5147,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)
@@ -4873,6 +5292,7 @@ function applyNativeInsets() {
 async function boot() {
   initToken()
   bindUi()
+  renderAnnouncementBoard()
   renderLangBtn()
   bindNativeBack()
   bindNativeLinks()
@@ -4886,17 +5306,17 @@ async function boot() {
   } else {
     // 多服务器: 启动时静默测速一次, 选最快的连接(同源页面也参与比较)
     await selectFastestServer({ silent: true, reconnect: false })
+    await maybeWarnAppBehindGateway({ probe: true })
     openStreams()
     await refreshAll()
     const host = await safeRpc('host.describe', {}, '')
     if (host) { state.hostInfo = host; $('host-desc').textContent = t('settings.hostDesc', { version: host.version, cwd: host.cwd, n: host.attachedSessions }) }
     loadDshControl()
   }
-  // 公告与更新共用当前服务器；公告优先，避免启动时两个弹窗重叠。
-  setTimeout(async () => {
-    const shown = await checkAnnouncements()
-    if (!shown && state.token) checkUpdate(true)
-  }, 4000)
+  // 网关从中央 HTTPS 公告源读取并在不可达时回退内置文件。前台每 30 秒检查，
+  // 回到前台或网络恢复时立即补查；公告优先，避免启动时两个弹窗重叠。
+  startAnnouncementPolling()
+  scheduleStartupNotices()
   renderPending()
 }