dsh-remote-plugin 0.6.20 → 0.6.21

package/index.mjs

@@ -513,6 +513,23 @@ async function resolveAgent(ctx, sessionId) {
   }
 }
 
+function commandHead(line) {
+  const match = /^\/+(\S+)/.exec(String(line || '').trim())
+  return match ? match[1].replace(/^\/+/, '') : ''
+}
+
+function commandEntryName(entry) {
+  const value = typeof entry === 'string' ? entry : entry?.name
+  return String(value || '').trim().replace(/^\/+/, '')
+}
+
+function commandWasExecuted(result) {
+  // DSH 0.1.x 的 commands.execute() 成功时可以返回 void。只要 Promise 正常
+  // 完成，就不应把同一条 /command 再降级为 session.prompt 的普通文本；只有
+  // 执行器明确返回 false / { executed: false } 才表示未处理。
+  return result !== false && result?.executed !== false
+}
+
 async function resolveFile(pathname) {
   let abs = targetPath(pathname)
   if (abs === null) return null
@@ -771,17 +788,27 @@ async function serveStatic(req, res, ctx) {
         sendJson(res, 200, { ok: false, message: 'agent not found', debug: { resolvePath, commandNames: [] } })
         return
       }
+      let commandEntries = null
       let commandNames = []
       try {
-        commandNames = (await ctx.commands.list(agent)).map(c => c.name)
+        const listed = await ctx.commands.list(agent)
+        commandEntries = Array.isArray(listed) ? listed : null
+        commandNames = commandEntries ? commandEntries.map(commandEntryName).filter(Boolean) : []
       } catch (e) {
         commandNames = ['list-error: ' + (e?.message || String(e))]
       }
+      const name = commandHead(line)
+      if (commandEntries && (!name || !commandEntries.some(entry => commandEntryName(entry) === name))) {
+        // 仅把 DSH 已登记的 slash command 截留到命令服务。未知 /xxx 仍让客户端
+        // 按普通文本发送，保持 DSH 自己处理自定义提示词的兼容行为。
+        sendJson(res, 200, { ok: true, executed: false, debug: { resolvePath, commandNames, reason: 'unknown-command' } })
+        return
+      }
       const signal = AbortSignal.timeout(30000)
       const result = ctx.commands.execute.length === 3
         ? await ctx.commands.execute(agent, line, signal)
         : await ctx.commands.execute(agent, line, [], signal)
-      sendJson(res, 200, { ok: true, executed: result !== undefined, debug: { resolvePath, commandNames } })
+      sendJson(res, 200, { ok: true, executed: commandWasExecuted(result), debug: { resolvePath, commandNames } })
     } catch (e) {
       sendJson(res, 200, { ok: false, message: e?.message || String(e) })
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.6.20",
+  "version": "0.6.21",
   "description": "DSH Remote 官方 bundle 插件：DSH 左侧原生边栏入口 + 右侧抽屉内嵌管理控制台；内置网关随 DSH 自动启停(systemd 独立单元)，抽屉直显令牌与设备监控；网关提供 /fs/* 文件传输端点(列表/断点下载/上传)，配合 Android App 远程操控会话/审批/提问/goal 与文件互传(多服务器测速切换、聊天记录离线缓存)。",
   "type": "module",
   "main": "./index.mjs",

package/public/app.js

@@ -938,10 +938,81 @@ function closeGroupMenu() {
   if (menu) menu.classList.add('hidden')
 }
 
+let groupDrawerReturnFocus = null
+
+function groupDrawerOpen() {
+  return !$('group-drawer')?.classList.contains('hidden')
+}
+
+function renderGroupDrawer() {
+  const trigger = $('group-drawer-trigger')
+  const brandGroup = $('brand-group-name')
+  const current = $('group-drawer-current')
+  const list = $('group-drawer-list')
+  if (brandGroup) brandGroup.textContent = state.activeGroup
+  if (trigger) trigger.setAttribute('aria-label', t('groups.drawerOpen') + '：' + state.activeGroup)
+  if (current) current.textContent = state.activeGroup
+  if (!list) return
+  list.innerHTML = state.groups.map(group => {
+    const servers = groupServers(group)
+    const selected = group === state.activeGroup
+    return `<button type="button" class="group-drawer-option ${selected ? 'current' : ''}" data-quick-group="${esc(group)}" ${selected ? 'aria-current="true"' : ''}>
+      <span class="group-drawer-option-mark" aria-hidden="true"></span>
+      <span class="group-drawer-option-copy"><span class="group-drawer-option-name">${esc(group)}</span><span class="group-drawer-option-meta">${t('groups.serverCount', { count: servers.length })}</span></span>
+      <span class="group-drawer-option-check" aria-hidden="true">${selected ? '✓' : ''}</span>
+    </button>`
+  }).join('')
+}
+
+function openGroupDrawer() {
+  const drawer = $('group-drawer')
+  const backdrop = $('group-drawer-backdrop')
+  const trigger = $('group-drawer-trigger')
+  if (!drawer || !backdrop || !trigger) return
+  renderGroupDrawer()
+  groupDrawerReturnFocus = document.activeElement instanceof HTMLElement ? document.activeElement : trigger
+  drawer.classList.remove('hidden')
+  backdrop.classList.remove('hidden')
+  document.body.classList.add('group-drawer-open')
+  trigger.setAttribute('aria-expanded', 'true')
+  requestAnimationFrame(() => (drawer.querySelector('[data-quick-group].current') || drawer.querySelector('[data-quick-group]') || drawer).focus({ preventScroll: true }))
+}
+
+function closeGroupDrawer({ restoreFocus = true } = {}) {
+  const drawer = $('group-drawer')
+  const backdrop = $('group-drawer-backdrop')
+  const trigger = $('group-drawer-trigger')
+  if (!drawer || !backdrop || drawer.classList.contains('hidden')) return
+  drawer.classList.add('hidden')
+  backdrop.classList.add('hidden')
+  document.body.classList.remove('group-drawer-open')
+  trigger?.setAttribute('aria-expanded', 'false')
+  if (restoreFocus) (groupDrawerReturnFocus || trigger)?.focus({ preventScroll: true })
+  groupDrawerReturnFocus = null
+}
+
+function keepGroupDrawerFocus(event) {
+  if (!groupDrawerOpen()) return
+  if (event.key === 'Escape') {
+    event.preventDefault()
+    closeGroupDrawer()
+    return
+  }
+  if (event.key !== 'Tab') return
+  const drawer = $('group-drawer')
+  const targets = [...drawer.querySelectorAll('button:not([disabled]), [href], [tabindex]:not([tabindex="-1"])')]
+  if (!targets.length) return
+  const first = targets[0]
+  const last = targets[targets.length - 1]
+  if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last.focus() }
+  else if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus() }
+}
+
 function renderServers() {
   const box = $('server-list')
   if (!box) return
   renderGroupSelect()
+  renderGroupDrawer()
   const groupsHtml = state.groups.map(g => {
     const list = groupServers(g)
     const auto = state.autoSelect[g] !== false
@@ -6879,6 +6950,22 @@ function bindUi() {
   $('btn-server-add').addEventListener('click', addServer)
   $('btn-group-add').addEventListener('click', addGroup)
   $('group-select-btn').addEventListener('click', (e) => { e.stopPropagation(); toggleGroupMenu() })
+  $('group-drawer-trigger').addEventListener('click', () => { groupDrawerOpen() ? closeGroupDrawer() : openGroupDrawer() })
+  $('group-drawer-close').addEventListener('click', () => closeGroupDrawer())
+  $('group-drawer-backdrop').addEventListener('click', () => closeGroupDrawer())
+  $('group-drawer-list').addEventListener('click', (e) => {
+    const option = e.target.closest('[data-quick-group]')
+    if (!option) return
+    const group = option.dataset.quickGroup
+    closeGroupDrawer({ restoreFocus: false })
+    if (group !== state.activeGroup) switchGroup(group)
+  })
+  $('group-drawer-manage').addEventListener('click', () => {
+    closeGroupDrawer({ restoreFocus: false })
+    showView('view-settings')
+    showSettingsPage('servers')
+  })
+  document.addEventListener('keydown', keepGroupDrawerFocus)
   document.addEventListener('click', (e) => {
     if (!e.target.closest('#group-select')) closeGroupMenu()
   })

package/public/desktop/desktop.css

@@ -9,9 +9,16 @@ html, body {
 .ds-app { position: fixed; inset: 0; display: flex; overflow: hidden; }
 .ds-sidebar { width: 280px; flex: none; display: flex; flex-direction: column; border-right: 1px solid var(--dsr-line); background: linear-gradient(180deg, var(--dsr-panel), var(--dsr-bg)); box-shadow: 12px 0 34px var(--dsr-shadow); overflow: hidden; }
 .ds-sidebar-backdrop { display: none; }
-.ds-brand { display: flex; align-items: center; gap: 8px; padding: 17px 18px 12px; font-weight: 750; font-size: 15px; letter-spacing: .1px; }
+.ds-brand { display: flex; align-items: center; gap: 6px; padding: 12px 12px 8px 18px; font-weight: 750; font-size: 15px; letter-spacing: .1px; }
+.ds-brand-trigger { min-width: 0; flex: 1; display: flex; align-items: center; gap: 8px; padding: 5px 6px 5px 0; border: 0; border-radius: 10px; background: transparent; color: var(--dsr-text); font: inherit; text-align: left; cursor: pointer; }
+.ds-brand-trigger:hover { background: var(--dsr-accent-soft); }
+.ds-brand-trigger:focus-visible { outline: 2px solid var(--dsr-accent); outline-offset: 2px; }
 .ds-logo { color: var(--dsr-accent-strong); }
-.ds-brand-name { flex: 1; min-width: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.ds-brand-copy { min-width: 0; flex: 1; display: flex; flex-direction: column; gap: 0; line-height: 1.14; }
+.ds-brand-name { min-width: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.ds-brand-group-name { min-width: 0; overflow: hidden; color: var(--dsr-muted); font-size: 10px; font-weight: 600; text-overflow: ellipsis; white-space: nowrap; }
+.ds-brand-caret { flex: none; color: var(--dsr-muted); font-size: 15px; line-height: 1; transition: transform .18s ease, color .18s ease; }
+.ds-brand-trigger[aria-expanded="true"] .ds-brand-caret { color: var(--dsr-accent-strong); transform: rotate(180deg); }
 .ds-gh { color: var(--dsr-accent-2); display: inline-flex; }
 .ds-gh svg { width: 17px; height: 17px; fill: currentColor; }
 .ds-new-session { padding: 0 12px 8px; }
@@ -470,6 +477,30 @@ button.ds-overview-attention-item, button.ds-overview-session-item { cursor:poin
 .ds-drawer-body::-webkit-scrollbar-thumb { background: var(--dsr-line); border-radius: 999px; }
 .ds-drawer-body::-webkit-scrollbar-thumb:hover { background: var(--dsr-muted); }
 
+/* 左上角应用名展开的组快捷切换抽屉 */
+.ds-group-drawer-backdrop { position: fixed; inset: 0; z-index: 108; border: 0; background: var(--dsr-overlay); }
+.ds-group-drawer { position: fixed; inset: 0 auto 0 0; z-index: 109; width: min(360px, calc(100vw - 18px)); display: flex; flex-direction: column; background: var(--dsr-panel); border-right: 1px solid var(--dsr-line); box-shadow: 18px 0 48px var(--dsr-shadow); animation: ds-group-drawer-in .22s cubic-bezier(.2,.8,.2,1); }
+.ds-group-drawer.hidden, .ds-group-drawer-backdrop.hidden { display: none; }
+@keyframes ds-group-drawer-in { from { opacity: .01; transform: translateX(-16px); } to { opacity: 1; transform: translateX(0); } }
+.ds-group-drawer-head { flex: none; display: flex; align-items: flex-start; justify-content: space-between; gap: 14px; padding: 19px 16px 15px; border-bottom: 1px solid var(--dsr-line); }
+.ds-group-drawer-eyebrow { margin-bottom: 3px; color: var(--dsr-accent-strong); font-size: 10px; font-weight: 750; letter-spacing: 1.5px; }
+.ds-group-drawer-head h2 { margin: 0; color: var(--dsr-text); font-size: 19px; line-height: 1.2; }
+.ds-group-drawer-current { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 14px 14px 8px; padding: 10px 12px; border: 1px solid var(--dsr-accent-line); border-radius: 12px; background: var(--dsr-accent-soft); color: var(--dsr-muted); font-size: 12px; }
+.ds-group-drawer-current strong { min-width: 0; overflow: hidden; color: var(--dsr-accent-strong); font-size: 13px; text-overflow: ellipsis; white-space: nowrap; }
+.ds-group-drawer-list { flex: 1; min-height: 0; overflow-y: auto; padding: 4px 10px 14px; display: flex; flex-direction: column; gap: 4px; overscroll-behavior: contain; scrollbar-width: thin; scrollbar-color: var(--dsr-line) transparent; }
+.ds-group-drawer-option { width: 100%; min-height: 56px; display: flex; align-items: center; gap: 11px; padding: 9px 11px; border: 1px solid transparent; border-radius: 13px; background: transparent; color: var(--dsr-text); font: inherit; text-align: left; cursor: pointer; }
+.ds-group-drawer-option:hover { background: var(--dsr-bg-2); }
+.ds-group-drawer-option.current { border-color: var(--dsr-accent-line); background: linear-gradient(100deg, var(--dsr-accent-soft), transparent); }
+.ds-group-drawer-mark { width: 10px; height: 10px; flex: none; border: 2px solid var(--dsr-line); border-radius: 50%; }
+.ds-group-drawer-option.current .ds-group-drawer-mark { border-color: var(--dsr-accent); background: var(--dsr-accent); box-shadow: 0 0 0 4px var(--dsr-accent-soft); }
+.ds-group-drawer-copy { min-width: 0; flex: 1; display: flex; flex-direction: column; gap: 2px; }
+.ds-group-drawer-name { overflow: hidden; font-size: 14px; font-weight: 700; text-overflow: ellipsis; white-space: nowrap; }
+.ds-group-drawer-meta { overflow: hidden; color: var(--dsr-muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
+.ds-group-drawer-check { flex: none; color: var(--dsr-accent-strong); font-size: 18px; font-weight: 750; }
+.ds-group-drawer-foot { flex: none; padding: 12px 14px; border-top: 1px solid var(--dsr-line); background: var(--dsr-bg-2); }
+.ds-group-drawer-foot .ds-btn { width: 100%; justify-content: space-between; }
+.ds-group-drawer-foot p { margin: 7px 2px 0; color: var(--dsr-muted); font-size: 11px; }
+
 /* 通知卡片栈(右下角) */
 .ds-toast-stack { position: fixed; right: 16px; bottom: 16px; z-index: 100; display: flex; flex-direction: column; gap: 10px; width: min(380px, calc(100vw - 32px)); }
 .ds-notif-card { background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-left: 3px solid var(--dsr-accent-strong); border-radius: 12px; box-shadow: 0 10px 28px rgba(0,0,0,.3); padding: 11px 13px; animation: dsSlideIn .22s ease; }

package/public/desktop/desktop.html

@@ -12,7 +12,9 @@
   <div class="ds-app" id="ds-app">
     <aside class="ds-sidebar" id="ds-sidebar">
       <div class="ds-brand">
-        <span class="ds-logo">◆</span><span class="ds-brand-name">DSH Remote</span>
+        <button id="ds-group-drawer-trigger" class="ds-brand-trigger" type="button" aria-haspopup="dialog" aria-controls="ds-group-drawer" aria-expanded="false" data-i18n-aria="ds.groupsDrawerOpen">
+          <span class="ds-logo">◆</span><span class="ds-brand-copy"><span class="ds-brand-name">DSH Remote</span><span id="ds-brand-group-name" class="ds-brand-group-name">默认</span></span><span class="ds-brand-caret" aria-hidden="true">⌄</span>
+        </button>
         <a class="ds-gh" href="https://github.com/Blank-not-black/dsh-Remote" target="_blank" rel="noopener" data-i18n-title="ds.repo" data-i18n-aria="ds.repo">
           <svg viewBox="0 0 16 16" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8a8.01 8.01 0 0 0 5.47 7.59c.4.08.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8Z"/></svg>
         </a>
@@ -82,6 +84,19 @@
       </div>
     </aside>
     <button id="ds-sidebar-backdrop" class="ds-sidebar-backdrop hidden" type="button" data-i18n-aria="ds.close" aria-label="关闭菜单"></button>
+    <button id="ds-group-drawer-backdrop" class="ds-group-drawer-backdrop hidden" type="button" tabindex="-1" aria-hidden="true"></button>
+    <aside id="ds-group-drawer" class="ds-group-drawer hidden" role="dialog" aria-modal="true" aria-labelledby="ds-group-drawer-title" tabindex="-1">
+      <div class="ds-group-drawer-head">
+        <div><div class="ds-group-drawer-eyebrow" data-i18n="ds.groupsDrawerEyebrow">QUICK SWITCH</div><h2 id="ds-group-drawer-title" data-i18n="ds.groupsDrawerTitle">切换服务器组</h2></div>
+        <button id="ds-group-drawer-close" class="ds-icon-btn" type="button" data-i18n-aria="ds.groupsDrawerClose" data-i18n-title="ds.groupsDrawerClose">×</button>
+      </div>
+      <div class="ds-group-drawer-current"><span data-i18n="ds.groupsDrawerCurrent">当前连接组</span><strong id="ds-group-drawer-current">默认</strong></div>
+      <div id="ds-group-drawer-list" class="ds-group-drawer-list" role="group" data-i18n-aria="ds.groupsDrawerTitle"></div>
+      <div class="ds-group-drawer-foot">
+        <button id="ds-group-drawer-manage" class="ds-btn" type="button"><span data-i18n="ds.groupsDrawerManage">管理服务器与组</span><span aria-hidden="true">›</span></button>
+        <p data-i18n="ds.groupsDrawerManageDesc">编辑、测速和调整组</p>
+      </div>
+    </aside>
 
     <div class="ds-main">
       <header class="ds-topbar">
@@ -528,6 +543,8 @@
         'ds.groupsPromptRename': '重命名组「{group}」：', 'ds.groupsRenamed': '组已重命名',
         'ds.groupsCannotDeleteDefault': '默认组不可删除',
         'ds.groupsConfirmDelete': '删除组「{group}」？组内服务器将归入默认组。', 'ds.groupsDeleted': '组已删除',
+        'ds.groupsDrawerOpen': '切换服务器组', 'ds.groupsDrawerClose': '关闭组列表', 'ds.groupsDrawerEyebrow': '快速切换', 'ds.groupsDrawerTitle': '切换服务器组', 'ds.groupsDrawerCurrent': '当前连接组',
+        'ds.groupsDrawerManage': '管理服务器与组', 'ds.groupsDrawerManageDesc': '编辑、测速和调整组', 'ds.groupsServerCount': '{count} 台服务器',
         'ds.theme.default': '默认深空', 'ds.theme.dark': '落日', 'ds.theme.light': '易北爱乐厅', 'ds.theme.neutral': '草原孤塔', 'ds.theme.mono': '黑曜白',
         'ds.role.me': '我', 'ds.role.dsh': 'DSH', 'ds.toolDefault': '工具',
         'ds.eventSystemReminder': '系统提示',
@@ -631,6 +648,8 @@
         'ds.groupsPromptRename': 'Rename group "{group}":', 'ds.groupsRenamed': 'Group renamed',
         'ds.groupsCannotDeleteDefault': 'The default group cannot be deleted',
         'ds.groupsConfirmDelete': 'Delete group "{group}"? Its servers move to the default group.', 'ds.groupsDeleted': 'Group deleted',
+        'ds.groupsDrawerOpen': 'Switch server group', 'ds.groupsDrawerClose': 'Close group list', 'ds.groupsDrawerEyebrow': 'QUICK SWITCH', 'ds.groupsDrawerTitle': 'Switch server group', 'ds.groupsDrawerCurrent': 'Current connection group',
+        'ds.groupsDrawerManage': 'Manage servers and groups', 'ds.groupsDrawerManageDesc': 'Edit, test, and organize groups', 'ds.groupsServerCount': '{count} servers',
         'ds.theme.default': 'Deep Space', 'ds.theme.dark': 'Sunset', 'ds.theme.light': 'Elbphilharmonie', 'ds.theme.neutral': 'Prairie Tower', 'ds.theme.mono': 'Monochrome',
         'ds.role.me': 'Me', 'ds.role.dsh': 'DSH', 'ds.toolDefault': 'tool',
         'ds.eventSystemReminder': 'System reminder',

package/public/desktop/desktop.js

@@ -840,10 +840,79 @@ function renderGroupSelect() {
 function toggleGroupMenu() { $('group-select-menu').classList.toggle('hidden') }
 function closeGroupMenu() { $('group-select-menu').classList.add('hidden') }
 
+let desktopGroupDrawerReturnFocus = null
+
+function desktopGroupDrawerOpen() {
+  return !$('ds-group-drawer')?.classList.contains('hidden')
+}
+
+function renderDesktopGroupDrawer() {
+  const trigger = $('ds-group-drawer-trigger')
+  const brandGroup = $('ds-brand-group-name')
+  const current = $('ds-group-drawer-current')
+  const list = $('ds-group-drawer-list')
+  if (brandGroup) brandGroup.textContent = state.activeGroup
+  if (trigger) trigger.setAttribute('aria-label', t('ds.groupsDrawerOpen') + '：' + state.activeGroup)
+  if (current) current.textContent = state.activeGroup
+  if (!list) return
+  list.innerHTML = state.groups.map(group => {
+    const servers = groupServers(group)
+    const selected = group === state.activeGroup
+    return `<button type="button" class="ds-group-drawer-option ${selected ? 'current' : ''}" data-ds-quick-group="${esc(group)}" ${selected ? 'aria-current="true"' : ''}>
+      <span class="ds-group-drawer-mark" aria-hidden="true"></span>
+      <span class="ds-group-drawer-copy"><span class="ds-group-drawer-name">${esc(group)}</span><span class="ds-group-drawer-meta">${t('ds.groupsServerCount', { count: servers.length })}</span></span>
+      <span class="ds-group-drawer-check" aria-hidden="true">${selected ? '✓' : ''}</span>
+    </button>`
+  }).join('')
+}
+
+function openDesktopGroupDrawer() {
+  const drawer = $('ds-group-drawer')
+  const backdrop = $('ds-group-drawer-backdrop')
+  const trigger = $('ds-group-drawer-trigger')
+  if (!drawer || !backdrop || !trigger) return
+  renderDesktopGroupDrawer()
+  desktopGroupDrawerReturnFocus = document.activeElement instanceof HTMLElement ? document.activeElement : trigger
+  drawer.classList.remove('hidden')
+  backdrop.classList.remove('hidden')
+  trigger.setAttribute('aria-expanded', 'true')
+  requestAnimationFrame(() => (drawer.querySelector('[data-ds-quick-group].current') || drawer.querySelector('[data-ds-quick-group]') || drawer).focus({ preventScroll: true }))
+}
+
+function closeDesktopGroupDrawer({ restoreFocus = true } = {}) {
+  const drawer = $('ds-group-drawer')
+  const backdrop = $('ds-group-drawer-backdrop')
+  const trigger = $('ds-group-drawer-trigger')
+  if (!drawer || !backdrop || drawer.classList.contains('hidden')) return
+  drawer.classList.add('hidden')
+  backdrop.classList.add('hidden')
+  trigger?.setAttribute('aria-expanded', 'false')
+  if (restoreFocus) (desktopGroupDrawerReturnFocus || trigger)?.focus({ preventScroll: true })
+  desktopGroupDrawerReturnFocus = null
+}
+
+function keepDesktopGroupDrawerFocus(event) {
+  if (!desktopGroupDrawerOpen()) return
+  if (event.key === 'Escape') {
+    event.preventDefault()
+    closeDesktopGroupDrawer()
+    return
+  }
+  if (event.key !== 'Tab') return
+  const drawer = $('ds-group-drawer')
+  const targets = [...drawer.querySelectorAll('button:not([disabled]), [href], [tabindex]:not([tabindex="-1"])')]
+  if (!targets.length) return
+  const first = targets[0]
+  const last = targets[targets.length - 1]
+  if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last.focus() }
+  else if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus() }
+}
+
 function renderServers() {
   const box = $('server-list')
   if (!box) return
   renderGroupSelect()
+  renderDesktopGroupDrawer()
   box.innerHTML = state.groups.map(g => {
     const list = groupServers(g)
     const auto = state.autoSelect[g] !== false
@@ -3077,6 +3146,22 @@ function bindUi() {
   $('btn-server-add').addEventListener('click', addServer)
   $('btn-group-add').addEventListener('click', addGroup)
   $('group-select-btn').addEventListener('click', (e) => { e.stopPropagation(); toggleGroupMenu() })
+  $('ds-group-drawer-trigger').addEventListener('click', () => { desktopGroupDrawerOpen() ? closeDesktopGroupDrawer() : openDesktopGroupDrawer() })
+  $('ds-group-drawer-close').addEventListener('click', () => closeDesktopGroupDrawer())
+  $('ds-group-drawer-backdrop').addEventListener('click', () => closeDesktopGroupDrawer())
+  $('ds-group-drawer-list').addEventListener('click', (e) => {
+    const option = e.target.closest('[data-ds-quick-group]')
+    if (!option) return
+    const group = option.dataset.dsQuickGroup
+    closeDesktopGroupDrawer({ restoreFocus: false })
+    if (group !== state.activeGroup) switchGroup(group)
+  })
+  $('ds-group-drawer-manage').addEventListener('click', () => {
+    closeDesktopGroupDrawer({ restoreFocus: false })
+    showView('view-settings')
+    showSettingsPage('servers')
+  })
+  document.addEventListener('keydown', keepDesktopGroupDrawerFocus)
   document.addEventListener('click', (e) => { if (!e.target.closest('#group-select')) closeGroupMenu() })
   $('server-input').addEventListener('keydown', (e) => { if (e.key === 'Enter' && !e.isComposing) { e.preventDefault(); addServer() } })
 

package/public/index.html

@@ -15,10 +15,11 @@
 </head>
 <body>
   <header class="topbar">
-    <div class="brand">
+    <button id="group-drawer-trigger" class="brand brand-trigger" type="button" aria-haspopup="dialog" aria-controls="group-drawer" aria-expanded="false" data-i18n-aria="groups.drawerOpen">
       <span class="brand-dot"></span>
-      <span class="brand-name">DSH Remote</span>
-    </div>
+      <span class="brand-copy"><span class="brand-name">DSH Remote</span><span id="brand-group-name" class="brand-group-name">默认</span></span>
+      <svg class="brand-caret" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 10 5 5 5-5"/></svg>
+    </button>
     <div class="topbar-right">
       <button id="btn-donate" class="topbar-btn icon-btn" data-i18n-title="settings.donate" data-i18n-aria="settings.donate"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M6 8h11v6a4 4 0 0 1-4 4H10a4 4 0 0 1-4-4Z"/><path d="M17 10h1.5a2.5 2.5 0 0 1 0 5H17M9 4c0 1 1 1.2 1 2M13 4c0 1 1 1.2 1 2M5 20h13"/></svg></button>
       <button id="btn-feedback" class="topbar-btn icon-btn" data-i18n-title="feedback.title" data-i18n-aria="feedback.title" aria-haspopup="menu" aria-expanded="false"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 11.5a7.5 7.5 0 0 1-7.5 7.5H7l-3 2 .8-3.1A7.5 7.5 0 1 1 20 11.5Z"/><path d="M8 11.5h.01M12 11.5h.01M16 11.5h.01"/></svg></button>
@@ -27,6 +28,20 @@
     </div>
   </header>
 
+  <button id="group-drawer-backdrop" class="group-drawer-backdrop hidden" type="button" tabindex="-1" aria-hidden="true"></button>
+  <aside id="group-drawer" class="group-drawer hidden" role="dialog" aria-modal="true" aria-labelledby="group-drawer-title" tabindex="-1">
+    <div class="group-drawer-head">
+      <div><div class="group-drawer-eyebrow" data-i18n="groups.drawerEyebrow">QUICK SWITCH</div><h2 id="group-drawer-title" data-i18n="groups.drawerTitle">切换服务器组</h2></div>
+      <button id="group-drawer-close" class="group-drawer-close" type="button" data-i18n-aria="groups.drawerClose" data-i18n-title="groups.drawerClose">×</button>
+    </div>
+    <div class="group-drawer-current"><span data-i18n="groups.drawerCurrent">当前连接组</span><strong id="group-drawer-current">默认</strong></div>
+    <div id="group-drawer-list" class="group-drawer-list" role="group" data-i18n-aria="groups.drawerTitle"></div>
+    <div class="group-drawer-foot">
+      <button id="group-drawer-manage" class="group-drawer-manage" type="button"><span data-i18n="groups.drawerManage">管理服务器与组</span><span aria-hidden="true">›</span></button>
+      <p data-i18n="groups.drawerManageDesc">编辑、测速和调整组</p>
+    </div>
+  </aside>
+
   <main id="main" class="main">
     <!-- 会话列表 -->
     <section id="view-home" class="view">
@@ -958,6 +973,8 @@
         'groups.added': '已创建组：{group}', 'groups.promptRename': '重命名组「{group}」：',
         'groups.renamed': '组已重命名', 'groups.cannotDeleteDefault': '默认组不可删除',
         'groups.confirmDelete': '删除组「{group}」？组内服务器将归入默认组。', 'groups.deleted': '组已删除',
+        'groups.drawerOpen': '切换服务器组', 'groups.drawerClose': '关闭组列表', 'groups.drawerEyebrow': '快速切换', 'groups.drawerTitle': '切换服务器组', 'groups.drawerCurrent': '当前连接组',
+        'groups.drawerManage': '管理服务器与组', 'groups.drawerManageDesc': '编辑、测速和调整组', 'groups.serverCount': '{count} 台服务器',
         'stream.error': '事件流错误：{msg}',
         'session.loading': '加载中…', 'session.unknown': '未知会话', 'session.running': '运行中', 'session.interrupted': '已中断',
         'session.stop': '停止本轮', 'session.history': '对话', 'session.errorMsg': '会话出错：{msg}', 'session.recovering': '恢复会话中…', 'session.recoveryReady': '会话已恢复', 'session.recoveryFailed': '会话恢复失败', 'session.recoveryCached': '正在查看缓存历史',
@@ -1188,6 +1205,8 @@
         'groups.added': 'Created group: {group}', 'groups.promptRename': 'Rename group "{group}":',
         'groups.renamed': 'Group renamed', 'groups.cannotDeleteDefault': 'The default group cannot be deleted',
         'groups.confirmDelete': 'Delete group "{group}"? Its servers move to the default group.', 'groups.deleted': 'Group deleted',
+        'groups.drawerOpen': 'Switch server group', 'groups.drawerClose': 'Close group list', 'groups.drawerEyebrow': 'QUICK SWITCH', 'groups.drawerTitle': 'Switch server group', 'groups.drawerCurrent': 'Current connection group',
+        'groups.drawerManage': 'Manage servers and groups', 'groups.drawerManageDesc': 'Edit, test, and organize groups', 'groups.serverCount': '{count} servers',
         'stream.error': 'Event stream error: {msg}',
         'session.loading': 'Loading…', 'session.unknown': 'Unknown session', 'session.running': 'Running', 'session.interrupted': 'Interrupted',
         'session.stop': 'Stop turn', 'session.history': 'Conversation', 'session.errorMsg': 'Session error: {msg}', 'session.recovering': 'Restoring session…', 'session.recoveryReady': 'Session ready', 'session.recoveryFailed': 'Session restore failed', 'session.recoveryCached': 'Viewing cached history',

package/public/styles.css

@@ -40,7 +40,15 @@ body { padding-bottom: calc(92px + var(--dsr-safe-b)); }
   background: var(--dsr-bg);
   border-bottom: 1px solid var(--dsr-line);
 }
-.brand { display: flex; align-items: center; gap: 8px; font-weight: 700; letter-spacing: .5px; }
+.brand { display: flex; align-items: center; gap: 8px; min-width: 0; font-weight: 700; letter-spacing: .5px; }
+.brand-trigger { padding: 4px 5px 4px 2px; border-radius: 11px; text-align: left; color: var(--dsr-text); }
+.brand-trigger:active { background: var(--dsr-accent-soft); }
+.brand-trigger:focus-visible { outline: 2px solid var(--dsr-accent); outline-offset: 2px; }
+.brand-copy { min-width: 0; display: flex; flex-direction: column; align-items: flex-start; gap: 0; line-height: 1.14; }
+.brand-name { white-space: nowrap; }
+.brand-group-name { max-width: 16ch; overflow: hidden; color: var(--dsr-muted); font-size: 10.5px; font-weight: 600; letter-spacing: .15px; text-overflow: ellipsis; white-space: nowrap; }
+.brand-caret { width: 14px; height: 14px; flex: none; color: var(--dsr-muted); transition: transform .18s ease, color .18s ease; }
+.brand-trigger[aria-expanded="true"] .brand-caret { color: var(--dsr-accent-strong); transform: rotate(180deg); }
 .brand-dot {
   width: 10px; height: 10px; border-radius: 50%;
   background: linear-gradient(135deg, var(--dsr-brand-a), var(--dsr-brand-b));
@@ -77,6 +85,34 @@ button {
 .topbar-right #btn-feedback { color: var(--dsr-info); }
 .topbar-right #btn-refresh { color: var(--dsr-success); }
 .topbar-right .topbar-btn.conn-badge { padding: 0 14px; border-radius: 999px; font-size: 12.5px; }
+
+/* ---------- 顶栏组切换抽屉 ---------- */
+.group-drawer-backdrop { position: fixed; inset: 0; z-index: 70; border: 0; background: var(--dsr-overlay); }
+.group-drawer { position: fixed; inset: 0 auto 0 0; z-index: 71; display: flex; flex-direction: column; width: min(360px, calc(100vw - 18px)); background: var(--dsr-panel); border-right: 1px solid var(--dsr-line); box-shadow: 18px 0 48px var(--dsr-shadow); animation: group-drawer-in .22s cubic-bezier(.2,.8,.2,1); }
+.group-drawer.hidden, .group-drawer-backdrop.hidden { display: none; }
+@keyframes group-drawer-in { from { opacity: .01; transform: translateX(-16px); } to { opacity: 1; transform: translateX(0); } }
+body.group-drawer-open { overflow: hidden; }
+.group-drawer-head { display: flex; align-items: flex-start; justify-content: space-between; gap: 14px; padding: calc(var(--dsr-safe-top) + 18px) 18px 15px; border-bottom: 1px solid var(--dsr-line); }
+.group-drawer-eyebrow { margin-bottom: 3px; color: var(--dsr-accent-strong); font-size: 10px; font-weight: 750; letter-spacing: 1.5px; }
+.group-drawer-head h2 { margin: 0; color: var(--dsr-text); font-size: 20px; line-height: 1.2; }
+.group-drawer-close { width: 38px; height: 38px; display: grid; flex: none; place-items: center; border: 1px solid var(--dsr-line); border-radius: 12px; background: var(--dsr-bg-2); color: var(--dsr-muted); font-size: 24px; line-height: 1; }
+.group-drawer-close:active { background: var(--dsr-accent-soft); color: var(--dsr-accent-strong); }
+.group-drawer-current { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 14px 14px 8px; padding: 11px 12px; border: 1px solid var(--dsr-accent-line); border-radius: 12px; background: var(--dsr-accent-soft); color: var(--dsr-muted); font-size: 12px; }
+.group-drawer-current strong { min-width: 0; overflow: hidden; color: var(--dsr-accent-strong); font-size: 13px; text-overflow: ellipsis; white-space: nowrap; }
+.group-drawer-list { flex: 1; min-height: 0; overflow-y: auto; padding: 4px 10px 14px; display: flex; flex-direction: column; gap: 4px; overscroll-behavior: contain; scrollbar-width: thin; scrollbar-color: var(--dsr-line) transparent; }
+.group-drawer-option { width: 100%; min-height: 58px; display: flex; align-items: center; gap: 11px; padding: 9px 11px; border: 1px solid transparent; border-radius: 13px; color: var(--dsr-text); text-align: left; }
+.group-drawer-option:active { background: var(--dsr-bg-2); }
+.group-drawer-option.current { border-color: var(--dsr-accent-line); background: linear-gradient(100deg, var(--dsr-accent-soft), transparent); }
+.group-drawer-option-mark { width: 10px; height: 10px; flex: none; border: 2px solid var(--dsr-line); border-radius: 50%; }
+.group-drawer-option.current .group-drawer-option-mark { border-color: var(--dsr-accent); background: var(--dsr-accent); box-shadow: 0 0 0 4px var(--dsr-accent-soft); }
+.group-drawer-option-copy { min-width: 0; flex: 1; display: flex; flex-direction: column; gap: 2px; }
+.group-drawer-option-name { overflow: hidden; font-size: 14px; font-weight: 700; text-overflow: ellipsis; white-space: nowrap; }
+.group-drawer-option-meta { overflow: hidden; color: var(--dsr-muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
+.group-drawer-option-check { flex: none; color: var(--dsr-accent-strong); font-size: 18px; font-weight: 750; }
+.group-drawer-foot { flex: none; padding: 12px 14px calc(12px + var(--dsr-safe-b)); border-top: 1px solid var(--dsr-line); background: var(--dsr-bg-2); }
+.group-drawer-manage { width: 100%; min-height: 44px; display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 0 12px; border: 1px solid var(--dsr-line); border-radius: 11px; background: var(--dsr-panel); color: var(--dsr-accent-strong); font-weight: 700; text-align: left; }
+.group-drawer-manage:active { background: var(--dsr-accent-soft); }
+.group-drawer-foot p { margin: 7px 2px 0; color: var(--dsr-muted); font-size: 11px; }
 .mini-btn {
   padding: 5px 11px; border-radius: 9px; font-size: 13px;
   background: var(--dsr-panel); border: 1px solid var(--dsr-line); color: var(--dsr-accent-strong);
@@ -1215,6 +1251,8 @@ button.overview-attention-item, button.overview-session-item { cursor:pointer; }
   .section-actions .session-sort { max-width: 98px; }
   .section-actions .mini-btn { max-width: 92px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
   .topbar { padding-left: 10px; padding-right: 10px; }
+  .brand { gap: 6px; }
+  .brand-group-name { max-width: 10ch; }
   .topbar-right { gap: 4px; min-width: 0; }
   .topbar-right .topbar-btn.icon-btn { width: 38px; height: 38px; }
   .topbar-right .topbar-btn.conn-badge { max-width: 72px; padding-left: 8px; padding-right: 8px; overflow: hidden; text-overflow: ellipsis; }

package/public/update.json

@@ -1,10 +1,14 @@
 {
-  "version": "0.6.20",
+  "version": "0.6.21",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "a5793085029414356a0a4faf411eb3c99bc934cdbf3ae387cc9c4c06738cf0c1",
-  "releasedAt": "2026-08-30T14:51:29.621Z",
-  "notes": "0.6.20：适配 DSH 0.1.2-alpha.1 的新版客户端模块、认证、斜杠 RPC 与 remote.mux 实时协议，同时保留旧版 DSH 的自动回退；修复斜杠命令因 commands.execute 参数变化触发 aborted 报错，以及新版历史、工作区、模型、目标和子代理等接口不兼容问题；审批与用户提问现在会在所属对话内完整显示并可直接处理，主页仍保留全局待办入口，长工具参数、原因和调用标识不再被截断。",
+  "sha256": "46fc5409dbe59300e352ae6dddfbc001856a349a85b81be025e958316a1c5dc0",
+  "releasedAt": "2026-08-31T04:10:09.396Z",
+  "notes": "0.6.21：左上角 DSH Remote 名称可展开服务器组快捷切换抽屉，当前组、组内服务器数量和管理入口一目了然，手机与桌面端均可一键切换；修复部分新版 DSH 命令执行成功返回 void 时被误判为未执行、继而把 /命令作为普通文本发送的问题，同时兼容旧版三参数、新版四参数及默认参数签名。",
   "history": [
+    {
+      "version": "0.6.21",
+      "notes": "0.6.21：左上角 DSH Remote 名称可展开服务器组快捷切换抽屉，当前组、组内服务器数量和管理入口一目了然，手机与桌面端均可一键切换；修复部分新版 DSH 命令执行成功返回 void 时被误判为未执行、继而把 /命令作为普通文本发送的问题，同时兼容旧版三参数、新版四参数及默认参数签名。"
+    },
     {
       "version": "0.6.20",
       "notes": "0.6.20：适配 DSH 0.1.2-alpha.1 的新版客户端模块、认证、斜杠 RPC 与 remote.mux 实时协议，同时保留旧版 DSH 的自动回退；修复斜杠命令因 commands.execute 参数变化触发 aborted 报错，以及新版历史、工作区、模型、目标和子代理等接口不兼容问题；审批与用户提问现在会在所属对话内完整显示并可直接处理，主页仍保留全局待办入口，长工具参数、原因和调用标识不再被截断。"
@@ -40,10 +44,6 @@
     {
       "version": "0.6.12",
       "notes": "0.6.12：修复远程启动和重启 DSH 时统一报 HTTP 502 且无法确认结果的问题；改为异步追踪 systemd 服务检查、命令提交、进程启动、DSH HTTP 恢复和 mux/host 实时通道重连阶段，成功时显示 PID、HTTP 状态和用时，失败时区分服务不存在、systemd 不可用、权限不足、命令失败、服务失败、启动超时、HTTP 恢复超时和实时通道恢复超时；优化工作区会话筛选、文件预览和应用内选择器；新增中央投票公告与反馈成功确认；主页公告栏常驻并在无未读公告时显示空状态，同时修正设置页异常右箭头、主页刷新图标居中和周末谷时提醒。"
-    },
-    {
-      "version": "0.6.11",
-      "notes": "0.6.11 正式版：新增按 DSH 工作区筛选、切换和创建会话，文件页支持切换工作区并直接预览常见文本与 Markdown；修复工作区筛选未正确收敛会话、工作区位于默认文件根外时无法查看，以及新会话工作区名称与完整路径显示异常；新增投票公告及隐私化汇总；统一手机端应用内选择抽屉；周末全天按谷时并修复重复峰谷提醒；插件侧栏图标采用亮色背景并随插件自身四套皮肤切换配色；加强网关安装、连接与故障排查引导。"
     }
   ]
 }

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.20"
+  "version": "0.6.21"
 }