dsh-remote-plugin 0.6.23 → 0.6.24

package/package.json

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

package/public/app.js

@@ -1837,7 +1837,17 @@ function resyncAfterStreamOpen() {
   state.lastStreamResyncAt = Date.now()
   void refreshAll().then(() => resyncCurrentSession())
 }
-function titleOf(s) { return proj(s, 'title') || (s?.sessionId ? short(s.sessionId) : t('session.unknown')) }
+function sessionTitleValue(s) {
+  const value = proj(s, 'title', '')
+  return value == null ? '' : String(value).trim()
+}
+function hasSessionTitle(s) { return !!sessionTitleValue(s) }
+function titleOf(s) { return sessionTitleValue(s) || (s?.sessionId ? t('session.untitled') : t('session.unknown')) }
+function sessionLabelOf(s) {
+  const title = titleOf(s)
+  if (!s?.sessionId || hasSessionTitle(s)) return title
+  return `${title} · ${String(s.sessionId).slice(-8)}`
+}
 function short(id) { return '…' + String(id).slice(-8) }
 function isTopLevelSession(session) {
   return !!session && !session.parentSessionId && session.origin !== 'subagent'
@@ -2110,7 +2120,7 @@ function renderWorkbench() {
       <div class="session-swipe" data-session-swipe data-id="${esc(s.sessionId)}">
         <button class="wb-session" type="button" data-wb-session="${esc(s.sessionId)}" data-motion-key="${esc(s.sessionId)}">
           <span class="wb-session-drag-handle" data-reorder-handle aria-hidden="true">⠿</span>
-          <span class="wb-session-title">${esc(titleOf(s))}</span>
+          <span class="wb-session-title">${esc(sessionLabelOf(s))}</span>
           <span class="wb-session-meta">${s.running ? esc(t('sessions.running')) : esc(fmtTime(sessionSortTime(s)))}</span>
         </button>
         <button type="button" class="sc-archive-btn" data-archive-session="${esc(s.sessionId)}">${esc(t('session.archive'))}</button>
@@ -2202,7 +2212,7 @@ function renderSessions() {
   const renderSession = s => {
       const workspace = sessionWorkspaceLabel(s)
       const workspaceTitle = sessionWorkspaceName(s)
-      const title = titleOf(s)
+      const title = sessionLabelOf(s)
       const goal = goalOf(s)
       const pending = (state.approvals.some(a => a.sessionId === s.sessionId) || state.questions.some(q => q.sessionId === s.sessionId)) ? 'pending' : ''
       const queueN = (state.queues[s.sessionId] || []).filter(i => i.placement === 'queued').length
@@ -3410,7 +3420,7 @@ function renameSession(sessionId = state.current) {
   const session = state.byId.get(sessionId)
   if (!session) return
   renamePendingSessionId = sessionId
-  $('rename-session-input').value = titleOf(session)
+  $('rename-session-input').value = sessionTitleValue(session)
   $('modal-rename').classList.remove('hidden')
   setTimeout(() => { $('rename-session-input').focus(); $('rename-session-input').select() }, 40)
 }
@@ -3601,7 +3611,7 @@ function renderOverview() {
   ]
   $('overview-attention-count').textContent = pending.length ? t('overview.pendingCount', { n: pending.length }) : '—'
   $('overview-attention-list').innerHTML = pending.length ? pending.slice(0, 3).map(({ kind, item }) => {
-    const title = titleOf(state.byId.get(item.sessionId))
+    const title = sessionLabelOf(state.byId.get(item.sessionId))
     if (kind === 'approval') return `<div class="overview-attention-item" data-overview-approval="${esc(item.approvalId)}">
       <span class="overview-item-mark">⌁</span><span class="overview-item-copy"><span class="overview-item-title">${esc(item.toolName || t('tool.default'))}</span><span class="overview-item-desc">${esc(approvalDetail(item))} · ${esc(title)}</span></span>
       <span class="overview-item-actions"><button type="button" class="mini-btn" data-overview-approve="1">${t('pending.allow')}</button><button type="button" class="mini-btn" data-overview-approve="0">${t('pending.reject')}</button></span>
@@ -3650,7 +3660,7 @@ function renderOverview() {
   $('overview-connection-mode').textContent = state.token ? t(state.streamMode === 'poll' ? 'overview.poll' : 'overview.ws') : '—'
   $('overview-active-count').textContent = running ? t('overview.activeCount', { n: running }) : ''
   $('overview-session-list').innerHTML = sessions.length ? sessions.map(s => `<button type="button" class="overview-session-item ${s.running ? 'running' : ''}" data-overview-session="${esc(s.sessionId)}">
-    <span class="overview-item-mark">${s.running ? '●' : '○'}</span><span class="overview-item-copy"><span class="overview-item-title">${esc(titleOf(s))}</span><span class="overview-item-desc">${s.running ? esc(t('sessions.running')) + ' · ' : ''}${esc(fmtTime(sessionSortTime(s)))}</span></span><span class="overview-item-arrow">›</span>
+    <span class="overview-item-mark">${s.running ? '●' : '○'}</span><span class="overview-item-copy"><span class="overview-item-title">${esc(sessionLabelOf(s))}</span><span class="overview-item-desc">${s.running ? esc(t('sessions.running')) + ' · ' : ''}${esc(fmtTime(sessionSortTime(s)))}</span></span><span class="overview-item-arrow">›</span>
   </button>`).join('') : `<div class="overview-empty">${t('overview.noSession')}</div>`
   $('overview-session-list').querySelectorAll('[data-overview-session]').forEach(btn => btn.addEventListener('click', () => openSession(btn.dataset.overviewSession)))
 }

package/public/desktop/desktop.css

@@ -528,6 +528,13 @@ button.ds-overview-attention-item, button.ds-overview-session-item { cursor:poin
 .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-new-session-desc { margin: 0; color: var(--dsr-muted); line-height: 1.55; }
+.ds-new-session-label { font-size: 12px; color: var(--dsr-muted); }
+.ds-new-session-select { 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-new-session-select:focus { border-color: var(--dsr-accent-line); }
+.ds-new-session-details { display: flex; flex-direction: column; gap: 4px; min-width: 0; padding: 8px 10px; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 9px; }
+.ds-new-session-name { font-size: 13px; font-weight: 600; }
+.ds-new-session-path { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsr-muted); font-size: 11.5px; }
 .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; }

package/public/desktop/desktop.html

@@ -393,6 +393,27 @@
     </div>
   </div>
 
+  <!-- 新建会话工作区模态 -->
+  <div id="modal-new-session" class="ds-modal hidden" role="dialog" aria-modal="true">
+    <div class="ds-modal-card">
+      <div class="ds-modal-title" data-i18n="ds.newSessionTitle">新建会话</div>
+      <div class="ds-modal-body">
+        <p class="ds-new-session-desc" data-i18n="ds.newSessionDesc">选择一个 DSH 工作区，新会话将在该工作区中创建。</p>
+        <label class="ds-new-session-label" for="new-session-workspace" data-i18n="ds.newSessionWorkspace">工作区</label>
+        <select id="new-session-workspace" class="ds-new-session-select"></select>
+        <div id="new-session-workspace-details" class="ds-new-session-details">
+          <span id="new-session-workspace-name" class="ds-new-session-name"></span>
+          <code id="new-session-workspace-path" class="ds-new-session-path"></code>
+        </div>
+        <div id="new-session-empty" class="ds-empty hidden" data-i18n="ds.newSessionNoWorkspaces">暂无可用工作区，请先创建一个工作区。</div>
+      </div>
+      <div class="ds-modal-actions">
+        <button id="new-session-cancel" class="ds-btn" data-i18n="ds.cancel">取消</button>
+        <button id="new-session-create" class="ds-btn primary" data-i18n="ds.newSessionCreate">创建</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 预设提示词管理模态 -->
   <div id="modal-presets" class="ds-modal hidden" role="dialog" aria-modal="true">
     <div class="ds-modal-card">
@@ -470,7 +491,7 @@
   <script>
     window.DESKTOP_STR = {
       zh: {
-        'ds.repo': 'GitHub 仓库', 'ds.newSession': '+ 新会话', 'ds.newWorkspace': '新建工作区', 'ds.sessions': '会话', 'ds.overview': '主页', 'ds.overviewEyebrow': 'SYSTEM OVERVIEW', 'ds.overviewSubtitle': '实时状态与需要你处理的事项',
+        'ds.repo': 'GitHub 仓库', 'ds.newSession': '+ 新会话', 'ds.sessionUntitled': '新会话', 'ds.newWorkspace': '新建工作区', 'ds.sessions': '会话', 'ds.overview': '主页', 'ds.overviewEyebrow': 'SYSTEM OVERVIEW', 'ds.overviewSubtitle': '实时状态与需要你处理的事项',
         'ds.systemPulse': '系统链路', 'ds.systemNominal': '系统链路正常', 'ds.systemDegraded': '部分链路需要关注', 'ds.systemOffline': '连接已断开', 'ds.checking': '检查中…', 'ds.components': '{n}/4 个模块在线', 'ds.live': 'LIVE', 'ds.allLinked': '全部链路', 'ds.offlineCore': 'OFFLINE',
         'ds.gateway': '网关', 'ds.dshUpstream': 'DSH 上游', 'ds.mux': '实时 mux', 'ds.host': '实时 host', 'ds.online': '在线', 'ds.offlineShort': '离线',
         'ds.attention': '需要你处理', 'ds.runtime': '运行指标', 'ds.recentActivity': '近期活动', 'ds.dshVersion': 'DSH 版本', 'ds.gatewayStatus': '网关状态', 'ds.activeSessions': '活跃会话', 'ds.connectionMode': '连接模式', 'ds.liveWs': '实时 WS', 'ds.poll': '降级轮询', 'ds.running': '运行中', 'ds.noReason': '无说明', 'ds.noActivity': '暂无后台活动', 'ds.noSessions': '暂无会话', 'ds.refreshOverview': '刷新总览', 'ds.pendingCount': '{n} 项待处理', 'ds.activeCount': '{n} 个活跃会话', 'ds.nothingPending': '暂无事项', 'ds.action.openSession': '打开最近会话', 'ds.action.newSession': '新建会话', 'ds.action.attention': '处理待办', 'ds.action.connect': '去设置连接', 'ds.action.refresh': '重新检查连接',
@@ -482,7 +503,7 @@
         'ds.cmdFeedback': '/feedback 反馈当前会话', 'ds.cmdGoal': '/goal 设置/查看任务目标',
         'ds.cmdPermission': '/permission 切换权限预设', 'ds.cmdPlan': '/plan 进入/退出计划模式',
         'ds.fsUp': '上级', 'ds.fsRoot': '允许根目录', '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.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.newSessionTitle': '新建会话', 'ds.newSessionDesc': '选择一个 DSH 工作区，新会话将在该工作区中创建。', 'ds.newSessionWorkspace': '工作区', 'ds.newSessionNoWorkspaces': '暂无可用工作区，请先创建一个工作区。', 'ds.newSessionCreate': '创建', 'ds.newSessionChooseWorkspace': '请选择一个工作区',
         'ds.groupGeneral': '通用', 'ds.groupGeneralDesc': '工具调用、预设提示词',
         'ds.groupServers': '服务器', 'ds.groupServersDesc': '服务器地址与令牌',
         'ds.groupNotify': '通知', 'ds.groupNotifyDesc': '通知与提醒',
@@ -575,7 +596,7 @@
         'menu.modelTitle': '模型切换', 'menu.effortTitle': '思考深度',
       },
       en: {
-        'ds.repo': 'GitHub repo', 'ds.newSession': '+ New session', 'ds.newWorkspace': 'New workspace', 'ds.sessions': 'Sessions', 'ds.overview': 'Home', 'ds.overviewEyebrow': 'SYSTEM OVERVIEW', 'ds.overviewSubtitle': 'Live status and items needing your attention',
+        'ds.repo': 'GitHub repo', 'ds.newSession': '+ New session', 'ds.sessionUntitled': 'New session', 'ds.newWorkspace': 'New workspace', 'ds.sessions': 'Sessions', 'ds.overview': 'Home', 'ds.overviewEyebrow': 'SYSTEM OVERVIEW', 'ds.overviewSubtitle': 'Live status and items needing your attention',
         'ds.systemPulse': 'System pulse', 'ds.systemNominal': 'System nominal', 'ds.systemDegraded': 'Some links need attention', 'ds.systemOffline': 'Connection offline', 'ds.checking': 'Checking…', 'ds.components': '{n}/4 components online', 'ds.live': 'LIVE', 'ds.allLinked': 'ALL LINKED', 'ds.offlineCore': 'OFFLINE',
         'ds.gateway': 'Gateway', 'ds.dshUpstream': 'DSH upstream', 'ds.mux': 'Live mux', 'ds.host': 'Live host', 'ds.online': 'Online', 'ds.offlineShort': 'Offline',
         'ds.attention': 'Needs attention', 'ds.runtime': 'Runtime metrics', 'ds.recentActivity': 'Recent activity', 'ds.dshVersion': 'DSH version', 'ds.gatewayStatus': 'Gateway status', 'ds.activeSessions': 'Active sessions', 'ds.connectionMode': 'Connection mode', 'ds.liveWs': 'Live WS', 'ds.poll': 'Degraded polling', 'ds.running': 'Running', 'ds.noReason': 'No reason given', 'ds.noActivity': 'No background activity', 'ds.noSessions': 'No sessions yet', 'ds.refreshOverview': 'Refresh overview', 'ds.pendingCount': '{n} pending', 'ds.activeCount': '{n} active sessions', 'ds.nothingPending': 'Nothing pending', 'ds.action.openSession': 'Open recent session', 'ds.action.newSession': 'New session', 'ds.action.attention': 'Review pending', 'ds.action.connect': 'Set up connection', 'ds.action.refresh': 'Check connection',
@@ -587,7 +608,7 @@
         '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.fsRoot': 'Allowed root', '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.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.newSessionTitle': 'New session', 'ds.newSessionDesc': 'Choose a DSH workspace for the new session.', 'ds.newSessionWorkspace': 'Workspace', 'ds.newSessionNoWorkspaces': 'No workspaces are available. Create a workspace first.', 'ds.newSessionCreate': 'Create', 'ds.newSessionChooseWorkspace': 'Choose a workspace',
         'ds.groupGeneral': 'General', 'ds.groupGeneralDesc': 'Tool calls, prompt presets',
         'ds.groupServers': 'Servers', 'ds.groupServersDesc': 'Server address and token',
         'ds.groupNotify': 'Notifications', 'ds.groupNotifyDesc': 'Notifications & reminders',

package/public/desktop/desktop.js

@@ -95,6 +95,7 @@ const state = {
   pollSeq: { mux: 0, host: 0 },
   fs: { path: null, initial: null, loaded: false, roots: [], rootIndex: 0 },
   models: { loaded: false, loading: false, groups: [], current: null, failures: [] },
+  workspaces: [],
   wb: { bound: false, path: '', title: '', expanded: false, projects: null, open: null, apiMissing: false },
   archivedIds: [],
   view: 'sessions',
@@ -1530,7 +1531,17 @@ function resyncAfterStreamOpen() {
   void refreshSessions().then(() => resyncCurrentSession())
 }
 function proj(s, key, d) { return s?.projections?.values?.[key] ?? d }
-function titleOf(s) { return proj(s, 'title') || (s?.sessionId ? short(s.sessionId) : t('ds.sessions')) }
+function sessionTitleValue(s) {
+  const value = proj(s, 'title', '')
+  return value == null ? '' : String(value).trim()
+}
+function hasSessionTitle(s) { return !!sessionTitleValue(s) }
+function titleOf(s) { return sessionTitleValue(s) || (s?.sessionId ? t('ds.sessionUntitled') : t('ds.sessions')) }
+function sessionLabelOf(s) {
+  const title = titleOf(s)
+  if (!s?.sessionId || hasSessionTitle(s)) return title
+  return `${title} · ${String(s.sessionId).slice(-8)}`
+}
 function isTopLevelSession(session) {
   return !!session && !session.parentSessionId && session.origin !== 'subagent'
 }
@@ -1660,7 +1671,7 @@ function renderSessions() {
   const renderSession = s => {
       const workspace = sessionWorkspaceLabel(s)
       const workspaceName = workspaceDisplayName(workspace)
-      const title = titleOf(s)
+      const title = sessionLabelOf(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-workspace" title="${esc(workspace)}">⌂ ${esc(workspaceName)}</span>
@@ -2146,7 +2157,7 @@ function renameSession(sessionId = state.current) {
   const session = state.byId.get(sessionId)
   if (!session) return
   renamePendingSessionId = sessionId
-  $('rename-session-input').value = titleOf(session)
+  $('rename-session-input').value = sessionTitleValue(session)
   $('modal-rename').classList.remove('hidden')
   setTimeout(() => { $('rename-session-input').focus(); $('rename-session-input').select() }, 40)
 }
@@ -2480,9 +2491,19 @@ async function createWorkspace() {
     }
     closeWorkspaceModal()
     await loadFs(parent || null, true)
-    const v = await safeRpc('session.create', { cwd: data.path }, t('ds.toastOpFailed'))
+    let workspace = null
+    try {
+      const created = await rpc('workspace.create', { path: data.path })
+      workspace = created?.workspace || null
+    } catch {}
+    if (workspace?.workspaceId) {
+      state.workspaces = [...state.workspaces.filter(item => item.workspaceId !== workspace.workspaceId), workspace]
+    }
+    const sessionPayload = workspace?.workspaceId ? { workspaceId: workspace.workspaceId } : { cwd: data.path }
+    const v = await safeRpc('session.create', sessionPayload, t('ds.toastOpFailed'))
     await refreshSessions()
     if (v?.sessionId) {
+      if (workspace?.workspaceId) LS.set('lastNewSessionWorkspaceV1', workspace.workspaceId)
       toast(t('ds.workspaceCreated'), 'ok')
       openSession(v.sessionId)
     } else {
@@ -2566,6 +2587,22 @@ function wbBaseName(p) {
   const value = String(p || '').replace(/[\\/]+$/, '')
   return value.split(/[\\/]/).pop() || value
 }
+function workspaceItems() {
+  return (state.workspaces || []).filter(w => w && typeof w.workspaceId === 'string' && w.workspaceId && typeof w.path === 'string' && w.path)
+}
+function workspaceById(workspaceId) {
+  return workspaceItems().find(w => w.workspaceId === workspaceId) || null
+}
+function workspaceName(workspace) {
+  return String(workspace?.title || wbBaseName(workspace?.path) || workspace?.path || '').trim()
+}
+function workspaceOptionLabel(workspace) {
+  const name = workspaceName(workspace)
+  return workspace.path && workspace.path !== name ? `${name} — ${workspace.path}` : name
+}
+function workspaceOptionsHtml(selected = '') {
+  return workspaceItems().map(workspace => `<option value="${esc(workspace.workspaceId)}"${workspace.workspaceId === selected ? ' selected' : ''}>${esc(workspaceOptionLabel(workspace))}</option>`).join('')
+}
 function wbStrictInside(pathValue, rootValue) {
   const pathKey = wbPathKey(pathValue)
   const rootKey = wbPathKey(rootValue)
@@ -2668,6 +2705,7 @@ async function refreshWorkbench({ silent = false } = {}) {
   }
   const wl = await safeRpc('workspace.list', {}, '')
   state.archivedIds = wl && Array.isArray(wl.archivedSessionIds) ? wl.archivedSessionIds : []
+  state.workspaces = wl && Array.isArray(wl.items) ? wl.items.slice() : []
   if (!wb) { renderWorkbench(); renderSessions(); return }
   if (!wb.bound) {
     state.wb = { bound: false, path: '', title: '', expanded: false, projects: null, open: null, apiMissing: false }
@@ -2696,7 +2734,11 @@ async function refreshWorkbench({ silent = false } = {}) {
           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)) }
+            if (created?.workspace) {
+              items.push(created.workspace)
+              state.workspaces.push(created.workspace)
+              have.add(wbPathKey(projectPath))
+            }
           } catch {}
         }
       }
@@ -2744,7 +2786,7 @@ function renderWorkbench() {
       </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)}" data-motion-key="${esc(s.sessionId)}"><span class="ds-wb-session-drag-handle" data-reorder-handle aria-hidden="true">⠿</span><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>`}
+        ${sessions.length ? sessions.map(s => `<button type="button" class="ds-wb-session ${state.current === s.sessionId ? 'current' : ''}" data-wb-session="${esc(s.sessionId)}" data-motion-key="${esc(s.sessionId)}"><span class="ds-wb-session-drag-handle" data-reorder-handle aria-hidden="true">⠿</span><span class="ds-wb-session-dot ${s.running ? 'running' : ''}"></span><span class="ds-wb-session-title">${esc(sessionLabelOf(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>`
@@ -2774,6 +2816,46 @@ function renderWorkbench() {
   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))
 }
+function renderNewSessionWorkspace(preferredId = '') {
+  const items = workspaceItems()
+  const select = $('new-session-workspace')
+  if (!select) return
+  const current = workspaceById(preferredId || select.value)?.workspaceId || items[0]?.workspaceId || ''
+  select.innerHTML = workspaceOptionsHtml(current)
+  select.disabled = !items.length
+  const workspace = workspaceById(select.value)
+  $('new-session-workspace-name').textContent = workspace ? workspaceName(workspace) : ''
+  $('new-session-workspace-path').textContent = workspace?.path || ''
+  $('new-session-empty').classList.toggle('hidden', !!items.length)
+  $('new-session-create').disabled = !workspace
+}
+async function openNewSessionModal() {
+  if (!state.token) return showView('view-settings')
+  if (!workspaceItems().length) await refreshWorkbench({ silent: true })
+  renderNewSessionWorkspace(LS.get('lastNewSessionWorkspaceV1', ''))
+  $('modal-new-session').classList.remove('hidden')
+  setTimeout(() => $('new-session-workspace')?.focus(), 50)
+}
+function closeNewSessionModal() { $('modal-new-session').classList.add('hidden') }
+async function createSessionInWorkspace() {
+  if (createSessionInWorkspace.busy) return
+  const workspaceId = $('new-session-workspace').value
+  if (!workspaceById(workspaceId)) return toast(t('ds.newSessionChooseWorkspace'), 'err')
+  createSessionInWorkspace.busy = true
+  const button = $('new-session-create')
+  button.disabled = true
+  try {
+    const value = await safeRpc('session.create', { workspaceId }, '')
+    if (!value?.sessionId) return
+    LS.set('lastNewSessionWorkspaceV1', workspaceId)
+    closeNewSessionModal()
+    await refreshSessions()
+    openSession(value.sessionId)
+  } finally {
+    createSessionInWorkspace.busy = false
+    button.disabled = false
+  }
+}
 const wbFs = { path: null, initial: null }
 function openWorkbenchModal() {
   $('modal-workbench').classList.remove('hidden')
@@ -2975,7 +3057,7 @@ function renderOverviewDesktop() {
   ]
   $('ds-overview-attention-count').textContent = pending.length ? t('ds.pendingCount', { n: pending.length }) : '—'
   $('ds-overview-attention-list').innerHTML = pending.length ? pending.slice(0, 4).map(({ kind, item }) => {
-    const title = titleOf(state.byId.get(item.sessionId))
+    const title = sessionLabelOf(state.byId.get(item.sessionId))
     if (kind === 'approval') return `<div class="ds-overview-attention-item" data-ds-overview-approval="${esc(item.approvalId)}">
       <span class="ds-overview-mark">⌁</span><span class="ds-overview-copy"><span class="ds-overview-item-title">${esc(item.toolName || t('ds.toolDefault'))}</span><span class="ds-overview-item-desc">${esc(desktopApprovalDetail(item))} · ${esc(title)}</span></span>
       <span class="ds-overview-actions"><button class="ds-btn allow" data-ds-overview-approve="1">${t('ds.allow')}</button><button class="ds-btn reject" data-ds-overview-approve="0">${t('ds.reject')}</button></span>
@@ -3019,7 +3101,7 @@ function renderOverviewDesktop() {
   $('ds-overview-connection-mode').textContent = state.token ? t(state.streamMode === 'poll' ? 'ds.poll' : 'ds.liveWs') : '—'
   $('ds-overview-active-count').textContent = running ? t('ds.activeCount', { n: running }) : ''
   $('ds-overview-session-list').innerHTML = sessions.length ? sessions.map(s => `<button type="button" class="ds-overview-session-item ${s.running ? 'running' : ''}" data-ds-overview-session="${esc(s.sessionId)}">
-    <span class="ds-overview-mark">${s.running ? '●' : '○'}</span><span class="ds-overview-copy"><span class="ds-overview-item-title">${esc(titleOf(s))}</span><span class="ds-overview-item-desc">${s.running ? esc(t('ds.running')) + ' · ' : ''}${esc(fmtTime(sessionSortTime(s)))}</span></span><span class="ds-overview-arrow">›</span>
+    <span class="ds-overview-mark">${s.running ? '●' : '○'}</span><span class="ds-overview-copy"><span class="ds-overview-item-title">${esc(sessionLabelOf(s))}</span><span class="ds-overview-item-desc">${s.running ? esc(t('ds.running')) + ' · ' : ''}${esc(fmtTime(sessionSortTime(s)))}</span></span><span class="ds-overview-arrow">›</span>
   </button>`).join('') : `<div class="ds-overview-empty">${t('ds.noSessions')}</div>`
   $('ds-overview-session-list').querySelectorAll('[data-ds-overview-session]').forEach(btn => btn.addEventListener('click', () => openSession(btn.dataset.dsOverviewSession)))
 }
@@ -3128,17 +3210,7 @@ function updateConn() {
 
 /* ---------------- 初始化 ---------------- */
 function bindUi() {
-  $('btn-new-session').addEventListener('click', async () => {
-    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-session').addEventListener('click', openNewSessionModal)
   $('btn-new-workspace').addEventListener('click', openWorkspaceModal)
   $('session-sort')?.addEventListener('change', (e) => {
     state.sessionSort = e.target.value === 'workspace' ? 'workspace' : 'time'
@@ -3261,6 +3333,10 @@ function bindUi() {
   $('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() })
+  $('new-session-workspace').addEventListener('change', () => renderNewSessionWorkspace())
+  $('new-session-cancel').addEventListener('click', closeNewSessionModal)
+  $('new-session-create').addEventListener('click', createSessionInWorkspace)
+  $('modal-new-session').addEventListener('click', (e) => { if (e.target === $('modal-new-session')) closeNewSessionModal() })
   $('modal-notes').addEventListener('click', (e) => { if (e.target === $('modal-notes')) closeNotesModal() })
   // 反馈
   $('btn-feedback').addEventListener('click', (e) => { e.stopPropagation(); toggleFeedbackMenu() })

package/public/index.html

@@ -982,7 +982,7 @@
         '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.loading': '加载中…', 'session.unknown': '未知会话', 'session.untitled': '新会话', 'session.running': '运行中', 'session.interrupted': '已中断',
         'session.stop': '停止本轮', 'session.history': '对话', 'session.errorMsg': '会话出错：{msg}', 'session.recovering': '恢复会话中…', 'session.recoveryReady': '会话已恢复', 'session.recoveryFailed': '会话恢复失败', 'session.recoveryCached': '正在查看缓存历史',
         'session.confirmStop': '停止当前回合？排队中的消息不会被删除。', 'session.stopFailed': '停止失败', 'session.stopRequested': '已请求停止本轮', 'session.archive': '归档', 'session.archiveConfirm': '归档这个会话？归档后可在“显示已归档会话”中打开。', 'session.archiveFailed': '归档失败：{msg}', 'session.archived': '会话已归档', 'session.archiveTitle': '确认归档会话', 'session.archiveDesc': '归档后会话将从普通列表隐藏，但不会删除对话记录。', 'session.archiveConversation': '对话', 'session.archiveWorkspace': '工作区', 'session.archiveCancel': '取消', 'session.archiveConfirmAction': '确认归档', 'session.rename': '重命名会话', 'session.renameTitle': '重命名会话', 'session.renamePlaceholder': '输入新的会话名称', 'session.renameCancel': '取消', 'session.renameConfirm': '保存', 'session.renameEmpty': '会话名称不能为空', 'session.renameFailed': '重命名失败', 'session.renamed': '会话名称已更新',
         'notify.approvalTitle': '工具审批', 'notify.approvalBody': '{tool} 需要批准', 'notify.questionTitle': 'DSH 提问', 'notify.questionBody': '需要你回答',
@@ -1215,7 +1215,7 @@
         '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.loading': 'Loading…', 'session.unknown': 'Unknown session', 'session.untitled': 'New 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',
         'session.confirmStop': 'Stop the current turn? Queued messages will be kept.', 'session.stopFailed': 'Stop failed', 'session.stopRequested': 'Stop requested', 'session.archive': 'Archive', 'session.archiveConfirm': 'Archive this session? You can open it from “Show archived”.', 'session.archiveFailed': 'Archive failed: {msg}', 'session.archived': 'Session archived', 'session.archiveTitle': 'Confirm archive', 'session.archiveDesc': 'The session will be hidden from the normal list, but its conversation will not be deleted.', 'session.archiveConversation': 'Conversation', 'session.archiveWorkspace': 'Workspace', 'session.archiveCancel': 'Cancel', 'session.archiveConfirmAction': 'Archive session', 'session.rename': 'Rename session', 'session.renameTitle': 'Rename session', 'session.renamePlaceholder': 'Enter a new session name', 'session.renameCancel': 'Cancel', 'session.renameConfirm': 'Save', 'session.renameEmpty': 'Session name cannot be empty', 'session.renameFailed': 'Rename failed', 'session.renamed': 'Session name updated',
         'notify.approvalTitle': 'Tool approval', 'notify.approvalBody': '{tool} needs approval', 'notify.questionTitle': 'DSH question', 'notify.questionBody': 'Needs your answer',

package/public/update.json

@@ -1,10 +1,14 @@
 {
-  "version": "0.6.23",
+  "version": "0.6.24",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "947d138637edf0b300e9db3e024ac9b983f62e825847a24327bf7399edd56c01",
-  "releasedAt": "2026-09-03T01:19:16.166Z",
-  "notes": "0.6.23：加强 DSH 版本兼容。旧版点号 RPC 与新版 slash Remote API 可自动协商和回退，修复部分新版 DSH 中 host.describe、创建会话等请求返回 404 的问题；DSH 重启或升级后会重新识别协议并恢复实时通道。反馈时可由用户选择附带脱敏兼容性诊断，便于定位接口问题；诊断不包含令牌、Cookie、对话内容或文件路径。",
+  "sha256": "524f38fd3c1f067ab1ce8bad692649366ca9b775dcf16c99ee9e21058c422529",
+  "releasedAt": "2026-09-05T13:01:00.792Z",
+  "notes": "0.6.24：同步 App 与宽屏客户端的会话命名体验；未命名会话显示为“新会话”并保留短标识，创建会话时可选择指定工作区；补充空会话清理与相关回归验证。",
   "history": [
+    {
+      "version": "0.6.24",
+      "notes": "0.6.24：同步 App 与宽屏客户端的会话命名体验；未命名会话显示为“新会话”并保留短标识，创建会话时可选择指定工作区；补充空会话清理与相关回归验证。"
+    },
     {
       "version": "0.6.23",
       "notes": "0.6.23：加强 DSH 版本兼容。旧版点号 RPC 与新版 slash Remote API 可自动协商和回退，修复部分新版 DSH 中 host.describe、创建会话等请求返回 404 的问题；DSH 重启或升级后会重新识别协议并恢复实时通道。反馈时可由用户选择附带脱敏兼容性诊断，便于定位接口问题；诊断不包含令牌、Cookie、对话内容或文件路径。"
@@ -40,10 +44,6 @@
     {
       "version": "0.6.15",
       "notes": "0.6.15：修复拖拽候选项拦截普通竖向滑动的问题，卡片中间也可自然滚动；仅在长按真正进入拖拽后锁定页面，并补充指针结束、取消、失焦和页面隐藏时的解锁清理。保留边缘自动滚动、占位符同步重排、主列表/工作台工作区与组内对话拖动。"
-    },
-    {
-      "version": "0.6.14",
-      "notes": "0.6.14-rc.7：将 Android 后台轮询服务接入与前台 App 相同的 client ID，修复 Dalvik 后台请求被显示为第二台未知设备；保留旧记录的顺序无关迁移；补齐文件上传请求的持久设备 ID；实时扫码继续使用 Worker 解码并降低取样负载；修复非用户来源的 DSH user/message 被误显示为用户输入；新增子代理折叠、排队消息插话、运行中提示和按轮次稳定排序；Markdown 支持 GFM 表格。"
     }
   ]
 }

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.23"
+  "version": "0.6.24"
 }