dsh-remote-plugin 0.6.5 → 0.6.7

package/public/app.js

@@ -46,11 +46,13 @@ const state = {
   serverLatency: {},      // url -> 最近一次 /health 测速毫秒数
   selectingServer: false, // 防重入: 测速/切换中
   sessions: [],
+  sessionSort: LS.get('sessionSort', 'time') === 'workspace' ? 'workspace' : 'time',
   byId: new Map(),
   current: null,           // 当前打开的 sessionId
   hostInfo: null,
   localVersion: '',
   updateInfo: null,
+  announcement: null,
   approvals: [],           // 待处理审批
   questions: [],           // 待处理提问
   queues: {},              // sessionId -> queue items
@@ -61,7 +63,12 @@ const state = {
   pollSeq: { mux: 0, host: 0 },
   refreshTimer: null,
   fs: { path: null, initial: null, loaded: false, upload: null },
-  models: { loaded: false, loading: false, groups: [], current: null, failures: [] }
+  models: { loaded: false, loading: false, groups: [], current: null, failures: [] },
+  wb: null,
+  wbProjects: [],
+  wbArchived: [],
+  wbOpen: false,
+  wbOpenProjects: {}
 }
 
 const $ = (id) => document.getElementById(id)
@@ -183,6 +190,24 @@ function apiUrl(path) {
   return (state.server || '') + path
 }
 
+function updateBase() {
+  const configured = String(state.server || '').replace(/\/+$/, '')
+  if (configured) return configured
+  if (!/^https?:$/.test(location.protocol)) return ''
+  const origin = location.origin.replace(/\/+$/, '')
+  return location.pathname === '/remote' || location.pathname.startsWith('/remote/')
+    ? origin + '/remote'
+    : origin
+}
+
+function adminApiUrl(path) {
+  const base = String(state.server || '').replace(/\/+$/, '')
+  if (base) return base + path
+  // DSH 抽屉页面同源运行在 /remote/ 前缀下，管理接口也必须带此前缀；
+  // 独立网关根页面则继续使用 /admin/api/*。
+  return location.pathname.startsWith('/remote/') ? '/remote' + path : path
+}
+
 function fmtCost(n) {
   return '¥' + (Number(n) || 0).toFixed(2)
 }
@@ -268,14 +293,14 @@ function renderStats(days) {
     </div>`
   }).join('')
 }
-async function rpc(method, payload = {}) {
+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' },
     body: JSON.stringify({ type: 'client-request', rpcId: uuid(), method, payload })
   }
   if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
-    opts.signal = AbortSignal.timeout(45000)
+    opts.signal = AbortSignal.timeout(timeoutMs)
   }
   const res = await fetch(apiUrl('/api/' + method), opts)
   if (res.status === 401) throw new Error('AUTH')
@@ -290,11 +315,15 @@ async function rpc(method, payload = {}) {
 }
 
 async function respond(rpcId, value) {
-  const res = await fetch(apiUrl('/api/respond'), {
+  const opts = {
     method: 'POST',
     headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': CAP?.isNativePlatform?.() ? 'app' : 'web' },
     body: JSON.stringify({ type: 'client-response', rpcId, result: { ok: true, value } })
-  })
+  }
+  if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
+    opts.signal = AbortSignal.timeout(15000)
+  }
+  const res = await fetch(apiUrl('/api/respond'), opts)
   if (res.status === 401) throw new Error('AUTH')
   const receipt = await res.json()
   return receipt?.accepted === true
@@ -430,7 +459,8 @@ async function selectFastestServer({ silent = false, reconnect = true } = {}) {
     let ms = Infinity
 
     if (state.autoSelect[state.activeGroup] !== false) {
-      for (const u of candidates) state.serverLatency[u] = await pingServer(u)
+      const measured = await Promise.all(candidates.map(async (u) => [u, await pingServer(u)]))
+      for (const [u, latency] of measured) state.serverLatency[u] = latency
       best = candidates
         .filter(u => Number.isFinite(state.serverLatency[u]))
         .sort((a, b) => state.serverLatency[a] - state.serverLatency[b])[0] || null
@@ -898,8 +928,18 @@ async function pollKind(kind) {
   let data
   try { data = await res.json() } catch { return }
   if (!data || !Array.isArray(data.events)) return
-  // 网关重启后 seq 会重置：落后就从头拉当前缓冲
-  if (typeof data.latestSeq === 'number' && data.latestSeq < since) state.pollSeq[kind] = 0
+  // 网关重启或客户端离线过久后，游标可能落后于内存环形缓冲；
+  // 从当前缓冲重新接收，并刷新权威会话列表，避免静默漏事件。
+  const reset = data.truncated === true || (typeof data.latestSeq === 'number' && data.latestSeq < since)
+  if (reset) {
+    state.pollSeq[kind] = 0
+    if (kind === 'mux') {
+      state.approvals = []
+      state.questions = []
+      renderPending()
+    }
+    scheduleRefresh()
+  }
   for (const item of data.events) {
     if (item.seq > (state.pollSeq[kind] || 0)) {
       state.pollSeq[kind] = item.seq
@@ -1056,6 +1096,7 @@ async function refreshSessions() {
   state.byId = new Map(state.sessions.map(s => [s.sessionId, s]))
   cacheWrite(CACHE.sessions, state.sessions.slice(0, 80))
   renderSessions()
+  refreshWorkbench()
 }
 
 function proj(s, key, d) { return s?.projections?.values?.[key] ?? d }
@@ -1070,7 +1111,8 @@ function applyProjection(sessionId, key, value, seq) {
   if (state.current === sessionId) { renderSessionTitle(); renderSessionCards() }
   if (['title', 'goal', 'todos', 'plan', 'sessionListMetadata'].includes(key)) scheduleRefresh()
   else renderSessions()
-}function titleOf(s) { return proj(s, 'title') || short(s.sessionId) }
+}
+function titleOf(s) { return proj(s, 'title') || (s?.sessionId ? short(s.sessionId) : t('session.unknown')) }
 function short(id) { return '…' + String(id).slice(-8) }
 const GOAL_TERMINAL_PHASES = new Set(['complete', 'cleared'])
 function isGoalTerminal(goal) {
@@ -1088,37 +1130,182 @@ function updatePendingBadge() {
   if (pending) $('nav-pending').textContent = pending
 }
 
-function renderSessions() {
-  const list = $('session-list')
-  const items = [...state.sessions].sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
-  list.innerHTML = items.map(s => {
-    const title = titleOf(s)
-    const goal = goalOf(s)
-    const pending = (state.approvals.some(a => a.sessionId === s.sessionId) || state.questions.some(q => q.sessionId === s.sessionId)) ? 'pending' : ''
-    const queueN = (state.queues[s.sessionId] || []).filter(i => i.placement === 'queued').length
-    const dots = []
-    if (s.running) dots.push('running')
-    if (pending) dots.push('pending')
-    const badge = goal ? `<span class="sc-badge ${goal.phase === 'active' ? 'goal-active' : ''}">${esc(t('sessions.goalBadge', { phase: goal.phase || '?' }))}</span>` : ''
-    const queueBadge = queueN ? `<span class="sc-badge">${esc(t('sessions.queueBadge', { n: queueN }))}</span>` : ''
-    return `<div class="session-card ${state.current === s.sessionId ? 'current' : ''}" data-id="${esc(s.sessionId)}">
-      <div class="sc-title">${esc(title)}</div>
-      <div class="sc-meta">
-        <span class="sc-dot ${dots.join(' ')}"></span>
-        <span>${fmtTime(s.updatedAt)}</span>
-        ${s.running ? '<span>' + t('sessions.running') + '</span>' : ''}
-        ${badge}${queueBadge}
-      </div>
-      <span class="sc-arrow">›</span>
+/* ---------------- 工作台与归档会话 ---------------- */
+function wbPathKey(p) {
+  let value = String(p || '').replace(/\\/g, '/').replace(/\/+/g, '/')
+  if (value.length > 1) value = value.replace(/\/+$/, '')
+  const windows = /^[A-Za-z]:\//.test(value) || /Windows/i.test(navigator.platform || navigator.userAgent || '')
+  return windows ? value.toLowerCase() : value
+}
+function wbBaseName(p) {
+  const value = String(p || '').replace(/[\\/]+$/, '')
+  return value.split(/[\\/]/).pop() || value
+}
+function wbStrictInside(pathValue, rootValue) {
+  const pathKey = wbPathKey(pathValue)
+  const rootKey = wbPathKey(rootValue)
+  if (!pathKey || !rootKey || pathKey === rootKey) return false
+  return pathKey.startsWith(rootKey.endsWith('/') ? rootKey : rootKey + '/')
+}
+function wbJoin(root, name) {
+  const raw = String(root || '')
+  const separator = raw.includes('\\') ? '\\' : '/'
+  return raw.replace(/[\\/]+$/, '') + separator + String(name || '')
+}
+function workbenchRoot() {
+  return state.wb?.bound && state.wb.path ? state.wb.path : ''
+}
+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' }
+    })
+    if (res.ok) {
+      const value = await res.json().catch(() => null)
+      if (value && typeof value.bound === 'boolean') state.wb = value
+    }
+  } catch {}
+  try {
+    const value = await rpc('workspace.list', {})
+    state.wbProjects = Array.isArray(value?.items) ? value.items : []
+    state.wbArchived = Array.isArray(value?.archivedSessionIds) ? value.archivedSessionIds : []
+  } catch {
+    state.wbProjects = []
+    state.wbArchived = []
+  }
+  renderWorkbench()
+  renderSessions()
+}
+function renderWorkbench() {
+  const bar = $('workbench-bar')
+  if (!bar) return
+  const bound = !!state.wb?.bound && !!state.wb.path
+  const toggle = $('wb-toggle')
+  const panel = $('wb-panel')
+  bar.classList.toggle('bound', bound)
+  bar.classList.toggle('unbound', !bound)
+  if (!bound) {
+    $('wb-label').textContent = t('wb.unbound')
+    toggle.setAttribute('aria-expanded', 'false')
+    panel.classList.add('hidden')
+    panel.innerHTML = ''
+    return
+  }
+  $('wb-label').textContent = t('wb.bound', { title: state.wb.title || wbBaseName(state.wb.path) })
+  toggle.setAttribute('aria-expanded', state.wbOpen ? 'true' : 'false')
+  panel.classList.toggle('hidden', !state.wbOpen)
+  if (!state.wbOpen) { panel.innerHTML = ''; return }
+  const projects = state.wbProjects.filter(w => wbStrictInside(w.path, workbenchRoot()))
+  if (!projects.length) {
+    panel.innerHTML = `<div class="wb-empty">${esc(t('wb.noProjects'))}</div>`
+    return
+  }
+  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)
+    const body = open ? `<div class="wb-sessions">${sessions.length ? sessions.map(s => `
+      <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>
+      </button>`).join('') : `<div class="wb-empty">${esc(t('wb.noSessions'))}</div>`}</div>` : ''
+    return `<div class="wb-project ${open ? 'open' : ''}" data-wb-project="${esc(id)}">
+      <div class="wb-project-head">
+        <span class="wb-chevron" aria-hidden="true">${open ? '▾' : '▸'}</span>
+        <span class="wb-project-title">${esc(w.title || wbBaseName(w.path) || w.path)}</span>
+        <button class="mini-btn wb-new" type="button" data-wb-new="${esc(id)}">${esc(t('wb.newSession'))}</button>
+      </div>${body}
     </div>`
   }).join('')
-  $('home-empty').classList.toggle('hidden', items.length > 0)
+}
+
+function sessionCwd(s) { return typeof s?.cwd === 'string' ? s.cwd.trim() : '' }
+function sessionWorkspaceLabel(s) {
+  const cwd = sessionCwd(s)
+  return cwd || t('sessions.workspaceUnknown')
+}
+function workspaceDisplayName(label) {
+  const value = String(label || '').trim()
+  if (!value || value === t('sessions.workspaceUnknown')) return value || t('sessions.workspaceUnknown')
+  const clean = value.replace(/[\\/]+$/, '')
+  const parts = clean.split(/[\\/]/).filter(Boolean)
+  return parts[parts.length - 1] || value
+}
+function sortedSessions() {
+  const items = [...state.sessions]
+  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 items.sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
+}
+function renderSessions() {
+  const list = $('session-list')
+  const allItems = sortedSessions()
+  const wbIds = new Set()
+  if (state.wb?.bound) for (const w of state.wbProjects) for (const id of (w.sessionIds || [])) wbIds.add(id)
+  const root = workbenchRoot()
+  const visible = allItems.filter(s => !(state.wb?.bound && (wbIds.has(s.sessionId) || wbStrictInside(s.cwd, root))))
+  const archivedSet = new Set(state.wbArchived || [])
+  const archived = visible.filter(s => archivedSet.has(s.sessionId))
+  const main = visible.filter(s => !archivedSet.has(s.sessionId))
+  const showArchived = LS.get('showArchivedV1', '0') === '1'
+  const renderItems = (items) => {
+    let lastWorkspace = null
+    const rows = []
+    for (const s of items) {
+      const workspace = sessionWorkspaceLabel(s)
+      const workspaceName = workspaceDisplayName(workspace)
+      if (state.sessionSort === 'workspace' && workspace !== lastWorkspace) {
+        rows.push(`<div class="session-group-label" title="${esc(workspace)}"><span class="session-group-icon" aria-hidden="true">⌂</span><span class="session-group-name">${esc(workspaceName)}</span></div>`)
+        lastWorkspace = workspace
+      }
+      const title = titleOf(s)
+      const goal = goalOf(s)
+      const pending = (state.approvals.some(a => a.sessionId === s.sessionId) || state.questions.some(q => q.sessionId === s.sessionId)) ? 'pending' : ''
+      const queueN = (state.queues[s.sessionId] || []).filter(i => i.placement === 'queued').length
+      const dots = []
+      if (s.running) dots.push('running')
+      if (pending) dots.push('pending')
+      const badge = goal ? `<span class="sc-badge ${goal.phase === 'active' ? 'goal-active' : ''}">${esc(t('sessions.goalBadge', { phase: goal.phase || '?' }))}</span>` : ''
+      const queueBadge = queueN ? `<span class="sc-badge">${esc(t('sessions.queueBadge', { n: queueN }))}</span>` : ''
+      const archiveButton = archivedSet.has(s.sessionId) ? '' : `<button type="button" class="sc-archive-btn" data-archive-session="${esc(s.sessionId)}">${esc(t('session.archive'))}</button>`
+      rows.push(`<div class="session-swipe" data-session-swipe data-id="${esc(s.sessionId)}">
+        <div class="session-card ${state.current === s.sessionId ? 'current' : ''}">
+        <div class="sc-title">${esc(title)}</div>
+        <div class="sc-meta">
+          <span class="sc-dot ${dots.join(' ')}"></span>
+          <span>${fmtTime(s.updatedAt)}</span>
+          ${s.running ? '<span>' + t('sessions.running') + '</span>' : ''}
+          ${badge}${queueBadge}
+        </div>
+        <div class="sc-workspace" title="${esc(workspace)}">⌂ ${esc(workspaceName)}</div>
+        <span class="sc-arrow">›</span>
+        </div>
+        ${archiveButton}
+      </div>`)
+    }
+    return rows.join('')
+  }
+  const divider = archived.length ? `<button class="archived-toggle" type="button" data-archived-toggle>${esc(showArchived ? t('wb.archivedShown') : t('wb.archivedHidden'))}</button>` : ''
+  const rows = renderItems(main) + divider + (showArchived ? renderItems(archived) : '')
+  const hiddenByWorkbench = allItems.length - visible.length
+  list.innerHTML = rows || `<div class="empty">${esc(hiddenByWorkbench ? t('wb.flatHidden', { n: hiddenByWorkbench }) : t('home.empty'))}</div>`
+  list.classList.toggle('workspace-sorted', state.sessionSort === 'workspace')
+  const sort = $('session-sort')
+  if (sort) sort.value = state.sessionSort
+  $('home-empty').classList.toggle('hidden', visible.length > 0)
   const running = state.sessions.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>
     <div class="stat pending"><div class="v">${pending}</div><div class="k">${t('sessions.statPending')}</div></div>
-    <div class="stat ctx"><div class="v">${items.length}</div><div class="k">${t('sessions.statTotal')}</div></div>`
+    <div class="stat ctx"><div class="v">${visible.length}</div><div class="k">${t('sessions.statTotal')}</div></div>`
   updatePendingBadge()
 }
 
@@ -1151,7 +1338,7 @@ function bindNativeBack() {
   try {
     CAP.Plugins?.App?.addListener?.('backButton', () => {
       const openModal = [...document.querySelectorAll('.modal')].find(m => !m.classList.contains('hidden'))
-      if (openModal) { if (openModal.id === 'modal-notes') closeNotesModal(); else openModal.classList.add('hidden'); return }   // 先关弹窗
+      if (openModal) { if (openModal.id === 'modal-notes') closeNotesModal(); else if (openModal.id === 'modal-archive') closeArchiveConfirm(); 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 }
@@ -1245,7 +1432,7 @@ function restoreCachedHistory() {
   if (!cached?.events?.length) return false
   const h = emptyHistory()
   for (const e of cached.events) {
-    if (!e?.seq) continue
+    if (e?.seq == null) continue
     h.seqs.add(e.seq)
     h.visible.push(e)
   }
@@ -1613,7 +1800,8 @@ async function goalAction(kind) {
   if (!method) return
   if (kind === 'clear' && !confirm(t('goal.confirmClear'))) return
   if (kind === 'complete' && !confirm(t('goal.confirmComplete'))) return
-  await safeRpc(method, { sessionId: state.current, ref }, t('goal.actionFailed'))
+  const result = await safeRpc(method, { sessionId: state.current, ref }, t('goal.actionFailed'))
+  if (result == null) return
   if (kind === 'complete') setGoalPhaseLocal('complete')
   if (kind === 'clear') setGoalPhaseLocal('cleared')
   toast(t('goal.actionSubmitted'), 'ok')
@@ -1622,7 +1810,8 @@ async function goalAction(kind) {
 
 async function interruptSubagent(childId) {
   if (!confirm(t('subagent.confirmInterrupt'))) return
-  await safeRpc('subagent.interrupt', { parentSessionId: state.current, childSessionId: childId, mode: 'continuable' }, t('subagent.interruptFailed'))
+  const result = await safeRpc('subagent.interrupt', { parentSessionId: state.current, childSessionId: childId, mode: 'continuable' }, t('subagent.interruptFailed'))
+  if (result == null) return
   toast(t('subagent.interruptSubmitted'), 'ok')
   setTimeout(renderSessionCards, 600)
 }
@@ -1678,6 +1867,7 @@ async function sendMessage() {
 function hideComposerMenu() {
   $('composer-menu').classList.add('hidden')
   $('btn-plus').classList.remove('active')
+  $('permission-submenu')?.classList.add('hidden')
 }
 
 function toggleComposerMenu() {
@@ -1688,6 +1878,13 @@ function toggleComposerMenu() {
   if (show && !state.models.loaded && !state.models.loading) loadSessionModels()
 }
 
+function isMobileDevice() {
+  return !!CAP?.isNativePlatform?.() || /Android|iPhone|iPad|iPod|Mobile|Windows Phone/i.test(navigator.userAgent || '')
+}
+function mobileEnterAction() {
+  return LS.get('mobileEnterAction', 'newline') === 'send' ? 'send' : 'newline'
+}
+
 async function loadSessionModels() {
   if (!state.current || state.models.loading) return
   state.models.loading = true
@@ -1784,13 +1981,103 @@ async function cancelSession() {
 }
 
 async function newSession() {
-  const v = await safeRpc('session.create', {}, t('home.createFailed'))
+  let payload = {}
+  // DSH 的 host.describe 返回当前工作目录。每次创建前短暂刷新一次，
+  // 避免用户在桌面端切换工作区后，手机仍沿用启动时的旧 cwd。
+  try {
+    const host = await rpc('host.describe', {}, 5000)
+    const cwd = typeof host?.cwd === 'string' ? host.cwd.trim() : ''
+    if (cwd) {
+      state.hostInfo = host
+      payload = { cwd }
+    }
+  } catch {}
+  const v = await safeRpc('session.create', payload, t('home.createFailed'))
   if (!v?.sessionId) return
   toast(t('home.created'), 'ok')
   await refreshSessions()
   openSession(v.sessionId)
 }
 
+let archivePendingSessionId = null
+function archiveSession(sessionId) {
+  const session = state.byId.get(sessionId)
+  if (!session) return
+  archivePendingSessionId = sessionId
+  $('archive-session-title').textContent = titleOf(session)
+  $('archive-session-workspace').textContent = sessionWorkspaceLabel(session)
+  $('modal-archive').classList.remove('hidden')
+}
+function closeArchiveConfirm() {
+  archivePendingSessionId = null
+  $('modal-archive').classList.add('hidden')
+}
+async function confirmArchiveSession() {
+  const sessionId = archivePendingSessionId
+  if (!sessionId) return
+  const button = $('archive-confirm')
+  button.disabled = true
+  try {
+    const value = await safeRpc('workspace.archiveSession', { sessionId }, t('session.archiveFailed', { msg: '' }))
+    if (value == null) return
+    closeArchiveConfirm()
+    toast(t('session.archived'), 'ok')
+    await refreshSessions()
+  } finally {
+    button.disabled = false
+  }
+}
+
+let swipeTracking = null
+let swipeSuppressClickUntil = 0
+function closeRevealedSwipes(except = null) {
+  document.querySelectorAll('#session-list .session-swipe.revealed').forEach(row => {
+    if (row !== except) row.classList.remove('revealed')
+  })
+}
+function bindSessionSwipe() {
+  const list = $('session-list')
+  list.addEventListener('touchstart', e => {
+    if (e.touches.length !== 1) return
+    const row = e.target.closest('[data-session-swipe]')
+    if (!row) return
+    closeRevealedSwipes(row)
+    const touch = e.touches[0]
+    swipeTracking = {
+      row,
+      startX: touch.clientX,
+      startY: touch.clientY,
+      offset: row.classList.contains('revealed') ? -92 : 0,
+      axis: null
+    }
+  }, { passive: true })
+  list.addEventListener('touchmove', e => {
+    if (!swipeTracking || e.touches.length !== 1) return
+    const touch = e.touches[0]
+    const dx = touch.clientX - swipeTracking.startX
+    const dy = touch.clientY - swipeTracking.startY
+    if (!swipeTracking.axis && Math.max(Math.abs(dx), Math.abs(dy)) >= 8) {
+      swipeTracking.axis = Math.abs(dx) > Math.abs(dy) ? 'x' : 'y'
+    }
+    if (swipeTracking.axis !== 'x') return
+    e.preventDefault()
+    const offset = Math.max(-92, Math.min(0, swipeTracking.offset + dx))
+    swipeTracking.row.style.setProperty('--swipe-x', offset + 'px')
+  }, { passive: false })
+  list.addEventListener('touchend', () => {
+    if (!swipeTracking) return
+    if (swipeTracking.axis === 'x') {
+      const row = swipeTracking.row
+      const offset = parseFloat(row.style.getPropertyValue('--swipe-x') || swipeTracking.offset)
+      row.classList.toggle('revealed', offset <= -46)
+      row.style.removeProperty('--swipe-x')
+      swipeSuppressClickUntil = Date.now() + 350
+    }
+    swipeTracking = null
+  }, { passive: true })
+  list.addEventListener('touchcancel', () => { swipeTracking = null }, { passive: true })
+}
+
 /* ---------------- 待办 ---------------- */
 function renderPending() {
   const list = $('pending-list')
@@ -1831,7 +2118,14 @@ function renderPending() {
 async function approveApproval(id, allow) {
   const a = state.approvals.find(x => x.approvalId === id)
   if (!a) return
-  const ok = await respond(a.rpcId, { sessionId: a.sessionId, approvalId: a.approvalId, outcome: allow ? 'allowed-once' : 'rejected' })
+  let ok
+  try {
+    ok = await respond(a.rpcId, { sessionId: a.sessionId, approvalId: a.approvalId, outcome: allow ? 'allowed-once' : 'rejected' })
+  } catch (e) {
+    if (e.message === 'AUTH') authFailure()
+    else toast(t('pending.submitFailed', { msg: e.message || t('fs.networkError') }), 'err')
+    return
+  }
   toast(ok ? (allow ? t('pending.allowed') : t('pending.rejected')) : t('pending.stale'), ok ? 'ok' : 'err')
   state.approvals = state.approvals.filter(x => x.approvalId !== id)
   renderPending()
@@ -1862,7 +2156,14 @@ async function submitQuestion() {
     return ans
   }).filter(Boolean)
   if (!answers.length) return toast(t('question.needAnswer'), 'err')
-  const ok = await respond(q.rpcId, { sessionId: q.sessionId, answer: { answers } })
+  let ok
+  try {
+    ok = await respond(q.rpcId, { sessionId: q.sessionId, answer: { answers } })
+  } catch (e) {
+    if (e.message === 'AUTH') authFailure()
+    else toast(t('question.submitFailed', { msg: e.message || t('fs.networkError') }), 'err')
+    return
+  }
   if (ok) { toast(t('question.submitted'), 'ok'); $('modal-question').classList.add('hidden'); state.questions = state.questions.filter(x => x.rpcId !== q.rpcId); renderPending() }
   else toast(t('question.stale'), 'err')
 }
@@ -1910,6 +2211,50 @@ function fsParent(p) {
   return clean.slice(0, idx)
 }
 
+async function openWorkspaceModal() {
+  if (!state.token) { toast(t('fs.noTokenToast'), 'err'); showView('view-settings'); return }
+  if (!state.fs.path) await loadFs(null, { silent: true })
+  $('workspace-parent-path').textContent = state.fs.path || '~'
+  $('workspace-name').value = ''
+  $('modal-workspace').classList.remove('hidden')
+  setTimeout(() => $('workspace-name').focus(), 50)
+}
+function closeWorkspaceModal() { $('modal-workspace').classList.add('hidden') }
+async function createWorkspace() {
+  if (createWorkspace.busy) return
+  const name = $('workspace-name').value.trim()
+  if (!name) { toast(t('workspace.nameRequired'), 'err'); $('workspace-name').focus(); return }
+  createWorkspace.busy = true
+  const parent = state.fs.path || ''
+  const button = $('workspace-create')
+  button.disabled = true
+  try {
+    const res = await fetch(fsApiUrl('/mkdir', { path: parent, name }), { method: 'POST', headers: fsHeaders() })
+    if (res.status === 401) { fsAuthError(401); return }
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) {
+      const msg = data.error === 'exists' ? t('workspace.exists') : data.error === 'bad-name' ? t('workspace.invalidName') : data.error || ('HTTP ' + res.status)
+      throw new Error(msg)
+    }
+    closeWorkspaceModal()
+    await loadFs(parent || null, { silent: true })
+    const v = await safeRpc('session.create', { cwd: data.path }, t('home.createFailed'))
+    await refreshSessions()
+    if (v?.sessionId) {
+      toast(t('workspace.created'), 'ok')
+      openSession(v.sessionId)
+    } else {
+      toast(t('workspace.createdNoSession'), 'ok')
+    }
+  } catch (e) {
+    if (e.message === 'AUTH') fsAuthError(401)
+    else toast(t('workspace.createFailed', { msg: e.message || t('fs.networkError') }), 'err')
+  } finally {
+    createWorkspace.busy = false
+    button.disabled = false
+  }
+}
+
 function fsApiUrl(sub, params = {}) {
   const u = new URL(apiUrl('/fs' + sub), location.href)
   for (const [k, v] of Object.entries(params)) {
@@ -2333,7 +2678,8 @@ async function submitGoalEdit() {
   if (!goal) return
   const objective = $('goal-edit-text')?.value?.trim()
   if (!objective) return toast(t('goal.cannotEmpty'), 'err')
-  await safeRpc('goal.edit', { sessionId: state.current, ref: { id: goal.id, revision: goal.revision }, objective }, t('goal.updateFailed'))
+  const result = await safeRpc('goal.edit', { sessionId: state.current, ref: { id: goal.id, revision: goal.revision }, objective }, t('goal.updateFailed'))
+  if (result == null) return
   $('modal-goal').classList.add('hidden')
   toast(t('goal.updated'), 'ok')
   scheduleRefresh()
@@ -2393,6 +2739,105 @@ async function loadLocalVersion() {
   $('update-desc').textContent = state.localVersion ? t('update.currentV', { version: state.localVersion }) : t('update.noVersion')
 }
 
+/* ---------------- 远程公告 ----------------
+ * 与 update.json 放在同一台服务器上，格式见 README/发布说明。
+ * 公告只读取文本并用 textContent/转义后的换行渲染，不执行服务端下发的 HTML/脚本。
+ */
+const ANNOUNCEMENTS_KEY = 'seenAnnouncementsV1'
+function readSeenAnnouncements() {
+  try {
+    const value = JSON.parse(LS.get(ANNOUNCEMENTS_KEY, '{}'))
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {}
+  } catch { return {} }
+}
+function markAnnouncementSeen(id) {
+  if (!id) return
+  const seen = readSeenAnnouncements()
+  seen[id] = Date.now()
+  const keys = Object.keys(seen)
+  if (keys.length > 100) {
+    keys.sort((a, b) => Number(seen[a]) - Number(seen[b]))
+    for (const key of keys.slice(0, keys.length - 100)) delete seen[key]
+  }
+  LS.set(ANNOUNCEMENTS_KEY, JSON.stringify(seen))
+}
+function announcementVersionMatch(item) {
+  const min = String(item.minVersion || item.minAppVersion || '').trim()
+  const max = String(item.maxVersion || item.maxAppVersion || '').trim()
+  if (!state.localVersion) return false
+  if (min && cmpVersion(state.localVersion, min) < 0) return false
+  if (max && cmpVersion(state.localVersion, max) > 0) return false
+  return true
+}
+function normalizeAnnouncement(item, base) {
+  if (!item || typeof item !== 'object') return null
+  const id = String(item.id || '').trim().slice(0, 120)
+  const title = String(item.title || '').trim().slice(0, 160)
+  const content = String(item.content ?? item.body ?? '').trim().slice(0, 20000)
+  if (!id || !title || !content || !announcementVersionMatch(item)) return null
+  const now = Date.now()
+  const startsAt = Date.parse(item.publishedAt || item.startsAt || '')
+  const expiresAt = Date.parse(item.expiresAt || '')
+  if (Number.isFinite(startsAt) && startsAt > now) return null
+  if (Number.isFinite(expiresAt) && expiresAt <= now) return null
+  let actionUrl = String(item.actionUrl || item.url || '').trim()
+  if (actionUrl) {
+    try {
+      const parsed = new URL(actionUrl, base + '/')
+      if (!['http:', 'https:'].includes(parsed.protocol)) actionUrl = ''
+      else actionUrl = parsed.href
+    } catch { actionUrl = '' }
+  }
+  return {
+    id, title, content, actionUrl,
+    actionText: String(item.actionText || '').trim().slice(0, 80),
+    publishedAt: Number.isFinite(startsAt) ? startsAt : 0,
+    force: item.force === true
+  }
+}
+function openAnnouncementModal(item) {
+  state.announcement = item
+  $('announcement-title').textContent = item.title
+  $('announcement-content').innerHTML = esc(item.content).replace(/\r?\n/g, '<br>')
+  const action = $('announcement-action')
+  if (item.actionUrl) {
+    action.href = item.actionUrl
+    action.textContent = item.actionText || t('announcement.open')
+    action.classList.remove('hidden')
+  } else {
+    action.removeAttribute('href')
+    action.textContent = ''
+    action.classList.add('hidden')
+  }
+  $('announcement-later').classList.toggle('hidden', item.force)
+  $('modal-announcement').classList.remove('hidden')
+}
+function closeAnnouncement(markSeen) {
+  if (markSeen && state.announcement) markAnnouncementSeen(state.announcement.id)
+  state.announcement = null
+  $('modal-announcement').classList.add('hidden')
+}
+async function checkAnnouncements() {
+  const base = updateBase()
+  if (!base || !state.localVersion) return false
+  try {
+    const signal = typeof AbortSignal?.timeout === 'function' ? AbortSignal.timeout(8000) : undefined
+    const url = base + '/announcements.json?t=' + Date.now()
+    const res = signal ? await fetch(url, { cache: 'no-store', signal }) : await fetch(url, { cache: 'no-store' })
+    if (!res.ok) return false
+    const raw = await res.text()
+    if (raw.length > 512 * 1024) return false
+    const data = JSON.parse(raw)
+    const source = Array.isArray(data) ? data : (Array.isArray(data?.items) ? data.items : [data])
+    const seen = readSeenAnnouncements()
+    const items = source.map(item => normalizeAnnouncement(item, base)).filter(item => item && !seen[item.id])
+      .sort((a, b) => b.publishedAt - a.publishedAt)
+    if (!items.length) return false
+    openAnnouncementModal(items[0])
+    return true
+  } catch { return false }
+}
+
 /* ---------------- 更新内容弹窗 ---------------- */
 const NOTES_KEY = 'seenNotesVersion'
 let notesVersion = ''
@@ -2477,7 +2922,7 @@ async function checkUpdate(silent) {
     if (!silent) toast(t('update.noVersion'), 'err')
     return
   }
-  const base = state.server
+  const base = updateBase()
   if (!base) {
     if (!silent) toast(t('update.needServer'), 'err')
     $('update-desc').textContent = state.localVersion ? `${t('update.currentV', { version: state.localVersion })} · ${t('update.needServer')}` : t('update.needServer')
@@ -2554,7 +2999,7 @@ async function verifyUpdateApk(info, url) {
 async function downloadUpdate() {
   const info = state.updateInfo
   if (!info) return
-  const base = state.server || ''
+  const base = updateBase()
   let url
   try { url = new URL(info.apkUrl || 'dsh-remote.apk', base + '/').href }
   catch { url = base + '/' + (info.apkUrl || 'dsh-remote.apk') }
@@ -2769,8 +3214,7 @@ async function schedulePeakReminders() {
   const b = bgBridge()
   if (!b?.startPeakReminder) return false
   try {
-    b.startPeakReminder()
-    return true
+    return b.startPeakReminder() !== false
   } catch { return false }
 }
 
@@ -2779,8 +3223,7 @@ async function cancelPeakReminders() {
   const b = bgBridge()
   if (!b?.stopPeakReminder) return false
   try {
-    b.stopPeakReminder()
-    return true
+    return b.stopPeakReminder() !== false
   } catch { return false }
 }
 
@@ -2973,6 +3416,55 @@ function initToken() {
   $('server-desc').textContent = state.server || t('servers.defaultDesc')
 }
 
+function renderDshControlStatus(v) {
+  const desc = $('dsh-control-desc')
+  if (!desc || !v) return
+  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') })
+    return
+  }
+  buttons.forEach(b => { b.disabled = false; b.classList.remove('hidden') })
+  desc.textContent = `${t(v.running ? 'settings.dshRunning' : 'settings.dshStopped')} · ${v.service || 'dsh-web'}`
+}
+
+async function loadDshControl() {
+  if (!state.token || !$('dsh-control-desc')) return
+  try {
+    const res = await fetch(adminApiUrl('/admin/api/dsh'), { headers: { authorization: 'Bearer ' + state.token } })
+    if (res.status === 401) return authFailure()
+    renderDshControlStatus(await res.json())
+  } catch {
+    $('dsh-control-desc').textContent = t('settings.dshFailed', { msg: t('conn.off') })
+  }
+}
+
+async function controlDsh(action) {
+  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 })
+  try {
+    const res = await fetch(adminApiUrl('/admin/api/dsh'), {
+      method: 'POST',
+      headers: { authorization: 'Bearer ' + state.token, 'content-type': 'application/json' },
+      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}`)
+    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')
+  } finally {
+    buttons.forEach(b => { b.disabled = false })
+  }
+}
+
 function renderLangBtn() {
   const btn = $('btn-lang')
   if (btn) btn.textContent = I18N.lang === 'zh' ? 'EN' : '中文'
@@ -3029,6 +3521,7 @@ function bindUi() {
     renderUpdateExpandBtn()
     renderServers()
     renderSessions()
+    renderWorkbench()
     renderPending(); renderQueue(); renderJobs()
     updateConn()
     if (state.current) { renderSessionTitle(); renderSessionSub(); renderSessionCards(); renderHistory(true) }
@@ -3056,9 +3549,53 @@ function bindUi() {
     b.addEventListener('click', () => showView(b.dataset.view)))
   // 会话列表点击
   $('session-list').addEventListener('click', (e) => {
+    if (swipeSuppressClickUntil > Date.now()) { swipeSuppressClickUntil = 0; return }
+    if (e.target.closest('[data-archived-toggle]')) {
+      LS.set('showArchivedV1', LS.get('showArchivedV1', '0') === '1' ? '0' : '1')
+      renderSessions()
+      return
+    }
+    const archive = e.target.closest('[data-archive-session]')
+    if (archive) {
+      e.stopPropagation()
+      archiveSession(archive.dataset.archiveSession)
+      return
+    }
+    const swipeRow = e.target.closest('[data-session-swipe]')
+    if (swipeRow?.classList.contains('revealed')) {
+      swipeRow.classList.remove('revealed')
+      return
+    }
     const card = e.target.closest('[data-id]')
     if (card) openSession(card.dataset.id)
   })
+  bindSessionSwipe()
+  $('wb-toggle').addEventListener('click', () => {
+    if (!state.wb?.bound) return
+    state.wbOpen = !state.wbOpen
+    renderWorkbench()
+  })
+  $('wb-panel').addEventListener('click', (e) => {
+    const newButton = e.target.closest('[data-wb-new]')
+    if (newButton) {
+      safeRpc('session.create', { workspaceId: newButton.dataset.wbNew }, t('home.createFailed')).then(async v => {
+        if (!v?.sessionId) return
+        toast(t('home.created'), 'ok')
+        await refreshSessions()
+        openSession(v.sessionId)
+      })
+      return
+    }
+    const head = e.target.closest('.wb-project-head')
+    if (head) {
+      const project = head.closest('[data-wb-project]')
+      const id = project?.dataset.wbProject
+      if (id) { state.wbOpenProjects[id] = !state.wbOpenProjects[id]; renderWorkbench() }
+      return
+    }
+    const session = e.target.closest('[data-wb-session]')
+    if (session) openSession(session.dataset.wbSession)
+  })
   $('btn-back').addEventListener('click', closeSession)
   $('btn-stats').addEventListener('click', () => { renderSessionCards(); $('modal-stats').classList.remove('hidden') })
   $('stats-close').addEventListener('click', () => $('modal-stats').classList.add('hidden'))
@@ -3089,12 +3626,24 @@ function bindUi() {
     if (e.key === 'Escape' && !$('feedback-sheet').classList.contains('hidden')) { closeFeedbackSheet(); $('btn-feedback').focus() }
   })
   $('btn-new-session').addEventListener('click', newSession)
+  $('btn-new-workspace').addEventListener('click', openWorkspaceModal)
+  $('session-sort')?.addEventListener('change', (e) => {
+    state.sessionSort = e.target.value === 'workspace' ? 'workspace' : 'time'
+    LS.set('sessionSort', state.sessionSort)
+    renderSessions()
+  })
   $('btn-cancel').addEventListener('click', cancelSession)
   $('btn-send').addEventListener('click', sendMessage)
   $('btn-plus').addEventListener('click', toggleComposerMenu)
   $('composer-menu').addEventListener('click', async (e) => {
     const chip = e.target.closest('[data-cmd]')
     if (chip) {
+      if (chip.dataset.cmd === '/permission') {
+        const submenu = $('permission-submenu')
+        submenu?.classList.toggle('hidden')
+        return
+      }
+      $('permission-submenu')?.classList.add('hidden')
       const input = $('composer-input')
       input.value = chip.dataset.cmd + ' '
       input.focus()
@@ -3102,6 +3651,15 @@ function bindUi() {
       hideComposerMenu()
       return
     }
+    const perm = e.target.closest('[data-perm]')
+    if (perm) {
+      const input = $('composer-input')
+      input.value = '/permission ' + perm.dataset.perm + ' '
+      input.focus()
+      autosize(input)
+      hideComposerMenu()
+      return
+    }
     const preset = e.target.closest('[data-preset]')
     if (preset) {
       const found = readPresets().find(x => x.id === preset.dataset.preset)
@@ -3118,7 +3676,9 @@ function bindUi() {
   const input = $('composer-input')
   input.addEventListener('input', () => autosize(input))
   input.addEventListener('keydown', (e) => {
-    if (e.key === 'Enter' && !e.shiftKey && !e.isComposing) { e.preventDefault(); sendMessage() }
+    if (e.key !== 'Enter' || e.isComposing) return
+    if (isMobileDevice() && mobileEnterAction() !== 'send') return
+    if (!e.shiftKey) { e.preventDefault(); sendMessage() }
   })
 
   // 审批
@@ -3136,6 +3696,18 @@ function bindUi() {
   // goal
   $('goal-close').addEventListener('click', () => $('modal-goal').classList.add('hidden'))
   $('goal-edit').addEventListener('click', submitGoalEdit)
+  $('workspace-cancel').addEventListener('click', closeWorkspaceModal)
+  $('workspace-create').addEventListener('click', createWorkspace)
+  $('workspace-name').addEventListener('keydown', (e) => { if (e.key === 'Enter') createWorkspace() })
+  $('modal-workspace').addEventListener('click', (e) => { if (e.target === $('modal-workspace')) closeWorkspaceModal() })
+  $('archive-cancel').addEventListener('click', closeArchiveConfirm)
+  $('archive-confirm').addEventListener('click', confirmArchiveSession)
+  $('modal-archive').addEventListener('click', (e) => { if (e.target === $('modal-archive')) closeArchiveConfirm() })
+  $('announcement-later').addEventListener('click', () => closeAnnouncement(false))
+  $('announcement-confirm').addEventListener('click', () => closeAnnouncement(true))
+  $('modal-announcement').addEventListener('click', (e) => {
+    if (e.target === $('modal-announcement') && !state.announcement?.force) closeAnnouncement(false)
+  })
   // 设置
   $('view-settings').addEventListener('click', (e) => {
     const group = e.target.closest('[data-settings-group]')
@@ -3165,15 +3737,23 @@ function bindUi() {
       $('host-desc').textContent = t('settings.hostDesc', { version: v.version, cwd: v.cwd, n: v.attachedSessions })
     }
   })
+  $('btn-dsh-start')?.addEventListener('click', () => controlDsh('start'))
+  $('btn-dsh-restart')?.addEventListener('click', () => controlDsh('restart'))
   $('btn-check-update').addEventListener('click', () => checkUpdate(false))
   $('btn-download-update').addEventListener('click', downloadUpdate)
   $('btn-update-expand').addEventListener('click', toggleUpdateExpand)
   $('btn-reset').addEventListener('click', () => {
     if (!confirm(t('settings.confirmReset'))) return
-    LS.del('token'); LS.del('notify'); LS.del('server')
+    LS.del('token'); LS.del('notify'); LS.del('server'); LS.del('mobileEnterAction')
     if (bgBridge()?.saveBackgroundConfig) saveBgConfig(false)
     location.reload()
   })
+  $('mobile-enter-action').value = mobileEnterAction()
+  $('mobile-enter-action').addEventListener('change', (e) => {
+    const action = e.target.value === 'send' ? 'send' : 'newline'
+    LS.set('mobileEnterAction', action)
+    toast(t(action === 'send' ? 'settings.mobileEnterSend' : 'settings.mobileEnterNewline'), 'ok')
+  })
   $('opt-notify').checked = LS.get('notify', '0') === '1'
   $('opt-notify').addEventListener('change', async (e) => {
     if (e.target.checked) {
@@ -3191,10 +3771,18 @@ function bindUi() {
       }
       const ok = await ensureNotify()
       if (!ok) { e.target.checked = false; return toast(t('settings.notifyDenied')) }
-      await schedulePeakReminders()
+      const started = await schedulePeakReminders()
+      if (!started) {
+        e.target.checked = false
+        return toast(t('peakRemind.failed'), 'err')
+      }
       toast(t('peakRemind.on'), 'ok')
     } else {
-      await cancelPeakReminders()
+      const stopped = await cancelPeakReminders()
+      if (!stopped) {
+        e.target.checked = true
+        return toast(t('peakRemind.failed'), 'err')
+      }
       toast(t('peakRemind.off'), 'ok')
     }
     LS.set('peakRemind', e.target.checked ? '1' : '0')
@@ -3240,6 +3828,7 @@ function bindUi() {
 
   // 文件页
   $('fs-up').addEventListener('click', fsUp)
+  $('fs-new-workspace').addEventListener('click', openWorkspaceModal)
   $('fs-refresh').addEventListener('click', () => { toast(t('common.refreshing')); loadFs() })
   $('fs-upload-btn').addEventListener('click', () => $('fs-file-input').click())
   $('fs-file-input').addEventListener('change', (e) => {
@@ -3295,7 +3884,7 @@ async function boot() {
   bindNativeLinks()
   applyNativeInsets()
   updateConn()
-  loadLocalVersion()
+  await loadLocalVersion()
   if (!state.token) {
     showView('view-settings')
     $('token-desc').textContent = t('token.notSetHint')
@@ -3306,9 +3895,13 @@ async function boot() {
     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 }) }
-    // 启动后自动检查一次更新(静默)
-    setTimeout(() => checkUpdate(true), 4000)
+    loadDshControl()
   }
+  // 公告与更新共用当前服务器；公告优先，避免启动时两个弹窗重叠。
+  setTimeout(async () => {
+    const shown = await checkAnnouncements()
+    if (!shown && state.token) checkUpdate(true)
+  }, 4000)
   renderPending()
 }