dsh-plugin-mobile-gateway 0.7.4 → 0.7.5

package/docs/dsh-rc2-mobile-integration.md

@@ -66,6 +66,10 @@
 
 这是最新历史窗口和活动生成状态在同一个上游切点的快照。没有正在生成的 attempt 时省略 `activeAttempt`，客户端应清空临时输出。`hasMore` 为 true 时同时返回 `nextBeforeSeq`，按普通历史请求补更早内容；`replace` 指当前订阅基线需要替换，不能把该窗口误认为完整历史。
 
+首屏窗口：网关向 Host `session.follow` 显式传入 `maxMessages: 12`，再将 conversation 事件限制在约 256 KiB 的最新连续后缀。单条最新消息不可拆分，独自超限时仍完整保留；活动 attempt 和 projections 不计入此正文预算，也不裁剪。被预算排除的较早记录通过 `hasMore/nextBeforeSeq` 按原协议分页获取。历史正文窗口可以缩小，但 `cursor` 始终保留 Host 的原子切点。
+
+读取更早页时，为获取当前切点而打开的短暂 follow 仅请求 1 条消息；实际 `session.page` 继续使用客户端请求的 `maxMessages`。此调整同时作用于 iOS 和 Android，不依赖本地历史磁盘缓存。
+
 客户端只处理当前 `subscriptionId`。收到新 snapshot 后更新 `streamId`，清理上一个 stream 的临时状态，并把持久流水位设为 `cursor`，不能使用精简 events 的最大 seq 代替它：精简视图可能隐藏了末尾的系统事件。
 
 未发送 `assistantStream: true` 的连接仍接收持久 `event`，不会收到伪装成持久事件的 token。control 连接不能订阅对话流。

package/lib/dsh-host-adapter.mjs

@@ -104,7 +104,9 @@ export function createDshHostAdapter(typertGateway) {
   const history = async (payload, signal) => {
     const request = {
       address: { kind: 'session', sessionId: payload.sessionId },
-      ...(payload.maxMessages === undefined ? {} : { maxMessages: payload.maxMessages }),
+      // Older-page requests need only the opening cursor/projections, not another large latest page.
+      ...(payload.beforeSeq !== undefined ? { maxMessages: 1 }
+        : payload.maxMessages === undefined ? {} : { maxMessages: payload.maxMessages }),
     }
     const snapshot = await sessionSnapshot(request, signal)
     let events = snapshot.events
@@ -270,7 +272,8 @@ export function createDshHostAdapter(typertGateway) {
     openSessionStream(sessionId, signal) {
       return typertGateway.stream({
         namespace: 'session', method: 'follow',
-        args: requestArgs({ address: { kind: 'session', sessionId }, assistantStream: true }),
+        // Bound the opening window at the Host; older records remain available via session.page.
+        args: requestArgs({ address: { kind: 'session', sessionId }, maxMessages: 12, assistantStream: true }),
         signal,
       })
     },

package/lib/index.mjs

@@ -1,3 +1,4 @@
+import { stringifyWireFrame } from './wire-json.mjs'
 // dsh-plugin-mobile-gateway — persistent Host plugin.
 //
 // Two directions:
@@ -278,6 +279,7 @@ function buildWireEvent(session, event) {
           type: 'user/message',
           text: textOf(d.content || []),
           source: d.source && d.source.kind,
+          ...(typeof d.id === 'string' && d.id ? { raw: { id: d.id } } : {}),
           ...(images.length ? { images } : {}),
         },
       })
@@ -562,6 +564,13 @@ async function proxyQuery(api, type, method, payload, signal) {
   }
 }
 
+// Projection queries must keep the caller's request identity on failure.
+// They need the opening cut and projections, not the full conversation body.
+async function querySessionProjection(api, requestType, sessionId) {
+  const history = await proxyQuery(api, 'history', api.sessions.history.bind(api.sessions), { sessionId, maxMessages: 1 })
+  return history.kind === 'error' ? { ...history, requestType, sessionId } : history
+}
+
 function fileTransferError(code, message, requestType, sessionId) {
   return {
     kind: 'error',
@@ -1025,6 +1034,9 @@ async function mutateGoal(api, type, method, payload) {
 // and truncates oversized tool-result text.
 // ---------------------------------------------------------------------------
 const HISTORY_DEFAULT_MAX_BYTES = 4 * 1024 * 1024 // 4 MiB per frame
+// Opening snapshots should be readable before older history is requested.
+// Keep the newest indivisible message even when it alone exceeds this budget.
+const HISTORY_OPENING_MAX_BYTES = 256 * 1024
 const HISTORY_TOOL_RESULT_MAX_CHARS = 2000 // per text block in conversation view
 
 function eventBytes(event) {
@@ -1624,7 +1636,9 @@ async function handleQuery(api, host, agentDefaultModel, msg) {
     }
     const sessionId = typeof msg.sessionId === 'string' && msg.sessionId.trim() !== '' ? msg.sessionId.trim() : null
     if (sessionId) {
-      const hist = await proxyQuery(api, 'history', api.sessions.history.bind(api.sessions), { sessionId })
+      out.sessionId = sessionId
+      const hist = await querySessionProjection(api, msg.type, sessionId)
+      if (hist.kind === 'error') return hist
       if (hist.kind === 'history' && hist.projections && hist.projections.values) {
         out.sessionPermissions = hist.projections.values.permissions || null
       }
@@ -1672,7 +1686,7 @@ async function handleQuery(api, host, agentDefaultModel, msg) {
   if (msg.type === 'context-usage') {
     const sessionId = requireSessionId(msg)
     if (sessionId.error) return sessionId.error
-    const hist = await proxyQuery(api, 'history', api.sessions.history.bind(api.sessions), { sessionId: sessionId.value })
+    const hist = await querySessionProjection(api, msg.type, sessionId.value)
     if (hist.kind !== 'history') return hist
     const values = (hist.projections && hist.projections.values) || {}
     return {
@@ -1686,7 +1700,7 @@ async function handleQuery(api, host, agentDefaultModel, msg) {
   if (msg.type === 'session-stats') {
     const sessionId = requireSessionId(msg)
     if (sessionId.error) return sessionId.error
-    const hist = await proxyQuery(api, 'history', api.sessions.history.bind(api.sessions), { sessionId: sessionId.value })
+    const hist = await querySessionProjection(api, msg.type, sessionId.value)
     if (hist.kind !== 'history') return hist
     const values = (hist.projections && hist.projections.values) || {}
     return {
@@ -2179,7 +2193,7 @@ const plugin = {
     })
 
     const broadcastInteractionFrame = (frame) => {
-      const wire = JSON.stringify(frame)
+      const wire = stringifyWireFrame(frame)
       for (const client of clients) {
         if (client.mobileChannel === 'conversation') continue
         if (client.filterSessionId && client.filterSessionId !== frame.sessionId) continue
@@ -2191,7 +2205,7 @@ const plugin = {
     // subscribed to one conversation. Subscriptions only scope the heavier
     // conversation and interaction streams.
     const broadcastSessionMetadataFrame = (frame) => {
-      const wire = JSON.stringify(frame)
+      const wire = stringifyWireFrame(frame)
       for (const client of clients) {
         if (client.mobileChannel === 'conversation') continue
         if (client.readyState === 1) client.send(wire)
@@ -2204,12 +2218,12 @@ const plugin = {
       let approvalCount = 0
       for (const pending of pendingQuestions.values()) {
         if (ws.filterSessionId && ws.filterSessionId !== pending.sessionId) continue
-        ws.send(JSON.stringify(questionFrameFor(pending.rpcId, pending, true)))
+        ws.send(stringifyWireFrame(questionFrameFor(pending.rpcId, pending, true)))
         questionCount += 1
       }
       for (const pending of pendingApprovals.values()) {
         if (ws.filterSessionId && ws.filterSessionId !== pending.sessionId) continue
-        ws.send(JSON.stringify(approvalFrameFor(pending.rpcId, pending, true)))
+        ws.send(stringifyWireFrame(approvalFrameFor(pending.rpcId, pending, true)))
         approvalCount += 1
       }
       log(`interaction replay: trigger=${trigger} filtered=${Boolean(ws.filterSessionId)} questions=${questionCount} approvals=${approvalCount}`)
@@ -2565,12 +2579,12 @@ const plugin = {
           }
 
           const sendFrame = frame => {
-            if (ws.readyState === 1) ws.send(JSON.stringify(frame))
+            if (ws.readyState === 1) ws.send(stringifyWireFrame(frame))
           }
           ws.sessionFollower = createSessionFollower(api, {
             onFrame(frame, context) {
               if (frame.type === 'snapshot') {
-                sendFrame({ ...historyPage(frame.history, { sessionId: context.sessionId, view: 'conversation' }),
+                sendFrame({ ...historyPage(frame.history, { sessionId: context.sessionId, view: 'conversation', maxBytes: HISTORY_OPENING_MAX_BYTES }),
                   kind: 'session-snapshot', ...context, assistantStream: frame.assistantStream, replace: true })
               } else if (frame.type === 'event') {
                 sendFrame({ ...buildWireEvent({ id: context.sessionId }, frame.event), ...context })
@@ -2589,19 +2603,19 @@ const plugin = {
             try {
               msg = JSON.parse(data.toString())
             } catch (error) {
-              ws.send(JSON.stringify({ kind: 'error', message: 'invalid json' }))
+              ws.send(stringifyWireFrame({ kind: 'error', message: 'invalid json' }))
               return
             }
             if (!msg || typeof msg.type !== 'string') return
             const conversationRequest = ['message', 'history', 'subscribe', 'unsubscribe'].includes(msg.type)
             if ((ws.mobileChannel === 'control' && conversationRequest) ||
                 (ws.mobileChannel === 'conversation' && !conversationRequest && msg.type !== 'ping')) {
-              ws.send(JSON.stringify({ kind: 'error', code: 'wrong-channel', requestType: msg.type, message: 'Request belongs to the other mobile channel' }))
+              ws.send(stringifyWireFrame({ kind: 'error', code: 'wrong-channel', requestType: msg.type, message: 'Request belongs to the other mobile channel' }))
               return
             }
 
             if (msg.type === 'ping') {
-              ws.send(JSON.stringify({ kind: 'pong', at: Date.now() }))
+              ws.send(stringifyWireFrame({ kind: 'pong', at: Date.now() }))
             } else if (msg.type === 'subscribe') {
               if (msg.assistantStream !== undefined && typeof msg.assistantStream !== 'boolean') {
                 sendFrame({ kind: 'error', code: 'bad-request', requestType: 'subscribe', message: 'assistantStream must be a boolean' })
@@ -2631,20 +2645,20 @@ const plugin = {
               sendFrame({ kind: 'subscribed', sessionId: null, assistantStream: false })
             } else if (msg.type === 'question-answer' || msg.type === 'question-cancel') {
               respondToQuestion(msg, msg.type === 'question-cancel').then((frame) => {
-                if (frame && ws.readyState === 1) ws.send(JSON.stringify(frame))
+                if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
             } else if (msg.type === 'approval-response') {
               respondToApproval(msg).then((frame) => {
-                if (frame && ws.readyState === 1) ws.send(JSON.stringify(frame))
+                if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
             } else if (msg.type === 'file-list' || 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(JSON.stringify(frame))
+                if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
             } else if (msg.type === 'message') {
               admitMessage(api, msg).then((frame) => {
-                if (frame && ws.readyState === 1) ws.send(JSON.stringify(frame))
+                if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
             } else if (msg.type === 'workspaces' || msg.type === 'sessions' || msg.type === 'history' || msg.type === 'attachment' ||
                        msg.type === 'search' || msg.type === 'host' || msg.type === 'directories' || msg.type === 'directory-create' ||
@@ -2658,10 +2672,10 @@ const plugin = {
                        msg.type === 'tasks' || msg.type === 'goal' || msg.type === 'goal-edit' ||
                        msg.type === 'goal-pause' || msg.type === 'goal-resume' || msg.type === 'goal-clear') {
               handleQuery(api, host, agentDefaultModel, msg).then((frame) => {
-                if (frame && ws.readyState === 1) ws.send(JSON.stringify(frame))
+                if (frame && ws.readyState === 1) ws.send(stringifyWireFrame(frame))
               })
             } else {
-              ws.send(JSON.stringify({ kind: 'error', message: 'unknown message type: ' + msg.type }))
+              ws.send(stringifyWireFrame({ kind: 'error', message: 'unknown message type: ' + msg.type }))
             }
           })
 
@@ -2678,14 +2692,14 @@ const plugin = {
 
           log(`client connected (id=${id}, total=${clients.size})${device ? ' device=' + device.name : ''}`)
           if (paired) {
-            ws.send(JSON.stringify({
+            ws.send(stringifyWireFrame({
               kind: 'paired',
               token: paired.token,
               device: paired.device,
               ...gatewayIdentity,
             }))
           }
-          ws.send(JSON.stringify({
+          ws.send(stringifyWireFrame({
             kind: 'hello',
             ...gatewayIdentity,
             protocol: 3,
@@ -2713,10 +2727,10 @@ const plugin = {
             ...(device ? { device: { id: device.id, name: device.name } } : {}),
           }))
           if (ws.mobileChannel !== 'conversation' && archivedSessionIds !== null) {
-            ws.send(JSON.stringify({ kind: 'session-archives', archivedSessionIds }))
+            ws.send(stringifyWireFrame({ kind: 'session-archives', archivedSessionIds }))
           }
           if (ws.mobileChannel !== 'conversation' && sessionQueues !== null) {
-            ws.send(JSON.stringify({ kind: 'session-queues', queues: Object.fromEntries(sessionQueues) }))
+            ws.send(stringifyWireFrame({ kind: 'session-queues', queues: Object.fromEntries(sessionQueues) }))
           }
           if (ws.mobileChannel !== 'conversation') {
             sendFrame({ kind: 'projection-baseline', projections: sessionProjectionBaselines })
@@ -2788,7 +2802,7 @@ const plugin = {
           ...(event.data.source ? { source: event.data.source } : {}),
         })
       }
-      const payload = JSON.stringify(wire)
+      const payload = stringifyWireFrame(wire)
       for (const client of clients) {
         if (client.mobileChannel === 'control' || client.sessionFollowerActive) continue
         if (client.filterSessionId && client.filterSessionId !== String(session.id)) continue

package/lib/session-follower.mjs

@@ -118,6 +118,8 @@ export function createSessionFollower(api, { onFrame, onError, retryMs = 1000 })
         } catch (error) {
           if (current !== state || signal.aborted) break
           permanent = ['unsupported-session-format', 'session/not-found', 'gateway/bad-request'].includes(error.code)
+            || (error.code === 'SESSION_QUERY_PERSISTENCE_FAILED'
+              && /refuses this format .*Session/.test(error.message || ''))
           onError(error, { ...context, retrying: !permanent })
         } finally {
           // Abort before return: the producer may be waiting for another event.

package/lib/wire-json.mjs

@@ -0,0 +1,7 @@
+// Host 的摘要截断可能留下单个 UTF-16 代理项。JSON.stringify 会将其转义，
+// 但 Swift/Foundation 仍拒绝整帧；在传输边界统一输出有效 Unicode。
+// 不修改原对象、历史正文、有效 emoji 或字面量反斜杠转义文本。
+export function stringifyWireFrame(frame) {
+  return JSON.stringify(frame, (_key, value) =>
+    typeof value === 'string' ? value.replace(/[\uD800-\uDFFF]/gu, '\uFFFD') : value)
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-plugin-mobile-gateway",
-  "version": "0.7.4",
-  "description": "Updated for dsh 0.1.5-rc.1/2 with dedicated realtime streams, reconnect recovery, history format and cursor validation, and fixes for command attachments and session state sync",
+  "version": "0.7.5",
+  "description": "Mobile gateway for dsh 0.1.5-rc.1/2 with smaller opening history snapshots, accurate query error reporting, Unicode-safe wire frames, and preserved user message IDs",
   "main": "lib/index.mjs",
   "files": [
     "bin",
@@ -26,7 +26,7 @@
   },
   "bin": "bin/setup-ip.mjs",
   "scripts": {
-    "test": "node test/setup-ip.test.mjs && node test/host-adapter.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/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/session-follower.test.mjs && node test/gateway.test.mjs && node test/auth.test.mjs && node test/lan.test.mjs && node test/multi-gateway.test.mjs"
   },
   "exports": {
     ".": "./lib/index.mjs",