dsh-monkeyai-sessions 0.1.7 → 0.1.8

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.7.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.8.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.7.tgz
+dsh plugin --profile web add ./dsh-monkeyai-sessions-0.1.8.tgz
 ```
 
 已在真实的 DSH `0.2.2-rc.1` web profile 与在线 MonkeyAI runtime 上端到端验证：授权、完整历史加载、指令下发、模型切换、回合取消均正常工作。

package/client.js

@@ -606,6 +606,24 @@ window.__ModuleLoader__.load({
     function errorText(error) {
       return typeof error?.message === "string" ? error.message : typeof error === "string" ? error : "\u8FDC\u7A0B\u64CD\u4F5C\u5931\u8D25";
     }
+    function withTimeout(promise, timeoutMs, label) {
+      return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error(`${label}\u8D85\u65F6\uFF0C\u8BF7\u91CD\u8BD5`)), timeoutMs);
+        Promise.resolve(promise).then(
+          (value) => {
+            clearTimeout(timer);
+            resolve(value);
+          },
+          (error) => {
+            clearTimeout(timer);
+            reject(error);
+          }
+        );
+      });
+    }
+    function isRemoteStreamCarrierError(error) {
+      return /api gateway: remote stream websocket (?:failed|closed)/i.test(errorText(error));
+    }
     function renderMarkdown(text) {
       if (typeof text !== "string" || text === "") return null;
       const blocks = [];
@@ -829,6 +847,7 @@ window.__ModuleLoader__.load({
       const authWindowRef = useRef(null);
       const eventsRef = useRef(null);
       const prevScrollHeightRef = useRef(null);
+      const streamGenerationRef = useRef(0);
       const title = useMemo(() => {
         const runtime = runtimeSessions.find((item) => item.id === sessionId);
         const summary = summarySessions.find((item) => item.id === sessionId);
@@ -849,6 +868,7 @@ window.__ModuleLoader__.load({
         });
         return () => {
           active = false;
+          streamGenerationRef.current += 1;
           streamRef.current?.dispose();
           streamRef.current = null;
         };
@@ -1011,6 +1031,7 @@ window.__ModuleLoader__.load({
         setError("");
         setLoading(true);
         try {
+          streamGenerationRef.current += 1;
           const result = await unwrap(api.listDevices({ accountId, page: 1 }));
           setDevices(result.items);
           const first = result.items.length > 0 ? result.items[0].machineId : "";
@@ -1034,24 +1055,32 @@ window.__ModuleLoader__.load({
         setError("");
         setLoading(true);
         setSessionId("");
+        streamGenerationRef.current += 1;
         streamRef.current?.dispose();
         streamRef.current = null;
         setFrames([]);
         setPendingRequests([]);
-        const results = await Promise.allSettled([
-          unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 })),
-          unwrap(api.listRuntimeSessions({ accountId, machineId: mid }))
-        ]);
-        const errors = [];
-        if (results[0].status === "fulfilled") setSummarySessions(results[0].value.items);
-        else errors.push(`\u4F1A\u8BDD\u6458\u8981\u7D22\u5F15\uFF1A${errorText(results[0].reason)}`);
-        if (results[1].status === "fulfilled") setRuntimeSessions(results[1].value.sessions);
-        else errors.push(`ACP \u4F1A\u8BDD\u5217\u8868\uFF1A${errorText(results[1].reason)}`);
-        setStatus(errors.length === 0 ? "\u4F1A\u8BDD\u5DF2\u5237\u65B0" : "\u90E8\u5206\u4F1A\u8BDD\u6765\u6E90\u4E0D\u53EF\u7528");
-        setError(errors.join("\n"));
-        setLoading(false);
+        try {
+          const results = await Promise.allSettled([
+            withTimeout(Promise.resolve().then(() => unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 }))), 5e4, "\u4F1A\u8BDD\u6458\u8981\u8BFB\u53D6"),
+            withTimeout(Promise.resolve().then(() => unwrap(api.listRuntimeSessions({ accountId, machineId: mid }))), 5e4, "ACP \u4F1A\u8BDD\u5217\u8868\u8BFB\u53D6")
+          ]);
+          const errors = [];
+          if (results[0].status === "fulfilled") setSummarySessions(results[0].value.items);
+          else errors.push(`\u4F1A\u8BDD\u6458\u8981\u7D22\u5F15\uFF1A${errorText(results[0].reason)}`);
+          if (results[1].status === "fulfilled") setRuntimeSessions(results[1].value.sessions);
+          else errors.push(`ACP \u4F1A\u8BDD\u5217\u8868\uFF1A${errorText(results[1].reason)}`);
+          setStatus(errors.length === 0 ? "\u4F1A\u8BDD\u5DF2\u5237\u65B0" : "\u90E8\u5206\u4F1A\u8BDD\u6765\u6E90\u4E0D\u53EF\u7528");
+          setError(errors.join("\n"));
+        } catch (reason) {
+          setStatus("\u4F1A\u8BDD\u5237\u65B0\u5931\u8D25");
+          setError(errorText(reason));
+        } finally {
+          setLoading(false);
+        }
       }
       async function openSession(session) {
+        const generation = ++streamGenerationRef.current;
         streamRef.current?.dispose();
         streamRef.current = null;
         historyLoadedRef.current = false;
@@ -1068,90 +1097,116 @@ window.__ModuleLoader__.load({
         setVisibleCount(RECENT_LIMIT);
         setHistoryLoading(true);
         setStatus("\u6B63\u5728\u8FDE\u63A5\u8FDC\u7A0B\u4F1A\u8BDD");
-        let stream;
-        try {
-          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) {
-            setFrames((current) => [...current, frame]);
-            if (frame.type === "ready" && !historyLoadedRef.current) setStatus("\u6B63\u5728\u56DE\u653E\u4F1A\u8BDD\u5386\u53F2");
-            if (frame.type === "reconnecting") setStatus(frame.message || "\u6B63\u5728\u91CD\u8FDE\u8FDC\u7A0B runtime");
-            if (frame.type === "history_loaded") {
-              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") {
-              setStatus("\u5386\u53F2\u4E0D\u5B8C\u6574\uFF1A" + (frame.message || "\u56DE\u653E\u88AB\u4E2D\u65AD"));
-              setHistoryLoading(false);
-            }
-            if (frame.type === "model_switched") {
-              if (frame.data?.model) setCurrentModel(frame.data.model);
-              setSwitchingModel(false);
-              setStatus("\u6A21\u578B\u5DF2\u5207\u6362");
-            }
-            if (frame.type === "model_switch_failed") {
-              setSwitchingModel(false);
-              setError(frame.message || "\u6A21\u578B\u5207\u6362\u88AB\u62D2\u7EDD");
-              setStatus("\u6A21\u578B\u5207\u6362\u5931\u8D25");
-            }
-            if (frame.type === "session_missing") {
-              setError(frame.message || "\u8BE5\u4F1A\u8BDD\u5728\u6240\u9009\u8BBE\u5907\u4E0A\u5DF2\u4E0D\u5B58\u5728\u3002");
-              setStatus("\u8BBE\u5907\u4E0A\u627E\u4E0D\u5230\u8BE5\u4F1A\u8BDD");
-              setHistoryLoading(false);
-            }
-            if (frame.type === "request") {
-              setPendingRequests((current) => [...current.filter((item) => item.requestId !== frame.requestId), frame]);
+        let retries = 0;
+        while (streamGenerationRef.current === generation) {
+          let stream;
+          try {
+            stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
+            if (streamGenerationRef.current !== generation) {
+              stream.dispose();
+              return;
             }
-            if (frame.type === "notification" && frame.method === "_monkeyai/session/state") {
-              const status2 = frame.data?.state?.status;
-              if (typeof status2 === "string" && SESSION_STATUS_LABEL[status2]) {
-                setSessionStatus(status2);
-                setTurnActive(status2 === "running");
-                if (status2 !== "running") setStopping(false);
+            streamRef.current = stream;
+            setStatus(retries > 0 ? "\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u91CD\u65B0\u8FDE\u63A5" : "\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u8FDE\u63A5");
+            for await (const frame of stream) {
+              setFrames((current) => [...current, frame]);
+              if (frame.type === "ready" && !historyLoadedRef.current) setStatus("\u6B63\u5728\u56DE\u653E\u4F1A\u8BDD\u5386\u53F2");
+              if (frame.type === "reconnecting") setStatus(frame.message || "\u6B63\u5728\u91CD\u8FDE\u8FDC\u7A0B runtime");
+              if (frame.type === "history_loaded") {
+                historyLoadedRef.current = true;
+                setStatus("\u5386\u53F2\u5DF2\u52A0\u8F7D");
+                setHistoryLoading(false);
+                setSessionStatus((current) => current || "idle");
+                if (frame.model) setCurrentModel(frame.model);
               }
-            }
-            if (frame.type === "delivery") {
-              const accepted = Boolean(frame.data?.accepted);
-              setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type });
-              setTurnActive(false);
-              setStopping(false);
-              if (accepted) {
-                const cancelled = frame.data?.result?.stopReason === "cancelled";
-                setStatus(cancelled ? "\u56DE\u5408\u5DF2\u505C\u6B62" : "\u56DE\u5408\u5DF2\u5B8C\u6210");
-              } else {
-                setPrompt((current) => current === "" ? lastDraftRef.current || "" : current);
-                setStatus("MonkeyAI \u672A\u63A5\u53D7\u8BE5\u6307\u4EE4\uFF0C\u8349\u7A3F\u5DF2\u4FDD\u7559");
-                if (frame.message) setError(frame.message);
+              if (frame.type === "history_incomplete") {
+                setStatus("\u5386\u53F2\u4E0D\u5B8C\u6574\uFF1A" + (frame.message || "\u56DE\u653E\u88AB\u4E2D\u65AD"));
+                setHistoryLoading(false);
+              }
+              if (frame.type === "model_switched") {
+                if (frame.data?.model) setCurrentModel(frame.data.model);
+                setSwitchingModel(false);
+                setStatus("\u6A21\u578B\u5DF2\u5207\u6362");
+              }
+              if (frame.type === "model_switch_failed") {
+                setSwitchingModel(false);
+                setError(frame.message || "\u6A21\u578B\u5207\u6362\u5931\u8D25");
+                setStatus("\u6A21\u578B\u5207\u6362\u5931\u8D25");
               }
+              if (frame.type === "session_missing") {
+                setError(frame.message || "\u8BE5\u4F1A\u8BDD\u5728\u6240\u9009\u8BBE\u5907\u4E0A\u5DF2\u4E0D\u5B58\u5728\u3002");
+                setStatus("\u8BBE\u5907\u4E0A\u627E\u4E0D\u5230\u8BE5\u4F1A\u8BDD");
+                setHistoryLoading(false);
+              }
+              if (frame.type === "request") {
+                setPendingRequests((current) => [...current.filter((item) => item.requestId !== frame.requestId), frame]);
+              }
+              if (frame.type === "notification" && frame.method === "_monkeyai/session/state") {
+                const status2 = frame.data?.state?.status;
+                if (typeof status2 === "string" && SESSION_STATUS_LABEL[status2]) {
+                  setSessionStatus(status2);
+                  setTurnActive(status2 === "running");
+                  if (status2 !== "running") setStopping(false);
+                }
+              }
+              if (frame.type === "delivery") {
+                const accepted = Boolean(frame.data?.accepted);
+                setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type });
+                setTurnActive(false);
+                setStopping(false);
+                if (accepted) {
+                  const cancelled = frame.data?.result?.stopReason === "cancelled";
+                  setStatus(cancelled ? "\u56DE\u5408\u5DF2\u505C\u6B62" : "\u56DE\u5408\u5DF2\u5B8C\u6210");
+                } else {
+                  setPrompt((current) => current === "" ? lastDraftRef.current || "" : current);
+                  setStatus("MonkeyAI \u672A\u63A5\u53D7\u8BE5\u6307\u4EE4\uFF0C\u8349\u7A3F\u5DF2\u4FDD\u7559");
+                  if (frame.message) setError(frame.message);
+                }
+              }
+              if (frame.type === "cancel_sent") {
+                setStopping(false);
+                setStatus("\u5DF2\u8BF7\u6C42\u505C\u6B62\uFF0C\u7B49\u5F85 runtime \u53D6\u6D88");
+              }
+              if (frame.type === "response_sent") {
+                setPendingRequests((current) => current.filter((item) => item.requestId !== frame.requestId));
+              }
+              if (frame.type === "response_error") {
+                setError(`\u8FDC\u7A0B\u56DE\u590D\u88AB\u62D2\u7EDD\uFF1A${frame.code || "\u672A\u77E5"}`);
+              }
+              if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
             }
-            if (frame.type === "cancel_sent") {
+            if (streamGenerationRef.current !== generation || streamRef.current !== stream) return;
+            streamRef.current = null;
+            setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
+            setHistoryLoading(false);
+            setTurnActive(false);
+            setStopping(false);
+            return;
+          } catch (reason) {
+            if (streamGenerationRef.current !== generation || stream && streamRef.current !== stream) return;
+            if (isRemoteStreamCarrierError(reason)) {
+              retries += 1;
+              try {
+                stream?.dispose();
+              } catch {
+              }
+              streamRef.current = null;
+              setError("");
+              setTurnActive(false);
               setStopping(false);
-              setStatus("\u5DF2\u8BF7\u6C42\u505C\u6B62\uFF0C\u7B49\u5F85 runtime \u53D6\u6D88");
-            }
-            if (frame.type === "response_sent") {
-              setPendingRequests((current) => current.filter((item) => item.requestId !== frame.requestId));
-            }
-            if (frame.type === "response_error") {
-              setError(`\u8FDC\u7A0B\u56DE\u590D\u88AB\u62D2\u7EDD\uFF1A${frame.code || "\u672A\u77E5"}`);
+              setStatus("\u8FDC\u7A0B\u8FDE\u63A5\u4E2D\u65AD\uFF0C\u6B63\u5728\u91CD\u8FDE");
+              const delay = Math.min(1e3 * 2 ** Math.min(retries - 1, 5), 3e4);
+              await new Promise((resolve) => setTimeout(resolve, delay));
+              continue;
             }
-            if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
+            streamRef.current = null;
+            setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u4E0D\u53EF\u7528");
+            setError(errorText(reason));
+            setHistoryLoading(false);
+            setTurnActive(false);
+            setStopping(false);
+            return;
           }
-          if (streamRef.current !== stream) return;
-          setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
-          setHistoryLoading(false);
-          setTurnActive(false);
-          setStopping(false);
-        } 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);
         }
       }
       function sendPrompt() {
@@ -1657,6 +1712,7 @@ window.__ModuleLoader__.load({
               style: { ...style.button, flexShrink: 0 },
               title: "\u5173\u95ED\u4F1A\u8BDD\u5E76\u8FD4\u56DE\u5217\u8868",
               onClick: () => {
+                streamGenerationRef.current += 1;
                 streamRef.current?.dispose();
                 streamRef.current = null;
                 setSessionId("");
@@ -1676,7 +1732,7 @@ window.__ModuleLoader__.load({
                   borderColor: sessionStatus === "running" ? t.accent : sessionStatus === "error" ? t.dangerBorder : t.border,
                   color: sessionStatus === "running" ? t.accent : sessionStatus === "error" ? t.danger : t.text2
                 },
-                title: "\u4F1A\u8BDD\u72B6\u6001\uFF08\u542B\u8FDC\u7AEF\u5BA2\u6237\u7AEF\u53D1\u8D77\u7684\u56DE\u5408\uFF09",
+                title: "\u4F1A\u8BDD\u72B6\u6001",
                 "aria-label": `\u4F1A\u8BDD\u72B6\u6001\uFF1A${SESSION_STATUS_LABEL[sessionStatus]}`
               },
               sessionStatus === "running" ? h("span", { className: "mai-pulse", style: { ...style.dot, background: t.accent } }) : null,
@@ -1865,7 +1921,7 @@ window.__ModuleLoader__.load({
             "div",
             { style: { fontSize: 11.5, color: turnActive ? t.accent : lastDelivery?.accepted ? t.success : lastDelivery?.frame === "pending" ? t.text3 : t.danger, textAlign: "right", display: "flex", alignItems: "center", justifyContent: "flex-end", gap: 6 } },
             turnActive ? h("span", { className: "mai-pulse", style: { ...style.dot, background: t.accent } }) : null,
-            turnActive ? stopping ? "\u6B63\u5728\u505C\u6B62\u5F53\u524D\u56DE\u5408\u2026" : sessionStatus === "running" ? "MonkeyAI \u6B63\u5728\u5904\u7406\uFF08\u8FDC\u7AEF\u5BA2\u6237\u7AEF\u53D1\u8D77\uFF09\u2026" : "MonkeyAI \u6B63\u5728\u5904\u7406\u2026" : lastDelivery?.accepted ? "\u56DE\u5408\u5DF2\u7ED3\u675F" : lastDelivery?.frame === "pending" ? "\u7B49\u5F85\u6295\u9012" : "\u6295\u9012\u88AB\u62D2\u7EDD"
+            turnActive ? stopping ? "\u6B63\u5728\u505C\u6B62\u5F53\u524D\u56DE\u5408\u2026" : "MonkeyAI \u6B63\u5728\u5904\u7406\u2026" : lastDelivery?.accepted ? "\u56DE\u5408\u5DF2\u7ED3\u675F" : lastDelivery?.frame === "pending" ? "\u7B49\u5F85\u6295\u9012" : "\u6295\u9012\u88AB\u62D2\u7EDD"
           ) : null
         ) : null
       );

package/lib/client-runtime.cjs

@@ -601,6 +601,24 @@ var PANEL_CSS = `
 function errorText(error) {
   return typeof error?.message === "string" ? error.message : typeof error === "string" ? error : "\u8FDC\u7A0B\u64CD\u4F5C\u5931\u8D25";
 }
+function withTimeout(promise, timeoutMs, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`${label}\u8D85\u65F6\uFF0C\u8BF7\u91CD\u8BD5`)), timeoutMs);
+    Promise.resolve(promise).then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
+function isRemoteStreamCarrierError(error) {
+  return /api gateway: remote stream websocket (?:failed|closed)/i.test(errorText(error));
+}
 function renderMarkdown(text) {
   if (typeof text !== "string" || text === "") return null;
   const blocks = [];
@@ -824,6 +842,7 @@ function RemoteSessionPage({ api }) {
   const authWindowRef = useRef(null);
   const eventsRef = useRef(null);
   const prevScrollHeightRef = useRef(null);
+  const streamGenerationRef = useRef(0);
   const title = useMemo(() => {
     const runtime = runtimeSessions.find((item) => item.id === sessionId);
     const summary = summarySessions.find((item) => item.id === sessionId);
@@ -844,6 +863,7 @@ function RemoteSessionPage({ api }) {
     });
     return () => {
       active = false;
+      streamGenerationRef.current += 1;
       streamRef.current?.dispose();
       streamRef.current = null;
     };
@@ -1006,6 +1026,7 @@ function RemoteSessionPage({ api }) {
     setError("");
     setLoading(true);
     try {
+      streamGenerationRef.current += 1;
       const result = await unwrap(api.listDevices({ accountId, page: 1 }));
       setDevices(result.items);
       const first = result.items.length > 0 ? result.items[0].machineId : "";
@@ -1029,24 +1050,32 @@ function RemoteSessionPage({ api }) {
     setError("");
     setLoading(true);
     setSessionId("");
+    streamGenerationRef.current += 1;
     streamRef.current?.dispose();
     streamRef.current = null;
     setFrames([]);
     setPendingRequests([]);
-    const results = await Promise.allSettled([
-      unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 })),
-      unwrap(api.listRuntimeSessions({ accountId, machineId: mid }))
-    ]);
-    const errors = [];
-    if (results[0].status === "fulfilled") setSummarySessions(results[0].value.items);
-    else errors.push(`\u4F1A\u8BDD\u6458\u8981\u7D22\u5F15\uFF1A${errorText(results[0].reason)}`);
-    if (results[1].status === "fulfilled") setRuntimeSessions(results[1].value.sessions);
-    else errors.push(`ACP \u4F1A\u8BDD\u5217\u8868\uFF1A${errorText(results[1].reason)}`);
-    setStatus(errors.length === 0 ? "\u4F1A\u8BDD\u5DF2\u5237\u65B0" : "\u90E8\u5206\u4F1A\u8BDD\u6765\u6E90\u4E0D\u53EF\u7528");
-    setError(errors.join("\n"));
-    setLoading(false);
+    try {
+      const results = await Promise.allSettled([
+        withTimeout(Promise.resolve().then(() => unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 }))), 5e4, "\u4F1A\u8BDD\u6458\u8981\u8BFB\u53D6"),
+        withTimeout(Promise.resolve().then(() => unwrap(api.listRuntimeSessions({ accountId, machineId: mid }))), 5e4, "ACP \u4F1A\u8BDD\u5217\u8868\u8BFB\u53D6")
+      ]);
+      const errors = [];
+      if (results[0].status === "fulfilled") setSummarySessions(results[0].value.items);
+      else errors.push(`\u4F1A\u8BDD\u6458\u8981\u7D22\u5F15\uFF1A${errorText(results[0].reason)}`);
+      if (results[1].status === "fulfilled") setRuntimeSessions(results[1].value.sessions);
+      else errors.push(`ACP \u4F1A\u8BDD\u5217\u8868\uFF1A${errorText(results[1].reason)}`);
+      setStatus(errors.length === 0 ? "\u4F1A\u8BDD\u5DF2\u5237\u65B0" : "\u90E8\u5206\u4F1A\u8BDD\u6765\u6E90\u4E0D\u53EF\u7528");
+      setError(errors.join("\n"));
+    } catch (reason) {
+      setStatus("\u4F1A\u8BDD\u5237\u65B0\u5931\u8D25");
+      setError(errorText(reason));
+    } finally {
+      setLoading(false);
+    }
   }
   async function openSession(session) {
+    const generation = ++streamGenerationRef.current;
     streamRef.current?.dispose();
     streamRef.current = null;
     historyLoadedRef.current = false;
@@ -1063,90 +1092,116 @@ function RemoteSessionPage({ api }) {
     setVisibleCount(RECENT_LIMIT);
     setHistoryLoading(true);
     setStatus("\u6B63\u5728\u8FDE\u63A5\u8FDC\u7A0B\u4F1A\u8BDD");
-    let stream;
-    try {
-      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) {
-        setFrames((current) => [...current, frame]);
-        if (frame.type === "ready" && !historyLoadedRef.current) setStatus("\u6B63\u5728\u56DE\u653E\u4F1A\u8BDD\u5386\u53F2");
-        if (frame.type === "reconnecting") setStatus(frame.message || "\u6B63\u5728\u91CD\u8FDE\u8FDC\u7A0B runtime");
-        if (frame.type === "history_loaded") {
-          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") {
-          setStatus("\u5386\u53F2\u4E0D\u5B8C\u6574\uFF1A" + (frame.message || "\u56DE\u653E\u88AB\u4E2D\u65AD"));
-          setHistoryLoading(false);
-        }
-        if (frame.type === "model_switched") {
-          if (frame.data?.model) setCurrentModel(frame.data.model);
-          setSwitchingModel(false);
-          setStatus("\u6A21\u578B\u5DF2\u5207\u6362");
-        }
-        if (frame.type === "model_switch_failed") {
-          setSwitchingModel(false);
-          setError(frame.message || "\u6A21\u578B\u5207\u6362\u88AB\u62D2\u7EDD");
-          setStatus("\u6A21\u578B\u5207\u6362\u5931\u8D25");
-        }
-        if (frame.type === "session_missing") {
-          setError(frame.message || "\u8BE5\u4F1A\u8BDD\u5728\u6240\u9009\u8BBE\u5907\u4E0A\u5DF2\u4E0D\u5B58\u5728\u3002");
-          setStatus("\u8BBE\u5907\u4E0A\u627E\u4E0D\u5230\u8BE5\u4F1A\u8BDD");
-          setHistoryLoading(false);
-        }
-        if (frame.type === "request") {
-          setPendingRequests((current) => [...current.filter((item) => item.requestId !== frame.requestId), frame]);
+    let retries = 0;
+    while (streamGenerationRef.current === generation) {
+      let stream;
+      try {
+        stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd });
+        if (streamGenerationRef.current !== generation) {
+          stream.dispose();
+          return;
         }
-        if (frame.type === "notification" && frame.method === "_monkeyai/session/state") {
-          const status2 = frame.data?.state?.status;
-          if (typeof status2 === "string" && SESSION_STATUS_LABEL[status2]) {
-            setSessionStatus(status2);
-            setTurnActive(status2 === "running");
-            if (status2 !== "running") setStopping(false);
+        streamRef.current = stream;
+        setStatus(retries > 0 ? "\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u91CD\u65B0\u8FDE\u63A5" : "\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u8FDE\u63A5");
+        for await (const frame of stream) {
+          setFrames((current) => [...current, frame]);
+          if (frame.type === "ready" && !historyLoadedRef.current) setStatus("\u6B63\u5728\u56DE\u653E\u4F1A\u8BDD\u5386\u53F2");
+          if (frame.type === "reconnecting") setStatus(frame.message || "\u6B63\u5728\u91CD\u8FDE\u8FDC\u7A0B runtime");
+          if (frame.type === "history_loaded") {
+            historyLoadedRef.current = true;
+            setStatus("\u5386\u53F2\u5DF2\u52A0\u8F7D");
+            setHistoryLoading(false);
+            setSessionStatus((current) => current || "idle");
+            if (frame.model) setCurrentModel(frame.model);
           }
-        }
-        if (frame.type === "delivery") {
-          const accepted = Boolean(frame.data?.accepted);
-          setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type });
-          setTurnActive(false);
-          setStopping(false);
-          if (accepted) {
-            const cancelled = frame.data?.result?.stopReason === "cancelled";
-            setStatus(cancelled ? "\u56DE\u5408\u5DF2\u505C\u6B62" : "\u56DE\u5408\u5DF2\u5B8C\u6210");
-          } else {
-            setPrompt((current) => current === "" ? lastDraftRef.current || "" : current);
-            setStatus("MonkeyAI \u672A\u63A5\u53D7\u8BE5\u6307\u4EE4\uFF0C\u8349\u7A3F\u5DF2\u4FDD\u7559");
-            if (frame.message) setError(frame.message);
+          if (frame.type === "history_incomplete") {
+            setStatus("\u5386\u53F2\u4E0D\u5B8C\u6574\uFF1A" + (frame.message || "\u56DE\u653E\u88AB\u4E2D\u65AD"));
+            setHistoryLoading(false);
+          }
+          if (frame.type === "model_switched") {
+            if (frame.data?.model) setCurrentModel(frame.data.model);
+            setSwitchingModel(false);
+            setStatus("\u6A21\u578B\u5DF2\u5207\u6362");
+          }
+          if (frame.type === "model_switch_failed") {
+            setSwitchingModel(false);
+            setError(frame.message || "\u6A21\u578B\u5207\u6362\u5931\u8D25");
+            setStatus("\u6A21\u578B\u5207\u6362\u5931\u8D25");
           }
+          if (frame.type === "session_missing") {
+            setError(frame.message || "\u8BE5\u4F1A\u8BDD\u5728\u6240\u9009\u8BBE\u5907\u4E0A\u5DF2\u4E0D\u5B58\u5728\u3002");
+            setStatus("\u8BBE\u5907\u4E0A\u627E\u4E0D\u5230\u8BE5\u4F1A\u8BDD");
+            setHistoryLoading(false);
+          }
+          if (frame.type === "request") {
+            setPendingRequests((current) => [...current.filter((item) => item.requestId !== frame.requestId), frame]);
+          }
+          if (frame.type === "notification" && frame.method === "_monkeyai/session/state") {
+            const status2 = frame.data?.state?.status;
+            if (typeof status2 === "string" && SESSION_STATUS_LABEL[status2]) {
+              setSessionStatus(status2);
+              setTurnActive(status2 === "running");
+              if (status2 !== "running") setStopping(false);
+            }
+          }
+          if (frame.type === "delivery") {
+            const accepted = Boolean(frame.data?.accepted);
+            setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type });
+            setTurnActive(false);
+            setStopping(false);
+            if (accepted) {
+              const cancelled = frame.data?.result?.stopReason === "cancelled";
+              setStatus(cancelled ? "\u56DE\u5408\u5DF2\u505C\u6B62" : "\u56DE\u5408\u5DF2\u5B8C\u6210");
+            } else {
+              setPrompt((current) => current === "" ? lastDraftRef.current || "" : current);
+              setStatus("MonkeyAI \u672A\u63A5\u53D7\u8BE5\u6307\u4EE4\uFF0C\u8349\u7A3F\u5DF2\u4FDD\u7559");
+              if (frame.message) setError(frame.message);
+            }
+          }
+          if (frame.type === "cancel_sent") {
+            setStopping(false);
+            setStatus("\u5DF2\u8BF7\u6C42\u505C\u6B62\uFF0C\u7B49\u5F85 runtime \u53D6\u6D88");
+          }
+          if (frame.type === "response_sent") {
+            setPendingRequests((current) => current.filter((item) => item.requestId !== frame.requestId));
+          }
+          if (frame.type === "response_error") {
+            setError(`\u8FDC\u7A0B\u56DE\u590D\u88AB\u62D2\u7EDD\uFF1A${frame.code || "\u672A\u77E5"}`);
+          }
+          if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
         }
-        if (frame.type === "cancel_sent") {
+        if (streamGenerationRef.current !== generation || streamRef.current !== stream) return;
+        streamRef.current = null;
+        setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
+        setHistoryLoading(false);
+        setTurnActive(false);
+        setStopping(false);
+        return;
+      } catch (reason) {
+        if (streamGenerationRef.current !== generation || stream && streamRef.current !== stream) return;
+        if (isRemoteStreamCarrierError(reason)) {
+          retries += 1;
+          try {
+            stream?.dispose();
+          } catch {
+          }
+          streamRef.current = null;
+          setError("");
+          setTurnActive(false);
           setStopping(false);
-          setStatus("\u5DF2\u8BF7\u6C42\u505C\u6B62\uFF0C\u7B49\u5F85 runtime \u53D6\u6D88");
-        }
-        if (frame.type === "response_sent") {
-          setPendingRequests((current) => current.filter((item) => item.requestId !== frame.requestId));
-        }
-        if (frame.type === "response_error") {
-          setError(`\u8FDC\u7A0B\u56DE\u590D\u88AB\u62D2\u7EDD\uFF1A${frame.code || "\u672A\u77E5"}`);
+          setStatus("\u8FDC\u7A0B\u8FDE\u63A5\u4E2D\u65AD\uFF0C\u6B63\u5728\u91CD\u8FDE");
+          const delay = Math.min(1e3 * 2 ** Math.min(retries - 1, 5), 3e4);
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          continue;
         }
-        if (frame.type === "error") setError(frame.message || frame.code || "\u8FDC\u7A0B\u4F1A\u8BDD\u9519\u8BEF");
+        streamRef.current = null;
+        setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u4E0D\u53EF\u7528");
+        setError(errorText(reason));
+        setHistoryLoading(false);
+        setTurnActive(false);
+        setStopping(false);
+        return;
       }
-      if (streamRef.current !== stream) return;
-      setStatus("\u8FDC\u7A0B\u4F1A\u8BDD\u5DF2\u65AD\u5F00");
-      setHistoryLoading(false);
-      setTurnActive(false);
-      setStopping(false);
-    } 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);
     }
   }
   function sendPrompt() {
@@ -1652,6 +1707,7 @@ function RemoteSessionPage({ api }) {
           style: { ...style.button, flexShrink: 0 },
           title: "\u5173\u95ED\u4F1A\u8BDD\u5E76\u8FD4\u56DE\u5217\u8868",
           onClick: () => {
+            streamGenerationRef.current += 1;
             streamRef.current?.dispose();
             streamRef.current = null;
             setSessionId("");
@@ -1671,7 +1727,7 @@ function RemoteSessionPage({ api }) {
               borderColor: sessionStatus === "running" ? t.accent : sessionStatus === "error" ? t.dangerBorder : t.border,
               color: sessionStatus === "running" ? t.accent : sessionStatus === "error" ? t.danger : t.text2
             },
-            title: "\u4F1A\u8BDD\u72B6\u6001\uFF08\u542B\u8FDC\u7AEF\u5BA2\u6237\u7AEF\u53D1\u8D77\u7684\u56DE\u5408\uFF09",
+            title: "\u4F1A\u8BDD\u72B6\u6001",
             "aria-label": `\u4F1A\u8BDD\u72B6\u6001\uFF1A${SESSION_STATUS_LABEL[sessionStatus]}`
           },
           sessionStatus === "running" ? h("span", { className: "mai-pulse", style: { ...style.dot, background: t.accent } }) : null,
@@ -1860,7 +1916,7 @@ function RemoteSessionPage({ api }) {
         "div",
         { style: { fontSize: 11.5, color: turnActive ? t.accent : lastDelivery?.accepted ? t.success : lastDelivery?.frame === "pending" ? t.text3 : t.danger, textAlign: "right", display: "flex", alignItems: "center", justifyContent: "flex-end", gap: 6 } },
         turnActive ? h("span", { className: "mai-pulse", style: { ...style.dot, background: t.accent } }) : null,
-        turnActive ? stopping ? "\u6B63\u5728\u505C\u6B62\u5F53\u524D\u56DE\u5408\u2026" : sessionStatus === "running" ? "MonkeyAI \u6B63\u5728\u5904\u7406\uFF08\u8FDC\u7AEF\u5BA2\u6237\u7AEF\u53D1\u8D77\uFF09\u2026" : "MonkeyAI \u6B63\u5728\u5904\u7406\u2026" : lastDelivery?.accepted ? "\u56DE\u5408\u5DF2\u7ED3\u675F" : lastDelivery?.frame === "pending" ? "\u7B49\u5F85\u6295\u9012" : "\u6295\u9012\u88AB\u62D2\u7EDD"
+        turnActive ? stopping ? "\u6B63\u5728\u505C\u6B62\u5F53\u524D\u56DE\u5408\u2026" : "MonkeyAI \u6B63\u5728\u5904\u7406\u2026" : lastDelivery?.accepted ? "\u56DE\u5408\u5DF2\u7ED3\u675F" : lastDelivery?.frame === "pending" ? "\u7B49\u5F85\u6295\u9012" : "\u6295\u9012\u88AB\u62D2\u7EDD"
       ) : null
     ) : null
   );

package/package.json

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

package/src/client/index.js

@@ -94,6 +94,20 @@ function errorText(error) {
   return typeof error?.message === 'string' ? error.message : typeof error === 'string' ? error : '远程操作失败'
 }
 
+function withTimeout(promise, timeoutMs, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`${label}超时，请重试`)), timeoutMs)
+    Promise.resolve(promise).then(
+      value => { clearTimeout(timer); resolve(value) },
+      error => { clearTimeout(timer); reject(error) },
+    )
+  })
+}
+
+function isRemoteStreamCarrierError(error) {
+  return /api gateway: remote stream websocket (?:failed|closed)/i.test(errorText(error))
+}
+
 // Lightweight inline markdown: fenced code blocks, `code`, **bold**,
 // headings and bullet lists. Everything else renders as plain text so
 // remote content can never inject markup.
@@ -299,6 +313,7 @@ function RemoteSessionPage({ api }) {
   const authWindowRef = useRef(null)
   const eventsRef = useRef(null)
   const prevScrollHeightRef = useRef(null)
+  const streamGenerationRef = useRef(0)
   const title = useMemo(() => {
     const runtime = runtimeSessions.find(item => item.id === sessionId)
     const summary = summarySessions.find(item => item.id === sessionId)
@@ -320,6 +335,7 @@ function RemoteSessionPage({ api }) {
     })
     return () => {
       active = false
+      streamGenerationRef.current += 1
       streamRef.current?.dispose()
       streamRef.current = null
     }
@@ -489,6 +505,7 @@ function RemoteSessionPage({ api }) {
     setError('')
     setLoading(true)
     try {
+      streamGenerationRef.current += 1
       const result = await unwrap(api.listDevices({ accountId, page: 1 }))
       setDevices(result.items)
       const first = result.items.length > 0 ? result.items[0].machineId : ''
@@ -513,25 +530,33 @@ function RemoteSessionPage({ api }) {
     setError('')
     setLoading(true)
     setSessionId('')
+    streamGenerationRef.current += 1
     streamRef.current?.dispose()
     streamRef.current = null
     setFrames([])
     setPendingRequests([])
-    const results = await Promise.allSettled([
-      unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 })),
-      unwrap(api.listRuntimeSessions({ accountId, machineId: mid })),
-    ])
-    const errors = []
-    if (results[0].status === 'fulfilled') setSummarySessions(results[0].value.items)
-    else errors.push(`会话摘要索引：${errorText(results[0].reason)}`)
-    if (results[1].status === 'fulfilled') setRuntimeSessions(results[1].value.sessions)
-    else errors.push(`ACP 会话列表：${errorText(results[1].reason)}`)
-    setStatus(errors.length === 0 ? '会话已刷新' : '部分会话来源不可用')
-    setError(errors.join('\n'))
-    setLoading(false)
+    try {
+      const results = await Promise.allSettled([
+        withTimeout(Promise.resolve().then(() => unwrap(api.listSessions({ accountId, machineId: mid, page: 1, pageSize: 50 }))), 50_000, '会话摘要读取'),
+        withTimeout(Promise.resolve().then(() => unwrap(api.listRuntimeSessions({ accountId, machineId: mid }))), 50_000, 'ACP 会话列表读取'),
+      ])
+      const errors = []
+      if (results[0].status === 'fulfilled') setSummarySessions(results[0].value.items)
+      else errors.push(`会话摘要索引：${errorText(results[0].reason)}`)
+      if (results[1].status === 'fulfilled') setRuntimeSessions(results[1].value.sessions)
+      else errors.push(`ACP 会话列表：${errorText(results[1].reason)}`)
+      setStatus(errors.length === 0 ? '会话已刷新' : '部分会话来源不可用')
+      setError(errors.join('\n'))
+    } catch (reason) {
+      setStatus('会话刷新失败')
+      setError(errorText(reason))
+    } finally {
+      setLoading(false)
+    }
   }
 
   async function openSession(session) {
+    const generation = ++streamGenerationRef.current
     streamRef.current?.dispose()
     streamRef.current = null
     historyLoadedRef.current = false
@@ -548,90 +573,113 @@ function RemoteSessionPage({ api }) {
     setVisibleCount(RECENT_LIMIT)
     setHistoryLoading(true)
     setStatus('正在连接远程会话')
-    let stream
-    try {
-      stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd })
-      streamRef.current = stream
-      setStatus('远程会话已连接')
-      for await (const frame of stream) {
-        setFrames(current => [...current, frame])
-        if (frame.type === 'ready' && !historyLoadedRef.current) setStatus('正在回放会话历史')
-        if (frame.type === 'reconnecting') setStatus(frame.message || '正在重连远程 runtime')
-        if (frame.type === 'history_loaded') {
-          historyLoadedRef.current = true
-          setStatus('历史已加载')
-          setHistoryLoading(false)
-          setSessionStatus(current => current || 'idle')
-          if (frame.model) setCurrentModel(frame.model)
-        }
-        if (frame.type === 'history_incomplete') {
-          setStatus('历史不完整：' + (frame.message || '回放被中断'))
-          setHistoryLoading(false)
-        }
-        if (frame.type === 'model_switched') {
-          if (frame.data?.model) setCurrentModel(frame.data.model)
-          setSwitchingModel(false)
-          setStatus('模型已切换')
-        }
-        if (frame.type === 'model_switch_failed') {
-          setSwitchingModel(false)
-          setError(frame.message || '模型切换被拒绝')
-          setStatus('模型切换失败')
+    let retries = 0
+    while (streamGenerationRef.current === generation) {
+      let stream
+      try {
+        stream = api.followSession({ accountId, machineId, sessionId: session.id, cwd: session.cwd })
+        if (streamGenerationRef.current !== generation) {
+          stream.dispose()
+          return
         }
-        if (frame.type === 'session_missing') {
-          setError(frame.message || '该会话在所选设备上已不存在。')
-          setStatus('设备上找不到该会话')
-          setHistoryLoading(false)
-        }
-        if (frame.type === 'request') {
-          setPendingRequests(current => [...current.filter(item => item.requestId !== frame.requestId), frame])
-        }
-        if (frame.type === 'notification' && frame.method === '_monkeyai/session/state') {
-          const status = frame.data?.state?.status
-          if (typeof status === 'string' && SESSION_STATUS_LABEL[status]) {
-            setSessionStatus(status)
-            setTurnActive(status === 'running')
-            if (status !== 'running') setStopping(false)
+        streamRef.current = stream
+        setStatus(retries > 0 ? '远程会话已重新连接' : '远程会话已连接')
+        for await (const frame of stream) {
+          setFrames(current => [...current, frame])
+          if (frame.type === 'ready' && !historyLoadedRef.current) setStatus('正在回放会话历史')
+          if (frame.type === 'reconnecting') setStatus(frame.message || '正在重连远程 runtime')
+          if (frame.type === 'history_loaded') {
+            historyLoadedRef.current = true
+            setStatus('历史已加载')
+            setHistoryLoading(false)
+            setSessionStatus(current => current || 'idle')
+            if (frame.model) setCurrentModel(frame.model)
           }
-        }
-        if (frame.type === 'delivery') {
-          const accepted = Boolean(frame.data?.accepted)
-          setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type })
-          setTurnActive(false)
-          setStopping(false)
-          if (accepted) {
-            const cancelled = frame.data?.result?.stopReason === 'cancelled'
-            setStatus(cancelled ? '回合已停止' : '回合已完成')
-          } else {
-            setPrompt(current => current === '' ? (lastDraftRef.current || '') : current)
-            setStatus('MonkeyAI 未接受该指令，草稿已保留')
-            if (frame.message) setError(frame.message)
+          if (frame.type === 'history_incomplete') {
+            setStatus('历史不完整：' + (frame.message || '回放被中断'))
+            setHistoryLoading(false)
+          }
+          if (frame.type === 'model_switched') {
+            if (frame.data?.model) setCurrentModel(frame.data.model)
+            setSwitchingModel(false)
+            setStatus('模型已切换')
+          }
+          if (frame.type === 'model_switch_failed') {
+            setSwitchingModel(false)
+            setError(frame.message || '模型切换失败')
+            setStatus('模型切换失败')
+          }
+          if (frame.type === 'session_missing') {
+            setError(frame.message || '该会话在所选设备上已不存在。')
+            setStatus('设备上找不到该会话')
+            setHistoryLoading(false)
+          }
+          if (frame.type === 'request') {
+            setPendingRequests(current => [...current.filter(item => item.requestId !== frame.requestId), frame])
+          }
+          if (frame.type === 'notification' && frame.method === '_monkeyai/session/state') {
+            const status = frame.data?.state?.status
+            if (typeof status === 'string' && SESSION_STATUS_LABEL[status]) {
+              setSessionStatus(status)
+              setTurnActive(status === 'running')
+              if (status !== 'running') setStopping(false)
+            }
+          }
+          if (frame.type === 'delivery') {
+            const accepted = Boolean(frame.data?.accepted)
+            setLastDelivery({ accepted, code: frame.data?.code, frame: frame.type })
+            setTurnActive(false)
+            setStopping(false)
+            if (accepted) {
+              const cancelled = frame.data?.result?.stopReason === 'cancelled'
+              setStatus(cancelled ? '回合已停止' : '回合已完成')
+            } else {
+              setPrompt(current => current === '' ? (lastDraftRef.current || '') : current)
+              setStatus('MonkeyAI 未接受该指令，草稿已保留')
+              if (frame.message) setError(frame.message)
+            }
+          }
+          if (frame.type === 'cancel_sent') {
+            setStopping(false)
+            setStatus('已请求停止，等待 runtime 取消')
           }
+          if (frame.type === 'response_sent') {
+            setPendingRequests(current => current.filter(item => item.requestId !== frame.requestId))
+          }
+          if (frame.type === 'response_error') {
+            setError(`远程回复被拒绝：${frame.code || '未知'}`)
+          }
+          if (frame.type === 'error') setError(frame.message || frame.code || '远程会话错误')
         }
-        if (frame.type === 'cancel_sent') {
+        if (streamGenerationRef.current !== generation || streamRef.current !== stream) return
+        streamRef.current = null
+        setStatus('远程会话已断开')
+        setHistoryLoading(false)
+        setTurnActive(false)
+        setStopping(false)
+        return
+      } catch (reason) {
+        if (streamGenerationRef.current !== generation || (stream && streamRef.current !== stream)) return
+        if (isRemoteStreamCarrierError(reason)) {
+          retries += 1
+          try { stream?.dispose() } catch {}
+          streamRef.current = null
+          setError('')
+          setTurnActive(false)
           setStopping(false)
-          setStatus('已请求停止，等待 runtime 取消')
-        }
-        if (frame.type === 'response_sent') {
-          setPendingRequests(current => current.filter(item => item.requestId !== frame.requestId))
-        }
-        if (frame.type === 'response_error') {
-          setError(`远程回复被拒绝：${frame.code || '未知'}`)
+          setStatus('远程连接中断，正在重连')
+          const delay = Math.min(1000 * (2 ** Math.min(retries - 1, 5)), 30_000)
+          await new Promise(resolve => setTimeout(resolve, delay))
+          continue
         }
-        if (frame.type === 'error') setError(frame.message || frame.code || '远程会话错误')
+        streamRef.current = null
+        setStatus('远程会话不可用')
+        setError(errorText(reason))
+        setHistoryLoading(false)
+        setTurnActive(false)
+        setStopping(false)
+        return
       }
-      if (streamRef.current !== stream) return
-      setStatus('远程会话已断开')
-      setHistoryLoading(false)
-      setTurnActive(false)
-      setStopping(false)
-    } catch (reason) {
-      if (stream && streamRef.current !== stream) return
-      setStatus('远程会话不可用')
-      setError(errorText(reason))
-      setHistoryLoading(false)
-      setTurnActive(false)
-      setStopping(false)
     }
   }
 
@@ -1028,7 +1076,7 @@ function RemoteSessionPage({ api }) {
       h('div', { style: style.row },
         h('button', {
           type: 'button', style: { ...style.button, flexShrink: 0 }, title: '关闭会话并返回列表',
-          onClick: () => { streamRef.current?.dispose(); streamRef.current = null; setSessionId(''); setTurnActive(false); setStopping(false); setSessionStatus(''); setStatus('远程会话已关闭') },
+          onClick: () => { streamGenerationRef.current += 1; streamRef.current?.dispose(); streamRef.current = null; setSessionId(''); setTurnActive(false); setStopping(false); setSessionStatus(''); setStatus('远程会话已关闭') },
         }, '←'),
         h('strong', { style: { flex: 1, fontSize: 13.5, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }, title }, title),
         sessionStatus ? h('span', {
@@ -1038,7 +1086,7 @@ function RemoteSessionPage({ api }) {
             borderColor: sessionStatus === 'running' ? t.accent : sessionStatus === 'error' ? t.dangerBorder : t.border,
             color: sessionStatus === 'running' ? t.accent : sessionStatus === 'error' ? t.danger : t.text2,
           },
-          title: '会话状态（含远端客户端发起的回合）',
+          title: '会话状态',
           'aria-label': `会话状态：${SESSION_STATUS_LABEL[sessionStatus]}`,
         },
           sessionStatus === 'running' ? h('span', { className: 'mai-pulse', style: { ...style.dot, background: t.accent } }) : null,
@@ -1160,7 +1208,7 @@ function RemoteSessionPage({ api }) {
                 h('path', { d: 'M8 12.5V3.5M8 3.5L4 7.5M8 3.5L12 7.5', stroke: 'currentColor', strokeWidth: 1.8, strokeLinecap: 'round', strokeLinejoin: 'round' })))),
       lastDelivery || turnActive ? h('div', { style: { fontSize: 11.5, color: turnActive ? t.accent : lastDelivery?.accepted ? t.success : lastDelivery?.frame === 'pending' ? t.text3 : t.danger, textAlign: 'right', display: 'flex', alignItems: 'center', justifyContent: 'flex-end', gap: 6 } },
         turnActive ? h('span', { className: 'mai-pulse', style: { ...style.dot, background: t.accent } }) : null,
-        turnActive ? (stopping ? '正在停止当前回合…' : sessionStatus === 'running' ? 'MonkeyAI 正在处理（远端客户端发起）…' : 'MonkeyAI 正在处理…') : lastDelivery?.accepted ? '回合已结束' : lastDelivery?.frame === 'pending' ? '等待投递' : '投递被拒绝') : null)
+        turnActive ? (stopping ? '正在停止当前回合…' : 'MonkeyAI 正在处理…') : lastDelivery?.accepted ? '回合已结束' : lastDelivery?.frame === 'pending' ? '等待投递' : '投递被拒绝') : null)
       : null)
 }