dsh-monkeyai-sessions 0.1.5 → 0.1.7

package/README.md

@@ -61,7 +61,7 @@ From a checkout:
 npm install
 npm run build
 npm pack
-dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.5.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.7.tgz
 ```
 
 Verified against a real DSH `0.2.2-rc.1` web profile and a live MonkeyAI runtime: authorization, full history loading, prompt delivery, model switching, and turn cancellation all work end to end.

package/README.zh.md

@@ -28,7 +28,7 @@ https://artenx.github.io/dsh-monkeyai-sessions/index.json
 npm install
 npm run build
 npm pack
-dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.5.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.7.tgz
 ```
 
 已在真实的 DSH `0.2.2-rc.1` web profile 与在线 MonkeyAI runtime 上端到端验证：授权、完整历史加载、指令下发、模型切换、回合取消均正常工作。

package/client.js

@@ -1068,8 +1068,9 @@ window.__ModuleLoader__.load({
         setVisibleCount(RECENT_LIMIT);
         setHistoryLoading(true);
         setStatus("\u6B63\u5728\u8FDE\u63A5\u8FDC\u7A0B\u4F1A\u8BDD");
+        let stream;
         try {
-          const stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
+          stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
           streamRef.current = stream;
           setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u8FDE\u63A5");
           for await (const frame of stream) {
@@ -1139,18 +1140,18 @@ window.__ModuleLoader__.load({
             }
             if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
           }
+          if (streamRef.current !== stream) return;
           setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
           setHistoryLoading(false);
           setTurnActive(false);
           setStopping(false);
-          setSessionStatus("");
         } catch (reason) {
+          if (stream && streamRef.current !== stream) return;
           setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u4E0D\u53EF\u7528");
           setError(errorText(reason));
           setHistoryLoading(false);
           setTurnActive(false);
           setStopping(false);
-          setSessionStatus("");
         }
       }
       function sendPrompt() {

package/lib/client-runtime.cjs

@@ -1063,8 +1063,9 @@ function RemoteSessionPage({ api }) {
     setVisibleCount(RECENT_LIMIT);
     setHistoryLoading(true);
     setStatus("\u6B63\u5728\u8FDE\u63A5\u8FDC\u7A0B\u4F1A\u8BDD");
+    let stream;
     try {
-      const stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
+      stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
       streamRef.current = stream;
       setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u8FDE\u63A5");
       for await (const frame of stream) {
@@ -1134,18 +1135,18 @@ function RemoteSessionPage({ api }) {
         }
         if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
       }
+      if (streamRef.current !== stream) return;
       setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
       setHistoryLoading(false);
       setTurnActive(false);
       setStopping(false);
-      setSessionStatus("");
     } catch (reason) {
+      if (stream && streamRef.current !== stream) return;
       setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u4E0D\u53EF\u7528");
       setError(errorText(reason));
       setHistoryLoading(false);
       setTurnActive(false);
       setStopping(false);
-      setSessionStatus("");
     }
   }
   function sendPrompt() {

package/package.json

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

package/src/client/index.js

@@ -548,8 +548,9 @@ function RemoteSessionPage({ api }) {
     setVisibleCount(RECENT_LIMIT)
     setHistoryLoading(true)
     setStatus('正在连接远程会话')
+    let stream
     try {
-      const stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd })
+      stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd })
       streamRef.current = stream
       setStatus('远程会话已连接')
       for await (const frame of stream) {
@@ -619,18 +620,18 @@ function RemoteSessionPage({ api }) {
         }
         if (frame.type === 'error') setError(frame.message || frame.code || '远程会话错误')
       }
+      if (streamRef.current !== stream) return
       setStatus('远程会话已断开')
       setHistoryLoading(false)
       setTurnActive(false)
       setStopping(false)
-      setSessionStatus('')
     } catch (reason) {
+      if (stream && streamRef.current !== stream) return
       setStatus('远程会话不可用')
       setError(errorText(reason))
       setHistoryLoading(false)
       setTurnActive(false)
       setStopping(false)
-      setSessionStatus('')
     }
   }
 

package/src/host/monkeyai-remote.js

@@ -974,11 +974,14 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
         }
         // The desktop client tracks turn state via _monkeyai/session/state
         // notifications. Seed the panel with the current status so a turn
-        // already running when the panel opens is shown as 进行中.
+        // already running when the panel opens is shown as 进行中. The state
+        // read omits state.status on some runtime builds, so fall back to the
+        // session.status field returned by the history read channel.
+        const KNOWN_STATUSES = ['running', 'idle', 'error', 'interrupted']
         try {
           const state = await readSessionState({ httpBase: ticketHttpBase, ticket: ticketValue, sessionId: selectedSession, signal })
           const status = state?.state?.status
-          if (typeof status === 'string' && ['running', 'idle', 'error', 'interrupted'].includes(status)) {
+          if (typeof status === 'string' && KNOWN_STATUSES.includes(status)) {
             emit({
               type: 'notification',
               sessionId: selectedSession,
@@ -990,6 +993,21 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
           // Older runtimes may not expose the state read; live notifications
           // still drive the status once the next turn starts.
         }
+        try {
+          const latest = await readSessionHistoryPage({ httpBase: ticketHttpBase, ticket: ticketValue, sessionId: selectedSession, limit: 1, signal })
+          const status = latest.session?.status
+          if (typeof status === 'string' && KNOWN_STATUSES.includes(status)) {
+            emit({
+              type: 'notification',
+              sessionId: selectedSession,
+              method: '_monkeyai/session/state',
+              data: { sessionId: selectedSession, state: { status } },
+            })
+          }
+        } catch {
+          // The history channel may be unavailable; live notifications remain
+          // the source of truth for subsequent turns.
+        }
       } catch (error) {
         if (signal?.aborted) throw error
         const message = error instanceof Error ? error.message : String(error)