dsh-monkeyai-sessions 0.1.16 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-monkeyai-sessions",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "在 DeepSeek Harness 中读取和继续 MonkeyAI 会话：查看完整对话历史、下发新指令，无缝接续之前在 MonkeyAI 客户端上的工作",
   "type": "module",
   "license": "MIT",

package/src/host/monkeyai-remote.js

@@ -792,8 +792,12 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       newReplayKeysThisConnection = 0
       const unsubscribeThis = acp.subscribe(event => {
         if (currentAcp !== acp) return
-        if (event.params?.sessionId !== selectedSession) return
         if (event.kind === 'request') {
+          const requestSessionId = event.params?.sessionId
+          const sessionlessQuestion = requestSessionId === undefined && event.method === 'elicitation/create'
+          // elicitation/create follows the MCP request shape and may omit the
+          // ACP session id. This socket is already bound to selectedSession.
+          if (requestSessionId !== selectedSession && !sessionlessQuestion) return
           if (pendingRequests.size >= 64) {
             const reason = new Error('Remote session has too many pending requests')
             controller.abort(reason)
@@ -809,6 +813,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
             data: event.params,
           })
         } else {
+          if (event.params?.sessionId !== selectedSession) return
           if (event.method === '_monkeyai/session/history_changed' && httpHistoryComplete && ticketHttpBase) {
             // Large live message bodies are persisted instead of streamed as
             // chunks. Match the desktop client: refresh the newest HTTP pages
@@ -1113,6 +1118,7 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
       const uplink = this.ctx.invocation?.uplink()
       if (!uplink) throw new Error('Remote session command channel is unavailable')
       uplinkIterator = uplink[Symbol.asyncIterator]()
+      let promptInFlight = false
 
       commandPump = (async () => {
         while (!signal.aborted) {
@@ -1167,24 +1173,38 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
             }
 
             if (command.type === 'prompt') {
-              try {
-                // session/prompt resolves only when the whole turn finishes;
-                // long turns on big sessions can take many minutes. Streamed
-                // session/update frames reach the panel while it runs.
-                const result = await currentAcp.request('session/prompt', {
-                  sessionId: selectedSession,
-                  prompt: [{ type: 'text', text: command.text }],
-                }, { signal, timeoutMs: 1_800_000 })
-                emit({ type: 'delivery', sessionId: selectedSession, data: { accepted: true, result } })
-              } catch (promptError) {
-                if (signal.aborted) return
+              if (promptInFlight) {
                 emit({
                   type: 'delivery',
                   sessionId: selectedSession,
-                  data: { accepted: false, code: 'remote_rejected' },
-                  message: promptError instanceof Error ? promptError.message : '远程 runtime 拒绝了该指令',
+                  data: { accepted: false, code: 'turn_in_progress' },
+                  message: '当前回合仍在执行，请等待完成后再下发新指令',
                 })
+                continue
               }
+              promptInFlight = true
+              const promptAcp = currentAcp
+              void (async () => {
+                try {
+                  // Let the command pump process answers and cancellation while
+                  // session/prompt waits for the remote turn to finish.
+                  const result = await promptAcp.request('session/prompt', {
+                    sessionId: selectedSession,
+                    prompt: [{ type: 'text', text: command.text }],
+                  }, { signal, timeoutMs: 1_800_000 })
+                  emit({ type: 'delivery', sessionId: selectedSession, data: { accepted: true, result } })
+                } catch (promptError) {
+                  if (signal.aborted) return
+                  emit({
+                    type: 'delivery',
+                    sessionId: selectedSession,
+                    data: { accepted: false, code: 'remote_rejected' },
+                    message: promptError instanceof Error ? promptError.message : '远程 runtime 拒绝了该指令',
+                  })
+                } finally {
+                  promptInFlight = false
+                }
+              })()
               continue
             }