dsh-remote-plugin 0.5.0 → 0.5.2

package/client.js

@@ -19,11 +19,6 @@ window.__ModuleLoader__.load({
       transform: 'translateX(102%)', transition: 'transform .22s ease',
       display: 'flex', flexDirection: 'column',
     }
-    var HEAD_STYLE = {
-      display: 'flex', alignItems: 'center', justifyContent: 'space-between',
-      gap: 8, padding: '9px 12px', background: '#0f766e', color: '#fff',
-      font: '600 13px/1 system-ui, sans-serif', flexShrink: 0,
-    }
     // DSH 原生 footerActions 容器默认 flex-row(官方类名已编译定型);
     // 动态注入列布局, 让各 footer action 上下堆叠。
     var FOOTER_FIX_ID = 'dsh-remote-footer-stack'
@@ -87,13 +82,6 @@ window.__ModuleLoader__.load({
         'aria-hidden': !open,
         style: Object.assign({}, DRAWER_STYLE, { transform: open ? 'translateX(0)' : 'translateX(102%)' }),
       },
-        React.createElement('div', { style: HEAD_STYLE },
-          React.createElement('span', null, '🖥 DSH Remote'),
-          React.createElement('button', {
-            type: 'button', 'aria-label': '关闭',
-            onClick: function () { props.actions.close() },
-            style: { border: 'none', background: 'transparent', color: '#fff', font: '600 16px/1 system-ui, sans-serif', cursor: 'pointer', padding: '2px 6px' },
-          }, '✕')),
         loaded.current ? React.createElement('iframe', {
           src: '/remote/admin/?embedded=1',
           title: 'DSH Remote',

package/gateway.cjs

@@ -255,13 +255,29 @@ function kickDevice(ip) {
 }
 
 // ---------- GitHub/镜像 更新检查 ----------
+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 = String(a || '').split('.').map(Number)
-  const pb = String(b || '').split('.').map(Number)
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const d = (pa[i] || 0) - (pb[i] || 0)
+  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
 }
 
@@ -394,6 +410,26 @@ function serveStatic(req, res, url) {
   }
   if (pathname === '/') pathname = '/index.html'
   if (pathname === '/admin') pathname = '/admin.html'
+  // 兼容旧版 App(版本比较不认 -rc): 无 local 参数的请求把 0.5.2-rc.1 显示为 0.5.2,
+  // 引导升级到新 APK; 新 App 带 ?local= 拿到真实 rc 版本, 不会循环提示。
+  if (pathname === '/update.json') {
+    fs.readFile(path.join(PUBLIC_DIR, 'update.json'), 'utf8', (err, raw) => {
+      if (err) {
+        res.writeHead(404, { 'content-type': 'text/plain; charset=utf-8' })
+        res.end('404 Not Found')
+        return
+      }
+      let json = {}
+      try { json = JSON.parse(raw) } catch {}
+      if (!url.searchParams.has('local')) {
+        json = { ...json, version: String(json.version || '').replace(/-.*$/, '') }
+      }
+      cors(res)
+      res.writeHead(200, { 'content-type': 'application/json; charset=utf-8', 'cache-control': 'no-store' })
+      res.end(JSON.stringify(json))
+    })
+    return
+  }
   const apkOverride = pathname === '/dsh-remote.apk'
   const baseDir = apkOverride ? path.join(ROOT, 'apk') : PUBLIC_DIR
   const filePath = path.normalize(path.join(baseDir, pathname))
@@ -451,6 +487,7 @@ function serveAdminApi(req, res, url) {
       res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
       res.end(JSON.stringify({
         ok: true,
+        mode: 'gateway',
         version: VERSION,
         pid: process.pid,
         hostname: os.hostname(),

package/package.json

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

package/public/admin.html

@@ -34,8 +34,8 @@
     .token-row code { flex: 1; background: var(--bg); border: 1px solid var(--line); border-radius: 8px; padding: 8px 10px; font-size: 12px; word-break: break-all; }
     .pair-box { background: var(--panel); border: 1px solid var(--line); border-radius: var(--radius); padding: 14px; margin-bottom: 14px; text-align: center; }
     .pair-box .pair-title { font-weight: 600; margin-bottom: 8px; }
-    .pair-qr { display: inline-block; background: #fff; border-radius: 8px; padding: 6px; }
-    .pair-qr svg { display: block; }
+    .pair-qr { display: inline-block; background: #fff; border-radius: 8px; padding: 6px; line-height: 0; }
+    .pair-qr svg { display: block; width: 180px; height: 180px; }
     .pair-box .muted { margin-top: 8px; font-size: 12px; }
     .empty { text-align: center; color: var(--muted); padding: 30px 0; }
     .empty-actions { display: flex; gap: 8px; justify-content: center; flex-wrap: wrap; margin-top: 12px; }
@@ -58,7 +58,7 @@
           <svg viewBox="0 0 16 16" aria-hidden="true"><path d="M8 0C3.58 0 0 3.58 0 8a8.01 8.01 0 0 0 5.47 7.59c.4.08.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8Z"/></svg>
           仓库
         </a>
-        <span id="conn-badge" class="conn-badge off">未认证</span>
+        <button id="conn-badge" class="conn-badge off" title="网关面板">未认证</button>
       </div>
     </div>
 

package/public/admin.js

@@ -69,7 +69,8 @@ function render(st) {
   const isGateway = st.mode === 'gateway'
   shownToken = st.token || token
   $('conn-badge').textContent = isPlugin ? '内嵌' : isGateway ? '网关' : '已连接'
-  $('conn-badge').className = 'conn-badge on'
+  $('conn-badge').className = 'conn-badge ' + (isPlugin || isGateway ? 'on' : 'off')
+  $('conn-badge').title = isGateway ? '新标签页打开网关管理面板' : '网关未运行'
   $('token-full').textContent = shownToken || (isPlugin ? '插件模式 · 未接网关, 无需令牌' : '未获取到令牌')
   // 主机端插件模式: 显示真实令牌(复制可用), 只隐藏退出按钮; 令牌门禁本身不存在
   $('btn-copy').classList.toggle('hidden', !shownToken)
@@ -258,6 +259,20 @@ $('btn-qr').addEventListener('click', () => {
   renderQr(lastState || { mode: '', token: shownToken })
 })
 
+/* 右上角「网关」徽章: 新标签页打开独立网关管理面板(带 token 免登录) */
+$('conn-badge').addEventListener('click', () => {
+  const st = lastState
+  if (!st || st.mode !== 'gateway') { toast('网关未运行', 'err'); return }
+  const host = location.hostname || '127.0.0.1'
+  const port = st.port || 8787
+  const url = `http://${host}:${port}/admin?token=${encodeURIComponent(shownToken || token)}`
+  try {
+    window.open(url, '_blank', 'noopener')
+  } catch {
+    toast('浏览器阻止了新窗口，请允许弹窗', 'err')
+  }
+})
+
 $('btn-rotate').addEventListener('click', async () => {
   if (!confirm('轮换后旧令牌立即失效，手机与浏览器都需要重新扫码/输入。继续？')) return
   try {

package/public/app.js

@@ -50,7 +50,8 @@ const state = {
   history: emptyHistory(),
   errCount: 0,
   refreshTimer: null,
-  fs: { path: null, initial: null, loaded: false, upload: null }
+  fs: { path: null, initial: null, loaded: false, upload: null },
+  models: { loaded: false, loading: false, groups: [], current: null, failures: [] }
 }
 
 const $ = (id) => document.getElementById(id)
@@ -298,6 +299,13 @@ function openStream(kind, handler, refreshOnOpen) {
     state.streamsOk[kind] = true
     state.errCount = 0
     updateConn()
+    // mux 每次(重)连接都会重放“仍待处理”的审批/提问基线:
+    // 先清空旧列表, 避免“桌面已自定义回答, 手机漏收 question/resolved”后永久残留。
+    if (kind === 'mux') {
+      state.approvals = []
+      state.questions = []
+      renderPending()
+    }
     if (refreshOnOpen) refreshAll()
   }
   ws.onmessage = (msg) => {
@@ -386,10 +394,15 @@ function onHostFrame(full) {
   if (['host/session-added', 'host/session-removed', 'host/workspace-changed', 'host/workspace-removed', 'host/workspace-order-changed', 'host/archived-sessions-changed'].includes(f.type)) return scheduleRefresh()
   if (f.type === 'host/session-status') {
     const s = state.byId.get(f.sessionId)
-    if (s) { s.running = f.running; if (state.current === f.sessionId) { renderSessionCards(); updateCancelBtn() } }
+    if (s) { s.running = f.running; if (state.current === f.sessionId) { renderSessionCards(); updateCancelBtn(); renderSessionSub(); updateSessionStatus() } }
     return
   }
-  if (f.type === 'host/agent-error') return toast(`会话出错：${f.message}`, 'err')
+  if (f.type === 'host/agent-error') {
+    const s = state.byId.get(f.sessionId)
+    if (s) { s.error = true; s.running = false }
+    if (state.current === f.sessionId) { renderSessionSub(); updateSessionStatus() }
+    return toast(`会话出错：${f.message}`, 'err')
+  }
   if (f.type === 'host/remote-event') return scheduleRefresh()
 }
 
@@ -398,8 +411,8 @@ function onSessionEvent(sessionId, event) {
   const s = state.byId.get(sessionId)
   if (s) s.updatedAt = Date.now()
   if (event.type === 'agent/status') {
-    if (s) { s.running = !!event.data?.running; s.blank = false }
-    if (state.current === sessionId) { updateCancelBtn(); renderSessionSub() }
+    if (s) { s.running = !!event.data?.running; s.blank = false; if (s.running) s.error = false }
+    if (state.current === sessionId) { updateCancelBtn(); renderSessionSub(); updateSessionStatus() }
   }
   if (event.type === 'session/title' || event.type === 'title') {
     if (event.data?.title && s) s.projections.values.title = event.data.title
@@ -417,7 +430,7 @@ function scheduleRefresh() {
 
 async function refreshAll() {
   await refreshSessions()
-  if (state.current) { renderSessionCards(); renderSessionSub(); updateCancelBtn() }
+  if (state.current) { renderSessionCards(); renderSessionSub(); updateCancelBtn(); updateSessionStatus() }
   renderPending(); renderQueue(); renderJobs(); updateConn()
 }
 
@@ -508,7 +521,7 @@ async function openSession(id) {
   state.history = emptyHistory()
   document.body.classList.add('in-session')
   showView('view-session')
-  renderSessionTitle(); renderSessionSub(); updateCancelBtn()
+  renderSessionTitle(); renderSessionSub(); updateCancelBtn(); updateSessionStatus()
   $('history').innerHTML = '<div class="empty">加载历史…</div>'
   await loadHistory(true)
   renderSessionCards()
@@ -519,6 +532,7 @@ function closeSession() {
   state.current = null
   state.history = emptyHistory()
   document.body.classList.remove('in-session')
+  hideComposerMenu()
   showView('view-home')
 }
 
@@ -550,9 +564,21 @@ function renderSessionSub() {
   const parts = [short(s.sessionId)]
   if (s.cwd) parts.push(s.cwd)
   if (s.running) parts.push('运行中')
+  else if (s.error) parts.push('已中断')
   $('session-sub').textContent = parts.join(' · ')
 }
 
+/** 顶栏状态: 运行中=蓝色流动渐变, 中断/出错=橙红渐变, 空闲=原样式 */
+function updateSessionStatus() {
+  const s = state.byId.get(state.current)
+  const head = $('session-head')
+  if (!head) return
+  head.classList.remove('running', 'interrupted')
+  const queued = (state.queues[state.current] || []).some(i => i.placement !== 'context')
+  if (s?.running || queued) head.classList.add('running')
+  else if (s?.error) head.classList.add('interrupted')
+}
+
 function updateCancelBtn() {
   const s = state.byId.get(state.current)
   const running = s?.running || (state.queues[state.current] || []).some(i => i.placement !== 'context')
@@ -966,20 +992,128 @@ async function interruptSubagent(childId) {
   setTimeout(renderSessionCards, 600)
 }
 
-/* ---------------- 发送 / 取消 ---------------- */
-async function sendMessage() {
-  const input = $('composer-input')
-  const text = input.value.trim()
-  if (!text || !state.current) return
+/* ---------------- 发送 / 取消 / 快捷菜单 ---------------- */
+async function sendSessionText(text) {
+  const clean = String(text || '').trim()
+  if (!clean || !state.current) return false
   $('btn-send').disabled = true
   const v = await safeRpc('session.prompt', {
     sessionId: state.current,
     mode: 'queue',
-    content: [{ type: 'text', text }]
+    content: [{ type: 'text', text: clean }]
   }, '发送失败')
   $('btn-send').disabled = false
-  if (v?.accepted) { input.value = ''; autosize(input); toast('已发送', 'ok') }
-  else if (v?.command?.text) toast('命令已执行')
+  if (v?.accepted) { toast(clean.startsWith('/') ? '指令已发送' : '已发送', 'ok'); return true }
+  if (v?.command?.text) { toast('命令已执行', 'ok'); return true }
+  return false
+}
+
+async function sendMessage() {
+  const input = $('composer-input')
+  const text = input.value.trim()
+  if (!text || !state.current) return
+  if (await sendSessionText(text)) { input.value = ''; autosize(input) }
+}
+
+function hideComposerMenu() {
+  $('composer-menu').classList.add('hidden')
+  $('btn-plus').classList.remove('active')
+}
+
+function toggleComposerMenu() {
+  const menu = $('composer-menu')
+  const show = menu.classList.contains('hidden')
+  menu.classList.toggle('hidden', !show)
+  $('btn-plus').classList.toggle('active', show)
+  if (show && !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') { authFailure(); return }
+    toast('模型列表加载失败：' + e.message, 'err')
+  }
+  state.models.loading = false
+  renderModelMenu()
+}
+
+function renderModelMenu() {
+  const box = $('menu-models')
+  if (!box) return
+  if (state.models.loading) { box.innerHTML = '<span>模型加载中…</span>'; return }
+  const groups = state.models.groups || []
+  if (!groups.length) {
+    box.innerHTML = '<span>' + ((state.models.failures || []).map(f => f.name + '不可用').join('；') || '没有可用模型') + '</span>'
+    const effortGroup = $('menu-effort-group')
+    if (effortGroup) effortGroup.classList.add('hidden')
+    return
+  }
+  const cur = state.models.current
+  box.innerHTML = groups.map(g => `
+    <div style="width:100%">
+      <div class="model-provider">${esc(g.name || g.id)}</div>
+      <div class="menu-chips">${(g.models || []).map(m => {
+        const isCur = cur && cur.provider === g.id && cur.model === m.id
+        return `<button class="model-chip ${isCur ? 'current' : ''}" data-model="${esc(m.id)}" data-provider="${esc(g.id)}">${esc(m.name || m.id)}</button>`
+      }).join('')}</div>
+    </div>`).join('')
+  box.querySelectorAll('[data-model]').forEach(btn =>
+    btn.addEventListener('click', () => selectSessionModel(btn.dataset.provider, btn.dataset.model)))
+  renderEffortMenu()
+}
+
+function renderEffortMenu() {
+  const group = $('menu-effort-group')
+  const box = $('menu-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="menu-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
+  }, '切换思考深度失败')
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderEffortMenu()
+    toast(`思考深度：${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, '切换模型失败')
+  if (v?.selected) {
+    state.models.current = v.selected
+    renderModelMenu()
+    toast(`已切换模型：${v.selected.model}`, 'ok')
+  }
 }
 
 async function cancelSession() {
@@ -1546,13 +1680,30 @@ async function submitGoalEdit() {
 }
 
 /* ---------------- 检查更新 ---------------- */
+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 = String(a || '').split('.').map(Number)
-  const pb = String(b || '').split('.').map(Number)
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const d = (pa[i] || 0) - (pb[i] || 0)
+  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
   }
+  // 无预发布后缀 = 正式版 > 任何 rc; 两个 rc 按段比较(数字段按数值, 字母段按字典序)
+  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 // 数字段 < 字母段(semver 规则)
+    else { const d = x.localeCompare(y); if (d) return d }
+  }
   return 0
 }
 
@@ -1573,7 +1724,7 @@ async function checkUpdate(silent) {
   }
   if (!silent) toast('正在检查更新…')
   try {
-    const res = await fetch(base + '/update.json?t=' + Date.now())
+    const res = await fetch(base + '/update.json?t=' + Date.now() + '&local=' + encodeURIComponent(state.localVersion))
     if (!res.ok) throw new Error('HTTP ' + res.status)
     const info = await res.json()
     if (info.version && cmpVersion(info.version, state.localVersion) > 0) {
@@ -1705,20 +1856,55 @@ function applyPairUrl(url) {
   }
 }
 
-/** App 内扫码: 调用原生 ML Kit, 扫到 dshremote://pair 后自动配对 */
+/** 拍照/相册得到的 dataUrl → 画到 canvas → jsQR 纯本地解码(不依赖任何谷歌服务) */
+async function decodeQrDataUrl(dataUrl) {
+  const img = new Image()
+  await new Promise((resolve, reject) => {
+    img.onload = resolve
+    img.onerror = () => reject(new Error('图片加载失败'))
+    img.src = dataUrl
+  })
+  const maxSide = 1600
+  const scale = Math.min(1, maxSide / Math.max(img.naturalWidth || 1, img.naturalHeight || 1))
+  const w = Math.max(1, Math.round((img.naturalWidth || 1) * scale))
+  const h = Math.max(1, Math.round((img.naturalHeight || 1) * scale))
+  const canvas = document.createElement('canvas')
+  canvas.width = w
+  canvas.height = h
+  const ctx = canvas.getContext('2d', { willReadFrequently: true })
+  if (!ctx) throw new Error('当前设备不支持图片解码')
+  ctx.drawImage(img, 0, 0, w, h)
+  const imageData = ctx.getImageData(0, 0, w, h)
+  const code = window.jsQR?.(imageData.data, w, h, { inversionAttempts: 'attemptBoth' })
+  return code?.data || ''
+}
+
+/** App 内扫码: 官方 Camera 拍照/相册 + jsQR 本地解码(无 Google ML Kit/GMS 依赖, 国内可用)。
+ *  冗余路径 1: 系统相机扫 dshremote:// 二维码直接唤起 App(见 bindNativeLinks);
+ *  冗余路径 2: 设置页手动粘贴令牌。 */
 async function scanPair() {
   if (!CAP?.isNativePlatform?.()) {
     toast('浏览器请打开主机管理页，用手机相机扫码', 'err')
     return
   }
-  const scanner = CAP.Plugins?.BarcodeScanner
-  if (!scanner?.scan) { toast('当前 App 版本不支持扫码，请先更新 App', 'err'); return }
+  const camera = CAP.Plugins?.Camera
+  if (!camera?.getPhoto) { toast('当前 App 版本不支持拍照扫码，请先更新 App', 'err'); return }
   try {
-    const supported = await scanner.isSupported?.()
-    if (supported && supported.supported === false) { toast('设备不支持扫码', 'err'); return }
-    const result = await scanner.scan({ formats: ['QR_CODE'], autoZoom: true })
-    const raw = result?.barcodes?.[0]?.rawValue || result?.barcodes?.[0]?.displayValue || ''
-    if (!raw) { toast('没有扫到内容', 'err'); return }
+    const perm = await camera.requestPermissions?.({ permissions: ['camera'] })
+    if (perm && perm.camera !== 'granted') { toast('未授予相机权限', 'err'); return }
+    const photo = await camera.getPhoto({
+      resultType: 'dataUrl',
+      source: 'PROMPT', // 拍照 / 从相册选择都行, 相册可扫截图
+      quality: 85,
+      correctOrientation: true,
+      saveToGallery: false,
+      promptLabelHeader: '扫描 DSH Remote 配对二维码',
+      promptLabelPhoto: '拍照扫描',
+      promptLabelPicture: '从相册选择',
+    })
+    if (!photo?.dataUrl) { toast('没有拿到图片，请重试', 'err'); return }
+    const raw = await decodeQrDataUrl(photo.dataUrl)
+    if (!raw) { toast('未识别到二维码，请对准后重试', 'err'); return }
     if (applyPairUrl(raw)) {
       toast('配对成功，正在连接', 'ok')
       openStreams()
@@ -1728,7 +1914,7 @@ async function scanPair() {
     }
   } catch (e) {
     const msg = String(e?.message || e || '')
-    toast(msg.includes('cancel') || msg.includes('Cancel') ? '已取消扫码' : '扫码失败：' + msg, 'err')
+    toast(/cancel/i.test(msg) ? '已取消扫码' : '扫码失败：' + msg, 'err')
   }
 }
 
@@ -1776,13 +1962,19 @@ function bindUi() {
   $('btn-back').addEventListener('click', closeSession)
   $('btn-stats').addEventListener('click', () => { renderSessionCards(); $('modal-stats').classList.remove('hidden') })
   $('stats-close').addEventListener('click', () => $('modal-stats').classList.add('hidden'))
-  $('btn-refresh').addEventListener('click', () => { toast('刷新中…'); refreshAll() })
+  $('btn-refresh').addEventListener('click', () => { toast('刷新中…'); openStreams(); refreshAll() })
   $('btn-admin').addEventListener('click', () => {
     location.href = state.server ? state.server.replace(/\/+$/, '') + '/admin' : 'admin'
   })
   $('btn-new-session').addEventListener('click', newSession)
   $('btn-cancel').addEventListener('click', cancelSession)
   $('btn-send').addEventListener('click', sendMessage)
+  $('btn-plus').addEventListener('click', toggleComposerMenu)
+  $('composer-menu').addEventListener('click', (e) => {
+    const chip = e.target.closest('[data-cmd]')
+    if (chip) { hideComposerMenu(); sendSessionText(chip.dataset.cmd) }
+  })
+  $('btn-model-refresh').addEventListener('click', loadSessionModels)
   const input = $('composer-input')
   input.addEventListener('input', () => autosize(input))
   input.addEventListener('keydown', (e) => {

package/public/index.html

@@ -59,7 +59,7 @@
 
     <!-- 会话详情 -->
     <section id="view-session" class="view hidden">
-      <div class="session-head">
+      <div id="session-head" class="session-head">
         <button id="btn-back" class="icon-btn">‹</button>
         <div class="session-head-meta">
           <div id="session-title" class="session-title">加载中…</div>
@@ -84,9 +84,38 @@
         </div>
       </div>
 
-      <div class="composer">
-        <textarea id="composer-input" rows="1" placeholder="给 DSH 发消息…（回车发送，Shift+Enter 换行）"></textarea>
-        <button id="btn-send" class="send-btn">发送</button>
+      <div class="composer-wrap">
+        <div id="composer-menu" class="composer-menu hidden">
+          <div class="menu-group">
+            <div class="menu-title">输入指令</div>
+            <div class="menu-chips">
+              <button class="menu-chip" data-cmd="/compact">/compact 压缩上下文</button>
+              <button class="menu-chip" data-cmd="/goal">/goal 查看目标</button>
+              <button class="menu-chip" data-cmd="/goal pause">/goal 暂停</button>
+              <button class="menu-chip" data-cmd="/goal resume">/goal 继续</button>
+            </div>
+          </div>
+          <div class="menu-group">
+            <div class="menu-title">权限控制</div>
+            <div class="menu-chips">
+              <button class="menu-chip" data-cmd="/permission workspace-write">工作区写（免审批）</button>
+              <button class="menu-chip danger" data-cmd="/permission danger-full-access">完全访问（全部免审批）</button>
+            </div>
+          </div>
+          <div class="menu-group">
+            <div class="menu-title">模型切换 <button id="btn-model-refresh" class="mini-btn" style="padding:1px 8px">刷新</button></div>
+            <div id="menu-models" class="menu-models muted">点开时自动加载</div>
+          </div>
+          <div class="menu-group hidden" id="menu-effort-group">
+            <div class="menu-title">思考深度</div>
+            <div id="menu-efforts" class="menu-chips"></div>
+          </div>
+        </div>
+        <div class="composer">
+          <button id="btn-plus" class="plus-btn" aria-label="更多操作" title="指令/权限/模型">＋</button>
+          <textarea id="composer-input" rows="1" placeholder="给 DSH 发消息…"></textarea>
+          <button id="btn-send" class="send-btn">发送</button>
+        </div>
       </div>
     </section>
 
@@ -111,7 +140,7 @@
           <button id="btn-server-add" class="mini-btn">添加</button>
         </div>
         <div class="setting-row">
-          <div><div class="setting-name">扫码连接</div><div class="setting-desc">扫主机管理页的令牌二维码，自动填入地址与令牌</div></div>
+          <div><div class="setting-name">扫码连接</div><div class="setting-desc">拍照/相册本地解码（无谷歌服务依赖）；也可系统相机扫码或手动粘贴</div></div>
           <button id="btn-scan-pair" class="mini-btn">扫码</button>
         </div>
         <div class="setting-row">
@@ -203,6 +232,7 @@
   <div id="toast" class="toast hidden"></div>
 
   <script src="sha256.js"></script>
+  <script src="jsqr.min.js"></script>
   <script src="app.js"></script>
 </body>
 </html>