dsh-monkeyai-sessions 0.1.4 → 0.1.6

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.4.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.6.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.4.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.6.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) {
@@ -1080,6 +1081,7 @@ window.__ModuleLoader__.load({
               historyLoadedRef.current = true;
               setStatus("\u5386\u53F2\u5DF2\u52A0\u8F7D");
               setHistoryLoading(false);
+              setSessionStatus((current) => current || "idle");
               if (frame.model) setCurrentModel(frame.model);
             }
             if (frame.type === "history_incomplete") {
@@ -1138,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) {
@@ -1075,6 +1076,7 @@ function RemoteSessionPage({ api }) {
           historyLoadedRef.current = true;
           setStatus("\u5386\u53F2\u5DF2\u52A0\u8F7D");
           setHistoryLoading(false);
+          setSessionStatus((current) => current || "idle");
           if (frame.model) setCurrentModel(frame.model);
         }
         if (frame.type === "history_incomplete") {
@@ -1133,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.4",
+  "version": "0.1.6",
   "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) {
@@ -560,6 +561,7 @@ function RemoteSessionPage({ api }) {
           historyLoadedRef.current = true
           setStatus('历史已加载')
           setHistoryLoading(false)
+          setSessionStatus(current => current || 'idle')
           if (frame.model) setCurrentModel(frame.model)
         }
         if (frame.type === 'history_incomplete') {
@@ -618,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

@@ -971,24 +971,24 @@ export class MonkeyAIRemoteService extends TypertRemoteService {
         if (httpHistoryComplete) {
           historyRefreshPromise = historyRefreshPromise.then(() => refreshPersistedHistory())
           await historyRefreshPromise
-          // 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 进行中.
-          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)) {
-              emit({
-                type: 'notification',
-                sessionId: selectedSession,
-                method: '_monkeyai/session/state',
-                data: { sessionId: selectedSession, state: { status }, eventSeq: state.eventSeq },
-              })
-            }
-          } catch {
-            // Older runtimes may not expose the state read; live notifications
-            // still drive the status once the next turn starts.
+        }
+        // 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 进行中.
+        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)) {
+            emit({
+              type: 'notification',
+              sessionId: selectedSession,
+              method: '_monkeyai/session/state',
+              data: { sessionId: selectedSession, state: { status }, eventSeq: state.eventSeq },
+            })
           }
+        } catch {
+          // Older runtimes may not expose the state read; live notifications
+          // still drive the status once the next turn starts.
         }
       } catch (error) {
         if (signal?.aborted) throw error