dsh-monkeyai-sessions 0.1.0 → 0.1.2

package/src/host/monkeyai-remote.js

@@ -390,6 +390,45 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
     return this.exchangeAuthorization(auth, callbackUrl)
   }
 
+  // The runtime requires an expectedRevision on every configuration write and
+  // rejects a stale one with configuration_conflict. The MonkeyAI client (or
+  // another panel) can advance the revision at any time, so read the current
+  // value from the conflict payload — or from the HTTP session state when we
+  // have none — and retry instead of failing the switch.
+  async setSessionModel({ acp, sessionId, model, httpBase, ticket, revision, signal, onRevision }) {
+    let expected = revision
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+      if (!Number.isSafeInteger(expected)) {
+        expected = await readSessionConfigurationRevision({ httpBase, ticket, sessionId, signal })
+      }
+      if (!Number.isSafeInteger(expected)) throw new Error('无法读取会话配置版本，暂时不能切换模型')
+      try {
+        const result = await acp.request('_monkeyai/session/model/set', {
+          sessionId,
+          model,
+          _meta: { expectedRevision: expected },
+        }, { signal, timeoutMs: 120_000 })
+        const next = result?._meta?.configurationRevision
+        if (Number.isSafeInteger(next)) onRevision(next)
+        return typeof result?.model === 'string' ? result.model : model
+      } catch (error) {
+        if (signal?.aborted) throw error
+        const current = error?.data?.configurationRevision
+        if (error?.data?.reason === 'configuration_conflict' && Number.isSafeInteger(current) && current !== expected) {
+          expected = current
+          onRevision(current)
+          continue
+        }
+        if (error?.data?.reason === 'configuration_version_required') {
+          expected = undefined
+          continue
+        }
+        throw error
+      }
+    }
+    throw new Error('会话配置持续被其他客户端修改，请重试切换模型')
+  }
+
   async exchangeAuthorization(auth, callbackUrl) {
     const callback = parseAuthorizationCallback(callbackUrl, auth)
     const tokens = await requestJson(auth.serverOrigin, '/oauth/token', {
@@ -620,7 +659,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       }
       return {
         switched: false,
-        message: 'This MonkeyAI runtime does not support switching models on an active session. Create a new session to use a different model.',
+        message: '该 MonkeyAI runtime 不支持在活跃会话上切换模型，请新建会话使用其他模型。',
       }
     } finally {
       acp.close()
@@ -665,7 +704,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       // oversized single frame; both end the stream.
       const pushed = events.push(frame)
       if (pushed === false) {
-        const reason = new Error('Remote session event queue exceeded its limit')
+        const reason = new Error('远程会话事件队列超出上限')
         controller.abort(reason)
         currentAcp?.close(reason)
         return false
@@ -793,7 +832,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
             return
           }
           reconnectsUsed += 1
-          emit({ type: 'reconnecting', sessionId: selectedSession, message: `History replay interrupted - reconnecting to continue loading (${reconnectsUsed}/${MAX_REPLAY_RECONNECTS})` })
+          emit({ type: 'reconnecting', sessionId: selectedSession, message: `历史回放中断，正在重连以继续加载（${reconnectsUsed}/${MAX_REPLAY_RECONNECTS}）` })
           void (async () => {
             try {
               await establishAcp(true)
@@ -802,7 +841,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
                 type: 'error',
                 sessionId: selectedSession,
                 code: 'acp_connection_closed',
-                message: reconnectError instanceof Error ? reconnectError.message : 'Remote session connection closed',
+                message: reconnectError instanceof Error ? reconnectError.message : '远程会话连接已关闭',
               })
               controller.abort(reason)
               events.close()
@@ -814,7 +853,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
         // keep working (the runtime binds sessions per connection).
         if (loadCompleted && reconnectsUsed < MAX_REPLAY_RECONNECTS) {
           reconnectsUsed += 1
-          emit({ type: 'reconnecting', sessionId: selectedSession, message: 'Remote connection dropped - reconnecting' })
+          emit({ type: 'reconnecting', sessionId: selectedSession, message: '远程连接中断，正在重连' })
           void (async () => {
             try {
               await establishAcp(true)
@@ -824,7 +863,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
                 type: 'error',
                 sessionId: selectedSession,
                 code: 'acp_connection_closed',
-                message: reconnectError instanceof Error ? reconnectError.message : 'Remote session connection closed',
+                message: reconnectError instanceof Error ? reconnectError.message : '远程会话连接已关闭',
               })
               controller.abort(reason)
               events.close()
@@ -836,14 +875,14 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
           type: 'error',
           sessionId: selectedSession,
           code: 'acp_connection_closed',
-          message: 'Remote session connection closed',
+          message: '远程会话连接已关闭',
         })
         controller.abort(reason)
         events.close()
       })
       unsubscribe = () => { unsubscribeThis(); unsubscribe = () => {} }
       unsubscribeClose = () => { unsubscribeCloseThis(); unsubscribeClose = () => {} }
-      if (signal.aborted) throw signal.reason ?? new Error('Remote session cancelled')
+      if (signal.aborted) throw signal.reason ?? new Error('远程会话已取消')
 
       const initialized = await acp.request('initialize', {
         protocolVersion: 1,
@@ -883,7 +922,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
             type: 'session_missing',
             sessionId: selectedSession,
             code: 'session_not_found',
-            message: 'This session no longer exists on the selected device (the runtime may have been reset). Create a new session instead.',
+            message: '该会话在所选设备上已不存在（runtime 可能已重置），请新建会话。',
           })
           connection.sessionMissing = true
           return
@@ -902,7 +941,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
             type: 'history_incomplete',
             sessionId: selectedSession,
             code: 'history_load_failed',
-            message: 'History replay was repeatedly cut off by the remote runtime; showing only the messages received so far.',
+            message: '历史回放被远程 runtime 反复中断，仅显示已收到的消息。',
           })
           loadCompleted = true
         }
@@ -914,12 +953,12 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       grantRef = await this.getGrant(accountId)
       this.requireScope(grantRef, 'device:connect')
       this.requireScope(grantRef, 'session:read')
-      if (signal.aborted) throw signal.reason ?? new Error('Remote session cancelled')
+      if (signal.aborted) throw signal.reason ?? new Error('远程会话已取消')
 
       const token = await this.refreshAccessToken(accountId, signal)
       const ticket = await this.requestConnectionTicket(accountId, grantRef, token, target, { signal })
       ticketValue = ticket.ticket
-      if (signal.aborted) throw signal.reason ?? new Error('Remote session cancelled')
+      if (signal.aborted) throw signal.reason ?? new Error('远程会话已取消')
 
       // Load the full history over the runtime's HTTP read channel before the
       // ACP connection starts. The ACP session/load replay only streams a
@@ -959,7 +998,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
           try {
             const currentGrant = await this.getGrant(accountId)
             if (!currentGrant.token.scopes.includes('session:read')) {
-              emit({ type: 'error', sessionId: selectedSession, code: 'read_permission_revoked', message: 'Session read permission is no longer available' })
+              emit({ type: 'error', sessionId: selectedSession, code: 'read_permission_revoked', message: '会话读取权限已失效' })
               controller.abort(new Error('Session read permission was revoked'))
               currentAcp?.close(new Error('Session read permission was revoked'))
               events.close()
@@ -973,18 +1012,20 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
               continue
             }
 
-            if (!currentAcp) throw new Error('ACP connection is re-establishing')
+            if (!currentAcp) throw new Error('ACP 连接正在重建')
 
             if (command.type === 'switch_model') {
               try {
-                const result = await currentAcp.request('_monkeyai/session/model/set', {
+                const model = await this.setSessionModel({
+                  acp: currentAcp,
                   sessionId: selectedSession,
                   model: command.model,
-                  ...(httpConfigurationRevision === undefined ? {} : { _meta: { expectedRevision: httpConfigurationRevision } }),
-                }, { signal, timeoutMs: 120_000 })
-                const nextRevision = result?._meta?.configurationRevision
-                if (Number.isSafeInteger(nextRevision)) httpConfigurationRevision = nextRevision
-                const model = typeof result?.model === 'string' ? result.model : command.model
+                  httpBase: ticket.httpBase,
+                  ticket: ticketValue,
+                  revision: httpConfigurationRevision,
+                  signal,
+                  onRevision: value => { httpConfigurationRevision = value },
+                })
                 currentLoadedModel = model
                 emit({ type: 'model_switched', sessionId: selectedSession, data: { model } })
               } catch (switchError) {
@@ -1017,7 +1058,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
                   type: 'delivery',
                   sessionId: selectedSession,
                   data: { accepted: false, code: 'remote_rejected' },
-                  message: promptError instanceof Error ? promptError.message : 'Remote runtime rejected the instruction',
+                  message: promptError instanceof Error ? promptError.message : '远程 runtime 拒绝了该指令',
                 })
               }
               continue
@@ -1043,7 +1084,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
               continue
             }
 
-            emit({ type: 'error', sessionId: selectedSession, code: 'invalid_command', message: 'Remote command is unsupported' })
+            emit({ type: 'error', sessionId: selectedSession, code: 'invalid_command', message: '不支持该远程命令' })
           } catch (error) {
             if (signal.aborted) return
             const requestId = command.type === 'respond' ? command.requestId : undefined
@@ -1061,9 +1102,9 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       })()
       commandPump.catch(() => {
         if (signal.aborted) return
-        emit({ type: 'error', sessionId: selectedSession, code: 'command_channel_closed', message: 'Remote command channel closed' })
-        controller.abort(new Error('Remote command channel closed'))
-        currentAcp?.close(new Error('Remote command channel closed'))
+        emit({ type: 'error', sessionId: selectedSession, code: 'command_channel_closed', message: '远程命令通道已关闭' })
+        controller.abort(new Error('远程命令通道已关闭'))
+        currentAcp?.close(new Error('远程命令通道已关闭'))
         events.close()
       })
 
@@ -1223,6 +1264,16 @@ async function readHistoryBodyText(response, maxBytes = HISTORY_PAGE_MAX_BYTES)
   return new TextDecoder().decode(joined)
 }
 
+// Reads the session's current configuration revision over the HTTP read
+// channel. Configuration writes must carry it, and the value changes whenever
+// any client edits the session.
+async function readSessionConfigurationRevision({ httpBase, ticket, sessionId, signal }) {
+  const timeout = AbortSignal.any([AbortSignal.timeout(20_000), ...(signal ? [signal] : [])])
+  const result = await readSessionHistoryPage({ httpBase, ticket, sessionId, limit: 1, signal: timeout })
+  const revision = result.session?.configurationRevision
+  return Number.isSafeInteger(revision) ? revision : undefined
+}
+
 async function readSessionHistoryPage({ httpBase, ticket, sessionId, cursor, direction, limit = 50, signal }) {
   const params = { sessionId, limit, ...(cursor ? { cursor, direction } : {}) }
   const response = await fetch(`${httpBase.endsWith('/') ? httpBase : `${httpBase}/`}read/session`, {

package/src/shared/projection.mjs

@@ -1,7 +1,7 @@
 const MESSAGE_UPDATES = Object.freeze({
-  user_message_chunk: { role: 'user', label: 'You', mode: 'append' },
+  user_message_chunk: { role: 'user', label: '我', mode: 'append' },
   agent_message_chunk: { role: 'assistant', label: 'MonkeyAI', mode: 'append' },
-  user_message: { role: 'user', label: 'You', mode: 'replace' },
+  user_message: { role: 'user', label: '我', mode: 'replace' },
   agent_message: { role: 'assistant', label: 'MonkeyAI', mode: 'replace' },
 })
 
@@ -11,7 +11,7 @@ const THOUGHT_UPDATES = Object.freeze({
 })
 
 export const TOOL_STATUS_LABEL = Object.freeze({
-  pending: 'queued', in_progress: 'running', completed: 'done', failed: 'failed', cancelled: 'cancelled',
+  pending: '排队中', in_progress: '执行中', completed: '完成', failed: '失败', cancelled: '已取消',
 })
 
 function contentText(content) {
@@ -124,20 +124,20 @@ function projectFrames(frames) {
       entries.push({ kind: 'raw', label: kind || 'session/update', data: update, key: `raw:${entries.length}` })
       continue
     }
-    if (frame.type === 'ready') { if (!seenReady) { seenReady = true; entries.push({ kind: 'system', label: 'Connected to remote runtime', key: `sys-ready:${entries.length}` }) } continue }
-    if (frame.type === 'history_loaded') { if (!seenHistoryLoaded) { seenHistoryLoaded = true; entries.push({ kind: 'system', label: 'History loaded', key: `sys-hist:${entries.length}` }) } continue }
-    if (frame.type === 'history_incomplete') { entries.push({ kind: 'system', label: 'History incomplete - some earlier messages may be missing', key: `sys-inc:${entries.length}` }); continue }
-    if (frame.type === 'reconnecting') { if (!seenReconnecting) { seenReconnecting = true; entries.push({ kind: 'system', label: frame.message || 'Reconnecting to remote runtime', key: `sys-reconn:${entries.length}` }) } continue }
+    if (frame.type === 'ready') { if (!seenReady) { seenReady = true; entries.push({ kind: 'system', label: '已连接到远程 runtime', key: `sys-ready:${entries.length}` }) } continue }
+    if (frame.type === 'history_loaded') { if (!seenHistoryLoaded) { seenHistoryLoaded = true; entries.push({ kind: 'system', label: '历史已加载', key: `sys-hist:${entries.length}` }) } continue }
+    if (frame.type === 'history_incomplete') { entries.push({ kind: 'system', label: '历史不完整，部分更早的消息可能缺失', key: `sys-inc:${entries.length}` }); continue }
+    if (frame.type === 'reconnecting') { if (!seenReconnecting) { seenReconnecting = true; entries.push({ kind: 'system', label: frame.message || '正在重连远程 runtime', key: `sys-reconn:${entries.length}` }) } continue }
     if (frame.type === 'reconnected') { continue }
     if (frame.type === 'delivery') {
       const accepted = Boolean(frame.data?.accepted)
       if (accepted) continue // turn completion is shown in the composer status line
-      entries.push({ kind: 'system', label: 'MonkeyAI did not accept the instruction', key: `sys-del:${entries.length}` })
+      entries.push({ kind: 'system', label: 'MonkeyAI 未接受该指令', key: `sys-del:${entries.length}` })
       continue
     }
-    if (frame.type === 'cancel_sent') { entries.push({ kind: 'system', label: 'Stop requested', key: `sys-cancel:${entries.length}` }); continue }
+    if (frame.type === 'cancel_sent') { entries.push({ kind: 'system', label: '已请求停止', key: `sys-cancel:${entries.length}` }); continue }
     if (frame.type === 'request') { continue } // rendered as an approval card from pendingRequests
-    if (frame.type === 'model_switched') { entries.push({ kind: 'system', label: `Model switched to ${frame.data?.model ?? 'selected model'}`, key: `sys-model:${entries.length}` }); continue }
+    if (frame.type === 'model_switched') { entries.push({ kind: 'system', label: `已切换模型：${frame.data?.model ?? '所选模型'}`, key: `sys-model:${entries.length}` }); continue }
     if (frame.type === 'model_switch_failed') { continue } // surfaced via the error banner
     if (frame.type === 'notification' && typeof frame.method === 'string' && frame.method.startsWith('_monkeyai/')) { continue } // internal runtime state notifications
     if (frame.type === 'error') { entries.push({ kind: 'raw', label: frame.code || 'error', data: { message: frame.message || frame.code }, key: `sys-err:${entries.length}` }); continue }