Agent Zero AI framework
refactor: Frontend adapter for new WebSocket architecture
keyboardstaffaf4d5db78958
diff --git a/webui/components/settings/developer/websocket-event-console-store.js b/webui/components/settings/developer/websocket-event-console-store.jsindex de5d521a6..811842d5e 100644--- a/webui/components/settings/developer/websocket-event-console-store.js+++ b/webui/components/settings/developer/websocket-event-console-store.js@@ -2,7 +2,8 @@ import { createStore } from "/js/AlpineStore.js";import { getNamespacedClient } from "/js/websocket.js";import { store as notificationStore } from "/components/notifications/notification-store.js";-const websocket = getNamespacedClient("/dev_websocket_test");+const websocket = getNamespacedClient("/ws");+websocket.addHandlers(["ws_dev_test"]);const DIAGNOSTIC_EVENT = "ws_dev_console_event";const SUBSCRIBE_EVENT = "ws_event_console_subscribe";@@ -205,7 +206,7 @@ const model = {sid: payload.sid || null,correlationId: payload.correlationId || envelope?.correlationId || null,timestamp: payload.timestamp || envelope?.ts || new Date().toISOString(),- handlerId: payload.handlerId || envelope?.handlerId || "WebSocketManager",+ handlerId: payload.handlerId || envelope?.handlerId || "WsManager",resultSummary: payload.resultSummary || {},payloadSummary: payload.payloadSummary || {},delivered: payload.delivered ?? null,diff --git a/webui/components/settings/developer/websocket-test-store.js b/webui/components/settings/developer/websocket-test-store.jsindex 3e1a4d989..fefcedec2 100644--- a/webui/components/settings/developer/websocket-test-store.js+++ b/webui/components/settings/developer/websocket-test-store.js@@ -11,8 +11,9 @@ import { store as syncStore } from "/components/sync/sync-store.js";const MAX_PAYLOAD_BYTES = 50 * 1024 * 1024;const TOAST_DURATION = 5;-const websocket = getNamespacedClient("/dev_websocket_test");-const stateSocket = getNamespacedClient("/webui");+const websocket = getNamespacedClient("/ws");+websocket.addHandlers(["ws_dev_test"]);+const stateSocket = websocket; // same /ws namespace clientfunction now() {return new Date().toISOString();@@ -163,7 +164,8 @@ const model = {websocket.off("ws_tester_broadcast");websocket.off("ws_tester_persistence");websocket.off("ws_tester_broadcast_demo");- stateSocket.off("state_push");+ // NOTE: Do NOT blanket-remove state_push — that nukes syncStore's handler.+ // The _subscriptionHandlers loop above already removes tester-specific handlers.},appendLog(message) {@@ -720,6 +722,10 @@ const model = {} finally {stateSocket.request = originalRequest;globalThis.poll = originalPoll;+ // Clear dangling retry timers left by simulated failures.+ syncStore._clearHandshakeRetry();+ syncStore._handshakeRetryAttempt = 0;+ syncStore._handshakeFailureCount = 0;}},@@ -729,6 +735,10 @@ const model = {return { ok: false, label, error: "syncStore._handlePush not available" };}const originalSendStateRequest = syncStore.sendStateRequest;+ const savedMode = syncStore.mode;+ const savedEpoch = syncStore.runtimeEpoch;+ const savedSeq = syncStore.lastSeq;+ const savedNeedsHandshake = syncStore.needsHandshake;let calls = [];try {if (typeof originalSendStateRequest !== "function") {@@ -773,6 +783,23 @@ const model = {return { ok: false, label, error: error.message || error };} finally {syncStore.sendStateRequest = originalSendStateRequest;+ // Restore syncStore state that the test mutated to avoid leaving the+ // UI stuck in HANDSHAKE_PENDING after the suite finishes.+ syncStore.runtimeEpoch = savedEpoch;+ syncStore.lastSeq = savedSeq;+ syncStore.needsHandshake = savedNeedsHandshake;+ // Re-establish a real handshake to return to HEALTHY.+ // Clear any dangling retry state before attempting recovery.+ syncStore._clearHandshakeRetry();+ syncStore._handshakeRetryAttempt = 0;+ syncStore._handshakeFailureCount = 0;+ try {+ await syncStore.sendStateRequest({ forceFull: true });+ } catch (_) {+ // Best-effort recovery; let the normal retry mechanism take over+ // instead of forcing HEALTHY with stale handshake state.+ syncStore.needsHandshake = true;+ }}},diff --git a/webui/components/sync/sync-store.js b/webui/components/sync/sync-store.jsindex 94a22be1a..f945f7123 100644--- a/webui/components/sync/sync-store.js+++ b/webui/components/sync/sync-store.js@@ -6,7 +6,8 @@ import { store as chatTopStore } from "/components/chat/top-section/chat-top-stoimport { store as notificationStore } from "/components/notifications/notification-store.js";import * as Extensions from "/js/extensions.js"-const stateSocket = getNamespacedClient("/webui");+const stateSocket = getNamespacedClient("/ws");+stateSocket.addHandlers(["ws_webui"]);const SYNC_MODES = {DISCONNECTED: "DISCONNECTED",diff --git a/webui/js/websocket.js b/webui/js/websocket.jsindex 6cc877b39..b693a9f0f 100644--- a/webui/js/websocket.js+++ b/webui/js/websocket.js@@ -274,6 +274,33 @@ class WebSocketClient {this._csrfInvalidatedForConnectError = false;this._connectErrorRetryTimer = null;this._connectErrorRetryAttempt = 0;+ this._handlers = new Set();+ }++ /**+ * Declare WS handler paths to activate on connect (e.g. "ws_webui").+ * Must be called before connect().+ * @param {string[]} handlers+ */+ addHandlers(handlers) {+ if (!Array.isArray(handlers)) return;+ let changed = false;+ for (const h of handlers) {+ if (typeof h === "string" && h.trim()) {+ const key = h.trim();+ if (!this._handlers.has(key)) {+ this._handlers.add(key);+ changed = true;+ }+ }+ }+ // If new handlers were added while already connected, reconnect so the+ // updated handler list is sent to the server via the auth callback.+ if (changed && this.socket && this.socket.connected) {+ this.debugLog("addHandlers: reconnecting to activate new handlers", [...this._handlers]);+ this.socket.disconnect();+ this.socket.connect();+ }}_clearConnectErrorRetryTimer() {@@ -594,11 +621,12 @@ class WebSocketClient {transports: ["websocket", "polling"],withCredentials: true,auth: (cb) => {+ const handlers = [...this._handlers];getCsrfToken()- .then((token) => cb({ csrf_token: token }))+ .then((token) => cb({ csrf_token: token, handlers })).catch((error) => {console.error("[websocket] failed to fetch CSRF token for connect", error);- cb({});+ cb({ handlers });});},});