dsh-remote-plugin 0.6.1 → 0.6.3

package/gateway.cjs

@@ -1653,10 +1653,20 @@ function proxyApi(req, res, url) {
 }
 
 // ---------- 其它 ----------
-function serveHealth(res) {
+async function serveHealth(res) {
+  let upstreamOk = false
+  try {
+    const ctrl = new AbortController()
+    const timer = setTimeout(() => ctrl.abort(), 2000)
+    const probe = await fetch(UPSTREAM.origin + '/healthz', { signal: ctrl.signal, cache: 'no-store' })
+    clearTimeout(timer)
+    upstreamOk = probe.ok
+  } catch {
+    upstreamOk = false
+  }
   cors(res)
   res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
-  res.end(JSON.stringify({ ok: true, service: 'dsh-remote', version: VERSION, upstream: UPSTREAM.origin }))
+  res.end(JSON.stringify({ ok: true, service: 'dsh-remote', version: VERSION, pid: process.pid, upstream: UPSTREAM.origin, upstreamOk }))
 }
 
 function lanAddresses() {

package/index.mjs

@@ -5,8 +5,8 @@
  *                         网关不可用时回退到插件模式主机状态
  * 浏览器侧入口由 client half 注册在 DSH 原生侧边栏(见 client.js)。
  */
-import { spawn } from 'node:child_process'
-import { createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs'
+import { execFileSync, spawn } from 'node:child_process'
+import { appendFileSync, createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs'
 import { stat } from 'node:fs/promises'
 import { homedir, hostname, networkInterfaces } from 'node:os'
 import { dirname, extname, normalize, resolve } from 'node:path'
@@ -128,9 +128,59 @@ function runExit(cmd, args) {
 
 async function gatewayRunning() {
   try {
-    const res = await fetch(`${GATEWAY_BASE}/health`, { signal: AbortSignal.timeout(800) })
-    return res.ok
+    const res = await fetch(`${GATEWAY_BASE}/health`, { signal: AbortSignal.timeout(3000) })
+    if (!res.ok) return { running: false }
+    const data = await res.json().catch(() => ({}))
+    return {
+      running: true,
+      pid: Number(data.pid) || 0,
+      upstream: typeof data.upstream === 'string' ? data.upstream : '',
+      upstreamOk: data.upstreamOk === true,
+    }
+  } catch {
+    return { running: false }
+  }
+}
+
+function gatewayPidFile() { return `${homedir()}/.dsh-remote/plugin-gateway.pid` }
+
+function readGatewayPid() {
+  try {
+    const pid = Number(readFileSync(gatewayPidFile(), 'utf8').trim())
+    return Number.isFinite(pid) && pid > 0 ? pid : 0
   } catch {
+    return 0
+  }
+}
+
+function writeGatewayPid(pid) {
+  try {
+    mkdirSync(`${homedir()}/.dsh-remote`, { recursive: true })
+    writeFileSync(gatewayPidFile(), String(pid) + '\n')
+  } catch {}
+}
+
+function logGateway(msg) {
+  try {
+    mkdirSync(`${homedir()}/.dsh-remote`, { recursive: true })
+    appendFileSync(`${homedir()}/.dsh-remote/plugin-gateway.log`, `[${new Date().toISOString()}] ${msg}\n`)
+  } catch {}
+}
+
+async function killGateway(health) {
+  const pid = (health && Number(health.pid)) || readGatewayPid()
+  if (!pid) return false
+  try {
+    if (process.platform === 'win32') {
+      await runExit('taskkill', ['/F', '/PID', String(pid)])
+    } else {
+      process.kill(pid)
+    }
+    logGateway('已停止旧网关 PID=' + pid)
+    await sleep(300)
+    return true
+  } catch (e) {
+    logGateway('停止旧网关失败 PID=' + pid + ' ' + (e?.message || String(e)))
     return false
   }
 }
@@ -157,7 +207,9 @@ function setGatewayEnabled(on) {
 
 /** 启动随插件分发的 gateway.cjs; 已运行则直接返回。 */
 async function startGateway() {
-  if (await gatewayRunning()) {
+  const upstream = `http://${dshListen.host}:${dshListen.port}`
+  const health = await gatewayRunning()
+  if (health.running) {
     setGatewayEnabled(true)
     return { ok: true, running: true, started: false }
   }
@@ -166,6 +218,7 @@ async function startGateway() {
     return { ok: false, running: false, error: '插件包缺少 gateway.cjs, 请升级插件' }
   }
   const port = process.env.DSH_REMOTE_GATEWAY_PORT || '8787'
+  logGateway('启动网关, 上游: ' + upstream)
 
   // 首选 systemd-run: 网关成为独立 user 单元, DSH 重启/升级不会连带杀掉它
   let sysd = false
@@ -173,10 +226,16 @@ async function startGateway() {
     await runExit('systemctl', ['--user', 'reset-failed', 'dsh-remote-gateway'])
     sysd = (await runExit('systemd-run', [
       '--user', '--unit=dsh-remote-gateway', '--service-type=exec',
-      '--setenv=PORT=' + port, '--setenv=HOST=0.0.0.0',
+      '--setenv=PORT=' + port, '--setenv=HOST=0.0.0.0', '--setenv=DSH_UPSTREAM=' + upstream,
       '--', process.execPath, script,
     ])) === 0
   } catch {}
+  if (sysd) {
+    try {
+      const pid = Number(execFileSync('systemctl', ['--user', 'show', '-p', 'MainPID', '--value', 'dsh-remote-gateway'], { encoding: 'utf8' }).trim())
+      if (Number.isFinite(pid) && pid > 1) writeGatewayPid(pid)
+    } catch {}
+  }
 
   // 无 systemd 的机器回退: detached 子进程
   if (!sysd) {
@@ -188,14 +247,17 @@ async function startGateway() {
       cwd: dirname(script),
       detached: true,
       stdio: ['ignore', logFd ?? 'ignore', logFd ?? 'ignore'],
-      env: { ...process.env, PORT: port },
+      env: { ...process.env, PORT: port, DSH_UPSTREAM: upstream },
     })
     child.unref()
+    writeGatewayPid(child.pid)
   }
   // 最多等 4 秒; 超过可能是端口冲突或首次初始化, 前端稍后刷新即可
   for (let i = 0; i < 16; i++) {
     await sleep(250)
-    if (await gatewayRunning()) {
+    const h = await gatewayRunning()
+    if (h.running) {
+      if (h.pid) writeGatewayPid(h.pid)
       setGatewayEnabled(true)
       return { ok: true, running: true, started: true }
     }
@@ -210,9 +272,24 @@ function ensureGateway() {
   if (ensurePromise) return ensurePromise
   ensurePromise = (async () => {
     try {
-      if (await gatewayRunning()) return true
-      const out = await startGateway()
-      return !!out.running
+      const health = await gatewayRunning()
+      if (!health.running) {
+        const out = await startGateway()
+        return !!out.running
+      }
+      const upstream = `http://${dshListen.host}:${dshListen.port}`
+      const oldUpstream = health.upstream || ''
+      if (health.upstreamOk === false || (oldUpstream && oldUpstream !== upstream) || (!oldUpstream && upstream)) {
+        logGateway(`网关上游需刷新: 旧=${oldUpstream || '?'} 新=${upstream}`)
+        await killGateway(health)
+        for (let i = 0; i < 10; i++) {
+          if (!(await gatewayRunning()).running) break
+          await sleep(200)
+        }
+        const out = await startGateway()
+        return !!out.running
+      }
+      return true
     } finally {
       setTimeout(() => { ensurePromise = null }, 4000)
     }
@@ -417,7 +494,8 @@ async function serveStatic(req, res, ctx) {
   // 本地网关开关(仅插件内嵌页使用): GET 状态 / POST {action:'start'|'stop'}
   if (pathname === `${MOUNT}/admin/api/gateway`) {
     if (req.method === 'GET') {
-      sendJson(res, 200, { ok: true, running: await gatewayRunning() })
+      const h = await gatewayRunning()
+      sendJson(res, 200, { ok: true, running: h.running, upstream: h.upstream || '', upstreamOk: h.upstreamOk === true })
       return
     }
     if (req.method === 'POST') {

package/package.json

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

package/public/app.js

@@ -2324,6 +2324,21 @@ function renderNotesPages(items) {
   box.scrollLeft = 0
   updateNotesPage()
 }
+function renderNotesVersionPages(entries) {
+  const box = $('notes-pages')
+  if (!box) return
+  notesPages = entries
+  notesPage = 0
+  box.innerHTML = entries.map(entry => {
+    const items = splitNotes(entry.notes)
+    return `<div class="notes-page" style="flex:0 0 100%;scroll-snap-align:start;box-sizing:border-box;min-width:0;">
+      <div class="notes-version-title" style="font-weight:700;margin-bottom:6px;opacity:.9;">v${esc(entry.version)}</div>
+      ${items.length ? items.map(item => `<div class="notes-item" style="padding:6px 0;line-height:1.5;">${esc(item)}</div>`).join('') : `<div class="notes-item" style="padding:6px 0;line-height:1.5;">${esc(entry.notes || '')}</div>`}
+    </div>`
+  }).join('')
+  box.scrollLeft = 0
+  updateNotesPage()
+}
 function updateNotesPage() {
   const box = $('notes-pages')
   const pageEl = $('notes-page')
@@ -2338,7 +2353,21 @@ function scrollNotes(dir) {
   if (box) box.scrollBy({ left: dir * box.clientWidth, behavior: 'smooth' })
 }
 function openNotesModal(info) {
-  if (!info?.version || String(info.version).includes('-rc')) return
+  if (!info?.version) return
+  const history = Array.isArray(info.history) ? info.history.filter(h => h && typeof h.version === 'string' && typeof h.notes === 'string' && !String(h.version).includes('-rc')) : []
+  const latestStable = history[0]?.version || info.version
+  if (history.length) {
+    const entries = history.filter(h => cmpVersion(h.version, state.localVersion) > 0)
+    if (!entries.length) return
+    if (LS.get(NOTES_KEY) === latestStable) return
+    notesVersion = latestStable
+    const vEl = $('notes-version')
+    if (vEl) vEl.textContent = 'v' + latestStable
+    renderNotesVersionPages(entries.reverse())
+    $('modal-notes').classList.remove('hidden')
+    return
+  }
+  if (String(info.version).includes('-rc')) return
   if (LS.get(NOTES_KEY) === info.version) return
   const items = splitNotes(info.notes)
   if (!items.length) return

package/public/desktop/desktop.css

@@ -1,5 +1,6 @@
 /* DSH Remote 桌面端专用样式 · 零依赖 · 只引用 --dsr-* 皮肤变量 */
 html, body { height: 100%; margin: 0; overflow: hidden; overscroll-behavior: none; background: var(--dsr-bg); color: var(--dsr-text); }
+.hidden { display: none !important; }
 .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: var(--dsr-panel); }
 .ds-brand { display: flex; align-items: center; gap: 8px; padding: 14px 14px 10px; font-weight: 700; font-size: 15px; }
@@ -52,12 +53,10 @@ a.ds-btn { text-decoration: none; }
   font: inherit; text-align: left; cursor: pointer; text-decoration: none;
 }
 .ds-feedback-item:hover, .ds-feedback-item:focus-visible { background: var(--dsr-bg); outline: none; }
-.ds-feedback-item.primary { background: var(--dsr-accent-soft); border: 1px solid var(--dsr-accent-line); }
 .ds-feedback-ico {
   width: 32px; height: 32px; border-radius: 9px; flex-shrink: 0;
   display: grid; place-items: center; background: var(--dsr-panel); border: 1px solid var(--dsr-line); color: var(--dsr-accent-strong);
 }
-.ds-feedback-item.primary .ds-feedback-ico { background: var(--dsr-accent-strong); border-color: var(--dsr-accent-strong); color: var(--dsr-on-accent); }
 .ds-feedback-ico svg { width: 16px; height: 16px; fill: currentColor; }
 .ds-feedback-body { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 1px; }
 .ds-feedback-name { font-size: 13px; font-weight: 600; }
@@ -100,16 +99,47 @@ a.ds-btn { text-decoration: none; }
 /* 会话视图 */
 #view-chat { padding: 0; }
 .ds-history { flex: 1; min-height: 0; overflow-y: auto; overscroll-behavior: contain; padding: 18px 22px; display: flex; flex-direction: column; gap: 10px; }
-.ds-msg { max-width: 78%; padding: 9px 12px; border-radius: 12px; font-size: 13.5px; line-height: 1.55; white-space: pre-wrap; word-break: break-word; }
+.ds-msg { max-width: min(78%, 680px); width: fit-content; box-sizing: border-box; padding: 9px 12px; border-radius: 12px; font-size: 13.5px; line-height: 1.6; white-space: pre-wrap; word-break: break-word; }
 .ds-msg.user { align-self: flex-end; background: var(--dsr-accent-soft); border: 1px solid var(--dsr-accent-line); color: var(--dsr-accent-strong); }
 .ds-msg.assistant { align-self: flex-start; background: var(--dsr-panel); border: 1px solid var(--dsr-line); color: var(--dsr-text); }
 .ds-msg .role { font-size: 10px; color: var(--dsr-muted); margin-bottom: 3px; }
-.ds-tool { align-self: flex-start; max-width: 78%; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 10px; padding: 8px 11px; font-size: 12px; }
+.ds-tool { align-self: flex-start; max-width: min(78%, 680px); width: fit-content; box-sizing: border-box; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 10px; padding: 8px 11px; font-size: 12px; }
 .ds-tool summary { cursor: pointer; color: var(--dsr-muted); }
 .ds-tool pre { margin: 6px 0 0; white-space: pre-wrap; word-break: break-all; font-size: 11px; color: var(--dsr-text); }
 .ds-empty { color: var(--dsr-muted); text-align: center; padding: 30px 0; font-size: 13px; }
-.ds-composer { flex: none; display: flex; gap: 10px; padding: 12px 16px; border-top: 1px solid var(--dsr-line); background: var(--dsr-panel); }
-.ds-composer textarea { flex: 1; min-width: 0; resize: none; background: var(--dsr-bg-2); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 11px; padding: 10px 12px; font: inherit; font-size: 13.5px; outline: none; max-height: 160px; }
+.ds-presets-guide { padding: 2px 8px 10px; font-size: 11px; line-height: 1.5; }
+.ds-session-cards { flex: none; max-height: 220px; overflow-y: auto; padding: 10px 22px 0; display: flex; flex-direction: column; gap: 8px; }
+.ds-session-cards:empty { display: none; }
+.ds-card { background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: 12px; padding: 10px 12px; }
+.ds-card-title { font-size: 11px; font-weight: 700; color: var(--dsr-muted); letter-spacing: .6px; margin-bottom: 6px; text-transform: uppercase; }
+.ds-goal-obj { font-size: 13px; line-height: 1.55; word-break: break-word; }
+.ds-goal-phase { font-size: 11px; color: var(--dsr-muted); margin-top: 3px; }
+.ds-goal-actions { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 8px; }
+.ds-mini-btn { display: inline-flex; align-items: center; justify-content: center; min-height: 26px; padding: 2px 9px; border-radius: 7px; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); color: var(--dsr-text); font: inherit; font-size: 11.5px; cursor: pointer; }
+.ds-mini-btn:hover { filter: brightness(1.08); }
+.ds-todo-row { display: flex; align-items: flex-start; gap: 8px; font-size: 12.5px; line-height: 1.5; padding: 2px 0; }
+.ds-pill { flex: none; font-size: 10.5px; line-height: 16px; padding: 0 7px; border-radius: 999px; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); color: var(--dsr-muted); }
+.ds-pill.active { background: var(--dsr-accent-soft); border-color: var(--dsr-accent-line); color: var(--dsr-accent-strong); }
+.ds-pill.done { background: var(--dsr-success-soft); border-color: var(--dsr-success-line); color: var(--dsr-success); }
+.ds-card-row { display: flex; align-items: center; gap: 10px; font-size: 12.5px; padding: 3px 0; }
+.ds-card-k { flex: 1; min-width: 0; word-break: break-word; }
+.ds-card-v { color: var(--dsr-muted); font-size: 11.5px; white-space: nowrap; }
+.ds-model-head { font-size: 11px; font-weight: 700; color: var(--dsr-muted); letter-spacing: .6px; padding: 4px 6px 2px; }
+.ds-model-group { padding: 2px 0 4px; }
+.ds-model-provider { font-size: 11px; color: var(--dsr-muted); padding: 2px 6px; }
+.ds-model-chips { display: flex; flex-wrap: wrap; gap: 6px; padding: 2px 6px 4px; }
+.ds-model-chip { display: inline-flex; align-items: center; min-height: 26px; padding: 2px 9px; border-radius: 999px; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); color: var(--dsr-text); font: inherit; font-size: 11.5px; cursor: pointer; white-space: nowrap; }
+.ds-model-chip:hover { filter: brightness(1.08); }
+.ds-model-chip.current { background: var(--dsr-accent-soft); border-color: var(--dsr-accent-line); color: var(--dsr-accent-strong); font-weight: 600; }
+.ds-model-effort-group { padding-top: 2px; border-top: 1px solid var(--dsr-divider); margin-top: 2px; }
+.ds-model-effort-group.hidden { display: none; }
+.ds-composer { flex: none; display: flex; flex-direction: column; gap: 8px; padding: 12px 16px; border-top: 1px solid var(--dsr-line); background: var(--dsr-panel); }
+.ds-composer textarea { width: 100%; min-width: 0; resize: none; background: var(--dsr-bg-2); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 12px; padding: 10px 14px; font: inherit; font-size: 13.5px; line-height: 1.5; outline: none; min-height: 44px; max-height: 120px; box-sizing: border-box; }
+.ds-composer-actions { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
+.ds-composer-left { display: flex; align-items: center; gap: 8px; min-width: 0; }
+.ds-composer-right { display: flex; align-items: center; flex: none; }
+.ds-composer .ds-btn { min-height: 34px; box-sizing: border-box; }
+.ds-send-btn { width: 36px; height: 36px; min-height: 36px; padding: 0; border-radius: 50%; background: var(--dsr-accent-strong); border-color: var(--dsr-accent-strong); color: var(--dsr-on-accent); font-size: 18px; line-height: 1; justify-content: center; }
 
 /* 文件传输 */
 .ds-fs-bar { display: flex; align-items: center; gap: 8px; margin: 8px 0; }
@@ -122,12 +152,26 @@ a.ds-btn { text-decoration: none; }
 .ds-fs-size { color: var(--dsr-muted); font-size: 12px; white-space: nowrap; }
 
 /* 设置 */
+#view-settings { overflow-y: auto; }
 .ds-settings { max-width: 720px; display: flex; flex-direction: column; gap: 10px; }
-.ds-setting-row { display: flex; align-items: center; gap: 12px; background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: 12px; padding: 11px 13px; }
+.ds-setting-row { display: flex; align-items: center; gap: 10px; background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: 12px; padding: 10px 14px; }
 .ds-setting-row > div:first-child { flex: 1; min-width: 0; }
+.ds-setting-arrow,
+#settings-home .ds-setting-row .ds-btn {
+  display: inline-flex; align-items: center; justify-content: center;
+  min-height: 32px; padding: 0 10px; border-radius: 8px;
+  background: transparent; border: 1px solid transparent; color: var(--dsr-muted);
+  font-size: 12.5px; cursor: pointer; white-space: nowrap; text-decoration: none;
+}
+.ds-setting-arrow { font-size: 16px; padding: 0 12px; }
+.ds-setting-arrow:hover,
+#settings-home .ds-setting-row .ds-btn:hover,
+#settings-home .ds-setting-row .ds-btn:focus-visible {
+  background: var(--dsr-bg-2); border-color: var(--dsr-line); color: var(--dsr-text);
+}
 .ds-setting-name { font-size: 13.5px; font-weight: 600; }
 .ds-setting-desc { font-size: 12px; color: var(--dsr-muted); margin-top: 2px; word-break: break-all; }
-.ds-feedback-links { display: flex; gap: 8px; flex-wrap: wrap; padding: 0 13px; }
+#token-desc { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%; }
 .ds-group-bar { display: flex; align-items: center; gap: 10px; padding: 2px 0; }
 .ds-group-bar > label { font-size: 12px; color: var(--dsr-muted); white-space: nowrap; }
 .ds-group-select { flex: 1; min-width: 0; position: relative; }
@@ -222,6 +266,16 @@ a.ds-btn { text-decoration: none; }
 .ds-q-option .muted { font-size: 11px; color: var(--dsr-muted); }
 .ds-modal-body textarea { width: 100%; box-sizing: border-box; margin-top: 6px; background: var(--dsr-bg-2); color: var(--dsr-text); border: 1px solid var(--dsr-line); border-radius: 9px; padding: 7px 9px; font: inherit; font-size: 13px; outline: none; }
 
+/* 预设提示词管理 */
+.ds-preset-toolbar { display: flex; align-items: center; justify-content: space-between; gap: 10px; margin-bottom: 8px; }
+.ds-preset-count { font-size: 12px; color: var(--dsr-muted); }
+.ds-preset-list { display: flex; flex-direction: column; gap: 8px; }
+.ds-preset-row { display: flex; align-items: center; gap: 8px; background: var(--dsr-bg-2); border: 1px solid var(--dsr-line); border-radius: 10px; padding: 8px 10px; }
+.ds-preset-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
+.ds-preset-name { font-size: 13px; font-weight: 600; word-break: break-word; }
+.ds-preset-preview { font-size: 11.5px; color: var(--dsr-muted); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.ds-preset-empty { font-size: 12.5px; color: var(--dsr-muted); text-align: center; padding: 18px 0; }
+
 .ds-toast { position: fixed; left: 50%; bottom: 22px; transform: translateX(-50%); z-index: 150; background: var(--dsr-panel); border: 1px solid var(--dsr-line); border-radius: 10px; padding: 9px 15px; font-size: 13px; box-shadow: 0 8px 24px rgba(0,0,0,.3); }
 .ds-toast.hidden { display: none; }
 

package/public/desktop/desktop.html

@@ -35,7 +35,7 @@
               <span class="ds-feedback-ico"><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="M12 20h9"/><path d="M16.5 3.5a2.1 2.1 0 0 1 3 3L7 19l-4 1 1-4Z"/></svg></span>
               <span class="ds-feedback-body"><span class="ds-feedback-name" data-i18n="ds.feedbackWrite">写反馈</span><span class="ds-feedback-desc" data-i18n="ds.feedbackWriteDesc">App 内直接提交</span></span>
             </button>
-            <a class="ds-feedback-item primary" href="https://github.com/Blank-not-black/dsh-Remote/issues" target="_blank" rel="noopener" role="menuitem">
+            <a class="ds-feedback-item" href="https://github.com/Blank-not-black/dsh-Remote/issues" target="_blank" rel="noopener" role="menuitem">
               <span class="ds-feedback-ico"><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></span>
               <span class="ds-feedback-body"><span class="ds-feedback-name">GitHub Issues</span><span class="ds-feedback-desc" data-i18n="ds.feedbackGithubDesc">反馈 bug / 提建议</span></span>
             </a>
@@ -77,25 +77,36 @@
 
         <!-- 会话详情 -->
         <section id="view-chat" class="ds-view">
+          <div id="session-cards" class="ds-session-cards"></div>
           <div id="history" class="ds-history" aria-live="polite"></div>
           <div class="ds-composer">
             <textarea id="composer" rows="1" data-i18n-placeholder="ds.composerPlaceholder" placeholder="输入消息…"></textarea>
-            <div style="position:relative">
-              <button id="btn-cmd" class="ds-btn" data-i18n="ds.commands">指令</button>
-              <div id="cmd-menu" class="ds-group-menu hidden" style="width:280px; left:auto; right:0; top:auto; bottom:calc(100% + 8px)">
-                <button class="ds-feedback-item" data-ds-cmd="/compact" data-i18n="ds.cmdCompact">/compact 压缩对话历史</button>
-                <button class="ds-feedback-item" data-ds-cmd="/export" data-i18n="ds.cmdExport">/export 导出会话日志 ZIP</button>
-                <button class="ds-feedback-item" data-ds-cmd="/feedback" data-i18n="ds.cmdFeedback">/feedback 反馈当前会话</button>
-                <button class="ds-feedback-item" data-ds-cmd="/goal" data-i18n="ds.cmdGoal">/goal 设置/查看任务目标</button>
-                <button class="ds-feedback-item" data-ds-cmd="/permission" data-i18n="ds.cmdPermission">/permission 切换权限预设</button>
-                <button class="ds-feedback-item" data-ds-cmd="/plan" data-i18n="ds.cmdPlan">/plan 进入/退出计划模式</button>
+            <div class="ds-composer-actions">
+              <div class="ds-composer-left">
+                <div style="position:relative">
+                  <button id="btn-cmd" class="ds-btn" data-i18n="ds.commands">指令</button>
+                  <div id="cmd-menu" class="ds-group-menu hidden" style="width:280px; left:0; right:auto; top:auto; bottom:calc(100% + 8px)">
+                    <button class="ds-feedback-item" data-ds-cmd="/compact" data-i18n="ds.cmdCompact">/compact 压缩对话历史</button>
+                    <button class="ds-feedback-item" data-ds-cmd="/export" data-i18n="ds.cmdExport">/export 导出会话日志 ZIP</button>
+                    <button class="ds-feedback-item" data-ds-cmd="/feedback" data-i18n="ds.cmdFeedback">/feedback 反馈当前会话</button>
+                    <button class="ds-feedback-item" data-ds-cmd="/goal" data-i18n="ds.cmdGoal">/goal 设置/查看任务目标</button>
+                    <button class="ds-feedback-item" data-ds-cmd="/permission" data-i18n="ds.cmdPermission">/permission 切换权限预设</button>
+                    <button class="ds-feedback-item" data-ds-cmd="/plan" data-i18n="ds.cmdPlan">/plan 进入/退出计划模式</button>
+                  </div>
+                </div>
+                <div style="position:relative">
+                  <button id="btn-preset" class="ds-btn" data-i18n="ds.presets">预设</button>
+                  <div id="preset-menu" class="ds-group-menu hidden" style="width:260px; left:0; right:auto; top:auto; bottom:calc(100% + 8px)"></div>
+                </div>
+                <div style="position:relative">
+                  <button id="btn-model" class="ds-btn" data-i18n="ds.models">模型</button>
+                  <div id="model-menu" class="ds-group-menu hidden" style="width:360px; left:0; right:auto; top:auto; bottom:calc(100% + 8px)"></div>
+                </div>
+              </div>
+              <div class="ds-composer-right">
+                <button id="btn-send" class="ds-btn primary ds-send-btn" data-i18n-aria="ds.send" data-i18n-title="ds.send" aria-label="发送">↑</button>
               </div>
             </div>
-            <div style="position:relative">
-              <button id="btn-preset" class="ds-btn" data-i18n="ds.presets">预设</button>
-              <div id="preset-menu" class="ds-group-menu hidden" style="width:260px; left:auto; right:0; top:auto; bottom:calc(100% + 8px)"></div>
-            </div>
-            <button id="btn-send" class="ds-btn primary" data-i18n="ds.send">发送</button>
           </div>
         </section>
 
@@ -117,23 +128,19 @@
             <div class="ds-settings">
               <div class="ds-setting-row" data-settings-group="general" style="cursor:pointer">
                 <div><div class="ds-setting-name" data-i18n="ds.groupGeneral">通用</div><div class="ds-setting-desc" data-i18n="ds.groupGeneralDesc">工具调用、预设提示词</div></div>
-                <span class="ds-feedback-item" style="font-size:18px">›</span>
+                <span class="ds-setting-arrow" aria-hidden="true">›</span>
               </div>
               <div class="ds-setting-row" data-settings-group="servers" style="cursor:pointer">
                 <div><div class="ds-setting-name" data-i18n="ds.groupServers">服务器</div><div class="ds-setting-desc" data-i18n="ds.groupServersDesc">服务器地址</div></div>
-                <span class="ds-feedback-item" style="font-size:18px">›</span>
-              </div>
-              <div class="ds-setting-row" data-settings-group="notify" style="cursor:pointer">
-                <div><div class="ds-setting-name" data-i18n="ds.groupNotify">通知</div><div class="ds-setting-desc" data-i18n="ds.groupNotifyDesc">通知与提醒</div></div>
-                <span class="ds-feedback-item" style="font-size:18px">›</span>
+                <span class="ds-setting-arrow" aria-hidden="true">›</span>
               </div>
               <div class="ds-setting-row" data-settings-group="theme" style="cursor:pointer">
                 <div><div class="ds-setting-name" data-i18n="ds.groupTheme">皮肤</div><div class="ds-setting-desc" data-i18n="ds.groupThemeDesc">配色主题</div></div>
-                <span class="ds-feedback-item" style="font-size:18px">›</span>
+                <span class="ds-setting-arrow" aria-hidden="true">›</span>
               </div>
               <div class="ds-setting-row" data-settings-group="about" style="cursor:pointer">
                 <div><div class="ds-setting-name" data-i18n="ds.groupAbout">关于</div><div class="ds-setting-desc" data-i18n="ds.groupAboutDesc">版本信息</div></div>
-                <span class="ds-feedback-item" style="font-size:18px">›</span>
+                <span class="ds-setting-arrow" aria-hidden="true">›</span>
               </div>
             </div>
             <div class="ds-settings">
@@ -145,14 +152,6 @@
                 <div><div class="ds-setting-name" data-i18n="ds.langTitle">语言 / Language</div></div>
                 <button id="btn-lang" class="ds-btn">EN</button>
               </div>
-              <div class="ds-setting-row">
-                <div><div class="ds-setting-name" data-i18n="ds.feedbackTitle">反馈渠道</div><div class="ds-setting-desc" data-i18n="ds.feedbackDesc">GitHub / Gitee / B站：反馈 bug、提建议、唠嗑</div></div>
-              </div>
-              <div class="ds-feedback-links">
-                <a class="ds-btn" href="https://github.com/Blank-not-black/dsh-Remote" target="_blank" rel="noopener">GitHub</a>
-                <a class="ds-btn" href="https://gitee.com/Blankneverfails/dsh-Remote" target="_blank" rel="noopener">Gitee</a>
-                <a class="ds-btn" href="https://space.bilibili.com/419009275/dynamic" target="_blank" rel="noopener">B站</a>
-              </div>
             </div>
           </div>
 
@@ -162,7 +161,8 @@
               <div class="ds-setting-name" data-i18n="ds.groupGeneral">通用</div>
             </div>
             <div class="ds-setting-row">
-              <div><div class="ds-setting-name" data-i18n="ds.emptyGroup">暂无设置项</div></div>
+              <div><div class="ds-setting-name" data-i18n="presets.title">预设提示词</div><div class="ds-setting-desc"><span data-i18n="presets.desc">常用提示词，对话界面一键插入（最多 20 条）</span> <span id="preset-count-home"></span></div></div>
+              <button id="btn-manage-presets" class="ds-btn" data-i18n="presets.manage">管理</button>
             </div>
           </div>
 
@@ -190,16 +190,6 @@
             </div>
           </div>
 
-          <div id="settings-page-notify" class="ds-settings hidden">
-            <div class="ds-setting-row" data-settings-back style="cursor:pointer">
-              <button class="ds-btn" data-i18n="ds.back">‹ 返回</button>
-              <div class="ds-setting-name" data-i18n="ds.groupNotify">通知</div>
-            </div>
-            <div class="ds-setting-row">
-              <div><div class="ds-setting-name" data-i18n="ds.emptyGroup">暂无设置项</div></div>
-            </div>
-          </div>
-
           <div id="settings-page-theme" class="ds-settings hidden">
             <div class="ds-setting-row" data-settings-back style="cursor:pointer">
               <button class="ds-btn" data-i18n="ds.back">‹ 返回</button>
@@ -218,7 +208,7 @@
             </div>
             <div class="ds-setting-row" id="btn-donate-about" style="cursor:pointer">
               <div><div class="ds-setting-name" data-i18n="ds.donate">赞赏支持</div><div class="ds-setting-desc" data-i18n="ds.donateDesc">如果 dsh-remote 帮到了你，欢迎赞赏支持开发 ☕</div></div>
-              <span class="ds-feedback-item" style="font-size:18px">›</span>
+              <span class="ds-setting-arrow" aria-hidden="true">›</span>
             </div>
           </div>
         </section>
@@ -276,6 +266,23 @@
     </div>
   </div>
 
+  <!-- 预设提示词管理模态 -->
+  <div id="modal-presets" class="ds-modal hidden">
+    <div class="ds-modal-card">
+      <div class="ds-modal-title" data-i18n="presets.title">预设提示词</div>
+      <div class="ds-modal-body">
+        <div class="ds-preset-toolbar">
+          <span id="preset-count" class="ds-preset-count"></span>
+          <button id="btn-preset-add" class="ds-btn" data-i18n="presets.add">新增</button>
+        </div>
+        <div id="preset-list" class="ds-preset-list"></div>
+      </div>
+      <div class="ds-modal-actions">
+        <button id="btn-presets-close" class="ds-btn" data-i18n="ds.close">关闭</button>
+      </div>
+    </div>
+  </div>
+
   <!-- 赞赏支持模态 -->
   <div id="modal-donate" class="ds-modal hidden">
     <div class="ds-modal-card">
@@ -328,7 +335,7 @@
         'ds.groupTheme': '皮肤', 'ds.groupThemeDesc': '配色主题',
         'ds.groupAbout': '关于', 'ds.groupAboutDesc': '版本信息',
         'ds.donate': '赞赏支持', 'ds.donateDesc': '如果 dsh-remote 帮到了你，欢迎赞赏支持开发 ☕', 'ds.donateThanks': '感谢你的支持 ☕', 'ds.donateClose': '关闭',
-        'ds.notesTitle': '更新内容', 'ds.notesClose': '关闭', 'ds.notesPage': '{current}/{total}',
+        'ds.notesTitle': '更新内容', 'ds.notesClose': '关闭', 'ds.notesPage': '版本号 {current}/{total}',
         'ds.back': '‹ 返回', 'ds.emptyGroup': '暂无设置项',
         'ds.serversTitle': '服务器（分组）', 'ds.speedTest': '测速', 'ds.currentGroup': '当前组',
         'ds.addGroup': '+ 组', 'ds.addServer': '添加', 'ds.tokenTitle': '访问令牌', 'ds.copyToken': '复制',
@@ -388,6 +395,24 @@
         'ds.questionOptions': '选项', 'ds.questionCustom': '自定义回答',
         'ds.questionNeedAnswer': '请选择一个选项或填写自定义回答', 'ds.questionSubmitted': '已提交回答',
         'ds.questionFrom': '来自 {server}',
+        'ds.models': '模型', 'ds.close': '关闭',
+        'ds.presetsEmpty': '暂时未设置快捷提示词', 'ds.presetsGuide': '去设置 → 通用 → 预设提示词 管理添加',
+        'presets.title': '预设提示词', 'presets.desc': '常用提示词，对话界面一键插入（最多 20 条）', 'presets.manage': '管理',
+        'presets.add': '新增', 'presets.edit': '编辑', 'presets.delete': '删除', 'presets.empty': '暂无预设',
+        'presets.menuTitle': '预设', 'presets.namePrompt': '预设名称（≤20 字）：', 'presets.textPrompt': '预设内容（≤2000 字）：',
+        'presets.nameEmpty': '名称不能为空', 'presets.nameTooLong': '名称不能超过 20 字', 'presets.textTooLong': '内容不能超过 2000 字', 'presets.limit': '最多 20 条预设', 'presets.added': '预设已添加',
+        'presets.confirmDelete': '删除预设「{name}」？', 'presets.saved': '预设已保存', 'presets.deleted': '预设已删除',
+        'goal.title': '目标', 'goal.pause': '暂停', 'goal.resume': '继续', 'goal.complete': '完成', 'goal.edit': '改目标', 'goal.clear': '清除',
+        'goal.none': '当前会话没有目标', 'goal.confirmClear': '清除当前目标？(不会删除会话)', 'goal.confirmComplete': '将目标标记为完成？',
+        'goal.actionFailed': '目标操作失败', 'goal.actionSubmitted': '目标操作已提交',
+        'goal.cannotEmpty': '目标不能为空', 'goal.updateFailed': '更新失败', 'goal.updated': '目标已更新', 'goal.editPrompt': '修改目标：',
+        'todos.title': '任务清单',
+        'subagent.title': '子代理', 'subagent.diagnostic': '诊断项', 'subagent.running': '· 运行中', 'subagent.interrupt': '中断',
+        'subagent.confirmInterrupt': '中断这个子代理当前回合？', 'subagent.interruptFailed': '中断失败', 'subagent.interruptSubmitted': '中断请求已提交',
+        'models.loading': '模型加载中…', 'models.loadFailed': '模型列表加载失败：{msg}', 'models.unavailable': '不可用', 'models.none': '没有可用模型',
+        'models.switchFailed': '切换模型失败', 'models.switched': '已切换模型：{model}',
+        'models.effortFailed': '切换思考深度失败', 'models.effortSwitched': '思考深度：{effort}',
+        'menu.modelTitle': '模型切换', 'menu.effortTitle': '思考深度',
       },
       en: {
         'ds.repo': 'GitHub repo', 'ds.newSession': '+ New session', 'ds.sessions': 'Sessions',
@@ -404,7 +429,7 @@
         'ds.groupTheme': 'Theme', 'ds.groupThemeDesc': 'Color themes',
         'ds.groupAbout': 'About', 'ds.groupAboutDesc': 'Version info',
         'ds.donate': 'Support', 'ds.donateDesc': 'If dsh-remote has been helpful to you, feel free to support development with a coffee ☕', 'ds.donateThanks': 'Thanks for your support ☕', 'ds.donateClose': 'Close',
-        'ds.notesTitle': 'What\'s New', 'ds.notesClose': 'Close', 'ds.notesPage': '{current}/{total}',
+        'ds.notesTitle': 'What\'s New', 'ds.notesClose': 'Close', 'ds.notesPage': 'Version {current}/{total}',
         'ds.back': '‹ Back', 'ds.emptyGroup': 'No settings here',
         'ds.serversTitle': 'Servers (groups)', 'ds.speedTest': 'Test', 'ds.currentGroup': 'Current group',
         'ds.addGroup': '+ Group', 'ds.addServer': 'Add', 'ds.tokenTitle': 'Access token', 'ds.copyToken': 'Copy',
@@ -464,6 +489,24 @@
         'ds.questionOptions': 'Options', 'ds.questionCustom': 'Custom answer',
         'ds.questionNeedAnswer': 'Choose an option or write a custom answer', 'ds.questionSubmitted': 'Answer submitted',
         'ds.questionFrom': 'From {server}',
+        'ds.models': 'Models', 'ds.close': 'Close',
+        'ds.presetsEmpty': 'No quick prompts yet', 'ds.presetsGuide': 'Go to Settings → General → Prompt presets to add one',
+        'presets.title': 'Prompt presets', 'presets.desc': 'Common prompts, insert into the composer in one tap (max 20)', 'presets.manage': 'Manage',
+        'presets.add': 'Add', 'presets.edit': 'Edit', 'presets.delete': 'Delete', 'presets.empty': 'No presets yet',
+        'presets.menuTitle': 'Presets', 'presets.namePrompt': 'Preset name (≤20 chars):', 'presets.textPrompt': 'Preset content (≤2000 chars):',
+        'presets.nameEmpty': 'Name cannot be empty', 'presets.nameTooLong': 'Name must be ≤20 characters', 'presets.textTooLong': 'Content must be ≤2000 characters', 'presets.limit': 'At most 20 presets', 'presets.added': 'Preset added',
+        'presets.confirmDelete': 'Delete preset "{name}"?', 'presets.saved': 'Preset saved', 'presets.deleted': 'Preset deleted',
+        'goal.title': 'Goal', 'goal.pause': 'Pause', 'goal.resume': 'Resume', 'goal.complete': 'Complete', 'goal.edit': 'Edit goal', 'goal.clear': 'Clear',
+        'goal.none': 'This session has no goal', 'goal.confirmClear': 'Clear the current goal? (the session stays)', 'goal.confirmComplete': 'Mark the goal as completed?',
+        'goal.actionFailed': 'Goal action failed', 'goal.actionSubmitted': 'Goal action submitted',
+        'goal.cannotEmpty': 'Goal cannot be empty', 'goal.updateFailed': 'Update failed', 'goal.updated': 'Goal updated', 'goal.editPrompt': 'Edit goal:',
+        'todos.title': 'Todos',
+        'subagent.title': 'Subagents', 'subagent.diagnostic': 'Diagnostic', 'subagent.running': '· running', 'subagent.interrupt': 'Interrupt',
+        'subagent.confirmInterrupt': 'Interrupt this subagent\'s current turn?', 'subagent.interruptFailed': 'Interrupt failed', 'subagent.interruptSubmitted': 'Interrupt requested',
+        'models.loading': 'Loading models…', 'models.loadFailed': 'Failed to load models: {msg}', 'models.unavailable': 'unavailable', 'models.none': 'No models available',
+        'models.switchFailed': 'Model switch failed', 'models.switched': 'Switched model: {model}',
+        'models.effortFailed': 'Failed to switch reasoning effort', 'models.effortSwitched': 'Reasoning effort: {effort}',
+        'menu.modelTitle': 'Model', 'menu.effortTitle': 'Reasoning effort',
       }
     }
   </script>

package/public/desktop/desktop.js

@@ -60,6 +60,7 @@ const state = {
   streamMode: 'ws', // 'ws' | 'poll'
   pollSeq: { mux: 0, host: 0 },
   fs: { path: null, initial: null, loaded: false },
+  models: { loaded: false, loading: false, groups: [], current: null, failures: [] },
   view: 'sessions'
 }
 const streams = {}
@@ -109,14 +110,90 @@ function renderPresetMenuDesktop() {
   const menu = $('preset-menu')
   if (!btn || !menu) return
   const list = readPresets()
-  btn.style.display = list.length ? '' : 'none'
+  btn.style.display = ''
   menu.classList.add('hidden')
+  if (!list.length) {
+    menu.innerHTML = `<div class="ds-empty">${esc(t('ds.presetsEmpty'))}</div><div class="ds-empty ds-presets-guide">${esc(t('ds.presetsGuide'))}</div>`
+    return
+  }
   menu.innerHTML = list.map(p => `<button class="ds-feedback-item" data-ds-preset="${esc(p.id)}">${esc(p.name)}</button>`).join('')
 }
+const PRESET_NAME_MAX = 20
+const PRESET_TEXT_MAX = 2000
+const PRESET_LIMIT = 20
+function renderPresetSummary() {
+  const home = $('preset-count-home')
+  const modal = $('preset-count')
+  const n = readPresets().length
+  if (home) home.textContent = `· ${n}/${PRESET_LIMIT}`
+  if (modal) modal.textContent = `${n}/${PRESET_LIMIT}`
+}
+function writePresets(list) {
+  LS.set(PRESETS_KEY, JSON.stringify(list))
+  renderPresetSummary()
+  renderPresets()
+  renderPresetMenuDesktop()
+}
+function renderPresets() {
+  const box = $('preset-list')
+  if (!box) return
+  const list = readPresets()
+  renderPresetSummary()
+  if (!list.length) {
+    box.innerHTML = `<div class="ds-preset-empty">${esc(t('presets.empty'))}</div>`
+    return
+  }
+  box.innerHTML = list.map(p => `<div class="ds-preset-row">
+    <div class="ds-preset-main"><div class="ds-preset-name">${esc(p.name)}</div><div class="ds-preset-preview">${esc((p.text || '').slice(0, 60))}</div></div>
+    <button class="ds-mini-btn" data-preset-edit="${esc(p.id)}">${t('presets.edit')}</button>
+    <button class="ds-mini-btn" data-preset-del="${esc(p.id)}">${t('presets.delete')}</button>
+  </div>`).join('')
+  box.querySelectorAll('[data-preset-edit]').forEach(b => b.addEventListener('click', () => editPreset(b.dataset.presetEdit)))
+  box.querySelectorAll('[data-preset-del]').forEach(b => b.addEventListener('click', () => deletePreset(b.dataset.presetDel)))
+}
+function promptPreset(id) {
+  const list = readPresets()
+  const existing = id ? list.find(p => p.id === id) : null
+  const name = prompt(t('presets.namePrompt'), existing?.name || '')
+  if (name == null) return
+  const text = prompt(t('presets.textPrompt'), existing?.text || '')
+  if (text == null) return
+  const n = (name || '').trim()
+  if (!n) return toast(t('presets.nameEmpty'), 'err')
+  if (n.length > PRESET_NAME_MAX) return toast(t('presets.nameTooLong'), 'err')
+  if (text.length > PRESET_TEXT_MAX) return toast(t('presets.textTooLong'), 'err')
+  if (existing) {
+    existing.name = n
+    existing.text = text
+  } else {
+    if (list.length >= PRESET_LIMIT) return toast(t('presets.limit'), 'err')
+    list.push({ id: 'p' + Date.now().toString(36) + Math.random().toString(36).slice(2, 6), name: n, text })
+  }
+  writePresets(list)
+  toast(existing ? t('presets.saved') : t('presets.added'), 'ok')
+}
+function addPreset() { promptPreset(null) }
+function editPreset(id) { promptPreset(id) }
+function deletePreset(id) {
+  const list = readPresets()
+  const p = list.find(x => x.id === id)
+  if (!p) return
+  if (!confirm(t('presets.confirmDelete', { name: p.name }))) return
+  writePresets(list.filter(x => x.id !== id))
+  toast(t('presets.deleted'), 'ok')
+}
+function openPresetModal() {
+  renderPresets()
+  const modal = $('modal-presets')
+  if (modal) modal.classList.remove('hidden')
+}
+function closePresetModal() {
+  const modal = $('modal-presets')
+  if (modal) modal.classList.add('hidden')
+}
 function togglePresetMenuDesktop() {
   const menu = $('preset-menu')
   if (!menu) return
-  if (!readPresets().length) return
   menu.classList.toggle('hidden')
 }
 function toggleCmdMenuDesktop() {
@@ -125,6 +202,101 @@ function toggleCmdMenuDesktop() {
   menu.classList.toggle('hidden')
 }
 
+/* ---------------- 模型 / 思考深度 ---------------- */
+function toggleModelMenuDesktop() {
+  const menu = $('model-menu')
+  if (!menu) return
+  const willOpen = menu.classList.contains('hidden')
+  menu.classList.toggle('hidden', !willOpen)
+  if (willOpen && !state.models.loaded && !state.models.loading) loadSessionModels()
+}
+
+async function loadSessionModels() {
+  if (!state.current || state.models.loading) return
+  state.models.loading = true
+  renderModelMenu()
+  try {
+    const v = await rpc('session.models', { sessionId: state.current })
+    state.models.groups = v.groups || []
+    state.models.current = v.current || null
+    state.models.failures = v.failures || []
+    state.models.loaded = true
+  } catch (e) {
+    if (e.message === 'AUTH') { toast(t('ds.toastAuth'), 'err'); state.models.loading = false; renderModelMenu(); return }
+    toast(t('models.loadFailed', { msg: e.message }), 'err')
+  }
+  state.models.loading = false
+  renderModelMenu()
+}
+
+function renderModelMenu() {
+  const box = $('model-menu')
+  if (!box) return
+  if (state.models.loading) { box.innerHTML = `<div class="ds-model-head">${t('menu.modelTitle')}</div><span>${t('models.loading')}</span>`; return }
+  const groups = state.models.groups || []
+  if (!groups.length) {
+    box.innerHTML = `<div class="ds-model-head">${t('menu.modelTitle')}</div><span>${(state.models.failures || []).map(f => f.name + ' ' + t('models.unavailable')).join('；') || t('models.none')}</span>`
+    return
+  }
+  const cur = state.models.current
+  box.innerHTML = `<div class="ds-model-head">${t('menu.modelTitle')}</div>` + groups.map(g => `
+    <div class="ds-model-group">
+      <div class="ds-model-provider">${esc(g.name || g.id)}</div>
+      <div class="ds-model-chips">${(g.models || []).map(m => {
+        const isCur = cur && cur.provider === g.id && cur.model === m.id
+        return `<button class="ds-model-chip ${isCur ? 'current' : ''}" data-model="${esc(m.id)}" data-provider="${esc(g.id)}">${esc(m.name || m.id)}</button>`
+      }).join('')}</div>
+    </div>`).join('') + `<div class="ds-model-effort-group" id="model-effort-group"><div class="ds-model-provider">${t('menu.effortTitle')}</div><div class="ds-model-chips" id="model-efforts"></div></div>`
+  box.querySelectorAll('[data-model]').forEach(btn =>
+    btn.addEventListener('click', () => selectSessionModel(btn.dataset.provider, btn.dataset.model)))
+  renderEffortMenu()
+}
+
+function renderEffortMenu() {
+  const group = $('model-effort-group')
+  const box = $('model-efforts')
+  if (!group || !box) return
+  const cur = state.models.current
+  const provider = (state.models.groups || []).find(g => g.id === cur?.provider)
+  const model = (provider?.models || []).find(m => m.id === cur?.model)
+  const efforts = model?.reasoning?.efforts || []
+  group.classList.toggle('hidden', !efforts.length)
+  box.innerHTML = efforts.map(e => {
+    const isCur = cur?.reasoningEffort === e.id || (!cur?.reasoningEffort && e.id === model.reasoning.defaultEffort)
+    return `<button class="ds-model-chip ${isCur ? 'current' : ''}" data-effort="${esc(e.id)}" title="${esc(e.description || '')}">${esc(e.name || e.id)}</button>`
+  }).join('')
+  box.querySelectorAll('[data-effort]').forEach(btn =>
+    btn.addEventListener('click', () => selectSessionEffort(btn.dataset.effort)))
+}
+
+async function selectSessionEffort(effortId) {
+  const cur = state.models.current
+  if (!state.current || !cur) return
+  const v = await safeRpc('session.selectModel', {
+    sessionId: state.current, provider: cur.provider, model: cur.model, reasoningEffort: effortId
+  }, t('models.effortFailed'))
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderEffortMenu()
+    toast(t('models.effortSwitched', { effort: effortId }), 'ok')
+  }
+}
+
+async function selectSessionModel(provider, modelId) {
+  if (!state.current) return
+  const group = (state.models.groups || []).find(g => g.id === provider)
+  const model = (group?.models || []).find(m => m.id === modelId)
+  const payload = { sessionId: state.current, provider, model: modelId }
+  const effort = model?.reasoning?.defaultEffort || model?.reasoning?.efforts?.[0]?.id
+  if (effort) payload.reasoningEffort = effort
+  const v = await safeRpc('session.selectModel', payload, t('models.switchFailed'))
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderModelMenu()
+    toast(t('models.switched', { model: v.selected.model }), 'ok')
+  }
+}
+
 /* ---------------- 反馈 ---------------- */
 const FEEDBACK_LINKS = {
   githubIssues: 'https://github.com/Blank-not-black/dsh-Remote/issues',
@@ -172,6 +344,31 @@ const NOTES_KEY = 'seenNotesVersion'
 let notesVersion = ''
 let notesPages = []
 let notesPage = 0
+function parseVersion(v) {
+  const m = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/.exec(String(v || '').trim())
+  if (!m) return { core: [0, 0, 0], pre: null }
+  return { core: [Number(m[1]), Number(m[2]), Number(m[3])], pre: m[4] || null }
+}
+function cmpVersion(a, b) {
+  const pa = parseVersion(a), pb = parseVersion(b)
+  for (let i = 0; i < 3; i++) {
+    const d = pa.core[i] - pb.core[i]
+    if (d) return d
+  }
+  if (!pa.pre && !pb.pre) return 0
+  if (!pa.pre) return 1
+  if (!pb.pre) return -1
+  const sa = String(pa.pre).split('.'), sb = String(pb.pre).split('.')
+  for (let i = 0; i < Math.max(sa.length, sb.length); i++) {
+    const x = sa[i] ?? '', y = sb[i] ?? ''
+    if (x === y) continue
+    const nx = /^\d+$/.test(x), ny = /^\d+$/.test(y)
+    if (nx && ny) { const d = Number(x) - Number(y); if (d) return d }
+    else if (nx !== ny) return nx ? -1 : 1
+    else { const d = x.localeCompare(y); if (d) return d }
+  }
+  return 0
+}
 function splitNotes(notes) {
   return String(notes || '').split(/[；;]/).map(s => s.trim()).filter(Boolean)
 }
@@ -186,6 +383,21 @@ function renderNotesPages(items) {
   box.scrollLeft = 0
   updateNotesPage()
 }
+function renderNotesVersionPages(entries) {
+  const box = $('notes-pages')
+  if (!box) return
+  notesPages = entries
+  notesPage = 0
+  box.innerHTML = entries.map(entry => {
+    const items = splitNotes(entry.notes)
+    return `<div class="notes-page" style="flex:0 0 100%;scroll-snap-align:start;box-sizing:border-box;min-width:0;">
+      <div class="notes-version-title" style="font-weight:700;margin-bottom:6px;opacity:.9;">v${esc(entry.version)}</div>
+      ${items.length ? items.map(item => `<div class="notes-item" style="padding:6px 0;line-height:1.5;">${esc(item)}</div>`).join('') : `<div class="notes-item" style="padding:6px 0;line-height:1.5;">${esc(entry.notes || '')}</div>`}
+    </div>`
+  }).join('')
+  box.scrollLeft = 0
+  updateNotesPage()
+}
 function updateNotesPage() {
   const box = $('notes-pages')
   const pageEl = $('notes-page')
@@ -200,7 +412,23 @@ function scrollNotes(dir) {
   if (box) box.scrollBy({ left: dir * box.clientWidth, behavior: 'smooth' })
 }
 function openNotesModal(info) {
-  if (!info?.version || String(info.version).includes('-rc')) return
+  if (!info?.version) return
+  const history = Array.isArray(info.history) ? info.history.filter(h => h && typeof h.version === 'string' && typeof h.notes === 'string' && !String(h.version).includes('-rc')) : []
+  const latestStable = history[0]?.version || info.version
+  if (history.length) {
+    const seen = LS.get(NOTES_KEY, '')
+    let entries
+    if (seen) entries = history.filter(h => cmpVersion(h.version, seen) > 0)
+    else entries = history.slice(0, 3)
+    if (!entries.length) return
+    notesVersion = latestStable
+    const vEl = $('notes-version')
+    if (vEl) vEl.textContent = 'v' + latestStable
+    renderNotesVersionPages(entries.slice().reverse())
+    $('modal-notes').classList.remove('hidden')
+    return
+  }
+  if (String(info.version).includes('-rc')) return
   if (LS.get(NOTES_KEY) === info.version) return
   const items = splitNotes(info.notes)
   if (!items.length) return
@@ -724,11 +952,23 @@ function applyProjection(sessionId, key, value, seq) {
     s.projections.values[key] = value
     s.projections.asOfSeq = Math.max(s.projections.asOfSeq || 0, seq || 0)
   }
-  if (state.current === sessionId) renderSessions()
+  if (state.current === sessionId) {
+    renderSessions()
+    if (['goal', 'todos'].includes(key)) renderSessionCards()
+  }
   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) }
+const GOAL_TERMINAL_PHASES = new Set(['complete', 'cleared'])
+function isGoalTerminal(goal) {
+  return !!goal && GOAL_TERMINAL_PHASES.has(goal.phase)
+}
+function goalOf(s) {
+  const p = proj(s, 'goal')
+  if (!p) return null
+  return p.goal && typeof p.goal === 'object' ? p.goal : p
+}
 function onSessionEvent(sessionId, event) {
   if (state.current === sessionId && event) {
     const h = state.history
@@ -739,6 +979,7 @@ function onSessionEvent(sessionId, event) {
       h.visible.sort((a, b) => a.seq - b.seq)
       renderHistory()
     }
+    if (String(event.type || '').startsWith('goal/') || String(event.type || '').startsWith('todo/')) renderSessionCards()
   }
 }
 
@@ -767,15 +1008,19 @@ function renderSessions() {
 async function openSession(id) {
   state.current = id
   state.history = { seqs: new Set(), visible: [], hasMore: false, loading: false, minSeq: Infinity }
+  state.models = { loaded: false, loading: false, groups: [], current: null, failures: [] }
   showView('view-chat')
   $('ds-title').textContent = titleOf(state.byId.get(id)) || t('ds.sessions')
   $('history').innerHTML = `<div class="ds-empty">${t('ds.historyLoading')}</div>`
   renderSessions()
+  renderSessionCards()
   await loadHistory()
 }
 function closeSession() {
   state.current = null
   state.history = { seqs: new Set(), visible: [], hasMore: false, loading: false, minSeq: Infinity }
+  const cards = $('session-cards')
+  if (cards) cards.innerHTML = ''
   showView('view-sessions')
 }
 async function loadHistory() {
@@ -866,6 +1111,95 @@ function renderHistory() {
   box.innerHTML = items.map(eventHtml).join('') || `<div class="ds-empty">${t('ds.historyEmpty')}</div>`
   box.scrollTop = box.scrollHeight
 }
+
+/* ---------------- 会话信息卡（goal / todo / 子代理） ---------------- */
+async function renderSessionCards() {
+  const box = $('session-cards')
+  const s = state.byId.get(state.current)
+  if (!box) return
+  if (!s) { box.innerHTML = ''; return }
+  const goal = goalOf(s)
+  const todos = proj(s, 'todos')
+  let html = ''
+  if (goal && !isGoalTerminal(goal)) {
+    html += `<div class="ds-card ds-goal-card"><div class="ds-card-title">${t('goal.title')}</div>
+      <div class="ds-goal-obj">${esc(goal.objective || '')}</div>
+      <div class="ds-goal-phase">phase: ${esc(goal.phase || '?')} · revision ${goal.revision ?? '?'}</div>
+      <div class="ds-goal-actions">
+        ${goal.phase === 'active' ? `<button class="ds-mini-btn" data-goal="pause">${t('goal.pause')}</button>` : `<button class="ds-mini-btn" data-goal="resume">${t('goal.resume')}</button>`}
+        <button class="ds-mini-btn" data-goal="complete">${t('goal.complete')}</button>
+        <button class="ds-mini-btn" data-goal="edit">${t('goal.edit')}</button>
+        <button class="ds-mini-btn" data-goal="clear">${t('goal.clear')}</button>
+      </div></div>`
+  }
+  if (todos?.items?.length) {
+    html += `<div class="ds-card"><div class="ds-card-title">${t('todos.title')}</div>${todos.items.map(item =>
+      `<div class="ds-todo-row"><span class="ds-pill ${item.status === 'completed' ? 'done' : item.status === 'in_progress' ? 'active' : ''}">${esc(item.status || 'pending')}</span><span>${esc(item.content || '')}</span></div>`
+    ).join('')}</div>`
+  }
+  box.innerHTML = html
+  box.querySelectorAll('[data-goal]').forEach(btn =>
+    btn.addEventListener('click', () => goalAction(btn.dataset.goal)))
+
+  const sub = await safeRpc('subagent.list', { parentSessionId: state.current }, '')
+  if (sub?.entries?.length) {
+    const rows = sub.entries.map(e => {
+      if (e.kind === 'diagnostic') return `<div class="ds-card-row"><span class="ds-card-k">${t('subagent.diagnostic')}</span><span class="ds-card-v">${esc(e.reason)}</span></div>`
+      const label = e.label || short(e.id)
+      const running = e.activity === 'running'
+      return `<div class="ds-card-row"><span class="ds-card-k">${running ? '▶ ' : ''}${esc(label)}</span><span class="ds-card-v">${esc(e.mode)} ${running ? t('subagent.running') : ''}${e.mode === 'continuable' && running ? ` <button class="ds-mini-btn" data-sub-interrupt="${esc(e.id)}">${t('subagent.interrupt')}</button>` : ''}</span></div>`
+    }).join('')
+    box.insertAdjacentHTML('beforeend', `<div class="ds-card"><div class="ds-card-title">${t('subagent.title')}</div>${rows}</div>`)
+    box.querySelectorAll('[data-sub-interrupt]').forEach(btn =>
+      btn.addEventListener('click', () => interruptSubagent(btn.dataset.subInterrupt)))
+  }
+}
+
+function setGoalPhaseLocal(phase) {
+  const s = state.byId.get(state.current)
+  const p = s && proj(s, 'goal')
+  const goal = p && typeof p === 'object' && p.goal && typeof p.goal === 'object' ? p.goal : p
+  if (!goal) return
+  goal.phase = phase
+  renderSessions()
+  renderSessionCards()
+}
+
+async function goalAction(kind) {
+  const s = state.byId.get(state.current)
+  const goal = goalOf(s)
+  if (!goal) return toast(t('goal.none'), 'err')
+  const ref = { id: goal.id, revision: goal.revision }
+  if (kind === 'edit') {
+    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'))
+    toast(t('goal.updated'), 'ok')
+    refreshSessions()
+    renderSessionCards()
+    return
+  }
+  const map = { pause: 'goal.pause', resume: 'goal.resume', complete: 'goal.complete', clear: 'goal.clear' }
+  const method = map[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'))
+  if (kind === 'complete') setGoalPhaseLocal('complete')
+  if (kind === 'clear') setGoalPhaseLocal('cleared')
+  toast(t('goal.actionSubmitted'), 'ok')
+  refreshSessions()
+  renderSessionCards()
+}
+
+async function interruptSubagent(childId) {
+  if (!confirm(t('subagent.confirmInterrupt'))) return
+  await safeRpc('subagent.interrupt', { parentSessionId: state.current, childSessionId: childId, mode: 'continuable' }, t('subagent.interruptFailed'))
+  toast(t('subagent.interruptSubmitted'), 'ok')
+  setTimeout(renderSessionCards, 600)
+}
+
 async function runSlashCommand(text) {
   const clean = String(text || '').trim()
   if (!clean.startsWith('/') || !state.current) return false
@@ -1120,7 +1454,7 @@ function showView(id) {
   if (id === 'view-settings') showSettingsHome()
 }
 
-const SETTINGS_GROUPS = ['general', 'servers', 'notify', 'theme', 'about']
+const SETTINGS_GROUPS = ['general', 'servers', 'theme', 'about']
 function showSettingsHome() {
   const home = $('settings-home')
   if (!home) return
@@ -1132,6 +1466,7 @@ function showSettingsPage(name) {
   if (!home || !SETTINGS_GROUPS.includes(name)) return
   home.classList.add('hidden')
   for (const g of SETTINGS_GROUPS) $('settings-page-' + g)?.classList.toggle('hidden', g !== name)
+  if (name === 'general') renderPresetSummary()
 }
 function updateConn() {
   const el = $('conn-badge')
@@ -1173,6 +1508,7 @@ function bindUi() {
     if (e.key === 'Enter' && !e.shiftKey && !e.isComposing) { e.preventDefault(); sendMessage() }
   })
   renderPresetMenuDesktop()
+  renderPresetSummary()
   $('btn-cmd').addEventListener('click', (e) => { e.stopPropagation(); toggleCmdMenuDesktop() })
   $('cmd-menu').addEventListener('click', (e) => {
     const item = e.target.closest('[data-ds-cmd]')
@@ -1196,9 +1532,14 @@ function bindUi() {
       $('preset-menu').classList.add('hidden')
     }
   })
+  $('btn-model').addEventListener('click', (e) => { e.stopPropagation(); toggleModelMenuDesktop() })
+  $('model-menu').addEventListener('click', (e) => {
+    if (e.target.closest('[data-model]') || e.target.closest('[data-effort]')) e.stopPropagation()
+  })
   document.addEventListener('click', (e) => {
     if (!e.target.closest('#preset-menu') && !e.target.closest('#btn-preset')) $('preset-menu')?.classList.add('hidden')
     if (!e.target.closest('#cmd-menu') && !e.target.closest('#btn-cmd')) $('cmd-menu')?.classList.add('hidden')
+    if (!e.target.closest('#model-menu') && !e.target.closest('#btn-model')) $('model-menu')?.classList.add('hidden')
   })
   $('btn-stats-top').addEventListener('click', toggleStatsDrawer)
   $('stats-drawer-close').addEventListener('click', toggleStatsDrawer)
@@ -1247,6 +1588,10 @@ function bindUi() {
     if (group) { showSettingsPage(group.dataset.settingsGroup); return }
     if (e.target.closest('[data-settings-back]')) { showSettingsHome(); return }
   })
+  $('btn-manage-presets').addEventListener('click', openPresetModal)
+  $('btn-preset-add').addEventListener('click', addPreset)
+  $('btn-presets-close').addEventListener('click', closePresetModal)
+  $('modal-presets').addEventListener('click', (e) => { if (e.target === $('modal-presets')) closePresetModal() })
   $('btn-server-speed').addEventListener('click', () => selectFastestServer({ silent: false }))
   $('btn-server-add').addEventListener('click', addServer)
   $('btn-group-add').addEventListener('click', addGroup)

package/public/index.html

@@ -592,7 +592,7 @@
         'update.corrupted': '下载文件损坏，请重试', 'update.serverFileMissing': '服务器上还没有对应版本的文件，请稍后再试',
         'update.installUnsupported': '当前版本不支持 App 内安装，已转浏览器下载',
         'update.expand': '展开', 'update.collapse': '收起',
-        'notes.title': '更新内容', 'notes.close': '关闭', 'notes.page': '{current}/{total}',
+        'notes.title': '更新内容', 'notes.close': '关闭', 'notes.page': '版本号 {current}/{total}',
         'scan.imageLoadFailed': '图片加载失败', 'scan.decodeUnsupported': '当前设备不支持图片解码',
         'scan.browserHint': '浏览器请打开主机管理页，用手机相机扫码', 'scan.unsupported': '当前 App 版本不支持拍照扫码，请先更新 App',
         'scan.permissionDenied': '未授予相机权限',
@@ -771,7 +771,7 @@
         'update.corrupted': 'Downloaded file is corrupted, please retry', 'update.serverFileMissing': 'The file for this version is not on the server yet, please try again later',
         'update.installUnsupported': 'This version cannot install in-app, opening browser download',
         'update.expand': 'Expand', 'update.collapse': 'Collapse',
-        'notes.title': 'What\'s New', 'notes.close': 'Close', 'notes.page': '{current}/{total}',
+        'notes.title': 'What\'s New', 'notes.close': 'Close', 'notes.page': 'Version {current}/{total}',
         'scan.imageLoadFailed': 'Image failed to load', 'scan.decodeUnsupported': 'This device cannot decode images',
         'scan.browserHint': 'In a browser, open the host admin page and scan with your phone camera', 'scan.unsupported': 'This app version cannot scan, please update first',
         'scan.permissionDenied': 'Camera permission not granted',

package/public/update.json

@@ -1,7 +1,17 @@
 {
-  "version": "0.6.1",
+  "version": "0.6.3",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "ee8292f6689ec539377a15da6b2f08a3c05fa943354a9107c0a3c5c596f0a1a9",
-  "releasedAt": "2026-08-18T17:20:46.562Z",
-  "notes": "admin 管理页新增赞赏入口；设置关于行去掉多余箭头；新版本首次打开弹“更新内容”（横向分页）；过滤 system-reminder 伪用户消息；赞赏码三入口（README + 设置关于 + WebUI 主页按钮）；斜杠命令桥接修复与 debug 定位（executed 状态可观测）；命令菜单全命令化并点击填入输入框；斜杠命令改插件桥接执行；客户端斜杠命令真实执行；会话历史秒开 + RPC 20s 超时兜底；后台轮询只统计 AI 新消息；新增任务结束通知；设置界面五分组；修复 goal 完成态隐藏与会话切换残留"
+  "sha256": "e658387db7cee1e0b5392fad3719056b463d40ce55b5aac0d313d797c07438f2",
+  "releasedAt": "2026-08-19T03:20:39.386Z",
+  "notes": "修复 DSH 重启后网关 upstream 端口不刷新（Issue #1）：/health 增加 upstream/upstreamOk/pid 探测；插件 ensureGateway 检测上游变化或不可达时自动杀旧网关并按新 DSH_UPSTREAM 重启；启动/刷新写插件日志与 PID 文件。",
+  "history": [
+    {
+      "version": "0.6.3",
+      "notes": "修复 DSH 重启后网关 upstream 端口不刷新（Issue #1）：/health 增加 upstream/upstreamOk/pid 探测；插件 ensureGateway 检测上游变化或不可达时自动杀旧网关并按新 DSH_UPSTREAM 重启；启动/刷新写插件日志与 PID 文件。"
+    },
+    {
+      "version": "0.6.2",
+      "notes": "桌面端 WebUI：设置页清理与输入区饱满化；新增会话功能（goal/todo/subagent/模型切换/思考深度）；预设提示词管理与空状态引导；更新弹窗改为按正式版逐版展示历史（App/桌面端）；移除通知分组；聊天宽度约 680px、输入框按钮对齐。"
+    }
+  ]
 }

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.6.1"
+  "version": "0.6.3"
 }