dsh-remote-plugin 0.4.9 → 0.5.2

package/public/app.js

@@ -50,7 +50,8 @@ const state = {
   history: emptyHistory(),
   errCount: 0,
   refreshTimer: null,
-  fs: { path: null, initial: null, loaded: false, upload: null }
+  fs: { path: null, initial: null, loaded: false, upload: null },
+  models: { loaded: false, loading: false, groups: [], current: null, failures: [] }
 }
 
 const $ = (id) => document.getElementById(id)
@@ -298,6 +299,13 @@ function openStream(kind, handler, refreshOnOpen) {
     state.streamsOk[kind] = true
     state.errCount = 0
     updateConn()
+    // mux 每次(重)连接都会重放“仍待处理”的审批/提问基线:
+    // 先清空旧列表, 避免“桌面已自定义回答, 手机漏收 question/resolved”后永久残留。
+    if (kind === 'mux') {
+      state.approvals = []
+      state.questions = []
+      renderPending()
+    }
     if (refreshOnOpen) refreshAll()
   }
   ws.onmessage = (msg) => {
@@ -386,10 +394,15 @@ function onHostFrame(full) {
   if (['host/session-added', 'host/session-removed', 'host/workspace-changed', 'host/workspace-removed', 'host/workspace-order-changed', 'host/archived-sessions-changed'].includes(f.type)) return scheduleRefresh()
   if (f.type === 'host/session-status') {
     const s = state.byId.get(f.sessionId)
-    if (s) { s.running = f.running; if (state.current === f.sessionId) { renderSessionCards(); updateCancelBtn() } }
+    if (s) { s.running = f.running; if (state.current === f.sessionId) { renderSessionCards(); updateCancelBtn(); renderSessionSub(); updateSessionStatus() } }
     return
   }
-  if (f.type === 'host/agent-error') return toast(`会话出错：${f.message}`, 'err')
+  if (f.type === 'host/agent-error') {
+    const s = state.byId.get(f.sessionId)
+    if (s) { s.error = true; s.running = false }
+    if (state.current === f.sessionId) { renderSessionSub(); updateSessionStatus() }
+    return toast(`会话出错：${f.message}`, 'err')
+  }
   if (f.type === 'host/remote-event') return scheduleRefresh()
 }
 
@@ -398,8 +411,8 @@ function onSessionEvent(sessionId, event) {
   const s = state.byId.get(sessionId)
   if (s) s.updatedAt = Date.now()
   if (event.type === 'agent/status') {
-    if (s) { s.running = !!event.data?.running; s.blank = false }
-    if (state.current === sessionId) { updateCancelBtn(); renderSessionSub() }
+    if (s) { s.running = !!event.data?.running; s.blank = false; if (s.running) s.error = false }
+    if (state.current === sessionId) { updateCancelBtn(); renderSessionSub(); updateSessionStatus() }
   }
   if (event.type === 'session/title' || event.type === 'title') {
     if (event.data?.title && s) s.projections.values.title = event.data.title
@@ -417,7 +430,7 @@ function scheduleRefresh() {
 
 async function refreshAll() {
   await refreshSessions()
-  if (state.current) { renderSessionCards(); renderSessionSub(); updateCancelBtn() }
+  if (state.current) { renderSessionCards(); renderSessionSub(); updateCancelBtn(); updateSessionStatus() }
   renderPending(); renderQueue(); renderJobs(); updateConn()
 }
 
@@ -508,7 +521,7 @@ async function openSession(id) {
   state.history = emptyHistory()
   document.body.classList.add('in-session')
   showView('view-session')
-  renderSessionTitle(); renderSessionSub(); updateCancelBtn()
+  renderSessionTitle(); renderSessionSub(); updateCancelBtn(); updateSessionStatus()
   $('history').innerHTML = '<div class="empty">加载历史…</div>'
   await loadHistory(true)
   renderSessionCards()
@@ -519,6 +532,7 @@ function closeSession() {
   state.current = null
   state.history = emptyHistory()
   document.body.classList.remove('in-session')
+  hideComposerMenu()
   showView('view-home')
 }
 
@@ -550,9 +564,21 @@ function renderSessionSub() {
   const parts = [short(s.sessionId)]
   if (s.cwd) parts.push(s.cwd)
   if (s.running) parts.push('运行中')
+  else if (s.error) parts.push('已中断')
   $('session-sub').textContent = parts.join(' · ')
 }
 
+/** 顶栏状态: 运行中=蓝色流动渐变, 中断/出错=橙红渐变, 空闲=原样式 */
+function updateSessionStatus() {
+  const s = state.byId.get(state.current)
+  const head = $('session-head')
+  if (!head) return
+  head.classList.remove('running', 'interrupted')
+  const queued = (state.queues[state.current] || []).some(i => i.placement !== 'context')
+  if (s?.running || queued) head.classList.add('running')
+  else if (s?.error) head.classList.add('interrupted')
+}
+
 function updateCancelBtn() {
   const s = state.byId.get(state.current)
   const running = s?.running || (state.queues[state.current] || []).some(i => i.placement !== 'context')
@@ -966,20 +992,128 @@ async function interruptSubagent(childId) {
   setTimeout(renderSessionCards, 600)
 }
 
-/* ---------------- 发送 / 取消 ---------------- */
-async function sendMessage() {
-  const input = $('composer-input')
-  const text = input.value.trim()
-  if (!text || !state.current) return
+/* ---------------- 发送 / 取消 / 快捷菜单 ---------------- */
+async function sendSessionText(text) {
+  const clean = String(text || '').trim()
+  if (!clean || !state.current) return false
   $('btn-send').disabled = true
   const v = await safeRpc('session.prompt', {
     sessionId: state.current,
     mode: 'queue',
-    content: [{ type: 'text', text }]
+    content: [{ type: 'text', text: clean }]
   }, '发送失败')
   $('btn-send').disabled = false
-  if (v?.accepted) { input.value = ''; autosize(input); toast('已发送', 'ok') }
-  else if (v?.command?.text) toast('命令已执行')
+  if (v?.accepted) { toast(clean.startsWith('/') ? '指令已发送' : '已发送', 'ok'); return true }
+  if (v?.command?.text) { toast('命令已执行', 'ok'); return true }
+  return false
+}
+
+async function sendMessage() {
+  const input = $('composer-input')
+  const text = input.value.trim()
+  if (!text || !state.current) return
+  if (await sendSessionText(text)) { input.value = ''; autosize(input) }
+}
+
+function hideComposerMenu() {
+  $('composer-menu').classList.add('hidden')
+  $('btn-plus').classList.remove('active')
+}
+
+function toggleComposerMenu() {
+  const menu = $('composer-menu')
+  const show = menu.classList.contains('hidden')
+  menu.classList.toggle('hidden', !show)
+  $('btn-plus').classList.toggle('active', show)
+  if (show && !state.models.loaded && !state.models.loading) loadSessionModels()
+}
+
+async function loadSessionModels() {
+  if (!state.current || state.models.loading) return
+  state.models.loading = true
+  renderModelMenu()
+  try {
+    const v = await rpc('session.models', { sessionId: state.current })
+    state.models.groups = v.groups || []
+    state.models.current = v.current || null
+    state.models.failures = v.failures || []
+    state.models.loaded = true
+  } catch (e) {
+    if (e.message === 'AUTH') { authFailure(); return }
+    toast('模型列表加载失败：' + e.message, 'err')
+  }
+  state.models.loading = false
+  renderModelMenu()
+}
+
+function renderModelMenu() {
+  const box = $('menu-models')
+  if (!box) return
+  if (state.models.loading) { box.innerHTML = '<span>模型加载中…</span>'; return }
+  const groups = state.models.groups || []
+  if (!groups.length) {
+    box.innerHTML = '<span>' + ((state.models.failures || []).map(f => f.name + '不可用').join('；') || '没有可用模型') + '</span>'
+    const effortGroup = $('menu-effort-group')
+    if (effortGroup) effortGroup.classList.add('hidden')
+    return
+  }
+  const cur = state.models.current
+  box.innerHTML = groups.map(g => `
+    <div style="width:100%">
+      <div class="model-provider">${esc(g.name || g.id)}</div>
+      <div class="menu-chips">${(g.models || []).map(m => {
+        const isCur = cur && cur.provider === g.id && cur.model === m.id
+        return `<button class="model-chip ${isCur ? 'current' : ''}" data-model="${esc(m.id)}" data-provider="${esc(g.id)}">${esc(m.name || m.id)}</button>`
+      }).join('')}</div>
+    </div>`).join('')
+  box.querySelectorAll('[data-model]').forEach(btn =>
+    btn.addEventListener('click', () => selectSessionModel(btn.dataset.provider, btn.dataset.model)))
+  renderEffortMenu()
+}
+
+function renderEffortMenu() {
+  const group = $('menu-effort-group')
+  const box = $('menu-efforts')
+  if (!group || !box) return
+  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)
+  box.innerHTML = efforts.map(e => {
+    const isCur = cur?.reasoningEffort === e.id || (!cur?.reasoningEffort && e.id === model.reasoning.defaultEffort)
+    return `<button class="menu-chip ${isCur ? 'current' : ''}" data-effort="${esc(e.id)}" title="${esc(e.description || '')}">${esc(e.name || e.id)}</button>`
+  }).join('')
+  box.querySelectorAll('[data-effort]').forEach(btn =>
+    btn.addEventListener('click', () => selectSessionEffort(btn.dataset.effort)))
+}
+
+async function selectSessionEffort(effortId) {
+  const cur = state.models.current
+  if (!state.current || !cur) return
+  const v = await safeRpc('session.selectModel', {
+    sessionId: state.current, provider: cur.provider, model: cur.model, reasoningEffort: effortId
+  }, '切换思考深度失败')
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderEffortMenu()
+    toast(`思考深度：${effortId}`, 'ok')
+  }
+}
+
+async function selectSessionModel(provider, modelId) {
+  if (!state.current) return
+  const group = (state.models.groups || []).find(g => g.id === provider)
+  const model = (group?.models || []).find(m => m.id === modelId)
+  const payload = { sessionId: state.current, provider, model: modelId }
+  const effort = model?.reasoning?.defaultEffort || model?.reasoning?.efforts?.[0]?.id
+  if (effort) payload.reasoningEffort = effort
+  const v = await safeRpc('session.selectModel', payload, '切换模型失败')
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderModelMenu()
+    toast(`已切换模型：${v.selected.model}`, 'ok')
+  }
 }
 
 async function cancelSession() {
@@ -1219,20 +1353,113 @@ function showFsProgress(pct, loaded, total) {
   $('fs-progress-text').textContent = `${pct}% · ${fmtSize(loaded)} / ${fmtSize(total)}`
 }
 
+function setFsProgressText(text) {
+  $('fs-progress-text').textContent = text
+}
+
 function hideFsProgress() {
   $('fs-progress').classList.add('hidden')
   $('fs-progress-bar').style.width = '0%'
 }
 
+function setFsButtons(show, paused = false) {
+  const pauseBtn = $('fs-pause-btn')
+  const cancelBtn = $('fs-cancel-btn')
+  if (!pauseBtn || !cancelBtn) return
+  pauseBtn.classList.toggle('hidden', !show)
+  cancelBtn.classList.toggle('hidden', !show)
+  if (show) pauseBtn.textContent = paused ? '继续' : '暂停'
+}
+
+function pauseFsUpload() {
+  const up = state.fs.upload
+  if (!up) return
+  if (!up.active) {
+    if (up.paused) resumeFsUpload()
+    return
+  }
+  up.pauseRequested = true
+  try { up.xhr?.abort() } catch {}
+}
+
+function resumeFsUpload() {
+  const up = state.fs.upload
+  if (!up || !up.file) return
+  up.paused = false
+  runFsUpload(up)
+}
+
+async function cancelFsUpload() {
+  const up = state.fs.upload
+  if (!up) return
+  up.cancelled = true
+  try { up.xhr?.abort() } catch {}
+  try {
+    await fetch(fsApiUrl('/upload-control', { path: up.path, name: up.name, session: up.session, action: 'cancel' }), {
+      method: 'POST', headers: fsHeaders()
+    })
+  } catch {}
+  state.fs.upload = null
+  hideFsProgress()
+  setFsButtons(false)
+  toast('已取消上传')
+}
+
+const FS_CHUNK_SIZE = 4 * 1024 * 1024 // 4MB/块, 断线后重选同一文件自动续传
+
+/** 把文件 [start,end) 逐块喂给 hasher(续传时补齐已传前缀); 期间可被暂停打断 */
+async function hashFsRange(file, hasher, start, end, up) {
+  const step = FS_CHUNK_SIZE
+  for (let off = start; off < end; off += step) {
+    const buf = await file.slice(off, Math.min(off + step, end)).arrayBuffer()
+    if (up?.pauseRequested) {
+      const err = new Error('已暂停'); err.code = 'PAUSED'; throw err
+    }
+    hasher.update(new Uint8Array(buf))
+  }
+}
+
 function uploadFsFile(file) {
   if (!file) return
   if (!state.token) { toast('请先到「设置」页设置令牌', 'err'); showView('view-settings'); return }
   if (file.size > 2 * 1024 * 1024 * 1024) { toast('单文件超过 2GB 上限', 'err'); return }
+  if (state.fs.upload?.active) { toast('已有上传任务，先暂停或取消', 'err'); return }
+
+  const prev = state.fs.upload
+  if (prev && prev.path === state.fs.path && prev.name === file.name && prev.size === file.size) {
+    prev.file = file
+    runFsUpload(prev)
+    return
+  }
+  // 换传别的文件: 顺手清掉旧任务的服务端分片, 不残留隐藏 .part
+  if (prev) {
+    prev.cancelled = true
+    try { prev.xhr?.abort() } catch {}
+    try {
+      fetch(fsApiUrl('/upload-control', { path: prev.path, name: prev.name, session: prev.session, action: 'cancel' }), {
+        method: 'POST', headers: fsHeaders()
+      })
+    } catch {}
+  }
+  const up = {
+    session: uuid(), path: state.fs.path, name: file.name, size: file.size,
+    offset: 0, file, xhr: null, active: false, paused: false, cancelled: false
+  }
+  state.fs.upload = up
+  runFsUpload(up)
+}
 
-  const FS_CHUNK_SIZE = 4 * 1024 * 1024 // 4MB/块, 断线后重选同一文件自动续传
+async function runFsUpload(up) {
+  if (!up || !up.file) return
+  up.active = true
+  up.cancelled = false
+  up.paused = false
+  up.pauseRequested = false
+  setFsButtons(true, false)
 
-  const uploadChunk = (params, blob, up) => new Promise((resolve, reject) => {
+  const uploadChunk = (params, blob) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest()
+    up.xhr = xhr
     xhr.open('POST', fsApiUrl('/upload', params))
     xhr.setRequestHeader('authorization', 'Bearer ' + state.token)
     xhr.setRequestHeader('x-dsh-remote-client', CAP?.isNativePlatform?.() ? 'app' : 'web')
@@ -1243,17 +1470,23 @@ function uploadFsFile(file) {
       }
     }
     xhr.onload = () => {
+      if (up.xhr === xhr) up.xhr = null
       let json = {}
       try { json = JSON.parse(xhr.responseText || '{}') } catch {}
       resolve({ status: xhr.status, json })
     }
-    xhr.onerror = () => reject(new Error('网络错误'))
-    xhr.upload.onerror = () => reject(new Error('网络中断'))
-    xhr.onabort = () => reject(new Error('已取消'))
+    xhr.onerror = () => { if (up.xhr === xhr) up.xhr = null; reject(new Error('网络错误')) }
+    xhr.upload.onerror = () => { if (up.xhr === xhr) up.xhr = null; reject(new Error('网络中断')) }
+    xhr.onabort = () => {
+      if (up.xhr === xhr) up.xhr = null
+      const err = new Error(up.cancelled ? '已取消' : '已暂停')
+      err.code = up.cancelled ? 'CANCELLED' : 'PAUSED'
+      reject(err)
+    }
     xhr.send(blob)
   })
 
-  const probe = async (up) => {
+  const probe = async () => {
     const res = await fetch(fsApiUrl('/upload-probe', { path: up.path, name: up.name, session: up.session }), { headers: fsHeaders() })
     if (res.status === 401) { fsAuthError(401); return null }
     const json = await res.json().catch(() => ({}))
@@ -1261,71 +1494,130 @@ function uploadFsFile(file) {
     return json
   }
 
-  ;(async () => {
-    let up = state.fs.upload
-    if (!up || up.path !== state.fs.path || up.name !== file.name || up.size !== file.size) {
-      up = { session: uuid(), path: state.fs.path, name: file.name, size: file.size, offset: 0 }
-      state.fs.upload = up
+  let overwrite = false
+  let wasResumed = false
+  let hasher = new SHA256()
+  try {
+    const info = await probe()
+    if (info === null || up.cancelled) return
+    if (info.partialSize > 0) wasResumed = true
+    if (info.targetExists && info.targetSize === up.size && !overwrite) {
+      if (!confirm('文件已存在（大小相同），覆盖它？')) { state.fs.upload = null; hideFsProgress(); setFsButtons(false); return }
+      overwrite = true
     }
-    let overwrite = false
-    let wasResumed = false
-    try {
-      const info = await probe(up)
-      if (info === null) return
-      if (info.partialSize > 0) wasResumed = true
-      if (info.targetExists && info.targetSize === up.size && !overwrite) {
-        if (!confirm('文件已存在（大小相同），覆盖它？')) { state.fs.upload = null; return }
-        overwrite = true
+    if (up.offset > 0) await hashFsRange(up.file, hasher, 0, up.offset, up)
+    showFsProgress(Math.round(up.offset / Math.max(1, up.size) * 100), up.offset, up.size)
+
+    while (up.offset < up.size) {
+      if (up.cancelled) return
+      const end = Math.min(up.offset + FS_CHUNK_SIZE, up.size)
+      const blob = up.file.slice(up.offset, end)
+      const before = hasher.clone()
+      const chunkBytes = new Uint8Array(await blob.arrayBuffer())
+      if (up.pauseRequested) {
+        const err = new Error('已暂停'); err.code = 'PAUSED'; throw err
       }
-      showFsProgress(Math.round(up.offset / Math.max(1, up.size) * 100), up.offset, up.size)
-
-      while (up.offset < up.size) {
-        const end = Math.min(up.offset + FS_CHUNK_SIZE, up.size)
-        const params = { path: up.path, name: up.name, session: up.session, offset: String(up.offset) }
-        if (end >= up.size) params.finish = '1'
-        if (overwrite) params.overwrite = '1'
-        const r = await uploadChunk(params, file.slice(up.offset, end), up)
-        if (r.status === 401) { fsAuthError(401); return }
-        if (r.status === 200 && r.json.offset != null) { up.offset = r.json.offset; continue }
-        if (r.status === 201) {
-          hideFsProgress()
-          state.fs.upload = null
-          toast(`已上传 ${file.name}${wasResumed ? '（断点续传完成）' : ''}`, 'ok')
-          loadFs()
-          return
-        }
-        if (r.status === 409 && r.json.error === 'conflict') {
-          if (!confirm('文件已存在，覆盖它？')) { state.fs.upload = null; return }
-          overwrite = true
-          continue // 同一 offset 带 overwrite=1 重发
+      hasher.update(chunkBytes)
+      const isLast = end >= up.size
+      const params = { path: up.path, name: up.name, session: up.session, offset: String(up.offset) }
+      if (isLast) { params.finish = '1'; params.sha256 = hasher.hex() }
+      if (overwrite) params.overwrite = '1'
+      const r = await uploadChunk(params, blob)
+      if (r.status === 401) { fsAuthError(401); return }
+      if (r.status === 200 && r.json.offset != null) { up.offset = r.json.offset; continue }
+      if (r.status === 201) {
+        const expected = params.sha256 || hasher.hex()
+        if (r.json.sha256 && r.json.sha256 !== expected) {
+          const err = new Error('文件校验不一致（SHA-256）'); err.checksum = true
+          throw err
         }
-        if (r.status === 409 && r.json.error === 'offset-mismatch') {
-          await probe(up)
-          continue
-        }
-        throw new Error(r.json.error || ('HTTP ' + r.status))
-      }
-
-      // 0 字节文件: 循环不执行, 发一个空 finish 块
-      if (up.size === 0 && up.offset === 0) {
-        const params = { path: up.path, name: up.name, session: up.session, offset: '0', finish: '1' }
-        if (overwrite) params.overwrite = '1'
-        const r = await uploadChunk(params, new Blob([]), up)
-        if (r.status === 401) { fsAuthError(401); return }
-        if (r.status !== 201) throw new Error(r.json.error || ('HTTP ' + r.status))
         hideFsProgress()
+        setFsButtons(false)
         state.fs.upload = null
-        toast(`已上传 ${file.name}`, 'ok')
+        toast(`已上传 ${up.name}（SHA-256 已校验${wasResumed ? ' · 断点续传' : ''}）`, 'ok')
         loadFs()
         return
       }
+      if (r.status === 409 && r.json.error === 'conflict') {
+        hasher = before // 这段数据没被写入, 回退哈希状态后带 overwrite=1 重发
+        if (!confirm('文件已存在，覆盖它？')) { state.fs.upload = null; hideFsProgress(); setFsButtons(false); return }
+        overwrite = true
+        continue
+      }
+      if (r.status === 409 && r.json.error === 'offset-mismatch') {
+        hasher = before
+        await probe()
+        continue
+      }
+      if (r.status === 422 && r.json.error === 'checksum-mismatch') {
+        const err = new Error('文件校验不一致（SHA-256），已清除坏分片')
+        err.checksum = true
+        throw err
+      }
+      throw new Error(r.json.error || ('HTTP ' + r.status))
+    }
 
+    // offset 已到文件末尾但还没落位(0 字节文件 / 续传时最后一块已完成而 rename 被中断):
+    // 发一个空 finish 块完成收尾, 同时带上全量 SHA-256 校验
+    if (up.offset >= up.size) {
+      const expected = hasher.hex()
+      const params = { path: up.path, name: up.name, session: up.session, offset: String(up.offset), finish: '1', sha256: expected }
+      if (overwrite) params.overwrite = '1'
+      const r = await uploadChunk(params, new Blob([]))
+      if (r.status === 401) { fsAuthError(401); return }
+      if (r.status === 409 && r.json.error === 'conflict') {
+        if (!confirm('文件已存在，覆盖它？')) { state.fs.upload = null; hideFsProgress(); setFsButtons(false); return }
+        params.overwrite = '1'
+        return runFsUpload(up) // 目标冲突未写入, 重新走 probe + 空 finish
+      }
+      if (r.status === 422 && r.json.error === 'checksum-mismatch') {
+        const err = new Error('文件校验不一致（SHA-256），已清除坏分片')
+        err.checksum = true
+        throw err
+      }
+      if (r.status !== 201) throw new Error(r.json.error || ('HTTP ' + r.status))
+      if (r.json.sha256 && r.json.sha256 !== expected) {
+        const err = new Error('文件校验不一致（SHA-256）'); err.checksum = true
+        throw err
+      }
       hideFsProgress()
-    } catch (e) {
-      hideFsProgress()
-      toast(`上传中断：${e.message}（重选同一文件可断点续传）`, 'err')
+      setFsButtons(false)
+      state.fs.upload = null
+      toast(`已上传 ${up.name}（SHA-256 已校验${wasResumed ? ' · 断点续传' : ''}）`, 'ok')
+      loadFs()
+      return
     }
-  })()
+
+    hideFsProgress()
+    setFsButtons(false)
+  } catch (e) {
+    up.active = false
+    if (up.cancelled || e?.code === 'CANCELLED') return
+    if (e?.code === 'PAUSED') {
+      up.paused = true
+      setFsButtons(true, true)
+      setFsProgressText(`已暂停 · ${Math.round(up.offset / Math.max(1, up.size) * 100)}%`)
+      toast('已暂停，点「继续」接着传', 'ok')
+      return
+    }
+    if (e?.checksum) {
+      // 坏分片保留只会反复校验失败: 服务端删掉, 下一次「继续」从 0 完整重传
+      up.paused = true
+      up.offset = 0
+      try {
+        await fetch(fsApiUrl('/upload-control', { path: up.path, name: up.name, session: up.session, action: 'cancel' }), {
+          method: 'POST', headers: fsHeaders()
+        })
+      } catch {}
+      setFsButtons(true, true)
+      setFsProgressText('校验失败 · 点「继续」重新上传')
+      toast(e.message, 'err')
+      return
+    }
+    hideFsProgress()
+    setFsButtons(false)
+    toast(`上传中断：${e.message}（重选同一文件可断点续传）`, 'err')
+  }
 }
 
 function fsUp() {
@@ -1388,13 +1680,30 @@ async function submitGoalEdit() {
 }
 
 /* ---------------- 检查更新 ---------------- */
+function parseVersion(v) {
+  const m = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/.exec(String(v || '').trim())
+  if (!m) return { core: [0, 0, 0], pre: null }
+  return { core: [Number(m[1]), Number(m[2]), Number(m[3])], pre: m[4] || null }
+}
 function cmpVersion(a, b) {
-  const pa = String(a || '').split('.').map(Number)
-  const pb = String(b || '').split('.').map(Number)
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const d = (pa[i] || 0) - (pb[i] || 0)
+  const pa = parseVersion(a), pb = parseVersion(b)
+  for (let i = 0; i < 3; i++) {
+    const d = pa.core[i] - pb.core[i]
     if (d) return d
   }
+  // 无预发布后缀 = 正式版 > 任何 rc; 两个 rc 按段比较(数字段按数值, 字母段按字典序)
+  if (!pa.pre && !pb.pre) return 0
+  if (!pa.pre) return 1
+  if (!pb.pre) return -1
+  const sa = String(pa.pre).split('.'), sb = String(pb.pre).split('.')
+  for (let i = 0; i < Math.max(sa.length, sb.length); i++) {
+    const x = sa[i] ?? '', y = sb[i] ?? ''
+    if (x === y) continue
+    const nx = /^\d+$/.test(x), ny = /^\d+$/.test(y)
+    if (nx && ny) { const d = Number(x) - Number(y); if (d) return d }
+    else if (nx !== ny) return nx ? -1 : 1 // 数字段 < 字母段(semver 规则)
+    else { const d = x.localeCompare(y); if (d) return d }
+  }
   return 0
 }
 
@@ -1415,7 +1724,7 @@ async function checkUpdate(silent) {
   }
   if (!silent) toast('正在检查更新…')
   try {
-    const res = await fetch(base + '/update.json?t=' + Date.now())
+    const res = await fetch(base + '/update.json?t=' + Date.now() + '&local=' + encodeURIComponent(state.localVersion))
     if (!res.ok) throw new Error('HTTP ' + res.status)
     const info = await res.json()
     if (info.version && cmpVersion(info.version, state.localVersion) > 0) {
@@ -1526,6 +1835,106 @@ function autosize(el) {
 }
 
 /* ---------------- 初始化 ---------------- */
+/** 解析 dshremote://pair?token=..&server=.. 配对二维码 */
+function applyPairUrl(url) {
+  try {
+    const u = new URL(String(url).trim())
+    if (u.protocol !== 'dshremote:' || u.hostname !== 'pair') return false
+    const t = (u.searchParams.get('token') || '').trim()
+    const server = (u.searchParams.get('server') || '').trim().replace(/\/+$/, '')
+    if (!t || !/^https?:\/\//i.test(server)) return false
+    state.token = t
+    LS.set('token', t)
+    state.server = server
+    if (!state.servers.includes(server)) state.servers.unshift(server)
+    saveServers()
+    renderServers()
+    $('token-desc').textContent = '已保存(扫码)'
+    return true
+  } catch {
+    return false
+  }
+}
+
+/** 拍照/相册得到的 dataUrl → 画到 canvas → jsQR 纯本地解码(不依赖任何谷歌服务) */
+async function decodeQrDataUrl(dataUrl) {
+  const img = new Image()
+  await new Promise((resolve, reject) => {
+    img.onload = resolve
+    img.onerror = () => reject(new Error('图片加载失败'))
+    img.src = dataUrl
+  })
+  const maxSide = 1600
+  const scale = Math.min(1, maxSide / Math.max(img.naturalWidth || 1, img.naturalHeight || 1))
+  const w = Math.max(1, Math.round((img.naturalWidth || 1) * scale))
+  const h = Math.max(1, Math.round((img.naturalHeight || 1) * scale))
+  const canvas = document.createElement('canvas')
+  canvas.width = w
+  canvas.height = h
+  const ctx = canvas.getContext('2d', { willReadFrequently: true })
+  if (!ctx) throw new Error('当前设备不支持图片解码')
+  ctx.drawImage(img, 0, 0, w, h)
+  const imageData = ctx.getImageData(0, 0, w, h)
+  const code = window.jsQR?.(imageData.data, w, h, { inversionAttempts: 'attemptBoth' })
+  return code?.data || ''
+}
+
+/** App 内扫码: 官方 Camera 拍照/相册 + jsQR 本地解码(无 Google ML Kit/GMS 依赖, 国内可用)。
+ *  冗余路径 1: 系统相机扫 dshremote:// 二维码直接唤起 App(见 bindNativeLinks);
+ *  冗余路径 2: 设置页手动粘贴令牌。 */
+async function scanPair() {
+  if (!CAP?.isNativePlatform?.()) {
+    toast('浏览器请打开主机管理页，用手机相机扫码', 'err')
+    return
+  }
+  const camera = CAP.Plugins?.Camera
+  if (!camera?.getPhoto) { toast('当前 App 版本不支持拍照扫码，请先更新 App', 'err'); return }
+  try {
+    const perm = await camera.requestPermissions?.({ permissions: ['camera'] })
+    if (perm && perm.camera !== 'granted') { toast('未授予相机权限', 'err'); return }
+    const photo = await camera.getPhoto({
+      resultType: 'dataUrl',
+      source: 'PROMPT', // 拍照 / 从相册选择都行, 相册可扫截图
+      quality: 85,
+      correctOrientation: true,
+      saveToGallery: false,
+      promptLabelHeader: '扫描 DSH Remote 配对二维码',
+      promptLabelPhoto: '拍照扫描',
+      promptLabelPicture: '从相册选择',
+    })
+    if (!photo?.dataUrl) { toast('没有拿到图片，请重试', 'err'); return }
+    const raw = await decodeQrDataUrl(photo.dataUrl)
+    if (!raw) { toast('未识别到二维码，请对准后重试', 'err'); return }
+    if (applyPairUrl(raw)) {
+      toast('配对成功，正在连接', 'ok')
+      openStreams()
+      refreshAll()
+    } else {
+      toast('这不是 DSH Remote 的配对二维码', 'err')
+    }
+  } catch (e) {
+    const msg = String(e?.message || e || '')
+    toast(/cancel/i.test(msg) ? '已取消扫码' : '扫码失败：' + msg, 'err')
+  }
+}
+
+/** 系统相机/浏览器扫码后通过 dshremote:// 链接唤起 App: 这里接住并配对 */
+function bindNativeLinks() {
+  if (!CAP?.isNativePlatform?.()) return
+  try {
+    CAP.Plugins?.App?.addListener?.('appUrlOpen', (data) => {
+      if (data?.url && applyPairUrl(data.url)) {
+        toast('已通过二维码配对', 'ok')
+        openStreams()
+        refreshAll()
+      }
+    })
+    CAP.Plugins?.App?.getLaunchUrl?.().then((data) => {
+      if (data?.url) applyPairUrl(data.url)
+    }).catch(() => {})
+  } catch {}
+}
+
 function initToken() {
   const urlToken = new URLSearchParams(location.search).get('token')
   if (urlToken) {
@@ -1553,13 +1962,19 @@ function bindUi() {
   $('btn-back').addEventListener('click', closeSession)
   $('btn-stats').addEventListener('click', () => { renderSessionCards(); $('modal-stats').classList.remove('hidden') })
   $('stats-close').addEventListener('click', () => $('modal-stats').classList.add('hidden'))
-  $('btn-refresh').addEventListener('click', () => { toast('刷新中…'); refreshAll() })
+  $('btn-refresh').addEventListener('click', () => { toast('刷新中…'); openStreams(); refreshAll() })
   $('btn-admin').addEventListener('click', () => {
     location.href = state.server ? state.server.replace(/\/+$/, '') + '/admin' : 'admin'
   })
   $('btn-new-session').addEventListener('click', newSession)
   $('btn-cancel').addEventListener('click', cancelSession)
   $('btn-send').addEventListener('click', sendMessage)
+  $('btn-plus').addEventListener('click', toggleComposerMenu)
+  $('composer-menu').addEventListener('click', (e) => {
+    const chip = e.target.closest('[data-cmd]')
+    if (chip) { hideComposerMenu(); sendSessionText(chip.dataset.cmd) }
+  })
+  $('btn-model-refresh').addEventListener('click', loadSessionModels)
   const input = $('composer-input')
   input.addEventListener('input', () => autosize(input))
   input.addEventListener('keydown', (e) => {
@@ -1582,6 +1997,7 @@ function bindUi() {
   $('goal-close').addEventListener('click', () => $('modal-goal').classList.add('hidden'))
   $('goal-edit').addEventListener('click', submitGoalEdit)
   // 设置
+  $('btn-scan-pair').addEventListener('click', scanPair)
   $('btn-change-token').addEventListener('click', () => {
     const t = prompt('输入访问令牌(网关启动时打印的 token)：', state.token)
     if (t && t.trim()) { state.token = t.trim(); LS.set('token', t.trim()); $('token-desc').textContent = '已保存'; toast('已保存，正在重连', 'ok'); openStreams(); refreshAll() }
@@ -1629,6 +2045,8 @@ function bindUi() {
     if (f) uploadFsFile(f)
     e.target.value = '' // 允许连续选同一个文件
   })
+  $('fs-pause-btn').addEventListener('click', pauseFsUpload)
+  $('fs-cancel-btn').addEventListener('click', cancelFsUpload)
   bindFsPullRefresh()
 
   bindRail()
@@ -1671,6 +2089,7 @@ async function boot() {
   initToken()
   bindUi()
   bindNativeBack()
+  bindNativeLinks()
   applyNativeInsets()
   updateConn()
   loadLocalVersion()