dsh-remote-plugin 0.7.0-rc.2 → 0.7.0

package/gateway.cjs

@@ -23,13 +23,15 @@
  *   DSH_REMOTE_FS_MAX_UPLOAD 上传字节上限, 默认 2147483648 (2GB)
  *   DSH_REMOTE_WORKBENCH     工作台绑定文件, 默认 ~/.dsh-remote/workbench.json
  *   DSH_REMOTE_ADVERTISE_HOSTS 额外写入配对二维码的宿主 IP/主机名, 逗号或空白分隔
- *   DSH_REMOTE_DSH_CONTROL_MODE DSH 生命周期后端: auto/systemd/windows/disabled
+ *   DSH_REMOTE_DSH_CONTROL_MODE DSH 生命周期后端: auto/systemd/windows/process/disabled
+ *   DSH_REMOTE_DSH_LAUNCH_FILE 本机 DSH 启动配置, 默认 ~/.dsh-remote/dsh-launch.json
  */
 'use strict'
 
 const http = require('node:http')
 const https = require('node:https')
-const { execFile } = require('node:child_process')
+const { execFile, spawn } = require('node:child_process')
+const net = require('node:net')
 const fs = require('node:fs')
 const path = require('node:path')
 const os = require('node:os')
@@ -85,12 +87,14 @@ const TOKEN_FILE = process.env.TOKEN_FILE || path.join(os.homedir(), '.dsh-remot
 const NOTES_FILE = process.env.DSH_REMOTE_NOTES || path.join(os.homedir(), '.dsh-remote', 'device-notes.json')
 const DEVICE_KEYS_FILE = process.env.DSH_REMOTE_DEVICE_KEYS || path.join(os.homedir(), '.dsh-remote', 'device-keys.json')
 const WORKBENCH_FILE = process.env.DSH_REMOTE_WORKBENCH || path.join(os.homedir(), '.dsh-remote', 'workbench.json')
+const HANDOFF_FILE = process.env.DSH_REMOTE_HANDOFF || path.join(os.homedir(), '.dsh-remote', 'handoff.json')
 const STARTED_AT = Date.now()
 const DSH_SERVICE = String(process.env.DSH_REMOTE_DSH_SERVICE || 'dsh-web').trim()
 const SYSTEMCTL = String(process.env.DSH_REMOTE_SYSTEMCTL || 'systemctl').trim() || 'systemctl'
 const WINDOWS_SC = String(process.env.DSH_REMOTE_WINDOWS_SC || 'sc.exe').trim() || 'sc.exe'
 const DSH_CONTROL_MODE_RAW = String(process.env.DSH_REMOTE_DSH_CONTROL_MODE || 'auto').trim().toLowerCase()
-const DSH_CONTROL_MODE = ['auto', 'systemd', 'windows', 'disabled'].includes(DSH_CONTROL_MODE_RAW) ? DSH_CONTROL_MODE_RAW : 'auto'
+const DSH_CONTROL_MODE = ['auto', 'systemd', 'windows', 'process', 'disabled'].includes(DSH_CONTROL_MODE_RAW) ? DSH_CONTROL_MODE_RAW : 'auto'
+const DSH_LAUNCH_FILE = process.env.DSH_REMOTE_DSH_LAUNCH_FILE || path.join(os.homedir(), '.dsh-remote', 'dsh-launch.json')
 const DSH_CONTROL_TIMEOUT_MS = durationEnv('DSH_REMOTE_DSH_CONTROL_TIMEOUT_MS', 45000, 2000, 5 * 60 * 1000)
 const DSH_CONTROL_POLL_MS = durationEnv('DSH_REMOTE_DSH_CONTROL_POLL_MS', 500, 50, 5000)
 const HTTP_REQUEST_TIMEOUT_MS = durationEnv('GATEWAY_HTTP_REQUEST_TIMEOUT_MS', 15 * 60 * 1000, 0, 24 * 60 * 60 * 1000)
@@ -153,6 +157,7 @@ function containerRuntimeDetected() {
 }
 
 function dshControlSupport() {
+  if (DSH_CONTROL_MODE === 'process') return { supported: true, manager: 'process' }
   if (DSH_CONTROL_MODE === 'disabled') {
     return { supported: false, code: 'EXTERNAL_LIFECYCLE', message: '当前 DSH 由 Docker、面板或其他外部平台管理' }
   }
@@ -1034,6 +1039,96 @@ async function windowsServiceStatus() {
   }
 }
 
+// Only a live ChildProcess handle grants restart authority. Never trust a saved PID:
+// a gateway restart or PID reuse must not turn an unrelated process into our child.
+let dshManagedChild = null
+let dshManagedExit = null
+function readDshLaunch() {
+  const config = JSON.parse(fs.readFileSync(DSH_LAUNCH_FILE, 'utf8'))
+  if (config.version !== 1 || !path.isAbsolute(config.executable || '') ||
+      !path.isAbsolute(config.cwd || '') || !Array.isArray(config.args) ||
+      !config.args.length || !config.args.every(arg => typeof arg === 'string' && !arg.includes('\0')) ||
+      !path.isAbsolute(config.args[0]) || !fs.statSync(config.args[0]).isFile() ||
+      !fs.statSync(config.executable).isFile() || !fs.statSync(config.cwd).isDirectory()) {
+    throw new Error('DSH 启动配置无效，请从 DSH Web 插件重新生成')
+  }
+  if (!['127.0.0.1', 'localhost', '[::1]'].includes(UPSTREAM.hostname) || config.upstream !== UPSTREAM.origin) {
+    throw new Error('DSH 启动配置与本机上游地址不匹配')
+  }
+  const env = {}
+  for (const key of ['DSH_HOME', 'HOME', 'USERPROFILE', 'PATH', 'NODE_OPTIONS']) {
+    if (typeof config.env?.[key] === 'string') env[key] = config.env[key]
+  }
+  return { ...config, env }
+}
+
+function dshPortOccupied() {
+  return new Promise(resolve => {
+    const socket = net.connect({ host: UPSTREAM.hostname.replace(/^\[|\]$/g, ''), port: UPSTREAM.port || (UPSTREAM.protocol === 'https:' ? 443 : 80) })
+    const finish = value => { socket.destroy(); resolve(value) }
+    socket.once('connect', () => finish(true))
+    socket.once('error', err => finish(err.code !== 'ECONNREFUSED'))
+    socket.setTimeout(1500, () => finish(true)) // uncertainty must not spawn a duplicate
+  })
+}
+
+async function dshProcessStatus() {
+  const base = { ok: true, supported: true, manager: 'process', service: 'dsh-process', running: false, mainPid: 0, canRestart: false }
+  try { readDshLaunch() } catch (err) {
+    return { ...base, supported: false, code: 'LAUNCH_CONFIG_INVALID', message: '缺少有效 DSH 启动配置，请先从 DSH Web 启动 Remote 插件', detail: err.message }
+  }
+  if (dshManagedChild) {
+    return { ...base, running: true, mainPid: dshManagedChild.pid, owned: true, canRestart: true, activeState: 'active', subState: 'running' }
+  }
+  const occupied = await dshPortOccupied()
+  const probe = occupied ? await probeDshUpstream() : null
+  return { ...base, running: !!probe?.ok, occupied, owned: false,
+    activeState: occupied ? (probe?.ok ? 'active' : 'inactive') : dshManagedExit ? 'failed' : 'inactive',
+    subState: occupied ? 'external' : 'stopped',
+    ...(dshManagedExit && !occupied ? { result: 'process-exited', execMainStatus: dshManagedExit.code, logFile: dshManagedExit.logFile } : {}),
+  }
+}
+
+async function executeDshProcessAction(action) {
+  const config = readDshLaunch()
+  if (action === 'restart' && !dshManagedChild && await dshPortOccupied()) {
+    return { ok: false, code: 'EXTERNAL_PROCESS', error: '当前 DSH 并非本网关启动，不能安全重启；请在原启动器中停止后重试' }
+  }
+  if (action === 'restart' && dshManagedChild) {
+    const child = dshManagedChild
+    const stopped = new Promise(resolve => {
+      const timer = setTimeout(() => { child.removeListener('exit', onExit); resolve(false) }, 5000)
+      const onExit = () => { clearTimeout(timer); resolve(true) }
+      child.once('exit', onExit)
+    })
+    child.kill()
+    if (!await stopped) return { ok: false, code: 'PROCESS_STOP_TIMEOUT', error: 'DSH 进程未及时退出，未启动第二个实例' }
+  }
+  if (dshManagedChild || await dshPortOccupied()) return { ok: false, code: 'PORT_IN_USE', error: 'DSH 端口已被占用，未启动重复实例' }
+  const logFile = path.join(path.dirname(DSH_LAUNCH_FILE), 'dsh-process.log')
+  fs.mkdirSync(path.dirname(logFile), { recursive: true })
+  const fd = fs.openSync(logFile, 'a', 0o600)
+  let child
+  try {
+    child = spawn(config.executable, config.args, {
+      cwd: config.cwd, env: { ...process.env, ...config.env },
+      detached: true, windowsHide: true, shell: false, stdio: ['ignore', fd, fd],
+    })
+  } finally { fs.closeSync(fd) }
+  dshManagedChild = child
+  dshManagedExit = null
+  child.once('exit', code => {
+    if (dshManagedChild === child) { dshManagedChild = null; dshManagedExit = { code, logFile } }
+  })
+  return new Promise(resolve => {
+    child.once('error', err => {
+      if (dshManagedChild === child) { dshManagedChild = null; dshManagedExit = { code: err.code, logFile } }
+      resolve({ ok: false, code: 'PROCESS_START_FAILED', error: `${err.message}；日志：${logFile}` })
+    })
+    child.once('spawn', () => { child.unref(); resolve({ ok: true, code: 0 }) })
+  })
+}
+
 async function dshServiceStatus() {
   if (!/^[A-Za-z0-9_.@-]+$/.test(DSH_SERVICE)) {
     return { ok: false, supported: false, running: false, service: DSH_SERVICE, code: 'INVALID_SERVICE', message: 'DSH_REMOTE_DSH_SERVICE 服务名配置不合法' }
@@ -1041,7 +1136,12 @@ async function dshServiceStatus() {
   if (!DSH_CONTROL_SUPPORT.supported) {
     return { ok: true, supported: false, running: false, service: DSH_SERVICE, ...DSH_CONTROL_SUPPORT }
   }
-  if (process.platform === 'win32') return windowsServiceStatus()
+  if (DSH_CONTROL_MODE === 'process') return dshProcessStatus()
+  if (process.platform === 'win32') {
+    const service = await windowsServiceStatus()
+    if (DSH_CONTROL_MODE === 'auto' && service.code === 'SERVICE_NOT_FOUND') return dshProcessStatus()
+    return { ...service, manager: 'windows' }
+  }
   const r = await execFileResult(SYSTEMCTL, [
     '--user', 'show', DSH_SERVICE,
     '--property=Id,LoadState,ActiveState,SubState,UnitFileState,MainPID,Result,ExecMainStatus',
@@ -1080,6 +1180,7 @@ async function dshServiceStatus() {
 }
 
 async function executeDshServiceAction(action, initial) {
+  if (initial?.manager === 'process') return executeDshProcessAction(action)
   if (process.platform !== 'win32') {
     return execFileResult(SYSTEMCTL, ['--user', '--no-block', action, DSH_SERVICE], 5000)
   }
@@ -1170,27 +1271,25 @@ function reconnectDshEventCollectors() {
 
 async function runDshControlOperation(operation) {
   try {
-    const manager = process.platform === 'win32' ? 'Windows 服务' : 'systemd 用户服务'
-    dshOperationStep(operation, 'checking', `正在检查 ${manager} ${DSH_SERVICE}`)
+    dshOperationStep(operation, 'checking', '正在检查 DSH 启动配置与运行状态')
     const initial = await dshServiceStatus()
     operation.initialStatus = initial
     operation.observed = initial
+    const manager = initial.manager === 'process' ? '本机进程' : process.platform === 'win32' ? 'Windows 服务' : 'systemd 用户服务'
+    operation.service = initial.service
     if (!initial.supported) {
       failDshOperation(operation, initial.code || 'UNSUPPORTED', initial.message || '当前 DSH 服务不可控', initial.detail, initial)
       return
     }
-    if (operation.action === 'start' && initial.running) {
-      dshOperationStep(operation, 'complete', `DSH 已在运行（${initial.service}，PID ${initial.mainPid || '未知'}）`, {
-        ok: true, done: true, code: 'ALREADY_RUNNING', status: initial, upstream: await probeDshUpstream(),
-      })
-      return
-    }
-
     dshOperationStep(operation, 'command', `正在向 ${manager} 提交 DSH ${operation.action === 'start' ? '启动' : '重启'}命令`)
-    const command = await executeDshServiceAction(operation.action, initial)
+    const command = operation.action === 'start' && initial.running
+      ? { ok: true, code: 'ALREADY_RUNNING' }
+      : await executeDshServiceAction(operation.action, initial)
     operation.command = { ok: command.ok, code: command.code, signal: command.signal }
     if (!command.ok) {
-      const failure = classifyDshServiceFailure(command)
+      const failure = initial.manager === 'process'
+        ? { code: command.code, message: command.error, detail: '' }
+        : classifyDshServiceFailure(command)
       failDshOperation(operation, failure.code, failure.message, failure.detail, await dshServiceStatus())
       return
     }
@@ -1215,7 +1314,7 @@ async function runDshControlOperation(operation) {
       }
       if (operation.action === 'restart' && (status.mainPid > 0 && status.mainPid !== initialPid || status.activeState !== 'active')) restartObserved = true
       if (status.activeState === 'failed') {
-        failDshOperation(operation, 'SERVICE_FAILED', `DSH 服务进入 failed 状态（Result=${status.result || 'unknown'}，ExecMainStatus=${status.execMainStatus}）`, '', status)
+        failDshOperation(operation, 'SERVICE_FAILED', `DSH 启动进程已退出（Result=${status.result || 'unknown'}，ExecMainStatus=${status.execMainStatus}）`, status.logFile ? `启动日志：${status.logFile}` : '', status)
         return
       }
       if (status.running && restartObserved) {
@@ -1479,7 +1578,10 @@ async function detectUpstreamApiFlavor(force = false) {
       }
     } catch (error) {
       upstreamApiFlavorCheckedAt = Date.now()
-      if (upstreamApiFlavor === 'unknown') upstreamApiFlavor = 'legacy'
+      // 网络级失败（上游未启动/cookie 未就绪）不改变 flavor：
+      // 把 unknown 定格成 legacy 会让新版 DSH 被永久当旧服务器探测，
+      // events 双流从此连不上（websocket error 循环）。保持 unknown，
+      // 下一轮 recheck 再探；已有明确 flavor 的也不因瞬断回退。
       recordCompatibility('protocol-probe-failed', { detail: error?.message || error })
     } finally {
       upstreamApiFlavorProbe = null
@@ -1656,7 +1758,15 @@ async function translateModernRpc(method, payload, rpcId) {
     return legacyFallback('no generated RPC adapter')
   }
 
-  const response = await callUpstreamRemote(endpoint, args, rpcId)
+  let response = await callUpstreamRemote(endpoint, args, rpcId)
+  if (method === 'session.prompt' && imageAdmissionRejected(response.body)) {
+    try {
+      const bridged = await bridgeVisionPrompt(args.request)
+      if (bridged) response = await callUpstreamRemote(endpoint, { ...args, request: bridged }, rpcId)
+    } catch (error) {
+      return legacyEnvelope(rpcId, modernError(error.message, 'image-vision-failed'))
+    }
+  }
   if (modernResponseNeedsLegacyFallback(response)) return legacyFallback(`generated RPC ${endpoint} unavailable`)
   if (!response.body?.result?.ok) {
     recordCompatibility('generated-rpc-error', { method, status: response.status, detail: remoteFailureKind(response) })
@@ -1975,6 +2085,11 @@ function legacyPush(kind, payload, rpcId = crypto.randomUUID()) {
 
 function openModernSessionStream(ws, sessionId) {
   if (!sessionId || ws.readyState !== 1) return
+  // subagent 来源的会话在 DSH 侧只接受带 durable parent address 的 follow，
+  // 直接按 session 地址 open 会被拒（session/agent-busy），错误帧还会污染事件流；
+  // 这些会话的投影变化由 control/workspaces 基线推送覆盖，无需单独 follow。
+  const summary = modernState.sessions.get(sessionId)
+  if (summary?.origin === 'subagent') return
   const streamId = 'session:' + sessionId
   ws.send(JSON.stringify({
     type: 'open', streamId, endpoint: 'session/follow',
@@ -2752,7 +2867,7 @@ function serveStatic(req, res, url) {
     })
     return
   }
-  const apkOverride = pathname === '/dsh-remote.apk'
+  const apkOverride = pathname === '/dsh-remote.apk' || pathname === '/dsh-remote-harmonyos-unsigned.hap' || pathname === '/dsh-remote-harmonyos.hap'
   const baseDir = apkOverride ? path.join(ROOT, 'apk') : PUBLIC_DIR
   const filePath = path.normalize(path.join(baseDir, pathname))
   if (filePath !== baseDir && !filePath.startsWith(baseDir + path.sep)) {
@@ -2778,7 +2893,7 @@ function serveStatic(req, res, url) {
     }
     res.writeHead(200, {
       'content-type': MIME[ext] || 'application/octet-stream',
-      'cache-control': ext === '.html' || ext === '.js' || ext === '.css' ? 'no-cache' : 'public, max-age=300',
+      'cache-control': pathname === '/harmonyos-update.json' ? 'no-store' : ext === '.html' || ext === '.js' || ext === '.css' ? 'no-cache' : 'public, max-age=300',
       'content-length': st.size,
       'last-modified': lastModified
     })
@@ -2805,7 +2920,7 @@ function upstreamReachable(cb) {
   req.end()
 }
 
-function serveAdminApi(req, res, url) {
+async function serveAdminApi(req, res, url) {
   const sub = url.pathname.slice('/admin/api'.length) || '/'
   if (sub === '/dsh') return serveDshControl(req, res, url)
   if (sub === '/state' && req.method === 'GET') {
@@ -2816,6 +2931,7 @@ function serveAdminApi(req, res, url) {
       res.end(JSON.stringify({ error: 'unauthorized' }))
       return
     }
+    const control = await dshControlDescription()
     upstreamReachable((reachable) => {
       res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
       res.end(JSON.stringify({
@@ -2831,8 +2947,8 @@ function serveAdminApi(req, res, url) {
         host: HOST,
         port: PORT,
         protocol: { version: PROTOCOL_VERSION },
-        capabilities: CAPABILITIES,
-        dshControl: DSH_CONTROL_SUPPORT,
+        capabilities: { ...CAPABILITIES, dshLifecycle: control.supported ? 2 : 0 },
+        dshControl: control,
         upstream: { url: UPSTREAM.origin, reachable },
         latest: {
           version: latestState.version,
@@ -3971,6 +4087,127 @@ function workbenchPathInfo(rawPath) {
   return { path: checked.abs }
 }
 
+/* ---------- /handoff 跨端接续指针 ----------
+ * 单条记录：最近一次"正在查看的会话"。双端客户端离开会话时 PUT，
+ * 进入会话列表时 GET，发现是另一台设备写的就展示"在 xx 上打开过"接续卡片。
+ * 只存指针（sessionId + 设备名），不存消息内容——消息仍由 DSH 实时通道下发。
+ * 支持多服务器共用一个网关：key 是上游会话所属服务器没有区分需求，
+ * 这里按"该 token 能看到的同一个 DSH"即单工作台语义，只存一份。
+ */
+const HANDOFF_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000
+let handoffMemory = null
+
+function handoffLoad() {
+  if (handoffMemory) return handoffMemory
+  try {
+    const raw = JSON.parse(fs.readFileSync(HANDOFF_FILE, 'utf8'))
+    if (raw && typeof raw === 'object' && typeof raw.sessionId === 'string' && raw.sessionId) {
+      handoffMemory = {
+        sessionId: String(raw.sessionId).slice(0, 128),
+        title: String(raw.title || '').slice(0, 200),
+        device: String(raw.device || '').slice(0, 80),
+        clientId: String(raw.clientId || '').slice(0, 96),
+        at: Number(raw.at) || 0
+      }
+    }
+  } catch {}
+  return handoffMemory
+}
+
+function handoffSave(record) {
+  handoffMemory = record
+  try {
+    fs.mkdirSync(path.dirname(HANDOFF_FILE), { recursive: true })
+    fs.writeFileSync(HANDOFF_FILE, JSON.stringify(record, null, 2) + '\n')
+  } catch {}
+}
+
+function handoffFresh() {
+  const rec = handoffLoad()
+  if (!rec) return null
+  if (!rec.at || Date.now() - rec.at > HANDOFF_MAX_AGE_MS) return null
+  return rec
+}
+
+function serveHandoff(req, res, url) {
+  cors(res)
+  if (req.method === 'OPTIONS') {
+    res.writeHead(204)
+    res.end()
+    return
+  }
+  if (req.method !== 'GET' && req.method !== 'PUT' && req.method !== 'DELETE') {
+    res.writeHead(405, { allow: 'GET, PUT, DELETE' })
+    res.end()
+    return
+  }
+  if (!authorized(req, url)) {
+    authFailures++
+    touchDevice(req, { failedAuth: true })
+    res.writeHead(401, { 'content-type': 'application/json; charset=utf-8' })
+    res.end(JSON.stringify({ error: 'unauthorized' }))
+    return
+  }
+  touchDevice(req)
+
+  if (req.method === 'GET') {
+    const rec = handoffFresh()
+    fsJson(res, 200, { ok: true, handoff: rec })
+    return
+  }
+
+  if (req.method === 'DELETE') {
+    handoffMemory = null
+    try { fs.rmSync(HANDOFF_FILE, { force: true }) } catch {}
+    fsJson(res, 200, { ok: true })
+    return
+  }
+
+  // PUT：读 JSON 体，字段白名单 + 截断，4KB 上限
+  let body = ''
+  let done = false
+  req.on('data', chunk => {
+    if (done) return
+    body += chunk
+    if (Buffer.byteLength(body) > 4096) {
+      done = true
+      fsJson(res, 413, { error: 'payload too large' })
+      req.destroy()
+    }
+  })
+  req.on('end', () => {
+    if (done || res.headersSent) return
+    done = true
+    let payload
+    try {
+      payload = JSON.parse(body || '{}')
+    } catch {
+      fsJson(res, 400, { error: 'invalid json' })
+      return
+    }
+    // JSON 允许 null/数组/标量：后续读 payload.sessionId 会在 end 回调里抛
+    // TypeError（外层 try/catch 接不住，请求悬挂无响应，2026-09-20 评审复现）。
+    // 先校验为普通对象，不合规直接 400。
+    if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+      fsJson(res, 400, { error: 'object body required' })
+      return
+    }
+    const sessionId = typeof payload.sessionId === 'string' ? payload.sessionId.trim() : ''
+    if (!sessionId) {
+      fsJson(res, 400, { error: 'sessionId required' })
+      return
+    }
+    handoffSave({
+      sessionId: sessionId.slice(0, 128),
+      title: String(payload.title || '').slice(0, 200),
+      device: String(payload.device || '').slice(0, 80),
+      clientId: String(payload.clientId || '').slice(0, 96),
+      at: Date.now()
+    })
+    fsJson(res, 200, { ok: true })
+  })
+}
+
 function loadWorkbench() {
   try {
     const raw = JSON.parse(fs.readFileSync(WORKBENCH_FILE, 'utf8'))
@@ -4088,7 +4325,50 @@ function readApiRequest(req, maxBytes = 4 * 1024 * 1024) {
   })
 }
 
-async function forwardLegacyRpc(url, raw) {
+// Only the explicit pre-admission image rejection is safe to retry. Never retry
+// a timeout, ambiguous transport failure, or an already accepted prompt.
+function imageAdmissionRejected(body) {
+  const result = body?.result
+  return result?.ok === false && result.error?.code === 'session/attachment-invalid'
+    && result.error?.details?.reason === 'MODEL_DOES_NOT_SUPPORT_IMAGES'
+}
+
+async function bridgeVisionPrompt(payload) {
+  if (!Array.isArray(payload?.content) || !payload.content.some(part => part?.type === 'image')) return null
+  const pluginFetch = (route, options = {}) => fetch(new URL('/api/dsh-image-vision/' + route, UPSTREAM), {
+    ...options,
+    headers: dshUpstreamHeaders({ 'content-type': 'application/json' }),
+    signal: AbortSignal.timeout(UPSTREAM_REQUEST_TIMEOUT_MS),
+    redirect: 'error',
+  })
+  const configResponse = await pluginFetch('config')
+  if (configResponse.status === 404) throw new Error('当前模型不支持图片，未找到兼容的 dsh-image-vision 插件；请安装并启用视觉辅助插件，或切换视觉模型。')
+  if (!configResponse.ok) throw new Error('无法检查视觉辅助插件状态，请稍后重试。')
+  const config = await configResponse.json()
+  if (config?.config?.enabled !== true) throw new Error('当前模型不支持图片，视觉辅助插件尚未开启。请在 DSH 中启用插件后重试。')
+  const content = []
+  for (const part of payload.content) {
+    if (part?.type !== 'image') { content.push(part); continue }
+    if (typeof part.data !== 'string' || !part.data || typeof part.mediaType !== 'string') {
+      throw new Error('视觉辅助转换失败：图片缺少内联数据，请重新选择图片。')
+    }
+    const response = await pluginFetch('attach', { method: 'POST', body: JSON.stringify({
+      data: part.data, mediaType: part.mediaType,
+      ...(typeof part.name === 'string' ? { name: part.name } : {}),
+    }) })
+    const value = await response.json().catch(() => null)
+    // Accept only the plugin's same-upstream attachment reference, not arbitrary
+    // returned text/URLs. Preserve every other block and the original send mode.
+    if (!response.ok || value?.ok !== true || typeof value.markdown !== 'string'
+      || !/^!\[图片\]\(\/api\/dsh-image-vision\/raw\/[A-Za-z0-9%._~-]+\?[^\s()<>]+\)$/.test(value.markdown)) {
+      throw new Error('视觉辅助图片上传失败，消息尚未发送，请检查插件后重试。')
+    }
+    content.push({ type: 'text', text: value.markdown })
+  }
+  return { ...payload, content }
+}
+
+async function forwardLegacyRpc(url, raw, allowVisionBridge = true) {
   const target = new URL(url.pathname + url.search, UPSTREAM)
   const response = await fetch(target, {
     method: 'POST',
@@ -4096,7 +4376,20 @@ async function forwardLegacyRpc(url, raw) {
     body: raw,
     signal: AbortSignal.timeout(UPSTREAM_REQUEST_TIMEOUT_MS),
   })
-  return { status: response.status, headers: response.headers, raw: await response.text() }
+  const result = { status: response.status, headers: response.headers, raw: await response.text() }
+  if (allowVisionBridge) {
+    let body, request
+    try { body = JSON.parse(result.raw); request = JSON.parse(raw) } catch {}
+    if (request?.method === 'session.prompt' && imageAdmissionRejected(body)) {
+      try {
+        const bridged = await bridgeVisionPrompt(request.payload)
+        if (bridged) return forwardLegacyRpc(url, JSON.stringify({ ...request, payload: bridged }), false)
+      } catch (error) {
+        return { ...result, status: 200, raw: JSON.stringify(legacyEnvelope(request.rpcId, modernError(error.message, 'image-vision-failed'))) }
+      }
+    }
+  }
+  return result
 }
 
 function sendBufferedUpstreamResponse(res, response) {
@@ -4286,6 +4579,15 @@ function proxyApi(req, res, url) {
 }
 
 // ---------- 其它 ----------
+async function dshControlDescription() {
+  if (!DSH_CONTROL_SUPPORT.supported) return DSH_CONTROL_SUPPORT
+  if (process.platform !== 'win32' && DSH_CONTROL_MODE !== 'process') return DSH_CONTROL_SUPPORT
+  const status = await dshServiceStatus()
+  return { supported: status.supported, manager: status.manager || DSH_CONTROL_SUPPORT.manager,
+    ...(status.code ? { code: status.code, message: status.message } : {}),
+    ...(status.canRestart !== undefined ? { canRestart: status.canRestart } : {}) }
+}
+
 async function serveHealth(req, res, url) {
   restoreMissingTokenFile()
   const eventHealth = Object.fromEntries(Object.entries(eventCollectorState).map(([kind, state]) => [kind, {
@@ -4326,6 +4628,7 @@ async function serveHealth(req, res, url) {
   const eventsOk = eventHealth.mux.connected && eventHealth.host.connected
   const readiness = { ok: upstreamOk && eventsOk, upstreamOk, eventsOk }
   const status = readiness.ok ? 'ready' : upstreamReachable ? 'degraded' : 'offline'
+  const control = await dshControlDescription()
   cors(res)
   res.writeHead(200, { 'content-type': 'application/json; charset=utf-8' })
   res.end(JSON.stringify({
@@ -4336,8 +4639,8 @@ async function serveHealth(req, res, url) {
     readiness,
     version: VERSION,
     protocol: { version: PROTOCOL_VERSION },
-    capabilities: CAPABILITIES,
-    dshControl: DSH_CONTROL_SUPPORT,
+    capabilities: { ...CAPABILITIES, dshLifecycle: control.supported ? 2 : 0 },
+    dshControl: control,
     pid: process.pid,
     upstream: UPSTREAM.origin,
     upstreamProbe: DSH_HEALTH_PATH,
@@ -4369,7 +4672,8 @@ const server = http.createServer(async (req, res) => {
     if (url.pathname === '/workbench' || url.pathname.startsWith('/workbench/')) return serveWorkbench(req, res, url)
     if (url.pathname === '/diagnostics') return serveDiagnostics(req, res, url)
     if (url.pathname === '/feedback') return serveFeedback(req, res, url)
-    if (url.pathname.startsWith('/admin/api')) return serveAdminApi(req, res, url)
+    if (url.pathname === '/handoff') return serveHandoff(req, res, url)
+    if (url.pathname.startsWith('/admin/api')) return await serveAdminApi(req, res, url)
     if (url.pathname.startsWith('/stats')) return serveStats(req, res, url)
     if (url.pathname === '/api/ws-ticket') return serveWsTicket(req, res, url)
     if (url.pathname === '/api/events.poll') return serveEventPoll(req, res, url)
@@ -4417,6 +4721,41 @@ function wsPingFrame(masked) {
   return Buffer.concat([Buffer.from([0x89, 0x80]), mask])
 }
 
+/**
+ * 从缓冲头部解析一个完整客户端帧（RFC6455 §5.2）。
+ * 返回 null 表示数据不够、需要等下一个 chunk；解析成功返回
+ * { fin, opcode, payload(已解掩码), total(帧总长) }。
+ * 客户端帧必须带掩码位（§5.1），无掩码直接按协议错误返回 null 并由调用方清缓冲。
+ * 只支持 ≤125 载荷的控制帧上限约束交由调用方（Ping 载荷协议上限 125）；
+ * 长度用 126/127 扩展格式完整解析，保证数据帧边界正确跳过。
+ */
+function wsParseClientFrame(buf) {
+  if (buf.length < 2) return null
+  const fin = (buf[0] & 0x80) !== 0
+  const opcode = buf[0] & 0x0f
+  const masked = (buf[1] & 0x80) !== 0
+  let len = buf[1] & 0x7f
+  let off = 2
+  if (len === 126) {
+    if (buf.length < 4) return null
+    len = buf.readUInt16BE(2)
+    off = 4
+  } else if (len === 127) {
+    if (buf.length < 10) return null
+    const big = buf.readBigUInt64BE(2)
+    if (big > BigInt(1 << 20)) return 'oversize'
+    len = Number(big)
+    off = 10
+  }
+  if (!masked) return 'unmasked'
+  if (buf.length < off + 4 + len) return null
+  const mask = buf.subarray(off, off + 4)
+  const payload = Buffer.alloc(len)
+  const src = buf.subarray(off + 4, off + 4 + len)
+  for (let i = 0; i < len; i++) payload[i] = src[i] ^ mask[i & 3]
+  return { fin, opcode, payload, total: off + 4 + len }
+}
+
 /**
  * 原始 TCP 透传也要维护 WebSocket 控制帧活性:
  * - 浏览器侧收到网关的未掩码 Ping 后会自动回 Pong;
@@ -4521,6 +4860,41 @@ function acceptCollectorClient(req, socket, head, kind, device) {
   socket.setNoDelay(true)
   collectorClients[kind].add(socket)
   eventCollectorState[kind].clients = collectorClients[kind].size
+  // 客户端（鸿蒙 lws 等严格 RFC 实现）会发掩码 Ping 并等待 Pong；
+  // 网关必须按 RFC6455 回 Pong(0x8A)，且服务端→客户端方向不带掩码位
+  // （RFC6455 §5.1：客户端帧必须掩码，服务端帧必须不掩码，违规即断链）。
+  // TCP 不保证帧边界与 data 事件对齐，逐字节扫描当前 chunk 会把跨包帧、
+  // 其他帧的掩码/载荷误认成帧头（2026-09-20 评审复现：掩码后拆包回出错误
+  // Pong 8a03010203）。这里按 RFC6455 组帧：维护 per-socket 缓冲，帧头
+  // （含 126/127 扩展长度）与载荷凑齐才应答，整帧消费，控制帧间数据帧安全跳过。
+  let rx = Buffer.alloc(0)
+  socket.on('data', (chunk) => {
+    rx = rx.length ? Buffer.concat([rx, chunk]) : chunk
+    while (true) {
+      let frame
+      try {
+        frame = wsParseClientFrame(rx)
+      } catch {
+        rx = Buffer.alloc(0)
+        break
+      }
+      if (!frame) break
+      if (typeof frame === 'string') { rx = Buffer.alloc(0); break }
+      rx = rx.subarray(frame.total)
+      if (frame.payload.length > 125) continue
+      if (frame.fin === false) continue
+      // 仅应答 Ping（RFC6455 §5.5 控制帧载荷上限 125）；Pong（0xA）消费后丢弃，
+      // 其余 opcode（含数据帧/分片）跳过
+      if (frame.opcode === 0x9) {
+        const pong = Buffer.alloc(2 + frame.payload.length)
+        pong[0] = 0x8a
+        pong[1] = frame.payload.length
+        frame.payload.copy(pong, 2)
+        try { socket.write(pong) } catch {}
+      }
+    }
+    if (rx.length > 1 << 20) rx = Buffer.alloc(0)
+  })
   for (const raw of collectorReplay[kind].values()) {
     if (socket.destroyed || !socket.writable) break
     try { socket.write(encodeWsText(raw)) } catch { break }

package/index.mjs

@@ -6,13 +6,13 @@
  * 浏览器侧入口由 client half 注册在 DSH 原生侧边栏(见 client.js)。
  */
 import { execFileSync, spawn } from 'node:child_process'
-import { appendFileSync, chmodSync, createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs'
+import { appendFileSync, chmodSync, createReadStream, existsSync, mkdirSync, openSync, readFileSync, writeFileSync, renameSync } from 'node:fs'
 import { stat } from 'node:fs/promises'
 import net from 'node:net'
 import { homedir, hostname, networkInterfaces } from 'node:os'
 import { dirname, extname, normalize, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { createPluginCenter } from './plugin-center.mjs'
+import { createPluginCenter, detectProfile } from './plugin-center.mjs'
 
 export const name = 'dsh-remote'
 export const inject = ['webServer', 'commands', 'agents', 'connection']
@@ -976,10 +976,37 @@ async function serveStatic(req, res, ctx) {
 }
 
 const pluginCenters = new WeakMap()
+export function saveDshLaunchConfig(ctx) {
+  // Desktop owns its Electron runtime. Never record a desktop or unknown launcher.
+  if (process.platform !== 'win32' || process.versions.electron) return false
+  const profile = detectProfile(ctx)
+  if (!profile?.cli || profile.name === 'desktop' || resolve(process.argv[1] || '') !== resolve(profile.cli)) return false
+  const env = { DSH_HOME: profile.home }
+  for (const key of ['HOME', 'USERPROFILE', 'PATH', 'NODE_OPTIONS']) {
+    if (process.env[key] !== undefined) env[key] = process.env[key]
+  }
+  const args = [profile.cli, ...process.argv.slice(2)]
+  if (!args.includes('--no-open')) args.push('--no-open')
+  const config = { version: 1, executable: process.execPath, args, cwd: process.cwd(),
+    env, profile: profile.name, upstream: upstreamUrlForListener({ host: ctx.webServer.host, port: ctx.webServer.port }) }
+  const file = process.env.DSH_REMOTE_DSH_LAUNCH_FILE || `${homedir()}/.dsh-remote/dsh-launch.json`
+  const tmp = `${file}.${process.pid}.tmp`
+  try {
+    mkdirSync(dirname(file), { recursive: true })
+    writeFileSync(tmp, JSON.stringify(config, null, 2) + '\n', { mode: 0o600 })
+    renameSync(tmp, file)
+    return true
+  } catch (err) {
+    logGateway('无法保存 DSH 启动配置: ' + err.message)
+    return false
+  }
+}
+
 export function apply(ctx) {
   pluginCenters.set(ctx, createPluginCenter(ctx))
   dshListen = { host: ctx.webServer.host, port: ctx.webServer.port }
   dshConnection = ctx.connection
+  saveDshLaunchConfig(ctx)
   ctx.effect(() => ctx.webServer.register({
     kind: 'prefix',
     path: MOUNT,

package/package.json

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

package/public/app.js

@@ -132,6 +132,7 @@ const CUSTOM_SELECT_TITLES = {
   'session-sort': 'sessions.sortLabel',
   'fs-workspace': 'workspace.select',
   'mobile-enter-action': 'settings.mobileEnterTitle',
+  'busy-send-mode': 'settings.busySendTitle',
   'bg-interval': 'settings.bgIntervalTitle',
   'new-session-workspace': 'workspace.select'
 }
@@ -606,7 +607,9 @@ async function rpc(method, payload = {}, timeoutMs = 45000) {
   if (!full?.result) throw new Error(t('err.badResponse'))
   if (!full.result.ok) {
     const err = full.result.error || {}
-    throw new Error(err.message || t('err.dshError'))
+    const error = new Error(err.message || t('err.dshError'))
+    error.rpcRejected = true
+    throw error
   }
   return full.result.value
 }
@@ -2416,6 +2419,7 @@ function renderSessionSub() {
 
 /** 顶栏状态: 运行中=蓝色流动渐变, 中断/出错=橙红渐变, 空闲=原样式 */
 function updateSessionStatus() {
+  renderComposerSend()
   const s = state.byId.get(state.current)
   const head = $('session-head')
   if (!head) return
@@ -3248,33 +3252,153 @@ async function sendSessionText(text) {
   return sendSessionContent(text, [])
 }
 
-async function sendSessionContent(text, images) {
+let composerSending = false
+const composerSendFeedback = new Map()
+const steeringInFlight = new Set()
+function composerContext() { return `${state.server}\0${state.current}` }
+function steerSendingEnabled() { return LS.get('steerSendingEnabled', '0') === '1' }
+function composerIsBusy() {
+  return !!state.byId.get(state.current)?.running || (state.queues[state.current] || []).some(item => item.placement === 'queued')
+}
+function composerSendMode(alternate = false) {
+  if (!steerSendingEnabled() || !composerIsBusy()) return 'queue'
+  const preferred = LS.get('busySendMode', 'queue') === 'steer' ? 'steer' : 'queue'
+  return alternate ? (preferred === 'queue' ? 'steer' : 'queue') : preferred
+}
+function renderComposerSend() {
+  const enabled = steerSendingEnabled() && composerIsBusy()
+  const mode = composerSendMode()
+  for (const id of ['btn-send', 'btn-fs-send']) {
+    const button = $(id)
+    if (!button) continue
+    if (composerSending || !button.classList.contains('send-hold-ready')) button.textContent = t(composerSending ? 'send.submitting' : enabled ? `send.${mode}Button` : 'composer.send')
+    button.disabled = composerSending
+    button.classList.toggle('steer-mode', enabled && mode === 'steer')
+    button.title = t(enabled ? 'send.holdHint' : 'composer.send')
+    button.setAttribute('aria-label', button.textContent)
+  }
+  const feedback = composerSendFeedback.get(composerContext())
+  const node = $('composer-send-status')
+  if (node) {
+    node.textContent = feedback ? t(feedback.key, { msg: feedback.message || '' }) : enabled ? t('send.holdHint') : ''
+    node.classList.toggle('hidden', !node.textContent)
+    node.dataset.phase = feedback?.phase || 'hint'
+  }
+}
+function setComposerSendFeedback(context, key, phase, message = '') {
+  composerSendFeedback.set(context, { key, phase, message })
+  if (composerSendFeedback.size > 100) composerSendFeedback.delete(composerSendFeedback.keys().next().value)
+  renderComposerSend()
+}
+// No preflight or automatic retry: an ambiguous timeout may already have delivered the message.
+async function submitSteer(method, payload, context) {
+  if (steeringInFlight.has(context)) {
+    if (composerContext() === context) toast(t('send.steerPending'), 'err')
+    return null
+  }
+  steeringInFlight.add(context)
+  setComposerSendFeedback(context, 'send.steerPending', 'pending')
+  const slow = setTimeout(() => setComposerSendFeedback(context, 'send.steerSlow', 'pending'), 3000)
+  try {
+    const result = await rpc(method, payload)
+    if (!result?.accepted) {
+      setComposerSendFeedback(context, 'send.steerUnconfirmed', 'unknown')
+      return result
+    }
+    setComposerSendFeedback(context, 'send.steerAccepted', 'accepted')
+    if (composerContext() === context) toast(t('send.steerAccepted'), 'ok')
+    return result
+  } catch (error) {
+    setComposerSendFeedback(context, error.rpcRejected || error.message === 'AUTH' ? 'send.steerRejected' : 'send.steerUnconfirmed', error.rpcRejected ? 'error' : 'unknown', error.message)
+    if (error.message === 'AUTH' && composerContext() === context) authFailure()
+    return null
+  } finally { clearTimeout(slow); steeringInFlight.delete(context) }
+}
+
+function bindComposerSend(button) {
+  let press = null
+  let suppressClickUntil = 0
+  const cancel = () => {
+    if (!press) return
+    clearTimeout(press.timer)
+    press = null
+    suppressClickUntil = Date.now() + 1000
+    button.classList.remove('send-hold-ready')
+    renderComposerSend()
+  }
+  button.addEventListener('pointerdown', event => {
+    if (event.button !== 0 || event.isPrimary === false || composerSending || !steerSendingEnabled() || !composerIsBusy()) return
+    cancel()
+    suppressClickUntil = 0
+    press = { id: event.pointerId, x: event.clientX, y: event.clientY, context: composerContext(), mode: composerSendMode(), alternate: composerSendMode(true), ready: false }
+    press.timer = setTimeout(() => {
+      if (!press || composerSending || composerContext() !== press.context) { cancel(); return }
+      press.ready = true
+      button.classList.add('send-hold-ready')
+      button.textContent = t(press.alternate === 'steer' ? 'send.releaseSteer' : 'send.releaseQueue')
+    }, 450)
+    button.setPointerCapture?.(event.pointerId)
+  })
+  button.addEventListener('pointermove', event => {
+    if (press && Math.hypot(event.clientX - press.x, event.clientY - press.y) > 12) cancel()
+  })
+  button.addEventListener('pointerup', event => {
+    if (!press || event.pointerId !== press.id) return
+    const intent = press
+    cancel()
+    event.preventDefault()
+    if (intent.context === composerContext() && steerSendingEnabled()) void sendMessage(intent.ready ? intent.alternate : intent.mode)
+  })
+  for (const name of ['pointercancel', 'lostpointercapture', 'blur']) button.addEventListener(name, cancel)
+  button.addEventListener('contextmenu', event => { if (press || Date.now() < suppressClickUntil) event.preventDefault() })
+  button.addEventListener('keydown', () => { cancel(); suppressClickUntil = 0 })
+  button.addEventListener('click', () => { if (Date.now() >= suppressClickUntil) void sendMessage() })
+}
+
+async function sendSessionContent(text, images, requestedMode = 'queue') {
   const clean = String(text || '').trim()
-  if ((!clean && !images.length) || !state.current) return false
+  if ((!clean && !images.length) || !state.current || composerSending) return false
   const sessionId = state.current
-  if (images.length === 0 && clean && await runSlashCommand(clean)) {
-    state.sessionActivity.add(sessionId)
-    return true
+  const context = composerContext()
+  const mode = requestedMode === 'steer' && steerSendingEnabled() && composerIsBusy() ? 'steer' : 'queue'
+  if (mode === 'steer' && clean.startsWith('/')) {
+    setComposerSendFeedback(context, 'send.steerSlash', 'error')
+    return false
   }
+  composerSending = true
   const buttons = [$('btn-send'), $('btn-fs-send')].filter(Boolean)
   buttons.forEach(button => { button.disabled = true })
   state.pendingPrompts.add(sessionId)
   try {
+    if (mode === 'steer') setComposerSendFeedback(context, 'send.steerPending', 'pending')
+    else { composerSendFeedback.delete(context); renderComposerSend() }
+    if (images.length === 0 && clean && await runSlashCommand(clean)) {
+      state.sessionActivity.add(sessionId)
+      return true
+    }
     const content = [...await encodeComposerImagesFor(images)]
     if (clean) content.push({ type: 'text', text: clean })
+    if (composerContext() !== context) {
+      setComposerSendFeedback(context, 'send.contextChanged', 'error')
+      return false
+    }
     setSessionRecovery('resuming')
-    const v = await safeRpc('session.prompt', {
+    const payload = {
       sessionId,
-      mode: 'queue',
+      mode,
       content
-    }, t('send.failed'))
+    }
+    const v = mode === 'steer'
+      ? await submitSteer('session.prompt', payload, context)
+      : await safeRpc('session.prompt', payload, t('send.failed'))
+    if (composerContext() !== context) return !!v?.accepted
     if (v?.accepted) {
       state.sessionActivity.add(sessionId)
-      if (state.current === sessionId) {
+      if (composerContext() === context) {
         setSessionRecovery('ready')
         noteSessionTurnTime(sessionId, Date.now())
         renderSessions()
-        toast(images.length ? t('send.imageSent') : (clean.startsWith('/') ? t('send.commandSent') : t('send.sent')), 'ok')
+        if (mode !== 'steer') toast(images.length ? t('send.imageSent') : (clean.startsWith('/') ? t('send.commandSent') : t('send.sent')), 'ok')
       }
       return true
     }
@@ -3286,14 +3410,17 @@ async function sendSessionContent(text, images) {
     if (state.current === sessionId) setSessionRecovery('error')
     return false
   } catch (e) {
-    if (state.current === sessionId) {
+    if (mode === 'steer') setComposerSendFeedback(context, 'send.steerRejected', 'error', e?.message || String(e))
+    if (composerContext() === context) {
       setSessionRecovery('error', e?.message)
       toast(t('composer.imageReadFailed', { msg: e?.message || e }), 'err')
     }
     return false
   } finally {
     state.pendingPrompts.delete(sessionId)
+    composerSending = false
     buttons.forEach(button => { button.disabled = false })
+    renderComposerSend()
   }
 }
 
@@ -3304,16 +3431,18 @@ async function encodeComposerImagesFor(images) {
   })))
 }
 
-async function sendMessage() {
+async function sendMessage(requestedMode) {
   const input = $('composer-input')
-  const text = input.value.trim()
+  const originalText = input.value
+  const text = originalText.trim()
+  const context = composerContext()
   const images = state.composerImages.slice()
   if ((!text && !images.length) || !state.current) return
   if (images.length && text.startsWith('/')) { toast(t('composer.imageSlashUnsupported'), 'err'); return }
-  if (await sendSessionContent(text, images)) {
-    input.value = ''
-    autosize(input)
-    clearComposerImages()
+  const mode = typeof requestedMode === 'string' ? requestedMode : composerSendMode()
+  if (await sendSessionContent(text, images, mode) && composerContext() === context) {
+    if (input.value === originalText) { input.value = ''; autosize(input) }
+    if (state.composerImages.length === images.length && images.every((item, i) => item === state.composerImages[i])) clearComposerImages()
   }
 }
 
@@ -3842,20 +3971,21 @@ function queuePreview(item) {
 }
 async function steerQueueItem(itemId) {
   const sessionId = state.current
+  const context = composerContext()
   const key = `${sessionId}:${itemId}`
   const s = state.byId.get(sessionId)
   if (!sessionId || !s?.running || state.queueSteering[key]) return
   state.queueSteering[key] = true
   renderQueue()
   try {
-    const v = await safeRpc('session.updateQueue', { sessionId, itemId, action: { kind: 'steer' } }, t('queue.steerFailed', { msg: '' }).replace(/：$/, '').replace(/: $/, ''))
-    if (v?.accepted) toast(t('queue.steerSubmitted'), 'ok')
+    await submitSteer('session.updateQueue', { sessionId, itemId, action: { kind: 'steer' } }, context)
   } finally {
     delete state.queueSteering[key]
     renderQueue()
   }
 }
 function renderQueue() {
+  renderComposerSend()
   const s = state.byId.get(state.current)
   if (!s) return
   const items = (state.queues[state.current] || []).filter(item => item?.placement === 'queued')
@@ -6960,8 +7090,8 @@ function bindUi() {
   $('rename-confirm').addEventListener('click', confirmRenameSession)
   $('rename-session-input').addEventListener('keydown', e => { if (e.key === 'Enter' && !e.isComposing) confirmRenameSession() })
   $('modal-rename').addEventListener('click', e => { if (e.target === $('modal-rename')) closeRenameSession() })
-  $('btn-send').addEventListener('click', sendMessage)
-  $('btn-fs-send').addEventListener('click', sendMessage)
+  bindComposerSend($('btn-send'))
+  bindComposerSend($('btn-fs-send'))
   $('btn-plus').addEventListener('click', toggleComposerMenu)
   $('btn-image').addEventListener('click', toggleComposerImageMenu)
   $('composer-image-menu').addEventListener('click', (e) => {
@@ -7139,11 +7269,23 @@ function bindUi() {
   })
   $('btn-reset').addEventListener('click', () => {
     if (!confirm(t('settings.confirmReset'))) return
-    LS.del('token'); LS.del('notify'); LS.del('server'); LS.del('mobileEnterAction'); LS.del(ANNOUNCEMENTS_KEY); LS.del(ANNOUNCEMENT_HISTORY_KEY); LS.del(ANNOUNCEMENT_VOTES_KEY)
+    LS.del('token'); LS.del('notify'); LS.del('server'); LS.del('mobileEnterAction'); LS.del('steerSendingEnabled'); LS.del('busySendMode'); LS.del(ANNOUNCEMENTS_KEY); LS.del(ANNOUNCEMENT_HISTORY_KEY); LS.del(ANNOUNCEMENT_VOTES_KEY)
     if (bgBridge()?.saveBackgroundConfig) saveBgConfig(false)
     location.reload()
   })
   $('mobile-enter-action').value = mobileEnterAction()
+  $('opt-steer-send').checked = steerSendingEnabled()
+  $('busy-send-mode').value = LS.get('busySendMode', 'queue') === 'steer' ? 'steer' : 'queue'
+  $('busy-send-mode').disabled = !steerSendingEnabled()
+  $('opt-steer-send').addEventListener('change', event => {
+    LS.set('steerSendingEnabled', event.target.checked ? '1' : '0')
+    $('busy-send-mode').disabled = !event.target.checked
+    renderComposerSend()
+  })
+  $('busy-send-mode').addEventListener('change', event => {
+    LS.set('busySendMode', event.target.value === 'steer' ? 'steer' : 'queue')
+    renderComposerSend()
+  })
   $('mobile-enter-action').addEventListener('change', (e) => {
     const action = e.target.value === 'send' ? 'send' : 'newline'
     LS.set('mobileEnterAction', action)

package/public/index.html

@@ -113,7 +113,7 @@
         <button id="btn-rename-session" class="icon-btn hidden" data-i18n-title="session.rename" data-i18n-aria="session.rename">✎</button>
         <button id="btn-archive-session" class="mini-btn hidden" data-i18n="session.archive">归档</button>
         <button id="btn-stats" class="icon-btn" data-i18n-title="stats.title" data-i18n-aria="stats.title"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 19V9M12 19V5M19 19v-7M3 19h18"/></svg></button>
-        <button id="btn-fs-send" class="session-send-btn hidden" type="button" data-i18n="composer.send" data-i18n-title="composer.send" data-i18n-aria="composer.send">发送</button>
+        <button id="btn-fs-send" class="session-send-btn hidden" type="button">发送</button>
         <button id="btn-cancel" class="danger-btn hidden" data-i18n="session.stop">停止</button>
       </div>
 
@@ -173,6 +173,7 @@
           <button type="button" class="composer-image-option" data-image-source="CAMERA" role="menuitem"><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="M4 8.5h3l1.5-2h7L17 8.5h3v10H4z"/><circle cx="12" cy="13.5" r="3.2"/></svg><span data-i18n="composer.takePhoto">拍照</span></button>
           <button type="button" class="composer-image-option" data-image-source="PHOTOS" role="menuitem"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3.5" y="4" width="17" height="16" rx="2"/><circle cx="8.5" cy="9" r="1.2"/><path d="m5 17 4.5-4.5 3 3 2-2L19 17"/></svg><span data-i18n="composer.choosePhoto">相册</span></button>
         </div>
+        <div id="composer-send-status" class="composer-send-status hidden" role="status" aria-live="polite" aria-atomic="true"></div>
         <div id="composer-attachments" class="composer-attachments hidden"></div>
         <div class="composer">
           <button id="btn-plus" class="plus-btn" data-i18n-aria="a11y.more" data-i18n-title="a11y.moreTitle">＋</button>
@@ -183,7 +184,7 @@
             </button>
           </div>
           <button id="btn-image" class="composer-image-btn" type="button" data-i18n-title="composer.addImage" data-i18n-aria="composer.addImage"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3.5" y="4" width="17" height="16" rx="2"/><circle cx="8.5" cy="9" r="1.2"/><path d="m5 17 4.5-4.5 3 3 2-2L19 17"/></svg></button>
-          <button id="btn-send" class="send-btn" data-i18n="composer.send">发送</button>
+          <button id="btn-send" class="send-btn" type="button">发送</button>
         </div>
         <input id="composer-camera-input" class="hidden" type="file" accept="image/*" capture="environment">
         <input id="composer-gallery-input" class="hidden" type="file" accept="image/*" multiple>
@@ -375,6 +376,17 @@
               <option value="send" data-i18n="settings.mobileEnterSend">回车发送</option>
             </select>
           </div>
+          <div class="setting-row">
+            <div><div class="setting-name" data-i18n="settings.steerSendTitle">启用长按插队发送</div><div class="setting-desc" data-i18n="settings.steerSendDesc">繁忙时长按发送切换方式，松开发送；移动手指取消。默认关闭。</div></div>
+            <label class="switch"><input type="checkbox" id="opt-steer-send" data-i18n-aria="settings.steerSendTitle"><span class="slider"></span></label>
+          </div>
+          <div class="setting-row">
+            <div><div class="setting-name" data-i18n="settings.busySendTitle">繁忙时默认发送方式</div><div class="setting-desc" data-i18n="settings.busySendDesc">单击和回车使用默认方式，长按使用另一种；空闲时正常发送。</div></div>
+            <select id="busy-send-mode" class="setting-select" data-i18n-aria="settings.busySendTitle">
+              <option value="queue" data-i18n="send.queueButton">排队发送</option>
+              <option value="steer" data-i18n="send.steerButton">插队发送</option>
+            </select>
+          </div>
           <div class="setting-row">
             <div><div class="setting-name" data-i18n="presets.title">预设提示词</div><div class="setting-desc" data-i18n="presets.desc">常用提示词，对话界面一键插入（最多 20 条）</div></div>
             <button id="btn-preset-add" class="mini-btn" data-i18n="presets.add">新增</button>
@@ -907,6 +919,17 @@
   <script>
     window.APP_STR = {
       zh: {
+        'settings.steerSendTitle': '启用长按插队发送', 'settings.steerSendDesc': '繁忙时长按发送切换方式，松开发送；移动手指取消。默认关闭。',
+        'settings.busySendTitle': '繁忙时默认发送方式', 'settings.busySendDesc': '单击和回车使用默认方式，长按使用另一种；空闲时正常发送。',
+        'send.queueButton': '排队发送', 'send.steerButton': '插队发送', 'send.submitting': '提交中…',
+        'send.holdHint': '长按切换发送方式，松开发送；移动取消', 'send.releaseSteer': '松开插队', 'send.releaseQueue': '松开排队',
+        'send.steerPending': '正在提交插队请求，尚未确认；请勿认为当前任务已打断。',
+        'send.steerSlow': '仍在等待 DSH 确认插队，请勿重复发送；当前任务可能仍在执行。',
+        'send.steerAccepted': 'DSH 已接受插队请求；不代表当前工具已中断。',
+        'send.steerUnconfirmed': '插队结果未确认，消息可能已送达。请先检查会话与队列，勿直接重复发送。',
+        'send.steerRejected': '插队未成功：{msg}。未自动改为排队。',
+        'send.steerSlash': '斜杠命令不支持插队发送，请使用排队发送执行命令。',
+        'send.contextChanged': '已切换会话或服务器，本次消息未发送。',
         'a11y.hostAdmin': '主机管理', 'a11y.refresh': '刷新', 'a11y.more': '更多操作', 'a11y.moreTitle': '指令/权限/模型',
         'conn.on': '已连接', 'conn.off': '未连接', 'conn.reconnecting': '连接中断，正在重连…',
         'conn.reconnectIn': '重连中 {n}s', 'conn.offline': '离线', 'conn.failed': '连接失败',
@@ -1139,6 +1162,17 @@
         'time.justNow': '刚刚', 'time.minAgo': ' 分钟前', 'time.hourAgo': ' 小时前'
       },
       en: {
+        'settings.steerSendTitle': 'Enable hold-to-steer sending', 'settings.steerSendDesc': 'While busy, hold to switch modes and release to send. Move to cancel. Off by default.',
+        'settings.busySendTitle': 'Default sending mode while busy', 'settings.busySendDesc': 'Click and Enter use the default; hold uses the other mode. Normal sending when idle.',
+        'send.queueButton': 'Queue', 'send.steerButton': 'Steer', 'send.submitting': 'Submitting…',
+        'send.holdHint': 'Hold to switch modes; release to send, move to cancel', 'send.releaseSteer': 'Release to steer', 'send.releaseQueue': 'Release to queue',
+        'send.steerPending': 'Submitting steering request, not yet confirmed. The current task may still be running.',
+        'send.steerSlow': 'Still waiting for DSH to confirm. Do not resend; the current task may still be running.',
+        'send.steerAccepted': 'DSH accepted the steering request. The current tool may still be running.',
+        'send.steerUnconfirmed': 'Steering is unconfirmed; the message may have arrived. Check the conversation and queue before resending.',
+        'send.steerRejected': 'Steering failed: {msg}. Not automatically queued.',
+        'send.steerSlash': 'Slash commands cannot be sent as steering. Use queue mode to execute the command.',
+        'send.contextChanged': 'Conversation or server changed; this message was not sent.',
         'a11y.hostAdmin': 'Host admin', 'a11y.refresh': 'Refresh', 'a11y.more': 'More actions', 'a11y.moreTitle': 'Commands / Permissions / Models',
         'conn.on': 'Connected', 'conn.off': 'Offline', 'conn.reconnecting': 'Connection lost, reconnecting…',
         'conn.reconnectIn': 'Reconnecting {n}s', 'conn.offline': 'Offline', 'conn.failed': 'Connection failed',

package/public/styles.css

@@ -1319,3 +1319,9 @@ button:focus-visible, a:focus-visible, input:focus-visible, select:focus-visible
 .update-download-progress { margin-top: 12px; font-size: 12px; line-height: 1.6; overflow-wrap: anywhere; }
 .update-download-progress progress { display: block; width: 100%; height: 10px; margin: 7px 0; accent-color: var(--dsr-accent, #2563eb); }
 #update-download-detail { color: var(--dsr-text-muted); font-variant-numeric: tabular-nums; }
+/* Sending intent remains visible while waiting for a steering acknowledgement. */
+.composer-send-status { padding: 6px 12px; font-size: 12px; line-height: 1.5; overflow-wrap: anywhere; }
+.composer-send-status[data-phase="pending"], .composer-send-status[data-phase="unknown"], .composer-send-status[data-phase="error"] { color: var(--dsr-accent-strong); font-weight: 600; }
+#btn-send, #btn-fs-send { touch-action: none; user-select: none; -webkit-touch-callout: none; }
+#btn-send.steer-mode, #btn-fs-send.steer-mode { outline: 2px solid currentColor; outline-offset: 2px; }
+.send-hold-ready { box-shadow: 0 0 0 3px var(--dsr-accent-strong); }

package/public/update.json

@@ -1,10 +1,14 @@
 {
-  "version": "0.7.0-rc.2",
+  "version": "0.7.0",
   "apkUrl": "dsh-remote.apk",
-  "sha256": "71a5cf1849e6eecc3ed72e6d0b3aec176ff9fbc75e50876831d09135c1af3efc",
-  "releasedAt": "2026-09-19T05:04:05.773Z",
-  "notes": "0.7.0-rc.2：修复令牌文件丢失后网关状态误判，健康探测可恢复原令牌，令牌写盘失败拒绝启动；管理认证异常与启停失败显示明确提示。插件网关支持配置 IPv6 监听地址。延续 rc.1 插件中心的搜索、安装、更新、卸载、启停、任务日志与配置备份功能。此为测试版，Android 真机与 Linux/fnOS 使用场景仍待验收。",
+  "sha256": "a2c885aecf6d677b76413d0ed92a369a7045f3227a4c8b90d3365c3dfc9979f9",
+  "releasedAt": "2026-09-24T07:05:55.044Z",
+  "notes": "0.7.0：Windows 上未注册为服务的 DSH 可由 Remote 网关按已检查的 CLI 启动配置受控启动；已有 Windows 服务仍优先使用，网关只重启自己启动并持有句柄的进程。手机发送图片遇到 DSH 明确拒绝（当前模型不支持图片）时，可通过已启用的 dsh-image-vision 插件桥接附件；桥接失败不会提交不完整消息。保留长按插队发送、跨设备接续、鸿蒙客户端源码与平板分栏、网关 WebSocket Ping 分帧修复等 0.7.0 RC 功能。本次提供 Android APK 与 Windows/Linux 网关，不提供鸿蒙 HAP。",
   "history": [
+    {
+      "version": "0.7.0",
+      "notes": "0.7.0：Windows 上未注册为服务的 DSH 可由 Remote 网关按已检查的 CLI 启动配置受控启动；已有 Windows 服务仍优先使用，网关只重启自己启动并持有句柄的进程。手机发送图片遇到 DSH 明确拒绝（当前模型不支持图片）时，可通过已启用的 dsh-image-vision 插件桥接附件；桥接失败不会提交不完整消息。保留长按插队发送、跨设备接续、鸿蒙客户端源码与平板分栏、网关 WebSocket Ping 分帧修复等 0.7.0 RC 功能。本次提供 Android APK 与 Windows/Linux 网关，不提供鸿蒙 HAP。"
+    },
     {
       "version": "0.6.26",
       "notes": "0.6.26：修复 DSH 通配监听地址导致的认证与实时连接失败，兼容 IPv6-only；上传覆盖失败保留原文件，避免并发同名覆盖和续传分片竞争；网关改用认证关闭，避免误杀其他进程；完善 dsh-ui 堆叠柱状图、标签页、表格排序与特殊单元格、趋势线、环形进度、文件树和修改前后预览。已通过 Windows 自动测试与浏览器检查，Linux/Docker 专项实测仍待完成。"
@@ -40,10 +44,6 @@
     {
       "version": "0.6.18",
       "notes": "0.6.18：新增独立 Token 量趋势统计并保留原有费用趋势；服务器连接身份改为地址加令牌，支持同地址不同令牌并兼容旧配置；投票在网关不可达时尝试直连公网收集器托底（需收集器允许 App/Web CORS）；修复 Windows 下 gateway-stats 调用 zstd 时弹出终端窗口的问题，并补充回归测试；同步完善相关模块文档。"
-    },
-    {
-      "version": "0.6.17",
-      "notes": "0.6.17：修复 host.describe 初次失败后总览误报 DSH 上游离线并增加恢复重试；识别 Docker、无 systemd 和插件内嵌等外部生命周期环境，隐藏不可用的 DSH 启停并给出明确提示；兼容 Caddy Basic Auth，避免管理 API 覆盖 Authorization 导致登录循环；支持通过环境变量或管理页手动补充 Docker 宿主、局域网和 Tailscale 地址并写入配对二维码；完整适配 Windows 盘符、UNC、多文件根和跨主机文件路径清理，并新增 Windows 原生 CI 安全门禁。"
     }
   ]
 }

package/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.7.0-rc.2"
+  "version": "0.7.0"
 }