@openhands/agent-canvas 1.16.0 → 1.17.0

package/dist/contexts/conversation-websocket-context.js

@@ -8,47 +8,51 @@ import "../node_modules/@openhands/typescript-client/dist/clients.js";
 import { buildWebSocketUrl as te } from "../utils/websocket-url.js";
 import { getAgentServerClientOptions as ne } from "../api/agent-server-client-options.js";
 import { useQueryClient as re } from "../node_modules/@tanstack/react-query/build/modern/QueryClientProvider.js";
-import { isActionEvent as a, isAgentErrorEvent as ie, isAgentServerEvent as ae, isAgentStatusConversationStateUpdateEvent as oe, isBrowserNavigateActionEvent as se, isBrowserObservationEvent as ce, isCanvasUIActionEvent as le, isConversationStateUpdateEvent as ue, isDisplayableErrorEvent as o, isExecuteBashActionEvent as de, isExecuteBashObservationEvent as fe, isFullStateConversationStateUpdateEvent as pe, isGoalConversationStateUpdateEvent as s, isLaunchChildConversationActionEvent as me, isPlanningFileEditorObservationEvent as he, isStatsConversationStateUpdateEvent as ge, isStreamingDeltaEvent as _e, isSwitchLLMObservationEvent as ve, isUserMessageEvent as c } from "../types/agent-server/type-guards.js";
-import { useEventStore as l } from "../stores/use-event-store.js";
-import { useWebSocket as ye } from "../hooks/use-websocket.js";
-import { SERVER_CONNECTION_ERROR_MESSAGE as be } from "../constants/server-connection-error.js";
-import { useErrorMessageStore as u } from "../stores/error-message-store.js";
-import { useOptimisticUserMessageStore as xe } from "../stores/optimistic-user-message-store.js";
-import { useGoalStore as Se } from "../stores/goal-store.js";
-import { createStreamingDeltaBatcher as Ce } from "../utils/streaming-delta-batcher.js";
-import { getStoredConversationMetadata as we, setStoredConversationMetadata as Te } from "../api/conversation-metadata-store.js";
-import { handleCanvasUIAction as Ee } from "../services/canvas-ui.js";
-import { handleLaunchChildConversationAction as De } from "../services/child-conversation-launch.js";
-import { handleActionEventCacheInvalidation as Oe } from "../utils/cache-utils.js";
-import ke from "../api/event-service/event-service.api.js";
-import { trackError as d } from "../utils/error-handler.js";
-import { useReadConversationFile as Ae } from "../hooks/mutation/use-read-conversation-file.js";
-import je from "../stores/metrics-store.js";
-import { useConversationHistory as Me } from "../hooks/query/use-conversation-history.js";
-import { recordModelSwitchMessage as Ne, seedModelSwitchesFromHistory as Pe } from "../hooks/chat/record-model-switch-message.js";
-import { invalidateConversationQueries as Fe, updateConversationLlmModelInCache as Ie } from "../hooks/mutation/conversation-mutation-utils.js";
-import Le, { createContext as Re, useCallback as f, useContext as p, useEffect as m, useLayoutEffect as ze, useMemo as h, useRef as g, useState as _ } from "react";
-import { jsx as Be } from "react/jsx-runtime";
+import { isActionEvent as ie, isAgentErrorEvent as ae, isAgentServerEvent as oe, isAgentStatusConversationStateUpdateEvent as se, isBrowserNavigateActionEvent as ce, isBrowserObservationEvent as le, isCanvasUIActionEvent as ue, isConversationStateUpdateEvent as de, isDisplayableErrorEvent as fe, isExecuteBashActionEvent as pe, isExecuteBashObservationEvent as me, isFullStateConversationStateUpdateEvent as he, isGoalConversationStateUpdateEvent as a, isLaunchChildConversationActionEvent as ge, isPlanningFileEditorObservationEvent as _e, isStatsConversationStateUpdateEvent as ve, isStreamingDeltaEvent as ye, isSwitchLLMObservationEvent as be, isUserMessageEvent as o } from "../types/agent-server/type-guards.js";
+import { useEventStore as s } from "../stores/use-event-store.js";
+import { useWebSocket as xe } from "../hooks/use-websocket.js";
+import { SERVER_CONNECTION_ERROR_MESSAGE as Se } from "../constants/server-connection-error.js";
+import { useErrorMessageStore as c } from "../stores/error-message-store.js";
+import { useOptimisticUserMessageStore as Ce } from "../stores/optimistic-user-message-store.js";
+import { useGoalStore as we } from "../stores/goal-store.js";
+import { createStreamingDeltaBatcher as Te } from "../utils/streaming-delta-batcher.js";
+import { isPlanFilePath as Ee } from "../utils/plan-file.js";
+import { handleCanvasUIAction as De } from "../services/canvas-ui.js";
+import { handleLaunchChildConversationAction as Oe } from "../services/child-conversation-launch.js";
+import { handleActionEventCacheInvalidation as ke } from "../utils/cache-utils.js";
+import Ae from "../api/event-service/event-service.api.js";
+import { trackError as l } from "../utils/error-handler.js";
+import { useReadConversationFile as je } from "../hooks/mutation/use-read-conversation-file.js";
+import Me from "../stores/metrics-store.js";
+import { useConversationHistory as Ne } from "../hooks/query/use-conversation-history.js";
+import { recordModelSwitchMessage as Pe, seedModelSwitchesFromHistory as Fe, stampActiveLlmProfile as Ie } from "../hooks/chat/record-model-switch-message.js";
+import { invalidateConversationQueries as Le, updateConversationLlmModelInCache as Re } from "../hooks/mutation/conversation-mutation-utils.js";
+import ze, { createContext as Be, useCallback as u, useContext as d, useEffect as f, useLayoutEffect as Ve, useMemo as p, useRef as m, useState as h } from "react";
+import { jsx as He } from "react/jsx-runtime";
 //#region src/contexts/conversation-websocket-context.tsx
-var Ve = Re(void 0);
-function v(e) {
+var Ue = Be(void 0);
+function g(e) {
 	return e.llm_message.content.filter((e) => e.type === "text").map((e) => e.text).join("");
 }
-function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey: b, subConversations: x, subConversationIds: He }) {
-	let [S, C] = _("CONNECTING"), [w, T] = _("CONNECTING"), E = Le.useRef(!1), D = Le.useRef(!1), O = re(), k = l((e) => e.addEvent), Ue = l((e) => e.addEvents), We = l((e) => e.clearEventsForConversation), { setErrorMessage: A, removeErrorMessage: Ge, clearConnectionError: j } = u(), M = xe((e) => e.consumeMatchingPendingMessage), { setExecutionStatus: N } = i(), { appendInput: P, appendOutput: F } = t(), Ke = e((e) => e.reset), I = g(null);
-	I.current === null && (I.current = Ce((e) => {
-		l.getState().addEvent(e), u.getState().clearConnectionError();
+function _({ children: Be, conversationId: d, conversationUrl: _, sessionApiKey: v, subConversations: y, subConversationIds: b }) {
+	let [x, S] = h("CONNECTING"), [C, w] = h("CONNECTING"), T = ze.useRef(!1), E = ze.useRef(!1), D = re(), O = s((e) => e.addEvent), We = s((e) => e.addEvents), Ge = s((e) => e.clearEventsForConversation), { setErrorMessage: k, removeErrorMessage: Ke, clearConnectionError: A } = c(), j = Ce((e) => e.consumeMatchingPendingMessage), { setExecutionStatus: M } = i(), { appendInput: N, appendOutput: P } = t(), qe = e((e) => e.reset), F = m(null);
+	F.current === null && (F.current = Te((e) => {
+		s.getState().addEvent(e), c.getState().clearConnectionError();
 	}));
-	let L = g(null);
-	L.current === null && (L.current = Ce((e) => {
-		l.getState().addEvent({
+	let I = m(null);
+	I.current === null && (I.current = Te((e) => {
+		s.getState().addEvent({
 			...e,
 			isFromPlanningAgent: !0
-		}), u.getState().clearConnectionError();
+		}), c.getState().clearConnectionError();
 	}));
-	let [R, z] = _(!0), [B, qe] = _(null), { setPlanContent: V } = r(), { mutate: H } = Ae(), U = g(0), W = g(null), Je = (e) => e?.toUpperCase().endsWith("PLAN.MD") ?? !1, G = f(() => {
-		j();
-	}, [j]), K = f((e) => {
+	let [L, R] = h(!0), [z, Je] = h(null), { setPlanContent: B } = r();
+	f(() => {
+		B(null);
+	}, [d, B]);
+	let { mutate: V } = je(), H = m(0), U = m(null), W = u(() => {
+		A();
+	}, [A]), G = u((e) => {
 		let t = e.value.usage_to_metrics;
 		if (!t) return;
 		let n = Object.values(t).reduce((e, t) => {
@@ -67,104 +71,104 @@ function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey:
 			maxBudgetPerTask: null,
 			usage: null
 		});
-		je.getState().setMetrics({
+		Me.getState().setMetrics({
 			cost: n.cost,
 			max_budget_per_task: n.maxBudgetPerTask,
 			usage: n.usage
 		});
-	}, []), { data: q, isPending: J } = Me(p), Ye = !!p && J;
-	ze(() => {
-		let e = p ?? null;
-		l.getState().loadedConversationId !== e && (We(e), Ke(), je.getState().resetMetrics());
+	}, []), { data: K, isPending: q } = Ne(d), Ye = !!d && q;
+	Ve(() => {
+		let e = d ?? null;
+		s.getState().loadedConversationId !== e && (Ge(e), qe(), Me.getState().resetMetrics());
 	}, [
-		p,
-		We,
-		Ke
-	]), ze(() => {
-		if (!(!q || q.events.length === 0) && (Ue(q.events), p)) {
-			Pe(p, l.getState().uiEvents);
-			for (let e of q.events) c(e) && M(p, v(e));
+		d,
+		Ge,
+		qe
+	]), Ve(() => {
+		if (!(!K || K.events.length === 0) && (We(K.events), d)) {
+			Fe(d, s.getState().uiEvents);
+			for (let e of K.events) o(e) && j(d, g(e));
 		}
 	}, [
-		q,
-		Ue,
-		p,
-		M
+		K,
+		We,
+		d,
+		j
 	]);
-	let Y = h(() => {
-		let e = q?.events ?? [], t = e[e.length - 1];
+	let J = p(() => {
+		let e = K?.events ?? [], t = e[e.length - 1];
 		return !t || !("timestamp" in t) || !t.timestamp ? null : t.timestamp;
-	}, [q]), X = h(() => !p || !y || J ? null : te(p, y), [
-		p,
-		y,
-		J
-	]), Z = h(() => {
-		if (!x?.length) return null;
-		let e = x[0];
+	}, [K]), Y = p(() => !d || !_ || q ? null : te(d, _), [
+		d,
+		_,
+		q
+	]), X = p(() => b?.[0] ?? null, [b]), Z = p(() => {
+		if (!y?.length) return null;
+		let e = y[0];
 		return !e?.id || !e.conversation_url ? null : te(e.id, e.conversation_url);
-	}, [x]), Xe = h(() => Z ? S === "CONNECTING" || w === "CONNECTING" ? "CONNECTING" : S === "OPEN" && w === "OPEN" ? "OPEN" : S === "CLOSED" && w === "CLOSED" ? "CLOSED" : S === "CLOSING" || w === "CLOSING" ? "CLOSING" : "CLOSED" : S, [
-		S,
-		w,
+	}, [y]), Xe = p(() => Z ? x === "CONNECTING" || C === "CONNECTING" ? "CONNECTING" : x === "OPEN" && C === "OPEN" ? "OPEN" : x === "CLOSED" && C === "CLOSED" ? "CLOSED" : x === "CLOSING" || C === "CLOSING" ? "CLOSING" : "CLOSED" : x, [
+		x,
+		C,
 		Z
 	]);
-	m(() => {
-		B !== null && U.current >= B && R && z(!1);
+	f(() => {
+		z !== null && H.current >= z && L && R(!1);
 	}, [
-		B,
-		R,
-		U
-	]), m(() => {
-		if (!R && W.current) {
-			let { path: e, conversationId: t } = W.current;
-			H({
+		z,
+		L,
+		H
+	]), f(() => {
+		if (!L && U.current) {
+			let { path: e, conversationId: t } = U.current;
+			V({
 				conversationId: t,
 				filePath: e
 			}, {
 				onSuccess: (e) => {
-					V(e);
+					B(e);
 				},
 				onError: (e) => {
 					console.warn("Failed to read conversation file:", e);
 				}
-			}), W.current = null;
+			}), U.current = null;
 		}
 	}, [
-		R,
-		H,
-		V
-	]), m(() => {
-		E.current = !1, z(!!He?.length), qe(null), U.current = 0, W.current = null;
-	}, [He]), m(() => {
-		E.current = !1, D.current = !1, W.current = null;
-	}, [p]), m(() => {
-		let e = I.current, t = L.current;
+		L,
+		V,
+		B
+	]), f(() => {
+		T.current = !1, R(!!b?.length), Je(null), H.current = 0, U.current = null;
+	}, [b]), f(() => {
+		T.current = !1, E.current = !1, U.current = null;
+	}, [d]), f(() => {
+		let e = F.current, t = I.current;
 		return () => {
 			e?.reset(), t?.reset();
 		};
-	}, [p]);
-	let Ze = h(() => Ye || R, [Ye, R]), Qe = f((t) => {
+	}, [d]);
+	let Ze = p(() => Ye || L, [Ye, L]), Qe = u((t) => {
 		try {
 			let r = JSON.parse(t.data);
-			if (ae(r)) {
-				if (_e(r)) {
-					I.current?.enqueue(r);
+			if (oe(r)) {
+				if (ye(r)) {
+					F.current?.enqueue(r);
 					return;
 				}
-				I.current?.flush();
-				let t = l.getState().eventIds.has(r.id ?? ""), i = ve(r) ? r : null;
-				if (k(r), t) return;
-				if (o(r)) {
+				F.current?.flush();
+				let t = s.getState().eventIds.has(r.id ?? ""), i = be(r) ? r : null;
+				if (O(r), t) return;
+				if (fe(r)) {
 					let e = r, t = "classification" in e ? e.classification : null;
-					d({
+					l({
 						source: "conversation",
 						metadata: {
 							eventId: e.id,
 							errorCode: e.code
 						},
 						classification: t
-					}), A(e.detail, "conversation", e.code, t);
-				} else G();
-				if (ie(r) && d({
+					}), k(e.detail, "conversation", e.code, t);
+				} else W();
+				if (ae(r) && l({
 					source: "agent",
 					metadata: {
 						eventId: r.id,
@@ -172,67 +176,55 @@ function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey:
 						toolCallId: r.tool_call_id
 					},
 					classification: r.classification
-				}), c(r) && p && (M(p, v(r)), n(p, { draftMessage: null })), a(r) && Oe(r, p || "test-conversation-id", O), ue(r) && (pe(r) && N(r.value.execution_status), oe(r) && N(r.value), ge(r) && K(r), s(r) && p && Se.getState().setStatus(p, r.value)), de(r) && P(r.action.command), fe(r) && F(r.observation.content.filter((e) => e.type === "text").map((e) => e.text).join("\n")), ce(r)) {
+				}), o(r) && d && (j(d, g(r)), n(d, { draftMessage: null })), ie(r) && ke(r, d || "test-conversation-id", D), de(r) && (he(r) && d && M(d, r.value.execution_status), se(r) && d && M(d, r.value), ve(r) && G(r), a(r) && d && we.getState().setStatus(d, r.value)), pe(r) && N(r.action.command), me(r) && P(r.observation.content.filter((e) => e.type === "text").map((e) => e.text).join("\n")), le(r)) {
 					let { screenshot_data: t } = r.observation;
 					if (t) {
 						let n = t.startsWith("data:") ? t : `data:image/png;base64,${t}`;
 						e.getState().setScreenshotSrc(n);
 					}
 				}
-				if (se(r) && e.getState().setUrl(r.action.url), p && i && !i.observation.is_error) {
-					Ne(p, i.observation.profile_name);
-					let e = we(p);
-					Te(p, {
-						selected_repository: e?.selected_repository ?? null,
-						selected_branch: e?.selected_branch ?? null,
-						git_provider: e?.git_provider ?? null,
-						selected_workspace: e?.selected_workspace ?? null,
-						active_profile: i.observation.profile_name,
-						plugins: e?.plugins ?? null
-					}), i.observation.active_model && Ie(O, p, i.observation.active_model), Fe(O, p);
-				}
-				le(r) && Ee(r.action, p ?? null), p && me(r) && De(r.action, p, r.tool_call_id);
+				ce(r) && e.getState().setUrl(r.action.url), d && i && !i.observation.is_error && (Pe(d, i.observation.profile_name), Ie(d, i.observation.profile_name, i.timestamp), i.observation.active_model && Re(D, d, i.observation.active_model), Le(D, d)), ue(r) && De(r.action, d ?? null), d && ge(r) && Oe(r.action, d, r.tool_call_id);
 			}
 		} catch (e) {
 			console.warn("Failed to parse WebSocket message as JSON:", e);
 		}
 	}, [
+		O,
 		k,
-		A,
+		j,
+		D,
+		d,
 		M,
-		O,
-		p,
 		N,
 		P,
-		F,
-		K,
-		G
-	]), $e = f((e) => {
+		G,
+		W
+	]), $e = u((e) => {
 		try {
 			let t = JSON.parse(e.data);
-			if (R && (U.current += 1, B !== null && U.current >= B && z(!1)), ae(t)) {
-				if (_e(t)) {
-					L.current?.enqueue(t);
+			if (L && (H.current += 1, z !== null && H.current >= z && R(!1)), oe(t)) {
+				if (ye(t)) {
+					I.current?.enqueue(t);
 					return;
 				}
-				L.current?.flush();
-				let e = l.getState().eventIds.has(t.id ?? "");
-				if (k({
+				I.current?.flush();
+				let e = s.getState().eventIds.has(t.id ?? "");
+				if (O({
 					...t,
 					isFromPlanningAgent: !0
 				}), e) return;
-				if (o(t)) {
+				if (fe(t)) {
 					let e = t, n = "classification" in e ? e.classification : null;
-					d({
+					l({
 						source: "planning_conversation",
 						metadata: {
 							eventId: e.id,
 							errorCode: e.code
 						},
 						classification: n
-					}), A(e.detail, "conversation", e.code, n);
-				} else G();
-				if (ie(t) && d({
+					}), k(e.detail, "conversation", e.code, n);
+				} else W();
+				if (ae(t) && l({
 					source: "planning_agent",
 					metadata: {
 						eventId: t.id,
@@ -240,19 +232,19 @@ function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey:
 						toolCallId: t.tool_call_id
 					},
 					classification: t.classification
-				}), c(t) && p && (M(p, v(t)), n(p, { draftMessage: null })), a(t) && Oe(t, x?.[0]?.id || "test-conversation-id", O), ue(t) && (pe(t) && N(t.value.execution_status), oe(t) && N(t.value), ge(t) && K(t), s(t) && p && Se.getState().setStatus(p, t.value)), de(t) && P(t.action.command), fe(t) && F(t.observation.content.filter((e) => e.type === "text").map((e) => e.text).join("\n")), he(t)) {
+				}), o(t) && d && (j(d, g(t)), n(d, { draftMessage: null })), ie(t) && ke(t, y?.[0]?.id || "test-conversation-id", D), de(t) && (he(t) && X && M(X, t.value.execution_status), se(t) && X && M(X, t.value), ve(t) && G(t), a(t) && d && we.getState().setStatus(d, t.value)), pe(t) && N(t.action.command), me(t) && P(t.observation.content.filter((e) => e.type === "text").map((e) => e.text).join("\n")), _e(t)) {
 					let { path: e } = t.observation;
-					if (Je(e)) {
-						let t = x?.[0]?.id;
-						t && e && (R ? W.current = {
+					if (Ee(e)) {
+						let t = y?.[0]?.id;
+						t && e && (L ? U.current = {
 							path: e,
 							conversationId: t
-						} : H({
+						} : V({
 							conversationId: t,
 							filePath: e
 						}, {
 							onSuccess: (e) => {
-								V(e);
+								B(e);
 							},
 							onError: (e) => {
 								console.warn("Failed to read conversation file:", e);
@@ -265,74 +257,75 @@ function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey:
 			console.warn("Failed to parse WebSocket message as JSON:", e);
 		}
 	}, [
+		O,
+		L,
+		z,
 		k,
-		R,
-		B,
-		A,
+		j,
+		D,
+		y,
+		X,
+		d,
 		M,
-		O,
-		x,
-		p,
 		N,
 		P,
-		F,
-		H,
 		V,
-		K,
-		G
-	]), et = h(() => ({
-		queryParams: Y ? {
+		B,
+		G,
+		W
+	]), et = p(() => ({
+		queryParams: J ? {
 			resend_mode: "since",
-			after_timestamp: Y
+			after_timestamp: J
 		} : { resend_mode: "all" },
-		sessionApiKey: b,
+		sessionApiKey: v,
 		reconnect: { enabled: !0 },
 		onOpen: () => {
-			C("OPEN"), E.current = !0, j();
+			S("OPEN"), T.current = !0, A();
 		},
 		onClose: () => {
-			C("CLOSED");
+			S("CLOSED");
 		},
 		onError: () => {
-			C("CLOSED"), E.current && A(be, "connection");
+			S("CLOSED"), T.current && k(Se, "connection");
 		},
 		onMessage: Qe
 	}), [
 		Qe,
+		k,
 		A,
-		j,
-		b,
-		Y
-	]), tt = h(() => {
-		let e = { resend_all: !0 }, t = x?.[0];
+		v,
+		J
+	]), tt = p(() => {
+		let e = { resend_all: !0 }, t = y?.[0];
 		return {
 			queryParams: e,
-			sessionApiKey: t?.session_api_key ?? b,
+			sessionApiKey: t?.session_api_key ?? v,
 			reconnect: { enabled: !0 },
 			onOpen: async () => {
-				if (T("OPEN"), D.current = !0, j(), t?.id && t.conversation_url) try {
-					let e = await ke.getEventCount(t.id, t.conversation_url, t.session_api_key);
-					qe(e), e === 0 && z(!1);
+				if (w("OPEN"), E.current = !0, A(), t?.id && t.conversation_url) try {
+					let e = await Ae.getEventCount(t.id, t.conversation_url, t.session_api_key);
+					Je(e), e === 0 && R(!1);
 				} catch {
-					z(!1);
+					R(!1);
 				}
 			},
 			onClose: () => {
-				T("CLOSED");
+				w("CLOSED");
 			},
 			onError: () => {
-				T("CLOSED"), D.current && A(be, "connection");
+				w("CLOSED"), E.current && k(Se, "connection");
 			},
 			onMessage: $e
 		};
 	}, [
 		$e,
+		k,
 		A,
-		j,
-		b,
-		x
-	]), { socket: Q, reconnect: nt } = ye(X || "", et), { socket: $, reconnect: rt } = ye(Z || "", tt), it = f(() => {
-		if (Ge(), r.getState().conversationMode === "plan" && Z) {
+		v,
+		y
+	]), { socket: Q, reconnect: nt } = xe(Y || "", et), { socket: $, reconnect: rt } = xe(Z || "", tt), it = u(() => {
+		if (Ke(), r.getState().conversationMode === "plan" && Z) {
 			rt();
 			return;
 		}
@@ -341,96 +334,99 @@ function y({ children: Re, conversationId: p, conversationUrl: y, sessionApiKey:
 		Z,
 		nt,
 		rt,
-		Ge
-	]), at = f(async (e) => {
-		let t = r.getState().conversationMode === "plan" ? $ : Q;
-		if (t?.readyState !== WebSocket.OPEN) {
-			if (!p) {
-				let e = /* @__PURE__ */ Error("No conversation ID available");
-				throw A(e.message), e;
+		Ke
+	]), at = u(async (e) => {
+		let t = r.getState().conversationMode, n = t === "plan" ? $ : Q, i = t === "plan" ? X : d;
+		if (n?.readyState !== WebSocket.OPEN) {
+			if (!i) {
+				let e = /* @__PURE__ */ Error(t === "plan" ? "Planning conversation is not ready yet" : "No conversation ID available");
+				throw k(e.message), e;
 			}
 			try {
-				return await new ee(ne()).sendEvent(p, {
+				return await new ee(ne()).sendEvent(i, {
 					role: "user",
 					content: e.content
 				}, { run: !0 }), { queued: !0 };
 			} catch (e) {
-				throw A(e instanceof Error ? e.message : "Failed to queue message for delivery"), e;
+				throw k(e instanceof Error ? e.message : "Failed to queue message for delivery"), e;
 			}
 		}
 		try {
-			return t.send(JSON.stringify({
+			return n.send(JSON.stringify({
 				...e,
 				run: !0
 			})), { queued: !1 };
 		} catch (e) {
-			throw A(e instanceof Error ? e.message : "Failed to send message"), e;
+			throw k(e instanceof Error ? e.message : "Failed to send message"), e;
 		}
 	}, [
 		Q,
 		$,
-		A,
-		p
+		k,
+		d,
+		X
 	]);
-	m(() => {
-		Q && X && (() => {
+	f(() => {
+		Q && Y && (() => {
 			switch (Q.readyState) {
 				case WebSocket.CONNECTING:
-					C("CONNECTING");
+					S("CONNECTING");
 					break;
 				case WebSocket.OPEN:
-					C("OPEN");
+					S("OPEN");
 					break;
 				case WebSocket.CLOSING:
-					C("CLOSING");
+					S("CLOSING");
 					break;
 				case WebSocket.CLOSED:
-					C("CLOSED");
+					S("CLOSED");
 					break;
 				default:
-					C("CLOSED");
+					S("CLOSED");
 					break;
 			}
 		})();
-	}, [Q, X]), m(() => {
+	}, [Q, Y]), f(() => {
 		$ && Z && (() => {
 			switch ($.readyState) {
 				case WebSocket.CONNECTING:
-					T("CONNECTING");
+					w("CONNECTING");
 					break;
 				case WebSocket.OPEN:
-					T("OPEN");
+					w("OPEN");
 					break;
 				case WebSocket.CLOSING:
-					T("CLOSING");
+					w("CLOSING");
 					break;
 				case WebSocket.CLOSED:
-					T("CLOSED");
+					w("CLOSED");
 					break;
 				default:
-					T("CLOSED");
+					w("CLOSED");
 					break;
 			}
 		})();
 	}, [$, Z]);
-	let ot = h(() => ({
+	let ot = p(() => ({
 		connectionState: Xe,
+		mainConnectionState: x,
 		sendMessage: at,
 		isLoadingHistory: Ze,
 		reconnect: it
 	}), [
 		Xe,
+		x,
 		at,
 		Ze,
 		it
 	]);
-	return /* @__PURE__ */ Be(Ve.Provider, {
+	return /* @__PURE__ */ He(Ue.Provider, {
 		value: ot,
-		children: Re
+		children: Be
 	});
 }
-var b = () => p(Ve) || null;
+var v = () => d(Ue) || null;
 //#endregion
-export { y as ConversationWebSocketProvider, b as useConversationWebSocket };
+export { _ as ConversationWebSocketProvider, v as useConversationWebSocket };
 
 //# sourceMappingURL=conversation-websocket-context.js.map