dsh-remote-plugin 0.6.5 → 0.6.7

package/public/desktop/desktop.js

@@ -49,6 +49,7 @@ const state = {
   serverLatency: {},
   selectingServer: false,
   sessions: [],
+  sessionSort: LS.get('sessionSort', 'time') === 'workspace' ? 'workspace' : 'time',
   byId: new Map(),
   current: null,
   history: { seqs: new Set(), visible: [], hasMore: false, loading: false, minSeq: Infinity },
@@ -61,6 +62,8 @@ const state = {
   pollSeq: { mux: 0, host: 0 },
   fs: { path: null, initial: null, loaded: false },
   models: { loaded: false, loading: false, groups: [], current: null, failures: [] },
+  wb: { bound: false, path: '', title: '', expanded: false, projects: null, open: null, apiMissing: false },
+  archivedIds: [],
   view: 'sessions'
 }
 const streams = {}
@@ -495,12 +498,16 @@ function hideTip() { const tip = $('ds-tip'); if (tip) tip.classList.add('hidden
 
 /* ---------------- API ---------------- */
 function apiUrl(path) { return (state.server || '') + path }
-async function rpc(method, payload = {}) {
-  const res = await fetch(apiUrl('/api/' + method), {
+async function rpc(method, payload = {}, timeoutMs = 45000) {
+  const opts = {
     method: 'POST',
     headers: { 'content-type': 'application/json', authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': 'web' },
     body: JSON.stringify({ type: 'client-request', rpcId: uuid(), method, payload })
-  })
+  }
+  if (typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function') {
+    opts.signal = AbortSignal.timeout(timeoutMs)
+  }
+  const res = await fetch(apiUrl('/api/' + method), opts)
   if (res.status === 401) throw new Error('AUTH')
   if (!res.ok) throw new Error('HTTP ' + res.status)
   const full = await res.json()
@@ -509,11 +516,15 @@ async function rpc(method, payload = {}) {
   return full.result.value
 }
 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': '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
@@ -610,7 +621,8 @@ async function selectFastestServer({ silent = false, reconnect = true } = {}) {
     let best = null
     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
       chosen = best || (state.server || '')
       ms = best ? state.serverLatency[best] : Infinity
@@ -972,7 +984,12 @@ async function pollKind(kind) {
   let data
   try { data = await res.json() } catch { return }
   if (!data || !Array.isArray(data.events)) return
-  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') renderNotifStack()
+    refreshSessions()
+  }
   for (const item of data.events) {
     if (item.seq > (state.pollSeq[kind] || 0)) {
       state.pollSeq[kind] = item.seq
@@ -1056,7 +1073,7 @@ function applyProjection(sessionId, key, value, seq) {
   if (['title', 'goal', 'todos', 'plan', 'sessionListMetadata'].includes(key)) refreshSessions()
 }
 function proj(s, key, d) { return s?.projections?.values?.[key] ?? d }
-function titleOf(s) { return proj(s, 'title') || short(s.sessionId) }
+function titleOf(s) { return proj(s, 'title') || (s?.sessionId ? short(s.sessionId) : t('ds.sessions')) }
 const GOAL_TERMINAL_PHASES = new Set(['complete', 'cleared'])
 function isGoalTerminal(goal) {
   return !!goal && GOAL_TERMINAL_PHASES.has(goal.phase)
@@ -1087,19 +1104,76 @@ async function refreshSessions() {
   state.sessions = v.items || []
   state.byId = new Map(state.sessions.map(s => [s.sessionId, s]))
   renderSessions()
+  scheduleWorkbenchRefresh()
+}
+function sessionCwd(s) { return typeof s?.cwd === 'string' ? s.cwd.trim() : '' }
+function sessionWorkspaceLabel(s) {
+  const cwd = sessionCwd(s)
+  return cwd || t('ds.workspaceUnknown')
+}
+function workspaceDisplayName(label) {
+  const value = String(label || '').trim()
+  if (!value || value === t('ds.workspaceUnknown')) return value || t('ds.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 items = [...state.sessions].sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
-  const html = items.map(s => {
-    const title = titleOf(s)
-    return `<button class="ds-session-item ${state.current === s.sessionId ? 'current' : ''}" data-id="${esc(s.sessionId)}">
-      <span class="ds-session-title">${esc(title)}</span>
-      <span class="ds-session-meta"><span class="ds-session-dot ${s.running ? 'running' : ''}"></span>${fmtTime(s.updatedAt)}</span>
-    </button>`
-  }).join('') || `<div class="ds-empty">${t('ds.sessionsEmpty')}</div>`
+  const allItems = sortedSessions()
+  const wbIds = new Set()
+  if (state.wb.bound && state.wb.projects) for (const w of state.wb.projects) for (const id of (w.sessionIds || [])) wbIds.add(id)
+  const root = state.wb.bound ? state.wb.path : ''
+  const visible = allItems.filter(s => !(state.wb.bound && (wbIds.has(s.sessionId) || wbStrictInside(s.cwd, root))))
+  const archivedSet = new Set(state.archivedIds || [])
+  const archived = visible.filter(s => archivedSet.has(s.sessionId))
+  const main = visible.filter(s => !archivedSet.has(s.sessionId))
+  const showArchived = LS.get('dsShowArchivedV1', '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="ds-session-group" title="${esc(workspace)}"><span class="ds-session-group-icon" aria-hidden="true">⌂</span><span class="ds-session-group-name">${esc(workspaceName)}</span></div>`)
+        lastWorkspace = workspace
+      }
+      const title = titleOf(s)
+      rows.push(`<button class="ds-session-item ${state.current === s.sessionId ? 'current' : ''}" data-id="${esc(s.sessionId)}">
+        <span class="ds-session-title">${esc(title)}</span>
+        <span class="ds-session-workspace" title="${esc(workspace)}">⌂ ${esc(workspaceName)}</span>
+        <span class="ds-session-meta"><span class="ds-session-dot ${s.running ? 'running' : ''}"></span>${fmtTime(s.updatedAt)}</span>
+      </button>`)
+    }
+    return rows.join('')
+  }
+  const divider = archived.length ? `<button class="ds-archived-toggle" type="button" data-archived-toggle>${esc(showArchived ? t('wb.archivedShown') : t('wb.archivedHidden'))}</button>` : ''
+  const hiddenByWorkbench = allItems.length - visible.length
+  const html = renderItems(main) + divider + (showArchived ? renderItems(archived) : '') || `<div class="ds-empty">${esc(hiddenByWorkbench ? t('wb.flatHidden', { n: hiddenByWorkbench }) : t('ds.sessionsEmpty'))}</div>`
   $('session-list').innerHTML = html
   $('mobile-session-list').innerHTML = html
+  $('session-list').classList.toggle('workspace-sorted', state.sessionSort === 'workspace')
+  $('mobile-session-list').classList.toggle('workspace-sorted', state.sessionSort === 'workspace')
+  const sort = $('session-sort')
+  if (sort) sort.value = state.sessionSort
+  document.querySelectorAll('[data-archived-toggle]').forEach(b => b.addEventListener('click', () => {
+    LS.set('dsShowArchivedV1', LS.get('dsShowArchivedV1', '0') === '1' ? '0' : '1')
+    renderSessions()
+  }))
   document.querySelectorAll('[data-id]').forEach(b => b.addEventListener('click', () => openSession(b.dataset.id)))
+  renderWorkbench()
 }
 
 async function openSession(id) {
@@ -1271,7 +1345,8 @@ async function goalAction(kind) {
     const objective = prompt(t('goal.editPrompt'), goal.objective || '')
     if (objective === null) return
     if (!objective.trim()) return toast(t('goal.cannotEmpty'), 'err')
-    await safeRpc('goal.edit', { sessionId: state.current, ref, objective: objective.trim() }, t('goal.updateFailed'))
+    const result = await safeRpc('goal.edit', { sessionId: state.current, ref, objective: objective.trim() }, t('goal.updateFailed'))
+    if (result == null) return
     toast(t('goal.updated'), 'ok')
     refreshSessions()
     renderSessionCards()
@@ -1282,7 +1357,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')
@@ -1292,7 +1368,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)
 }
@@ -1384,7 +1461,14 @@ function renderNotifStack() {
 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') toast(t('ds.toastAuth'), 'err')
+    else toast(t('ds.pendingSubmitFailed', { msg: e.message || t('ds.feedbackNetworkError') }), 'err')
+    return
+  }
   toast(ok ? (allow ? t('ds.allowed') : t('ds.rejected')) : t('ds.stale'), ok ? 'ok' : 'err')
   state.approvals = state.approvals.filter(x => x.approvalId !== id)
   renderNotifStack()
@@ -1413,7 +1497,14 @@ async function submitQuestion() {
     return ans
   }).filter(Boolean)
   if (!answers.length) return toast(t('ds.questionNeedAnswer'), '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') toast(t('ds.toastAuth'), 'err')
+    else toast(t('ds.pendingSubmitFailed', { msg: e.message || t('ds.feedbackNetworkError') }), 'err')
+    return
+  }
   if (ok) {
     toast(t('ds.questionSubmitted'), 'ok')
     $('modal-question').classList.add('hidden')
@@ -1439,6 +1530,48 @@ function fsParent(p) {
   parts.pop()
   return parts.length ? '/' + parts.join('/') : '/'
 }
+async function openWorkspaceModal() {
+  if (!state.token) { toast(t('ds.toastAuth'), 'err'); showView('view-settings'); return }
+  if (!state.fs.path) await loadFs(null, 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('ds.workspaceNameRequired'), '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) { toast(t('ds.toastAuth'), 'err'); return }
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok) {
+      const msg = data.error === 'exists' ? t('ds.workspaceExists') : data.error === 'bad-name' ? t('ds.workspaceInvalidName') : data.error || ('HTTP ' + res.status)
+      throw new Error(msg)
+    }
+    closeWorkspaceModal()
+    await loadFs(parent || null, true)
+    const v = await safeRpc('session.create', { cwd: data.path }, t('ds.toastOpFailed'))
+    await refreshSessions()
+    if (v?.sessionId) {
+      toast(t('ds.workspaceCreated'), 'ok')
+      openSession(v.sessionId)
+    } else {
+      toast(t('ds.workspaceCreatedNoSession'), 'ok')
+    }
+  } catch (e) {
+    toast(`${t('ds.workspaceCreateFailed')}：${e.message || t('ds.feedbackNetworkError')}`, 'err')
+  } finally {
+    createWorkspace.busy = false
+    button.disabled = false
+  }
+}
 async function loadFs(dir, silent) {
   if (!state.token) {
     $('fs-path').textContent = t('ds.toastAuth')
@@ -1480,6 +1613,228 @@ function fsUp() {
   }
 }
 
+/* ---------------- 工作台绑定 / 项目会话 ---------------- */
+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 wbFsParent(p) {
+  if (!p) return null
+  const raw = String(p)
+  const separator = raw.includes('\\') ? '\\' : '/'
+  const index = raw.lastIndexOf(separator)
+  if (index <= 0 || /^[A-Za-z]:$/.test(raw.slice(0, index))) return null
+  return raw.slice(0, index)
+}
+async function wbGateway(method, pathname, body) {
+  const options = { method, headers: { authorization: 'Bearer ' + state.token, 'x-dsh-remote-client': 'web' } }
+  if (body !== undefined) {
+    options.headers['content-type'] = 'application/json'
+    options.body = JSON.stringify(body)
+  }
+  const res = await fetch(apiUrl(pathname), options)
+  if (res.status === 401) throw new Error('AUTH')
+  const data = await res.json().catch(() => ({}))
+  if (!res.ok) throw new Error(data.error || ('HTTP ' + res.status))
+  return data
+}
+async function refreshWorkbench({ silent = false } = {}) {
+  if (!state.token) { renderWorkbench(); return }
+  let wb = null
+  try {
+    wb = await wbGateway('GET', '/workbench')
+    state.wb.apiMissing = false
+  } catch (e) {
+    if (e.message === 'AUTH') { toast(t('ds.toastAuth'), 'err'); return }
+    if (!silent) toast(t('wb.loadFailed', { msg: e.message }), 'err')
+    if (!state.wb.bound && /404/.test(e.message)) state.wb.apiMissing = true
+  }
+  const wl = await safeRpc('workspace.list', {}, '')
+  state.archivedIds = wl && Array.isArray(wl.archivedSessionIds) ? wl.archivedSessionIds : []
+  if (!wb) { renderWorkbench(); renderSessions(); return }
+  if (!wb.bound) {
+    state.wb = { bound: false, path: '', title: '', expanded: false, projects: null, open: null, apiMissing: false }
+    renderWorkbench()
+    renderSessions()
+    return
+  }
+  state.wb.bound = true
+  state.wb.path = wb.path || ''
+  state.wb.title = wb.title || ''
+  if (!wl) { state.wb.projects = []; renderWorkbench(); renderSessions(); return }
+  const items = Array.isArray(wl.items) ? wl.items.slice() : []
+  try {
+    const listRes = await fetch(fsApiUrl('/list', { path: state.wb.path }), { headers: fsHeaders() })
+    if (listRes.ok) {
+      const listData = await listRes.json().catch(() => ({}))
+      const have = new Set(items.map(w => wbPathKey(w.path)))
+      for (const entry of listData.entries || []) {
+        if (entry.type !== 'dir') continue
+        const projectPath = wbJoin(state.wb.path, entry.name)
+        if (have.has(wbPathKey(projectPath))) continue
+        try {
+          const created = await rpc('workspace.create', { path: projectPath })
+          if (created?.workspace) { items.push(created.workspace); have.add(wbPathKey(projectPath)) }
+        } catch {}
+      }
+    }
+  } catch {}
+  state.wb.projects = items
+    .filter(w => wbStrictInside(w.path, state.wb.path))
+    .sort((a, b) => String(a.title || wbBaseName(a.path)).localeCompare(String(b.title || wbBaseName(b.path)), 'zh-CN', { numeric: true }))
+  renderWorkbench()
+  renderSessions()
+}
+function renderWorkbench() {
+  const box = $('workbench-box')
+  if (!box) return
+  const unbound = $('wb-unbound')
+  const bound = $('wb-bound')
+  const hint = $('wb-api-hint')
+  if (!state.wb.bound) {
+    unbound.classList.remove('hidden')
+    bound.classList.add('hidden')
+    hint?.classList.toggle('hidden', !state.wb.apiMissing)
+    return
+  }
+  unbound.classList.add('hidden')
+  bound.classList.remove('hidden')
+  $('wb-head-text').textContent = t('wb.bound', { title: state.wb.title || wbBaseName(state.wb.path) })
+  $('wb-head').setAttribute('aria-expanded', state.wb.expanded ? 'true' : 'false')
+  $('wb-caret').textContent = state.wb.expanded ? '▾' : '▸'
+  const panel = $('wb-panel')
+  panel.classList.toggle('hidden', !state.wb.expanded)
+  if (!state.wb.expanded) return
+  const projects = state.wb.projects || []
+  let html = `<div class="ds-wb-panel-title">${esc(t('wb.projects'))}</div>`
+  html += projects.length ? projects.map(w => {
+    const id = String(w.workspaceId || '')
+    const sessions = (w.sessionIds || []).map(sid => state.byId.get(sid)).filter(Boolean).sort((a, b) => (b.updatedAt || 0) - (a.updatedAt || 0))
+    const open = state.wb.open === id
+    return `<div class="ds-wb-project ${open ? 'open' : ''}">
+      <button type="button" class="ds-wb-project-head" data-wb-head="${esc(id)}">
+        <span class="ds-wb-caret" aria-hidden="true">${open ? '▾' : '▸'}</span>
+        <span class="ds-wb-project-title" title="${esc(w.path)}">${esc(w.title || wbBaseName(w.path) || short(id))}</span>
+        <span class="ds-wb-project-count">${sessions.length}</span>
+      </button>
+      <div class="ds-wb-project-body ${open ? '' : 'hidden'}">
+        <button type="button" class="ds-mini-btn ds-wb-new-session" data-wb-new="${esc(id)}">+ ${esc(t('wb.newSession'))}</button>
+        ${sessions.length ? sessions.map(s => `<button type="button" class="ds-wb-session ${state.current === s.sessionId ? 'current' : ''}" data-wb-session="${esc(s.sessionId)}"><span class="ds-wb-session-dot ${s.running ? 'running' : ''}"></span><span class="ds-wb-session-title">${esc(titleOf(s))}</span></button>`).join('') : `<div class="ds-wb-session-empty">${esc(t('wb.noSessions'))}</div>`}
+      </div>
+    </div>`
+  }).join('') : `<div class="ds-wb-empty">${esc(t('wb.noProjects'))}</div>`
+  html += `<button type="button" class="ds-mini-btn ds-wb-unbind-panel" data-wb-unbind-panel>${esc(t('wb.unbind'))}</button>`
+  panel.innerHTML = html
+  panel.querySelectorAll('[data-wb-head]').forEach(button => button.addEventListener('click', () => {
+    state.wb.open = state.wb.open === button.dataset.wbHead ? null : button.dataset.wbHead
+    renderWorkbench()
+  }))
+  panel.querySelectorAll('[data-wb-new]').forEach(button => button.addEventListener('click', async () => {
+    const value = await safeRpc('session.create', { workspaceId: button.dataset.wbNew }, '')
+    if (value?.sessionId) { await refreshSessions(); openSession(value.sessionId) }
+  }))
+  panel.querySelectorAll('[data-wb-session]').forEach(button => button.addEventListener('click', () => openSession(button.dataset.wbSession)))
+  panel.querySelectorAll('[data-wb-unbind-panel]').forEach(button => button.addEventListener('click', unbindWorkbench))
+}
+const wbFs = { path: null, initial: null }
+function openWorkbenchModal() {
+  $('modal-workbench').classList.remove('hidden')
+  wbFs.path = null
+  wbFs.initial = null
+  wbFsLoad(null)
+  setTimeout(() => $('wb-path-input').focus(), 50)
+}
+function closeWorkbenchModal() { $('modal-workbench').classList.add('hidden') }
+async function wbFsLoad(dir) {
+  const box = $('wb-fs-list')
+  const target = dir ?? wbFs.path ?? ''
+  box.innerHTML = `<div class="ds-empty">${esc(t('ds.loading'))}</div>`
+  $('wb-fs-path').textContent = target ? '…' + target.slice(-40) : '~'
+  try {
+    const res = await fetch(fsApiUrl('/list', target ? { path: target } : {}), { headers: fsHeaders() })
+    const data = await res.json().catch(() => ({}))
+    if (!res.ok || !Array.isArray(data.entries)) throw new Error(data.error || ('HTTP ' + res.status))
+    wbFs.path = data.path
+    if (!wbFs.initial) wbFs.initial = data.path
+    $('wb-fs-path').textContent = data.path
+    const dirs = (data.entries || []).filter(e => e.type === 'dir')
+    box.innerHTML = dirs.length ? dirs.map(e => {
+      const p = wbJoin(data.path, e.name)
+      return `<div class="ds-wb-fs-row" data-wb-dir="${esc(p)}"><span>📁</span><span class="ds-wb-fs-name">${esc(e.name)}</span><button type="button" class="ds-btn ds-wb-select" data-wb-select="${esc(p)}">${esc(t('wb.selectDir'))}</button></div>`
+    }).join('') : `<div class="ds-empty">${esc(t('wb.empty'))}</div>`
+    box.querySelectorAll('[data-wb-dir]').forEach(row => row.addEventListener('click', e => { if (!e.target.closest('[data-wb-select]')) wbFsLoad(row.dataset.wbDir) }))
+    box.querySelectorAll('[data-wb-select]').forEach(button => button.addEventListener('click', () => bindWorkbench(button.dataset.wbSelect)))
+  } catch (e) {
+    $('wb-fs-path').textContent = target || '~'
+    box.innerHTML = `<div class="ds-empty">${esc(e.message || t('ds.toastConnFailed'))}</div>`
+  }
+}
+function wbFsUp() {
+  if (wbFs.path && wbFs.initial && wbFs.path !== wbFs.initial) {
+    const parent = wbFsParent(wbFs.path)
+    if (parent) wbFsLoad(parent)
+  }
+}
+async function bindWorkbench(rawPath) {
+  const value = String(rawPath || '').trim()
+  if (!value) return toast(t('wb.pathEmpty'), 'err')
+  try {
+    const wb = await wbGateway('POST', '/workbench/bind', { path: value })
+    state.wb = { bound: true, path: wb.path || value, title: wb.title || '', expanded: true, projects: null, open: null, apiMissing: false }
+    const paths = [state.wb.path]
+    try {
+      const res = await fetch(fsApiUrl('/list', { path: state.wb.path }), { headers: fsHeaders() })
+      const data = await res.json().catch(() => ({}))
+      for (const e of data.entries || []) if (e.type === 'dir') paths.push(wbJoin(state.wb.path, e.name))
+    } catch {}
+    for (const projectPath of paths) {
+      try { await rpc('workspace.create', { path: projectPath }) } catch {}
+    }
+    closeWorkbenchModal()
+    await refreshWorkbench({ silent: true })
+    await refreshSessions()
+    toast(t('wb.boundOk', { path: state.wb.path }), 'ok')
+  } catch (e) {
+    if (e.message === 'AUTH') return toast(t('ds.toastAuth'), 'err')
+    toast(t('wb.bindFailed', { msg: e.message }), 'err')
+  }
+}
+async function unbindWorkbench() {
+  if (!confirm(t('wb.unbindConfirm'))) return
+  try {
+    await wbGateway('POST', '/workbench/unbind')
+    state.wb = { bound: false, path: '', title: '', expanded: false, projects: null, open: null, apiMissing: false }
+    renderWorkbench()
+    renderSessions()
+    toast(t('wb.unboundOk'), 'ok')
+  } catch (e) {
+    if (e.message === 'AUTH') return toast(t('ds.toastAuth'), 'err')
+    toast(t('wb.unbindFailed', { msg: e.message }), 'err')
+  }
+}
+let wbRefreshTimer = null
+function scheduleWorkbenchRefresh() {
+  clearTimeout(wbRefreshTimer)
+  wbRefreshTimer = setTimeout(() => refreshWorkbench({ silent: true }), 400)
+}
+
 /* ---------------- 统计 ---------------- */
 function bucketTokens(b) { return (b.input || 0) + (b.cacheRead || 0) + (b.cacheWrite || 0) + (b.output || 0) }
 let statsDrawerOpened = false
@@ -1615,18 +1970,52 @@ function updateConn() {
 /* ---------------- 初始化 ---------------- */
 function bindUi() {
   $('btn-new-session').addEventListener('click', async () => {
-    const v = await safeRpc('session.create', {}, '')
+    let payload = {}
+    // 与移动端保持一致：新会话继承 DSH 当前工作目录；查询失败时兼容回退。
+    try {
+      const host = await rpc('host.describe', {}, 5000)
+      const cwd = typeof host?.cwd === 'string' ? host.cwd.trim() : ''
+      if (cwd) payload = { cwd }
+    } catch {}
+    const v = await safeRpc('session.create', payload, '')
     if (v?.sessionId) { await refreshSessions(); openSession(v.sessionId) }
   })
+  $('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-mobile-nav').addEventListener('click', () => {
     const list = $('mobile-session-list')
     list.style.display = list.style.display === 'none' ? 'flex' : 'none'
   })
   document.querySelectorAll('.ds-nav-item').forEach(b => b.addEventListener('click', () => showView(b.dataset.view)))
   $('session-list').addEventListener('click', (e) => {
+    if (e.target.closest('[data-archived-toggle]')) {
+      LS.set('dsShowArchivedV1', LS.get('dsShowArchivedV1', '0') === '1' ? '0' : '1')
+      renderSessions()
+      return
+    }
     const item = e.target.closest('[data-id]')
     if (item) openSession(item.dataset.id)
   })
+  $('btn-wb-bind').addEventListener('click', openWorkbenchModal)
+  $('btn-wb-bind-manual').addEventListener('click', () => bindWorkbench($('wb-path-input').value))
+  $('wb-path-input').addEventListener('keydown', e => {
+    if (e.key === 'Enter' && !e.isComposing) { e.preventDefault(); bindWorkbench($('wb-path-input').value) }
+  })
+  $('wb-fs-up').addEventListener('click', wbFsUp)
+  $('wb-fs-home').addEventListener('click', () => wbFsLoad(wbFs.initial || null))
+  $('btn-wb-modal-close').addEventListener('click', closeWorkbenchModal)
+  $('modal-workbench').addEventListener('click', e => { if (e.target === $('modal-workbench')) closeWorkbenchModal() })
+  $('wb-head').addEventListener('click', () => {
+    state.wb.expanded = !state.wb.expanded
+    if (state.wb.expanded && !state.wb.projects) refreshWorkbench({ silent: false })
+    else renderWorkbench()
+  })
+  $('btn-wb-path').addEventListener('click', () => { if (state.wb.path) toast(t('wb.boundPath', { path: state.wb.path }), 'ok') })
+  $('btn-wb-unbind').addEventListener('click', unbindWorkbench)
   $('btn-send').addEventListener('click', sendMessage)
   $('composer').addEventListener('keydown', (e) => {
     if (e.key === 'Enter' && !e.shiftKey && !e.isComposing) { e.preventDefault(); sendMessage() }
@@ -1676,6 +2065,10 @@ function bindUi() {
   $('notes-prev').addEventListener('click', () => scrollNotes(-1))
   $('notes-next').addEventListener('click', () => scrollNotes(1))
   $('notes-pages').addEventListener('scroll', updateNotesPage)
+  $('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() })
   $('modal-notes').addEventListener('click', (e) => { if (e.target === $('modal-notes')) closeNotesModal() })
   // 反馈
   $('btn-feedback').addEventListener('click', (e) => { e.stopPropagation(); toggleFeedbackMenu() })
@@ -1738,6 +2131,7 @@ function bindUi() {
     renderServers(); renderSessions(); updateConn(); themeApply()
   })
   $('fs-up').addEventListener('click', fsUp)
+  $('fs-new-workspace').addEventListener('click', openWorkspaceModal)
   $('fs-refresh').addEventListener('click', () => loadFs(state.fs.path || null))
   $('btn-question-submit').addEventListener('click', submitQuestion)
   $('btn-question-cancel').addEventListener('click', () => { $('modal-question').classList.add('hidden'); toast(t('ds.ignored'), 'ok') })
@@ -1755,12 +2149,14 @@ async function start() {
   }
   $('token-desc').textContent = state.token ? '● ' + state.token.slice(0, 12) + '…' : t('ds.toastAuth')
   bindUi()
+  renderWorkbench()
   updateConn()
   checkNotesOnStart()
   if (state.token) {
     if (state.servers.length) await selectFastestServer({ silent: true, reconnect: false })
     openStreams()
     refreshSessions()
+    refreshWorkbench({ silent: true })
   }
 }
 

package/public/desktop/i18n.js

@@ -10,6 +10,38 @@
     if (saved === 'zh' || saved === 'en') return saved
     return (navigator.language || 'zh').toLowerCase().startsWith('zh') ? 'zh' : 'en'
   }
+  const BUILTIN = {
+    zh: {
+      'wb.unbound': 'DSH Remote（未绑定）', 'wb.bind': '绑定工作台', 'wb.bound': 'DSH Remote（绑定 {title}）',
+      'wb.viewPath': '已绑定 workspace', 'wb.unbind': '解绑', 'wb.unbindConfirm': '确定解绑当前工作台？解绑后这些会话将回到扁平会话列表。',
+      'wb.modalTitle': '绑定工作台', 'wb.modalDesc': '选择工作台根目录，其下每个子文件夹会自动成为项目工作区。',
+      'wb.up': '上级', 'wb.home': '根目录', 'wb.selectDir': '选择此目录', 'wb.pathPlaceholder': '或手动输入绝对路径…',
+      'wb.pathEmpty': '请输入要绑定的路径', 'wb.empty': '此目录没有子文件夹', 'wb.boundOk': '工作台已绑定：{path}',
+      'wb.bindFailed': '绑定失败：{msg}', 'wb.unboundOk': '已解绑工作台', 'wb.unbindFailed': '解绑失败：{msg}',
+      'wb.boundPath': '绑定路径：{path}', 'wb.projects': '项目', 'wb.noProjects': '暂无项目（根目录下新建文件夹后会自动出现）',
+      'wb.newSession': '新会话', 'wb.noSessions': '暂无会话', 'wb.flatHidden': '工作台会话已收起（{n} 个在工作台面板）',
+      'wb.apiMissing': '工作台接口不可用（需更新网关）', 'wb.loadFailed': '工作台加载失败：{msg}',
+      'wb.archivedHidden': '------隐藏已归档会话------', 'wb.archivedShown': '------显示已归档会话------'
+    },
+    en: {
+      'wb.unbound': 'DSH Remote (unbound)', 'wb.bind': 'Bind workbench', 'wb.bound': 'DSH Remote (bound {title})',
+      'wb.viewPath': 'Bound workspace', 'wb.unbind': 'Unbind', 'wb.unbindConfirm': 'Unbind the current workbench? These sessions will return to the flat list.',
+      'wb.modalTitle': 'Bind workbench', 'wb.modalDesc': 'Choose the workbench root; each subfolder becomes a project workspace automatically.',
+      'wb.up': 'Up', 'wb.home': 'Root', 'wb.selectDir': 'Select this folder', 'wb.pathPlaceholder': 'Or type an absolute path…',
+      'wb.pathEmpty': 'Enter a path to bind', 'wb.empty': 'No subfolders in this folder', 'wb.boundOk': 'Workbench bound: {path}',
+      'wb.bindFailed': 'Bind failed: {msg}', 'wb.unboundOk': 'Workbench unbound', 'wb.unbindFailed': 'Unbind failed: {msg}',
+      'wb.boundPath': 'Bound path: {path}', 'wb.projects': 'Projects', 'wb.noProjects': 'No projects yet',
+      'wb.newSession': 'New session', 'wb.noSessions': 'No sessions', 'wb.flatHidden': 'Workbench sessions folded ({n} in the workbench panel)',
+      'wb.apiMissing': 'Workbench API unavailable (update gateway)', 'wb.loadFailed': 'Workbench load failed: {msg}',
+      'wb.archivedHidden': '------ Hide archived ------', 'wb.archivedShown': '------ Show archived ------'
+    }
+  }
+  function mergeDicts(strings) {
+    return {
+      zh: Object.assign({}, BUILTIN.zh, strings?.zh || {}),
+      en: Object.assign({}, BUILTIN.en, strings?.en || {})
+    }
+  }
   let dict = null
   let lang = detect()
 
@@ -46,7 +78,7 @@
   }
 
   window.I18N = {
-    init(strings) { dict = strings || dict; return apply(document) },
+    init(strings) { dict = mergeDicts(strings || dict || {}); return apply(document) },
     t, setLang, apply,
     get lang() { return lang }
   }