clay-server 2.29.4 → 2.29.5-beta.1

package/lib/project.js

@@ -872,6 +872,12 @@ function createProjectContext(opts) {
 
   // --- WS disconnection handler (delegated to project-connection.js) ---
   function handleDisconnection(ws) {
+    // Clean up extension WS reference if this was the extension client
+    if (browserState._extensionWs === ws) {
+      browserState._extensionWs = null;
+      browserState._extensionId = null;
+      if (_mcp) _mcp.handleExtensionDisconnect();
+    }
     _connection.handleDisconnection(ws);
   }
 

package/lib/public/app.js

@@ -54,7 +54,7 @@ import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateR
 import { initCursors, handleRemoteCursorMove as _curHandleRemoteCursorMove, handleRemoteCursorLeave as _curHandleRemoteCursorLeave, handleRemoteSelection as _curHandleRemoteSelection, clearRemoteCursors as _curClearRemoteCursors, initCursorToggle } from './modules/app-cursors.js';
 import { initFavicon, updateFavicon as _favUpdateFavicon, setSendBtnMode as _favSetSendBtnMode, blinkIO as _favBlinkIO, blinkSessionDot as _favBlinkSessionDot, updateCrossProjectBlink as _favUpdateCrossProjectBlink, startUrgentBlink as _favStartUrgentBlink, stopUrgentBlink as _favStopUrgentBlink, setActivity as _favSetActivity, drawFaviconAnimFrame as _favDrawFaviconAnimFrame } from './modules/app-favicon.js';
 import { initHeader, closeSessionInfoPopover as _hdrCloseSessionInfoPopover, updateHistorySentinel as _hdrUpdateHistorySentinel, requestMoreHistory as _hdrRequestMoreHistory, prependOlderHistory as _hdrPrependOlderHistory } from './modules/app-header.js';
-import { initMisc, showImageModal as _miscShowImageModal, closeImageModal as _miscCloseImageModal, showPasteModal as _miscShowPasteModal, closePasteModal as _miscClosePasteModal, showConfirm as _miscShowConfirm, hideConfirm as _miscHideConfirm, showForceChangePinOverlay as _miscShowForceChangePinOverlay, sendExtensionCommand as _miscSendExtensionCommand, handleExtensionResult as _miscHandleExtensionResult } from './modules/app-misc.js';
+import { initMisc, flushPendingExtMessages, showImageModal as _miscShowImageModal, closeImageModal as _miscCloseImageModal, showPasteModal as _miscShowPasteModal, closePasteModal as _miscClosePasteModal, showConfirm as _miscShowConfirm, hideConfirm as _miscHideConfirm, showForceChangePinOverlay as _miscShowForceChangePinOverlay, sendExtensionCommand as _miscSendExtensionCommand, handleExtensionResult as _miscHandleExtensionResult } from './modules/app-misc.js';
 import { initSkillInstall, requireSkills as _siRequireSkills, requireClayMateInterview as _siRequireClayMateInterview, handleSkillInstallWs as _siHandleSkillInstallWs } from './modules/app-skills-install.js';
 import { initDebateUi, showDebateConcludeConfirm as _debShowDebateConcludeConfirm, exitDebateConcludeMode as _debExitDebateConcludeMode, handleDebateConcludeSend as _debHandleDebateConcludeSend, showDebateEndedMode as _debShowDebateEndedMode, exitDebateEndedMode as _debExitDebateEndedMode, showDebateUserFloor as _debShowDebateUserFloor, exitDebateFloorMode as _debExitDebateFloorMode, handleDebateFloorSend as _debHandleDebateFloorSend, renderDebateUserFloorDone as _debRenderDebateUserFloorDone, showDebateSticky as _debShowDebateSticky, showDebateBottomBar as _debShowDebateBottomBar, removeDebateBottomBar as _debRemoveDebateBottomBar, sendDebateStickyComment as _debSendDebateStickyComment, updateDebateRound as _debUpdateDebateRound } from './modules/app-debate-ui.js';
 import { initLoopUi, updateLoopInputVisibility as _loopUpdateLoopInputVisibility, updateLoopButton as _loopUpdateLoopButton, showLoopBanner as _loopShowLoopBanner, updateLoopBanner as _loopUpdateLoopBanner, updateRalphBars as _loopUpdateRalphBars, showRalphCraftingBar as _loopShowRalphCraftingBar, showRalphApprovalBar as _loopShowRalphApprovalBar, updateRalphApprovalStatus as _loopUpdateRalphApprovalStatus, openRalphPreviewModal as _loopOpenRalphPreviewModal, showExecModal as _loopShowExecModal, closeExecModal as _loopCloseExecModal, updateExecModalStatus as _loopUpdateExecModalStatus } from './modules/app-loop-ui.js';
@@ -1337,6 +1337,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     setActivity: setActivity,
     processMessage: processMessage,
     onConnected: function () {
+      // Flush any extension messages that arrived before WS was ready
+      flushPendingExtMessages();
+
       // Reset terminal xterm instances (server will send fresh term_list)
       resetTerminals();
 

package/lib/public/modules/app-misc.js

@@ -11,6 +11,29 @@ import { setExtensionConnected } from './mcp-ui.js';
 var confirmCallback = null;
 var _extRequestCallbacks = {};
 
+// Queue for extension messages that arrived before WS was ready
+var _pendingExtMessages = [];
+
+function sendOrQueue(msgObj) {
+  var ws = getWs();
+  if (ws && ws.readyState === 1) {
+    ws.send(JSON.stringify(msgObj));
+  } else {
+    _pendingExtMessages.push(msgObj);
+  }
+}
+
+export function flushPendingExtMessages() {
+  if (_pendingExtMessages.length === 0) return;
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return;
+  var queued = _pendingExtMessages.slice();
+  _pendingExtMessages = [];
+  for (var i = 0; i < queued.length; i++) {
+    ws.send(JSON.stringify(queued[i]));
+  }
+}
+
 export function initMisc() {
   // --- Confirm modal listeners ---
   var confirmModal = document.getElementById("confirm-modal");
@@ -98,14 +121,11 @@ export function initMisc() {
     if (msg.type === "clay_ext_tab_list") {
       setExtensionConnected(true);
       updateBrowserTabList(msg.tabs);
-      // Also inform server about tab list
-      var ws = getWs();
-      if (ws && ws.readyState === 1) {
-        ws.send(JSON.stringify({
-          type: "browser_tab_list",
-          tabs: msg.tabs
-        }));
-      }
+      // Also inform server about tab list (queue if WS not ready yet)
+      sendOrQueue({
+        type: "browser_tab_list",
+        tabs: msg.tabs
+      });
     }
     if (msg.type === "clay_ext_result") {
       handleExtensionResult(msg.requestId, msg.result);
@@ -114,19 +134,17 @@ export function initMisc() {
       setExtensionConnected(false);
     }
 
-    // MCP bridge: extension reports available MCP servers
+    // MCP bridge: extension reports available MCP servers (queue if WS not ready yet)
     if (msg.type === "mcp_servers_available") {
-      var ws2 = getWs();
-      if (ws2 && ws2.readyState === 1) {
-        ws2.send(JSON.stringify({
-          type: "mcp_servers_available",
-          servers: msg.servers,
-          hostConnected: msg.hostConnected
-        }));
-      }
+      sendOrQueue({
+        type: "mcp_servers_available",
+        servers: msg.servers,
+        hostConnected: msg.hostConnected
+      });
     }
 
-    // MCP bridge: tool result from extension
+    // MCP bridge: tool result from extension (tool results should not be queued,
+    // if WS is down the call already timed out server-side)
     if (msg.type === "mcp_tool_result") {
       var ws3 = getWs();
       if (ws3 && ws3.readyState === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.29.4",
+  "version": "2.29.5-beta.1",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",