dsh-remote-plugin 0.6.5 → 0.6.6

package/public/app.js

@@ -46,6 +46,7 @@ const state = {
   serverLatency: {},      // url -> 最近一次 /health 测速毫秒数
   selectingServer: false, // 防重入: 测速/切换中
   sessions: [],
+  sessionSort: LS.get('sessionSort', 'time') === 'workspace' ? 'workspace' : 'time',
   byId: new Map(),
   current: null,           // 当前打开的 sessionId
   hostInfo: null,
@@ -183,6 +184,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 +287,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 +309,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 +453,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 +922,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
@@ -1070,7 +1104,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,10 +1123,42 @@ function updatePendingBadge() {
   if (pending) $('nav-pending').textContent = pending
 }
 
+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 items = [...state.sessions].sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
-  list.innerHTML = items.map(s => {
+  const items = sortedSessions()
+  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' : ''
@@ -1101,7 +1168,7 @@ function renderSessions() {
     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)}">
+    rows.push(`<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>
@@ -1109,9 +1176,14 @@ function renderSessions() {
         ${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>`
-  }).join('')
+    </div>`)
+  }
+  list.innerHTML = rows.join('')
+  list.classList.toggle('workspace-sorted', state.sessionSort === 'workspace')
+  const sort = $('session-sort')
+  if (sort) sort.value = state.sessionSort
   $('home-empty').classList.toggle('hidden', items.length > 0)
   const running = state.sessions.filter(s => s.running).length
   const pending = state.approvals.length + state.questions.length
@@ -1245,7 +1317,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 +1685,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 +1695,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)
 }
@@ -1784,7 +1858,18 @@ 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()
@@ -1831,7 +1916,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 +1954,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 +2009,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 +2476,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()
@@ -2477,7 +2621,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 +2698,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 +2913,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 +2922,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 +3115,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' : '中文'
@@ -3089,6 +3280,12 @@ 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)
@@ -3136,6 +3333,10 @@ 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() })
   // 设置
   $('view-settings').addEventListener('click', (e) => {
     const group = e.target.closest('[data-settings-group]')
@@ -3165,6 +3366,8 @@ 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)
@@ -3191,10 +3394,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 +3451,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) => {
@@ -3306,6 +3518,7 @@ 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 }) }
+    loadDshControl()
     // 启动后自动检查一次更新(静默)
     setTimeout(() => checkUpdate(true), 4000)
   }

package/public/desktop/desktop.css

@@ -15,12 +15,29 @@ html, body { height: 100%; margin: 0; overflow: hidden; overscroll-behavior: non
 .ds-btn:active { filter: brightness(.96); }
 a.ds-btn { text-decoration: none; }
 .ds-new-session .ds-btn { width: 100%; justify-content: center; }
-.ds-section-label { font-size: 11px; color: var(--dsr-muted); letter-spacing: .8px; padding: 10px 14px 6px; font-weight: 700; }
+.ds-section-head { display: flex; align-items: center; justify-content: space-between; gap: 6px; min-width: 0; padding-right: 10px; }
+.ds-section-label { min-width: 0; flex: 1; font-size: 11px; color: var(--dsr-muted); letter-spacing: .8px; padding: 10px 14px 6px; font-weight: 700; }
+.ds-session-sort {
+  width: 92px; min-width: 0; height: 26px; padding: 0 5px; color: var(--dsr-muted);
+  background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 7px;
+  font: inherit; font-size: 10.5px; outline: none;
+}
+.ds-session-sort:focus { border-color: var(--dsr-accent-line); color: var(--dsr-text); }
 .ds-session-list { flex: 1; min-height: 0; overflow-y: auto; overscroll-behavior: contain; padding: 0 8px; display: flex; flex-direction: column; gap: 3px; }
-.ds-session-item { width: 100%; text-align: left; border: none; background: transparent; color: var(--dsr-text); font: inherit; font-size: 13px; padding: 8px 9px; border-radius: 9px; cursor: pointer; display: flex; flex-direction: column; gap: 3px; }
+.ds-session-group {
+  display: flex; align-items: center; gap: 6px; flex: 0 0 auto; min-width: 0; min-height: 28px;
+  box-sizing: border-box; padding: 8px 10px 4px; border-bottom: 1px solid var(--dsr-line);
+  color: var(--dsr-accent-strong); font-size: 10px; font-weight: 700; line-height: 1.2;
+}
+.ds-session-group-icon { flex: 0 0 auto; color: var(--dsr-accent-2); font-size: 11px; }
+.ds-session-group-name { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.ds-session-item { width: 100%; flex: 0 0 auto; text-align: left; border: none; background: transparent; color: var(--dsr-text); font: inherit; font-size: 13px; padding: 8px 9px; border-radius: 9px; cursor: pointer; display: flex; flex-direction: column; gap: 3px; }
 .ds-session-item:hover { background: var(--dsr-bg-2); }
 .ds-session-item.current { background: var(--dsr-accent-soft); color: var(--dsr-accent-strong); }
 .ds-session-title { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.ds-session-workspace { min-width: 0; color: var(--dsr-muted); font-size: 10.5px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.ds-session-list.workspace-sorted .ds-session-workspace { display: none; }
+.ds-session-list.workspace-sorted .ds-session-item { padding-top: 9px; padding-bottom: 9px; }
 .ds-session-meta { display: flex; gap: 7px; font-size: 11px; color: var(--dsr-muted); align-items: center; }
 .ds-session-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--dsr-line); }
 .ds-session-dot.running { background: var(--dsr-warning); }
@@ -146,7 +163,7 @@ a.ds-btn { text-decoration: none; }
 .ds-composer { flex: none; display: flex; flex-direction: column; gap: 8px; padding: 12px 16px; border-top: 1px solid var(--dsr-line); background: var(--dsr-panel); }
 .ds-composer textarea { width: 100%; min-width: 0; resize: none; background: var(--dsr-bg-2); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 12px; padding: 10px 14px; font: inherit; font-size: 13.5px; line-height: 1.5; outline: none; min-height: 44px; max-height: 120px; box-sizing: border-box; }
 .ds-composer-actions { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
-.ds-composer-left { display: flex; align-items: center; gap: 8px; min-width: 0; }
+.ds-composer-left { display: flex; align-items: center; gap: 8px; min-width: 0; flex-wrap: wrap; }
 .ds-composer-right { display: flex; align-items: center; flex: none; }
 .ds-composer .ds-btn { min-height: 34px; box-sizing: border-box; }
 .ds-send-btn { width: 36px; height: 36px; min-height: 36px; padding: 0; border-radius: 50%; background: var(--dsr-accent-strong); border-color: var(--dsr-accent-strong); color: var(--dsr-on-accent); font-size: 18px; line-height: 1; justify-content: center; }
@@ -269,6 +286,11 @@ a.ds-btn { text-decoration: none; }
 .ds-modal-card { width: min(520px, 100%); background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: 14px; padding: 16px; }
 .ds-modal-title { font-weight: 700; margin-bottom: 10px; }
 .ds-modal-body { display: flex; flex-direction: column; gap: 10px; max-height: 60vh; overflow-y: auto; }
+.ds-workspace-create-desc { margin: 0; color: var(--dsr-muted); line-height: 1.55; }
+.ds-workspace-create-location { display: flex; align-items: center; gap: 8px; min-width: 0; color: var(--dsr-muted); font-size: 12px; }
+.ds-workspace-create-location code { min-width: 0; flex: 1; padding: 7px 9px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsr-text); background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 9px; }
+.ds-workspace-name { width: 100%; box-sizing: border-box; background: var(--dsr-bg-2); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 9px; padding: 8px 10px; font: inherit; outline: none; }
+.ds-workspace-name:focus { border-color: var(--dsr-accent-line); }
 .ds-modal-actions { display: flex; gap: 8px; justify-content: flex-end; margin-top: 12px; }
 .ds-q-item { border: 1px solid var(--dsr-line); border-radius: 10px; padding: 9px 11px; }
 .ds-q-text { font-size: 13.5px; margin-bottom: 6px; }
@@ -332,3 +354,12 @@ a.ds-btn { text-decoration: none; }
   .ds-toast-stack { left: 10px; right: 10px; width: auto; }
   .mobile-only { display: block; }
 }
+
+@media (max-width: 520px) {
+  .ds-topbar { gap: 6px; padding: 0 8px; }
+  .ds-top-right { gap: 5px; }
+  .ds-composer-actions { align-items: stretch; flex-wrap: wrap; gap: 6px; }
+  .ds-composer-left { flex: 1 1 100%; gap: 5px; }
+  .ds-composer-left .ds-btn { flex: 1 1 0; min-width: 0; padding-left: 7px; padding-right: 7px; overflow: hidden; text-overflow: ellipsis; }
+  .ds-composer-right { margin-left: auto; }
+}

package/public/desktop/desktop.html

@@ -20,7 +20,14 @@
       <div class="ds-new-session">
         <button id="btn-new-session" class="ds-btn primary" data-i18n="ds.newSession">+ 新会话</button>
       </div>
-      <div class="ds-section-label" data-i18n="ds.sessions">会话</div>
+      <div class="ds-section-head">
+        <div class="ds-section-label" data-i18n="ds.sessions">会话</div>
+        <select id="session-sort" class="ds-session-sort" data-i18n-aria="ds.sortLabel">
+          <option value="time" data-i18n="ds.sortTime">按时间</option>
+          <option value="workspace" data-i18n="ds.sortWorkspace">按工作区</option>
+        </select>
+        <button id="btn-new-workspace" class="ds-icon-btn ds-workspace-create" data-i18n-title="ds.newWorkspace" data-i18n-aria="ds.newWorkspace">＋</button>
+      </div>
       <div class="ds-session-list" id="session-list"></div>
       <div class="ds-sidebar-foot">
         <button class="ds-nav-item" data-view="view-files"><span class="ds-nav-ico">⇅</span><span data-i18n="ds.files">文件传输</span></button>
@@ -116,6 +123,7 @@
           <div class="ds-fs-bar">
             <button id="fs-up" class="ds-btn" data-i18n="ds.fsUp">上级</button>
             <span id="fs-path" class="ds-fs-path">/</span>
+            <button id="fs-new-workspace" class="ds-btn" data-i18n="ds.fsNewWorkspace">新建工作区</button>
             <button id="fs-refresh" class="ds-btn" data-i18n="ds.fsRefresh">刷新</button>
           </div>
           <div id="fs-list" class="ds-fs-list"></div>
@@ -266,6 +274,22 @@
     </div>
   </div>
 
+  <!-- 新建工作区模态 -->
+  <div id="modal-workspace" class="ds-modal hidden">
+    <div class="ds-modal-card">
+      <div class="ds-modal-title" data-i18n="ds.workspaceCreateTitle">新建工作区</div>
+      <div class="ds-modal-body">
+        <p class="ds-workspace-create-desc" data-i18n="ds.workspaceCreateDesc">将在当前文件目录下创建文件夹，并自动打开新会话。</p>
+        <div class="ds-workspace-create-location"><span data-i18n="ds.workspaceParent">父目录</span><code id="workspace-parent-path">~</code></div>
+        <input id="workspace-name" class="ds-workspace-name" maxlength="120" autocomplete="off" data-i18n-placeholder="ds.workspaceNamePlaceholder" placeholder="例如：my-project">
+      </div>
+      <div class="ds-modal-actions">
+        <button id="workspace-cancel" class="ds-btn" data-i18n="ds.cancel">取消</button>
+        <button id="workspace-create" class="ds-btn primary" data-i18n="ds.workspaceCreate">创建并打开</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 预设提示词管理模态 -->
   <div id="modal-presets" class="ds-modal hidden">
     <div class="ds-modal-card">
@@ -321,14 +345,16 @@
   <script>
     window.DESKTOP_STR = {
       zh: {
-        'ds.repo': 'GitHub 仓库', 'ds.newSession': '+ 新会话', 'ds.sessions': '会话',
+        'ds.repo': 'GitHub 仓库', 'ds.newSession': '+ 新会话', 'ds.newWorkspace': '新建工作区', 'ds.sessions': '会话',
+        'ds.sortLabel': '会话排序', 'ds.sortTime': '按时间', 'ds.sortWorkspace': '按工作区', 'ds.workspace': '工作区', 'ds.workspaceUnknown': '未指定工作区',
         'ds.files': '文件传输', 'ds.settings': '设置', 'ds.stats': '统计', 'ds.menu': '导航',
         'ds.send': '发送', 'ds.composerPlaceholder': '输入消息，Enter 发送…', 'ds.presets': '预设',
         'ds.commands': '指令',
         'ds.cmdCompact': '/compact 压缩对话历史', 'ds.cmdExport': '/export 导出会话日志 ZIP',
         'ds.cmdFeedback': '/feedback 反馈当前会话', 'ds.cmdGoal': '/goal 设置/查看任务目标',
         'ds.cmdPermission': '/permission 切换权限预设', 'ds.cmdPlan': '/plan 进入/退出计划模式',
-        'ds.fsUp': '上级', 'ds.fsRefresh': '刷新', 'ds.fsEmpty': '目录为空',
+        'ds.fsUp': '上级', 'ds.fsNewWorkspace': '新建工作区', 'ds.fsRefresh': '刷新', 'ds.fsEmpty': '目录为空',
+        'ds.workspaceCreateTitle': '新建工作区', 'ds.workspaceCreateDesc': '将在当前文件目录下创建文件夹，并自动打开新会话。', 'ds.workspaceParent': '父目录', 'ds.workspaceNamePlaceholder': '例如：my-project', 'ds.workspaceCreate': '创建并打开', 'ds.cancel': '取消', 'ds.workspaceNameRequired': '请输入工作区名称', 'ds.workspaceExists': '该目录已存在', 'ds.workspaceInvalidName': '名称不能包含路径分隔符', 'ds.workspaceCreateFailed': '创建工作区失败', 'ds.workspaceCreated': '工作区已创建', 'ds.workspaceCreatedNoSession': '工作区已创建，但新会话未能打开',
         'ds.groupGeneral': '通用', 'ds.groupGeneralDesc': '工具调用、预设提示词',
         'ds.groupServers': '服务器', 'ds.groupServersDesc': '服务器地址',
         'ds.groupNotify': '通知', 'ds.groupNotifyDesc': '通知与提醒',
@@ -365,7 +391,7 @@
         'ds.approvalTitle': '工具审批', 'ds.questionNotify': '需要回答',
         'ds.approvalBody': '{tool} · {server}', 'ds.approvalReason': '原因：{reason}',
         'ds.allowed': '已允许', 'ds.rejected': '已拒绝', 'ds.ignored': '已忽略',
-        'ds.stale': '请求已失效',
+        'ds.stale': '请求已失效', 'ds.pendingSubmitFailed': '提交失败：{msg}',
         'ds.statsTodayTokens': '今日 Token', 'ds.statsTodayCost': '今日费用', 'ds.statsPeakShare': '高峰占比',
         'ds.statsInput': '未缓存输入', 'ds.statsCacheRead': '缓存命中', 'ds.statsCacheWrite': '缓存写入', 'ds.statsOutput': '输出',
         'ds.statsPeak': '高峰', 'ds.statsOff': '空闲', 'ds.statsDays': '近 {n} 天',
@@ -416,14 +442,16 @@
         'menu.modelTitle': '模型切换', 'menu.effortTitle': '思考深度',
       },
       en: {
-        'ds.repo': 'GitHub repo', 'ds.newSession': '+ New session', 'ds.sessions': 'Sessions',
+        'ds.repo': 'GitHub repo', 'ds.newSession': '+ New session', 'ds.newWorkspace': 'New workspace', 'ds.sessions': 'Sessions',
+        'ds.sortLabel': 'Session sort', 'ds.sortTime': 'By time', 'ds.sortWorkspace': 'By workspace', 'ds.workspace': 'Workspace', 'ds.workspaceUnknown': 'No workspace',
         'ds.files': 'Files', 'ds.settings': 'Settings', 'ds.stats': 'Stats', 'ds.menu': 'Menu',
         'ds.send': 'Send', 'ds.composerPlaceholder': 'Type a message, Enter to send…', 'ds.presets': 'Presets',
         'ds.commands': 'Commands',
         'ds.cmdCompact': '/compact Compress conversation history', 'ds.cmdExport': '/export Export session log ZIP',
         'ds.cmdFeedback': '/feedback Feedback current session', 'ds.cmdGoal': '/goal Set/view task goal',
         'ds.cmdPermission': '/permission Switch permission preset', 'ds.cmdPlan': '/plan Enter/exit plan mode',
-        'ds.fsUp': 'Up', 'ds.fsRefresh': 'Refresh', 'ds.fsEmpty': 'Empty directory',
+        'ds.fsUp': 'Up', 'ds.fsNewWorkspace': 'New workspace', 'ds.fsRefresh': 'Refresh', 'ds.fsEmpty': 'Empty directory',
+        'ds.workspaceCreateTitle': 'New workspace', 'ds.workspaceCreateDesc': 'Create a folder in the current file directory and open a new session there.', 'ds.workspaceParent': 'Parent folder', 'ds.workspaceNamePlaceholder': 'For example: my-project', 'ds.workspaceCreate': 'Create & open', 'ds.cancel': 'Cancel', 'ds.workspaceNameRequired': 'Enter a workspace name', 'ds.workspaceExists': 'That folder already exists', 'ds.workspaceInvalidName': 'The name cannot contain path separators', 'ds.workspaceCreateFailed': 'Could not create workspace', 'ds.workspaceCreated': 'Workspace created', 'ds.workspaceCreatedNoSession': 'Workspace created, but the new session could not be opened',
         'ds.groupGeneral': 'General', 'ds.groupGeneralDesc': 'Tool calls, prompt presets',
         'ds.groupServers': 'Servers', 'ds.groupServersDesc': 'Server address',
         'ds.groupNotify': 'Notifications', 'ds.groupNotifyDesc': 'Notifications & reminders',
@@ -460,7 +488,7 @@
         'ds.approvalTitle': 'Tool approval', 'ds.questionNotify': 'Question',
         'ds.approvalBody': '{tool} · {server}', 'ds.approvalReason': 'Reason: {reason}',
         'ds.allowed': 'Allowed', 'ds.rejected': 'Rejected', 'ds.ignored': 'Ignored',
-        'ds.stale': 'Request is stale',
+        'ds.stale': 'Request is stale', 'ds.pendingSubmitFailed': 'Submit failed: {msg}',
         'ds.statsTodayTokens': 'Tokens today', 'ds.statsTodayCost': 'Cost today', 'ds.statsPeakShare': 'Peak share',
         'ds.statsInput': 'Uncached input', 'ds.statsCacheRead': 'Cache read', 'ds.statsCacheWrite': 'Cache write', 'ds.statsOutput': 'Output',
         'ds.statsPeak': 'Peak', 'ds.statsOff': 'Off-peak', 'ds.statsDays': 'Last {n} days',