@tangle-network/sandbox-ui 0.105.0 → 0.105.2

package/dist/{chunk-7KB22BLB.js → chunk-F7LNWZQR.js}

@@ -3,7 +3,7 @@ import { useState, useEffect, useRef, useCallback } from "react";
 function createEmptyBatch() {
   return { data: "", waiters: [] };
 }
-var WS_OPEN_TIMEOUT_MS = 1e4;
+var WS_READY_TIMEOUT_MS = 1e4;
 function toWsUrl(apiUrl, sessionId) {
   try {
     const base = typeof window !== "undefined" ? window.location.href : void 0;
@@ -37,6 +37,20 @@ function createTerminalConnectionId() {
   }
   return `terminal-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`;
 }
+function interactiveIdentityKey(incarnationId, control) {
+  if (incarnationId === void 0 && control === void 0) return "plain";
+  if (incarnationId === void 0 || control === void 0) {
+    return `incomplete:${incarnationId ?? ""}`;
+  }
+  return [
+    incarnationId,
+    control.refDigest,
+    String(control.generation),
+    control.leaseId,
+    control.holderId,
+    control.expiresAt
+  ].join("\0");
+}
 function usePtySession({
   apiUrl,
   token,
@@ -64,6 +78,7 @@ function usePtySession({
   const reconnectRef = useRef(null);
   const shouldDeleteSessionRef = useRef(false);
   const transportReadyRef = useRef(false);
+  const protocolFailureRef = useRef(false);
   const colsRef = useRef(DEFAULT_TERMINAL_COLS);
   const rowsRef = useRef(DEFAULT_TERMINAL_ROWS);
   const wsRef = useRef(null);
@@ -160,6 +175,7 @@ function usePtySession({
       }
       ws.binaryType = "arraybuffer";
       pendingWsRef.current = ws;
+      const isCurrentSocket = () => wsRef.current === ws || pendingWsRef.current === ws;
       let opened = false;
       let settled = false;
       const settle = (ok) => {
@@ -169,13 +185,25 @@ function usePtySession({
         resolve(ok);
       };
       const handshakeTimer = setTimeout(() => {
-        if (opened) return;
         try {
           ws.close();
         } catch {
         }
         settle(false);
-      }, WS_OPEN_TIMEOUT_MS);
+      }, WS_READY_TIMEOUT_MS);
+      const failProtocol = (message) => {
+        protocolFailureRef.current = true;
+        transportReadyRef.current = false;
+        if (wsRef.current === ws) wsRef.current = null;
+        setIsConnected(false);
+        setError(message);
+        rejectPendingInput(message);
+        try {
+          ws.close();
+        } catch {
+        }
+        settle(false);
+      };
       ws.onopen = () => {
         opened = true;
         if (pendingWsRef.current !== ws || !mountedRef.current) {
@@ -212,15 +240,11 @@ function usePtySession({
             return;
           }
         }
+        if (protocolFailureRef.current) return;
         wsRef.current = ws;
-        transportReadyRef.current = true;
-        setIsConnected(true);
-        setError(null);
-        retryCountRef.current = 0;
-        settle(true);
       };
       ws.onmessage = (ev) => {
-        if (!mountedRef.current) return;
+        if (!mountedRef.current || !isCurrentSocket()) return;
         const data = ev.data;
         let text;
         if (typeof data === "string") {
@@ -231,7 +255,7 @@ function usePtySession({
           text = new TextDecoder().decode(data);
         } else {
           data.text().then((t) => {
-            if (mountedRef.current) onDataRef.current(t);
+            if (mountedRef.current && isCurrentSocket()) onDataRef.current(t);
           }).catch(() => {
           });
           return;
@@ -239,17 +263,38 @@ function usePtySession({
         if (typeof data === "string") {
           try {
             const event = JSON.parse(text);
-            if (event?.type === "ready") {
-              return;
-            }
-            if (event?.type === "error") {
-              const message = typeof event.message === "string" ? event.message : "Terminal WebSocket error";
-              setError(message);
-              return;
-            }
-            if (event?.type === "exit") {
-              setIsConnected(false);
-              return;
+            if (event !== null && typeof event === "object" && !Array.isArray(event)) {
+              const controlFrame = event;
+              switch (controlFrame.type) {
+                case "ready":
+                  transportReadyRef.current = true;
+                  setIsConnected(true);
+                  setError(null);
+                  retryCountRef.current = 0;
+                  settle(true);
+                  return;
+                case "error": {
+                  const message = typeof controlFrame.message === "string" ? controlFrame.message : "Terminal WebSocket error";
+                  if (!transportReadyRef.current) {
+                    failProtocol(message);
+                  } else {
+                    setError(message);
+                  }
+                  return;
+                }
+                case "exit":
+                  transportReadyRef.current = false;
+                  setIsConnected(false);
+                  return;
+                case "rec":
+                case "rec.done":
+                  return;
+                default: {
+                  const frameType = typeof controlFrame.type === "string" ? controlFrame.type : "<missing type>";
+                  failProtocol(`Unknown terminal control frame: ${frameType}`);
+                  return;
+                }
+              }
             }
           } catch {
           }
@@ -263,6 +308,7 @@ function usePtySession({
           pendingWsRef.current = null;
         }
         const wasActive = wsRef.current === ws;
+        const wasReady = wasActive && transportReadyRef.current;
         if (wasActive) {
           wsRef.current = null;
           transportReadyRef.current = false;
@@ -271,7 +317,11 @@ function usePtySession({
           settle(false);
           return;
         }
-        if (!wasActive || !mountedRef.current) return;
+        if (!wasReady) {
+          settle(false);
+          return;
+        }
+        if (protocolFailureRef.current || !wasActive || !mountedRef.current) return;
         setIsConnected(false);
         if (sessionIdRef.current) {
           retryTimerRef.current = setTimeout(() => {
@@ -286,7 +336,7 @@ function usePtySession({
         }
       };
     });
-  }, [apiUrl]);
+  }, [apiUrl, rejectPendingInput]);
   const connectStream = useCallback(async (sessionId) => {
     if (exactAttachRequiredRef.current) {
       throw new Error(
@@ -384,9 +434,11 @@ function usePtySession({
   controlRef.current = control;
   exactAttachRequiredRef.current = incarnationId !== void 0 || control !== void 0;
   connectStreamRef.current = connectStream;
+  const exactIdentityKey = interactiveIdentityKey(incarnationId, control);
   const connect = useCallback(async () => {
     cleanup();
     const myGen = ++connectGenRef.current;
+    protocolFailureRef.current = false;
     retryCountRef.current = 0;
     setError(null);
     if (exactAttachRequiredRef.current && (!incarnationIdRef.current || !controlRef.current)) {
@@ -402,6 +454,7 @@ function usePtySession({
       inputAbortRef.current = new AbortController();
       const directWsOk = await connectWs(connectionId, { initOnOpen: true });
       if (!mountedRef.current || connectGenRef.current !== myGen) return;
+      if (protocolFailureRef.current) return;
       ensureDrainRunningRef.current?.();
       if (directWsOk) {
         return;
@@ -442,6 +495,7 @@ function usePtySession({
       inputAbortRef.current = new AbortController();
       const wsOk = await connectWs(sessionId, { initOnOpen: true });
       if (!mountedRef.current || connectGenRef.current !== myGen) return;
+      if (protocolFailureRef.current) return;
       ensureDrainRunningRef.current?.();
       if (wsOk) {
         return;
@@ -456,7 +510,14 @@ function usePtySession({
         setIsConnected(false);
       }
     }
-  }, [apiUrl, providedConnectionId, cleanup, connectWs, connectStream]);
+  }, [
+    apiUrl,
+    providedConnectionId,
+    cleanup,
+    connectWs,
+    connectStream,
+    exactIdentityKey
+  ]);
   reconnectRef.current = connect;
   const resizeTerminal = useCallback(async (cols, rows) => {
     if (cols > 0) colsRef.current = cols;
@@ -564,6 +625,10 @@ function usePtySession({
         resolve();
         return;
       }
+      if (protocolFailureRef.current) {
+        reject(new Error("Terminal protocol failure"));
+        return;
+      }
       pendingBatchRef.current.data += command;
       pendingBatchRef.current.waiters.push({ resolve, reject });
       ensureDrainRunning();

package/dist/{chunk-4VLVVKQZ.js → chunk-LWSWKLI5.js}

@@ -1,6 +1,6 @@
 import {
   usePtySession
-} from "./chunk-7KB22BLB.js";
+} from "./chunk-F7LNWZQR.js";
 
 // src/terminal/terminal-view.tsx
 import "@xterm/xterm/css/xterm.css";

package/dist/{chunk-NAWEV5UJ.js → chunk-X24MVW2R.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-K4Q4E7D7.js";
 import {
   TerminalView
-} from "./chunk-4VLVVKQZ.js";
+} from "./chunk-LWSWKLI5.js";
 import {
   cn
 } from "./chunk-EI44GEQ5.js";

package/dist/hooks.d.ts

@@ -51,8 +51,9 @@ interface UsePtySessionReturn {
  *      - Server → client: BINARY frames carrying PTY output; TEXT frames
  *        carrying lifecycle/control messages.
  *      - Client → server: TEXT frames carrying JSON input/resize messages.
- *   2. If direct WS does not reach OPEN within WS_OPEN_TIMEOUT_MS, or it
- *      errors before opening, fall back to the older terminal contract:
+ *   2. If direct WS does not reach server `ready` within
+ *      WS_READY_TIMEOUT_MS, or it errors before ready, fall back to the older
+ *      terminal contract:
  *      - POST /terminals creates the session.
  *      - GET /terminals/:id/ws tries the older WS transport.
  *      - GET /terminals/:id/stream (SSE for output)

package/dist/hooks.js

@@ -26,7 +26,7 @@ import {
 } from "./chunk-3GX5BSD4.js";
 import {
   usePtySession
-} from "./chunk-7KB22BLB.js";
+} from "./chunk-F7LNWZQR.js";
 import "./chunk-CZ7CSFO4.js";
 export {
   RealtimeSessionRegistry,

package/dist/index.js

@@ -153,7 +153,7 @@ import {
   buildUnifiedPatch,
   computeDiffStats,
   resolveLanguage
-} from "./chunk-NAWEV5UJ.js";
+} from "./chunk-X24MVW2R.js";
 import {
   FileArtifactPane,
   FilePreview,
@@ -238,10 +238,10 @@ import {
   UsageChart,
   formatPrice
 } from "./chunk-OMUIPJQZ.js";
-import "./chunk-4VLVVKQZ.js";
+import "./chunk-LWSWKLI5.js";
 import {
   usePtySession
-} from "./chunk-7KB22BLB.js";
+} from "./chunk-F7LNWZQR.js";
 import {
   Avatar,
   AvatarFallback,

package/dist/terminal.js

@@ -1,8 +1,8 @@
 import {
   DEFAULT_TERMINAL_THEME,
   TerminalView
-} from "./chunk-4VLVVKQZ.js";
-import "./chunk-7KB22BLB.js";
+} from "./chunk-LWSWKLI5.js";
+import "./chunk-F7LNWZQR.js";
 import "./chunk-CZ7CSFO4.js";
 export {
   DEFAULT_TERMINAL_THEME,

package/dist/workbench.js

@@ -12,12 +12,12 @@ import {
   buildUnifiedPatch,
   computeDiffStats,
   resolveLanguage
-} from "./chunk-NAWEV5UJ.js";
+} from "./chunk-X24MVW2R.js";
 import "./chunk-PZVUIUUW.js";
 import "./chunk-K4Q4E7D7.js";
 import "./chunk-OMUIPJQZ.js";
-import "./chunk-4VLVVKQZ.js";
-import "./chunk-7KB22BLB.js";
+import "./chunk-LWSWKLI5.js";
+import "./chunk-F7LNWZQR.js";
 import "./chunk-2XPJ2XF7.js";
 import "./chunk-RQZRXKMR.js";
 import "./chunk-BGVEHENC.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangle-network/sandbox-ui",
-  "version": "0.105.0",
+  "version": "0.105.2",
   "description": "Unified UI component library for Tangle Sandbox — primitives, chat, dashboard, terminal, editor, and workspace components",
   "repository": {
     "type": "git",