dsh-plugin-mobile-gateway 0.10.1 → 0.10.3

package/lib/dsh-host-adapter.mjs

@@ -13,7 +13,7 @@ function requireArray(value, endpoint) {
   return value
 }
 
-export const DSH_VERSION = '0.2.0-rc.2'
+export const DSH_VERSION = '0.2.1-rc.2'
 export const SESSION_FORMAT_VERSION = 4
 
 export function readHistoryRecords(records) {
@@ -44,12 +44,12 @@ export function readSessionSnapshot(frame, sessionId) {
   }
 }
 
-async function firstStreamFrame(gateway, namespace, method, args, signal) {
+async function firstStreamFrame(stream, namespace, method, args, signal) {
   const ownedAbort = new AbortController()
   const streamSignal = signal ? AbortSignal.any([signal, ownedAbort.signal]) : ownedAbort.signal
   let iterator
   try {
-    const iterable = await gateway.stream({ namespace, method, args, signal: streamSignal })
+    const iterable = await stream(namespace, method, args, streamSignal)
     const iteratorFactory = iterable?.[Symbol.asyncIterator] ?? iterable?.[Symbol.iterator]
     if (typeof iteratorFactory !== 'function') throw new Error(`${namespace}/${method} returned an invalid stream`)
     iterator = iteratorFactory.call(iterable)
@@ -78,21 +78,28 @@ function sessionListArgs(request) {
  * descriptors. Its public methods intentionally match mobile-gateway domain
  * operations, not the upstream transport envelope.
  */
-export function createDshHostAdapter(typertGateway) {
+export function createDshHostAdapter(typertGateway, peer) {
   if (!typertGateway || typeof typertGateway.invoke !== 'function' || typeof typertGateway.stream !== 'function') {
     throw new Error('mobile-gateway requires the DSH Remote Gateway host service')
   }
+  if (!peer || !(peer.signal instanceof AbortSignal)) {
+    throw new Error('mobile-gateway requires a DSH Connection Peer (DSH 0.2.1-rc.2 or later)')
+  }
 
   const invoke = (namespace, method, args, signal) => typertGateway.invoke({
     namespace,
     method,
     args,
+    peer,
     ...(signal === undefined ? {} : { signal }),
   })
+  const stream = (namespace, method, args, signal) => typertGateway.stream({
+    namespace, method, args, peer, signal,
+  })
 
   const sessionSnapshot = async (request, signal) => {
     const frame = requireRecord(await firstStreamFrame(
-      typertGateway,
+      stream,
       'session',
       'follow',
       requestArgs(request),
@@ -200,7 +207,7 @@ export function createDshHostAdapter(typertGateway) {
   return {
     speech: {
       catalog: (signal) => invoke('speech', 'catalog', {}, signal),
-      follow: (signal) => typertGateway.stream({ namespace: 'speech', method: 'follow', args: {}, signal }),
+      follow: (signal) => stream('speech', 'follow', {}, signal),
       configure: (patch, signal) => invoke('speech', 'configure', { patch }, signal),
       prepare: (providerId, options, signal) => invoke('speech', 'prepare', {
         providerId, ...(options === undefined ? {} : { options }),
@@ -248,7 +255,7 @@ export function createDshHostAdapter(typertGateway) {
     },
     workspace: {
       async list(_payload = {}, signal) {
-        const frame = requireRecord(await firstStreamFrame(typertGateway, 'workspace', 'follow', {}, signal), 'workspace/follow')
+        const frame = requireRecord(await firstStreamFrame(stream, 'workspace', 'follow', {}, signal), 'workspace/follow')
         if (frame.type !== 'baseline') throw new Error('workspace/follow returned an invalid opening baseline')
         return requireRecord(frame.value, 'workspace/follow baseline')
       },
@@ -371,18 +378,17 @@ export function createDshHostAdapter(typertGateway) {
       if (event.type === 'turn/start') admittedPrompts.delete(sessionId)
     },
     openSessionStream(sessionId, signal) {
-      return typertGateway.stream({
-        namespace: 'session', method: 'follow',
+      return stream('session', 'follow',
         // Bound the opening window at the Host; older records remain available via session.page.
-        args: requestArgs({ address: { kind: 'session', sessionId }, maxMessages: 12, assistantStream: true }),
+        requestArgs({ address: { kind: 'session', sessionId }, maxMessages: 12, assistantStream: true }),
         signal,
-      })
+      )
     },
     openControlStream(signal) {
-      return typertGateway.stream({ namespace: 'session', method: 'control', args: {}, signal })
+      return stream('session', 'control', {}, signal)
     },
     openWorkspaceStream(signal) {
-      return typertGateway.stream({ namespace: 'workspace', method: 'follow', args: {}, signal })
+      return stream('workspace', 'follow', {}, signal)
     },
   }
 }

package/lib/index.mjs

@@ -1,4 +1,5 @@
 import { stringifyWireFrame } from './wire-json.mjs'
+import { assistantFinish, failureDetails, toolResultDetails, turnReasonDetails } from './session-event-details.mjs'
 // dsh-plugin-mobile-gateway — persistent Host plugin.
 //
 // Two directions:
@@ -35,6 +36,7 @@ import { stringifyWireFrame } from './wire-json.mjs'
 //                     { "type": "attachment", "sessionId", "attachmentId" }
 //                        -> verified image metadata + canonical base64 bytes
 //                     { "type": "file-list", "requestId"?, "sessionId", "path"? }
+//                     { "type": "file-resolve", "requestId", "sessionId", "path" }
 //                     { "type": "file-download-open", "requestId", "sessionId", "path" }
 //                     { "type": "file-download-read", "transferId", "offset" }
 //                     { "type": "file-download-cancel", "transferId" }
@@ -93,6 +95,7 @@ import { stringifyWireFrame } from './wire-json.mjs'
 //                     { "kind": "command-selected", "sessionId", "command", "selected" }
 //                     { "kind": "attachment", "sessionId", "attachment", "data" }
 //                     { "kind": "file-list", "requestId"?, "sessionId", "path", "entries" }
+//                     { "kind": "file-resolved", "requestId", "sessionId", "path", "name", "mediaType", "size", "modifiedAt" }
 //                     { "kind": "file-download-opened", "requestId", "transferId", "sessionId",
 //                       "path", "name", "mediaType", "size", "chunkBytes" }
 //                     { "kind": "file-download-chunk", "transferId", "offset", "data", "eof", "sha256"? }
@@ -308,6 +311,7 @@ function buildWireEvent(session, event) {
       }
       return Object.assign(base, {
         event: { type: 'assistant/message', turn: d.turn, step: d.step, text, reasoning, toolCalls,
+          ...(assistantFinish(d) ? { finish: assistantFinish(d) } : {}),
           ...(d.interrupted === true ? { interrupted: true } : {}),
           ...(d.usage === undefined ? {} : { usage: d.usage }),
           ...(images.length ? { images } : {}),
@@ -315,7 +319,15 @@ function buildWireEvent(session, event) {
       })
     }
     case 'assistant/attempt':
-      return Object.assign(base, { event: { type: event.type, turn: d.turn, step: d.step, stream: d.stream } })
+      return Object.assign(base, { event: { type: event.type, turn: d.turn, step: d.step, stream: d.stream,
+        ...(assistantFinish(d) ? { finish: assistantFinish(d) } : {}) } })
+    case 'llm/retry':
+    case 'llm/retry-started':
+      return Object.assign(base, { event: { type: event.type, turn: d.turn, step: d.step,
+        retryId: d.retryId, retry: d.retry,
+        ...(event.type === 'llm/retry' ? { provider: d.provider, mode: d.mode,
+          maxRetries: d.maxRetries, delayMs: d.delayMs, failure: failureDetails(d.failure) } : {}),
+      } })
     case 'session/title':
       return Object.assign(base, {
         event: {
@@ -326,6 +338,16 @@ function buildWireEvent(session, event) {
       })
     case 'agent-preset/selected':
       return Object.assign(base, { event: { type: event.type, agentPreset: d.agentPreset } })
+    case 'deliverables/presented':
+      return Object.assign(base, {
+        event: { type: event.type, turn: d.turn, callId: d.callId,
+          files: (Array.isArray(d.files) ? d.files : [])
+            .filter(file => file && typeof file.path === 'string' && file.path.trim())
+            .map(file => ({ path: file.path,
+              ...(typeof file.description === 'string' ? { description: file.description } : {}),
+            })),
+        },
+      })
     case 'tool/call':
       return Object.assign(base, {
         event: { type: 'tool/call', turn: d.turn, step: d.step, callId: d.callId, name: d.name, arguments: d.arguments },
@@ -347,6 +369,7 @@ function buildWireEvent(session, event) {
           callId: d.message?.toolCallId ?? d.message?.source?.callId,
           isError: d.message?.isError === true || !!d.error || ((d.message && d.message.content) || []).some(block => block?.type === 'tool-result' && block.isError === true),
           preview,
+          ...toolResultDetails(d),
           ...(d.error ? { error: d.error } : {}),
         },
       })
@@ -405,7 +428,8 @@ function buildWireEvent(session, event) {
     case 'step/start':
     case 'step/end':
       return Object.assign(base, {
-        event: { type: event.type, turn: d.turn, step: d.step, reason: d.reason && d.reason.kind },
+        event: { type: event.type, turn: d.turn, step: d.step, reason: d.reason && d.reason.kind,
+          ...(turnReasonDetails(d.reason) ? { reasonDetails: turnReasonDetails(d.reason) } : {}) },
       })
     default:
       return Object.assign(base, { event: { type: event.type } })
@@ -674,20 +698,31 @@ function createFileTransferManager(api, options) {
       if (!stat.isDirectory()) {
         return fileTransferError('file-workspace-unavailable', 'the session working directory is unavailable', requestType, sessionId)
       }
-      return { root }
+      return { root, inputRoot: path.resolve(item.cwd) }
     } catch {
       return fileTransferError('file-workspace-unavailable', 'the session working directory is unavailable', requestType, sessionId)
     }
   }
 
   const resolveWorkspaceTarget = async (sessionId, rawPath, requestType, inputOptions) => {
-    const requested = normalizedWorkspaceInput(rawPath, inputOptions)
+    // Only the resolver accepts native absolute paths from recorded deliveries
+    // or Markdown links. Download requests remain workspace-relative.
+    const absoluteInput = inputOptions?.allowAbsolute === true
+      && typeof rawPath === 'string' && path.isAbsolute(rawPath.trim())
+    const requested = absoluteInput
+      ? (rawPath.includes('\0') || rawPath.trim().split(/[\\/]+/).includes('..') ? null : rawPath.trim())
+      : normalizedWorkspaceInput(rawPath, inputOptions)
     if (!requested) {
-      return fileTransferError('bad-request', `${requestType} requires a relative workspace path`, requestType, sessionId)
+      return fileTransferError('bad-request', `${requestType} requires a valid ${inputOptions?.allowAbsolute ? '' : 'relative '}workspace path`, requestType, sessionId)
     }
     const rootResult = await resolveSessionRoot(sessionId, requestType)
     if (rootResult.kind === 'error') return rootResult
-    const candidate = path.resolve(rootResult.root, requested)
+    // macOS commonly exposes one workspace as both /var/... and /private/var/...
+    // (and cwd itself may be a symlink). Map only the known cwd alias before
+    // enforcing the canonical root, then still verify the target's realpath.
+    const candidate = absoluteInput && isInsideWorkspace(rootResult.inputRoot, requested)
+      ? path.resolve(rootResult.root, path.relative(rootResult.inputRoot, requested))
+      : path.resolve(rootResult.root, requested)
     if (!isInsideWorkspace(rootResult.root, candidate)) {
       return fileTransferError('file-not-allowed', 'path must stay inside the session working directory', requestType, sessionId)
     }
@@ -706,6 +741,28 @@ function createFileTransferManager(api, options) {
     }
   }
 
+  const resolveFile = async (msg) => {
+    const session = requireSessionId(msg)
+    if (session.error) return session.error
+    if (typeof msg.requestId !== 'string' || !msg.requestId.trim()) {
+      return fileTransferError('bad-request', 'file-resolve requires a requestId', 'file-resolve', session.value)
+    }
+    const resolved = await resolveWorkspaceTarget(session.value, msg.path, 'file-resolve', { allowAbsolute: true })
+    if (resolved.kind === 'error') return resolved
+    if (!resolved.stat.isFile()) {
+      return fileTransferError('file-not-regular', 'only regular files can be previewed', 'file-resolve', session.value)
+    }
+    if (resolved.stat.size > options.fileDownloadMaxBytes) {
+      return fileTransferError('file-too-large', 'file exceeds the configured download limit', 'file-resolve', session.value)
+    }
+    return {
+      kind: 'file-resolved', requestId: msg.requestId, sessionId: session.value,
+      path: workspaceRelativePath(resolved.root, resolved.target),
+      name: path.basename(resolved.target), mediaType: fileMediaType(resolved.target),
+      size: resolved.stat.size, modifiedAt: resolved.stat.mtimeMs,
+    }
+  }
+
   const fileList = async (msg) => {
     const session = requireSessionId(msg)
     if (session.error) return session.error
@@ -885,9 +942,11 @@ function createFileTransferManager(api, options) {
 
   return {
     async handle(client, msg) {
+      const correlation = typeof msg.requestId === 'string' ? { requestId: msg.requestId } : {}
       if (!options.fileDownloadsEnabled) {
-        return fileTransferError('file-download-disabled', 'file downloads are disabled by gateway configuration', msg.type)
+        return { ...fileTransferError('file-download-disabled', 'file downloads are disabled by gateway configuration', msg.type), ...correlation }
       }
+      if (msg.type === 'file-resolve') return { ...await resolveFile(msg), ...correlation }
       if (msg.type === 'file-list') return fileList(msg)
       if (msg.type === 'file-download-open') return open(client, msg)
       if (msg.type === 'file-download-read') return read(client, msg)
@@ -1078,12 +1137,14 @@ function trimConversationEvent(event) {
     case 'assistant/message':
     case 'assistant/attempt': {
       const { stream, ...data } = event.data || {}
-      return { ...event, data }
+      const finish = assistantFinish(event.data || {})
+      return { ...event, data: { ...data, ...(finish ? { finish } : {}) } }
     }
     case 'tool/result': {
       const d = event.data || {}
       const message = d.message
-      if (!message || !Array.isArray(message.content)) return event
+      const details = toolResultDetails(d)
+      if (!message || !Array.isArray(message.content)) return { ...event, data: { ...d, ...details } }
       let changed = false
       const truncateBlock = (block) => {
         if (!block || typeof block !== 'object') return block
@@ -1097,8 +1158,7 @@ function trimConversationEvent(event) {
         return block
       }
       const content = message.content.map(truncateBlock)
-      if (!changed) return event
-      return { ...event, data: { ...d, message: { ...message, content } } }
+      return { ...event, data: { ...d, ...details, ...(changed ? { message: { ...message, content } } : {}) } }
     }
     default:
       return event
@@ -2133,13 +2193,19 @@ const plugin = {
   // Hard dependencies: the gateway registers on the host web server and
   // admits mobile messages through the Host Remote Gateway. Cordis must not
   // activate this row before either service exists.
-  inject: ['webServer', 'typertGateway', 'agentDefaultModel'],
+  inject: ['webServer', 'typertGateway', 'connection', 'agentDefaultModel'],
   // exported for local tests; Cordis ignores unknown plugin fields
   admitMessage,
   handleQuery,
   apply(ctx, config) {
     const webServer = ctx.webServer
-    const api = createDshHostAdapter(ctx.typertGateway)
+    if (typeof ctx.connection?.createPeer !== 'function') {
+      throw new Error('mobile-gateway requires DSH 0.2.1-rc.2 or later with Connection.createPeer')
+    }
+    // 已配对设备沿用本机用户权限；身份只由 Host 创建，不能由移动端参数指定。
+    // 问答与审批仍由本插件的 Host 监听器处理，无需另开 Remote 交互流。
+    const peer = ctx.connection.createPeer({ principal: { kind: 'owner' }, interactions: 'none' })
+    const api = createDshHostAdapter(ctx.typertGateway, peer)
     const host = api
     const agentDefaultModel = ctx.agentDefaultModel
     const options = {
@@ -2952,7 +3018,7 @@ const plugin = {
               respondToApproval(msg).then((frame) => {
                 if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
-            } else if (msg.type === 'file-list' || msg.type === 'file-download-open' ||
+            } else if (msg.type === 'file-list' || msg.type === 'file-resolve' || msg.type === 'file-download-open' ||
                        msg.type === 'file-download-read' || msg.type === 'file-download-cancel') {
               fileTransfers.handle(ws, msg).then((frame) => {
                 if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
@@ -3043,7 +3109,7 @@ const plugin = {
               'queue-control',
               'session-archive',
               'session-rename',
-              ...(options.fileDownloadsEnabled ? ['file-downloads'] : []),
+              ...(options.fileDownloadsEnabled ? ['file-downloads', 'file-references-v1'] : []),
             ],
             port: transport.port || webServer.port,
             clients: clients.size,
@@ -3213,7 +3279,7 @@ const plugin = {
 
     const disposeApprovals = ctx.on('approval/request', (request, next) => {
       const sessionId = request?.agent?.id === undefined ? null : String(request.agent.id)
-      if (!sessionId || typeof request.toolName !== 'string' || !hasInteractionClient(sessionId)) return next()
+      if (!sessionId || typeof request.toolName !== 'string' || !gatewayEnabled) return next()
       const rpcId = crypto.randomUUID()
       const approvalId = crypto.randomUUID()
       return new Promise((resolve, reject) => {
@@ -3243,7 +3309,10 @@ const plugin = {
         }
         pendingApprovals.set(rpcId, pending)
         broadcastInteractionFrame(approvalFrameFor(rpcId, pending))
+        // 控制连接重连期间仍登记待审批，桌面端继续处理同一个请求。
+        // 若桌面端仍在等待，后续连接可以重放；无可用答复时保持原有回退行为。
         startDownstreamApproval(pending)
+        if (!hasInteractionClient(sessionId)) fallbackApproval(pending)
         log(`approval requested: rpcId=${rpcId} approvalId=${approvalId} session=${sessionId} tool=${request.toolName}`)
       })
     }, { prepend: true })
@@ -3408,6 +3477,9 @@ const plugin = {
       if (waitTimer) clearTimeout(waitTimer)
       clearInterval(fileTransferExpiryTimer)
       backgroundStreamAbort.abort()
+      peer.dispose().catch((error) => {
+        log(`Host peer disposal failed: ${error && error.message ? error.message : String(error)}`)
+      })
       speechInput.dispose()
       for (const pending of [...pendingQuestions.values()]) fallbackQuestion(pending)
       for (const pending of [...pendingApprovals.values()]) fallbackApproval(pending)

package/lib/session-event-details.mjs

@@ -0,0 +1,53 @@
+// Keep diagnostic facts when token replay and tool bodies are trimmed for mobile.
+const TOOL_OUTPUT_LIMIT = 16_000
+
+export function failureDetails(value) {
+  if (!value || typeof value !== 'object') return undefined
+  const result = {}
+  for (const key of ['message', 'code', 'name', 'reason', 'requestId']) {
+    if (typeof value[key] === 'string') result[key] = value[key]
+  }
+  for (const key of ['status', 'providerRetryAfterMs']) {
+    if (Number.isFinite(value[key])) result[key] = value[key]
+  }
+  return Object.keys(result).length ? result : undefined
+}
+
+export function assistantFinish(data) {
+  for (let i = (data.stream?.length || 0) - 1; i >= 0; i--) {
+    const record = data.stream[i]
+    if (record?.type !== 'chunk' || record.chunk?.type !== 'finish') continue
+    const reason = record.chunk.reason
+    if (typeof reason?.kind !== 'string') return undefined
+    const failure = failureDetails(reason.failure ?? reason.error)
+    return { kind: reason.kind, ...(failure ? { failure } : {}) }
+  }
+  return data.finish
+}
+
+export function toolResultDetails(data) {
+  const texts = []
+  const visit = block => {
+    if (block?.type === 'text' && typeof block.text === 'string') texts.push(block.text)
+    else if (block?.type === 'tool-result' && Array.isArray(block.content)) block.content.forEach(visit)
+  }
+  for (const block of data.message?.content || []) visit(block)
+  const full = texts.join('')
+  const outputTruncated = full.length > TOOL_OUTPUT_LIMIT
+  // Retain the terminal status and sandbox hints at the end as well as the start.
+  const output = outputTruncated
+    ? `${full.slice(0, TOOL_OUTPUT_LIMIT / 2)}\n[…]\n${full.slice(-TOOL_OUTPUT_LIMIT / 2)}`
+    : full
+  return { output, outputTruncated }
+}
+
+export function turnReasonDetails(reason) {
+  if (!reason || typeof reason.kind !== 'string') return undefined
+  const error = failureDetails(reason.error ?? reason.failure)
+  return { kind: reason.kind, ...(error ? { error } : {}),
+    ...(typeof reason.reason?.kind === 'string' ? { reason: {
+      kind: reason.reason.kind,
+      ...(typeof reason.reason.reason === 'string' ? { reason: reason.reason.reason } : {}),
+    } } : {}),
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-mobile-gateway",
-  "version": "0.10.1",
-  "description": "DeepSeek Harness 移动网关，支持安全设备配对、实时会话同步、插件管理、局域网及 Cloudflare Tunnel，以及自适应深浅色控制面板。0.10.1 新增官方语音输入接入，支持模型准备与状态同步、音频转文字及取消转写。",
+  "version": "0.10.3",
+  "description": "DeepSeek Harness 移动网关，支持安全设备配对、实时会话同步、插件管理、官方语音输入、文件卡片与安全文件预览、局域网及 Cloudflare Tunnel，以及自适应深浅色控制面板。0.10.3 适配 DSH 0.2.1-rc.2，为 Remote 请求及实时订阅补齐 Connection Peer，修复读取 signal 时的空值报错，并在网关停止时释放 Peer。",
   "main": "lib/index.mjs",
   "files": [
     "bin",
@@ -26,7 +26,7 @@
   },
   "bin": "bin/setup-ip.mjs",
   "scripts": {
-    "test": "node test/wire-json.test.mjs && node test/setup-ip.test.mjs && node test/host-adapter.test.mjs && node test/speech-input.test.mjs && node test/plugin-management.test.mjs && node test/session-preset.test.mjs && node test/session-follower.test.mjs && node test/gateway.test.mjs && node test/auth.test.mjs && node test/lan.test.mjs && node test/cloudflared-binary.test.mjs && node test/cloudflare-tunnel.test.mjs && node --test test/public-endpoint-check.test.mjs && node test/gateway-tools.test.mjs && node test/multi-gateway.test.mjs"
+    "test": "node test/wire-json.test.mjs && node test/setup-ip.test.mjs && node test/host-adapter.test.mjs && node test/speech-input.test.mjs && node test/plugin-management.test.mjs && node test/session-preset.test.mjs && node test/session-follower.test.mjs && node test/session-event-details.test.mjs && node test/gateway.test.mjs && node --test test/approval-replay.test.mjs && node test/auth.test.mjs && node test/lan.test.mjs && node test/cloudflared-binary.test.mjs && node test/cloudflare-tunnel.test.mjs && node --test test/public-endpoint-check.test.mjs && node test/gateway-tools.test.mjs && node test/multi-gateway.test.mjs"
   },
   "exports": {
     ".": "./lib/index.mjs",