@openclaw/gateway-client 2026.10.5-beta.4 → 2026.10.10-beta.1

package/README.md

@@ -31,7 +31,7 @@ Use the verified stable release with exact pins:
 npm install --save-exact @openclaw/gateway-client@2026.8.1 @openclaw/gateway-protocol@2026.8.1
 ```
 
-See the canonical [installation guide](https://docs.openclaw.ai/gateway/clients#install-the-packages)
+See the [installation guide](https://docs.openclaw.ai/gateway/clients#install-the-packages)
 for package/wire-version rules and recovery from reserved `0.0.0` artifacts.
 Test it with the Gateway version you deploy; the root `openclaw` CLI has its own
 package versions and dist-tags.
@@ -162,7 +162,7 @@ transport timeouts return `false`. Both entries use the same implementation.
 
 ## Defaults and reconnect behavior
 
-The Node client starts with a 30 second request timeout, a 15 second
+The Node client starts with a 30 second request timeout, a 30 second
 connect-challenge timeout, and exponential reconnect backoff from 1 second to 30
 seconds with a multiplier of 2. Reconnects use randomized delays: the first waits
 1–1.2 seconds, and sustained failures spread retries across 25–30 seconds.
@@ -181,7 +181,14 @@ first so its authoritative outcome can settle the run. Other gapped frames and
 subsequent frames from that socket are not delivered. Reconnect restores a fresh live-text baseline; applications should
 also refresh durable state and restore their session subscriptions.
 
-The canonical defaults table and the server policy fields that can replace
+Session subscription requests time out without compensating RPCs. If the Gateway
+applied a subscribe or unsubscribe but its acknowledgment was lost, observation
+may remain stale until a fresh subscription or reconnect. In particular, a
+retained handle may miss updates after an unacknowledged unsubscribe. The caller
+still receives the timeout; ordinary acknowledged leases and release retries
+retain their ownership and ordering.
+
+The defaults table and the server policy fields that can replace
 pre-handshake values are documented in the
 [Gateway protocol specification](https://docs.openclaw.ai/gateway/protocol#client-constants).
 

package/dist/browser.mjs

@@ -1,5 +1,5 @@
-import { A as buildGatewayConnectAuth, B as normalizeDeviceMetadataForAuth, C as isGatewayProtocolResponseError, D as gatewayCredentialScope, E as resolveModelCatalogConnect, F as asNullableRecord, M as selectGatewayConnectAuth, N as shouldRetryGatewayWithDeviceToken, O as gatewayOriginScope, P as mergeChatStreamMessage, R as buildDeviceAuthPayload, S as GatewayProtocolRequestTimeoutError, _ as isSessionProjectionErrorMessage, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isLocallyOptimisticSessionMessage, g as readSessionMessageSequence, h as readSessionMessageIdentity, i as resetGatewaySessionMessageSubscriptionCoordinator, j as resolveGatewayConnectScopes, k as GatewayBrowserDeviceAuthLifecycle, l as reduceSessionProjectionRunEvent, m as readAssistantStreamSegmentIdentity, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as normalizeSessionProjectionRunId, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as projectSessionTerminalReplyMessage, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect, z as buildDeviceAuthPayloadV3 } from "./session-subscriptions-DE0w2upu.mjs";
-import { n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, p as resolveSafeTimeoutDelayMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS } from "./timeouts-CQTCye5U.mjs";
+import { A as buildGatewayConnectAuth, B as normalizeDeviceMetadataForAuth, C as isGatewayProtocolResponseError, D as gatewayCredentialScope, E as resolveModelCatalogConnect, F as asNullableRecord, M as selectGatewayConnectAuth, N as shouldRetryGatewayWithDeviceToken, O as gatewayOriginScope, P as mergeChatStreamMessage, R as buildDeviceAuthPayload, S as GatewayProtocolRequestTimeoutError, _ as isSessionProjectionErrorMessage, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isLocallyOptimisticSessionMessage, g as readSessionMessageSequence, h as readSessionMessageIdentity, i as resetGatewaySessionMessageSubscriptionCoordinator, j as resolveGatewayConnectScopes, k as GatewayBrowserDeviceAuthLifecycle, l as reduceSessionProjectionRunEvent, m as readAssistantStreamSegmentIdentity, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as normalizeSessionProjectionRunId, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as projectSessionTerminalReplyMessage, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect, z as buildDeviceAuthPayloadV3 } from "./session-subscriptions-hOI4k496.mjs";
+import { n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, p as resolveSafeTimeoutDelayMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS } from "./timeouts-F2UKsnjG.mjs";
 import { GATEWAY_SERVER_CAPS } from "@openclaw/gateway-protocol/frame-guards";
 export * from "@openclaw/gateway-protocol/connect-error-details";
 export * from "@openclaw/gateway-protocol/gateway-error-details";

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { A as buildGatewayConnectAuth, B as normalizeDeviceMetadataForAuth, C as isGatewayProtocolResponseError, D as gatewayCredentialScope, E as resolveModelCatalogConnect, I as asRecord, L as isRecord, M as selectGatewayConnectAuth, N as shouldRetryGatewayWithDeviceToken, O as gatewayOriginScope, P as mergeChatStreamMessage, R as buildDeviceAuthPayload, S as GatewayProtocolRequestTimeoutError, T as raceWithTimeout, _ as isSessionProjectionErrorMessage, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isLocallyOptimisticSessionMessage, g as readSessionMessageSequence, h as readSessionMessageIdentity, i as resetGatewaySessionMessageSubscriptionCoordinator, j as resolveGatewayConnectScopes, k as GatewayBrowserDeviceAuthLifecycle, l as reduceSessionProjectionRunEvent, m as readAssistantStreamSegmentIdentity, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as normalizeSessionProjectionRunId, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as projectSessionTerminalReplyMessage, w as createAbortError, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect, z as buildDeviceAuthPayloadV3 } from "./session-subscriptions-DE0w2upu.mjs";
-import { _ as normalizeOptionalString, a as MIN_CONNECT_CHALLENGE_TIMEOUT_MS, c as clearGatewayConnectTimeout, d as resolveFiniteTimeoutDelayMs, f as resolvePreauthHandshakeTimeoutMs, h as normalizeLowercaseStringOrEmpty, i as MAX_SAFE_TIMEOUT_DELAY_MS, l as getConnectChallengeTimeoutMsFromEnv, m as startGatewayConnectTimeout, n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, o as addSafeTimeoutDelayGraceMs, p as resolveSafeTimeoutDelayMs, r as MAX_CONNECT_CHALLENGE_TIMEOUT_MS, s as clampConnectChallengeTimeoutMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, u as resolveConnectChallengeTimeoutMs } from "./timeouts-CQTCye5U.mjs";
+import { A as buildGatewayConnectAuth, B as normalizeDeviceMetadataForAuth, C as isGatewayProtocolResponseError, D as gatewayCredentialScope, E as resolveModelCatalogConnect, I as asRecord, L as isRecord, M as selectGatewayConnectAuth, N as shouldRetryGatewayWithDeviceToken, O as gatewayOriginScope, P as mergeChatStreamMessage, R as buildDeviceAuthPayload, S as GatewayProtocolRequestTimeoutError, T as raceWithTimeout, _ as isSessionProjectionErrorMessage, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isLocallyOptimisticSessionMessage, g as readSessionMessageSequence, h as readSessionMessageIdentity, i as resetGatewaySessionMessageSubscriptionCoordinator, j as resolveGatewayConnectScopes, k as GatewayBrowserDeviceAuthLifecycle, l as reduceSessionProjectionRunEvent, m as readAssistantStreamSegmentIdentity, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as normalizeSessionProjectionRunId, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as projectSessionTerminalReplyMessage, w as createAbortError, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect, z as buildDeviceAuthPayloadV3 } from "./session-subscriptions-hOI4k496.mjs";
+import { _ as normalizeOptionalString, a as MIN_CONNECT_CHALLENGE_TIMEOUT_MS, c as clearGatewayConnectTimeout, d as resolveFiniteTimeoutDelayMs, f as resolvePreauthHandshakeTimeoutMs, h as normalizeLowercaseStringOrEmpty, i as MAX_SAFE_TIMEOUT_DELAY_MS, l as getConnectChallengeTimeoutMsFromEnv, m as startGatewayConnectTimeout, n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, o as addSafeTimeoutDelayGraceMs, p as resolveSafeTimeoutDelayMs, r as MAX_CONNECT_CHALLENGE_TIMEOUT_MS, s as clampConnectChallengeTimeoutMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, u as resolveConnectChallengeTimeoutMs } from "./timeouts-F2UKsnjG.mjs";
 import { rawDataToString } from "./websocket-data.mjs";
-import { n as startGatewayClientWithReadinessWait, r as waitForEventLoopReady, t as startGatewayClientWhenEventLoopReady } from "./readiness-rG6_5Ynk.mjs";
+import { n as startGatewayClientWithReadinessWait, r as waitForEventLoopReady, t as startGatewayClientWhenEventLoopReady } from "./readiness-CwRz4ZX8.mjs";
 import { GatewayScopeUpgrade } from "./scope-upgrade.mjs";
 import { createRequire } from "node:module";
 import { ConnectErrorDetailCodes, formatConnectErrorMessage, readConnectErrorDetailCode } from "@openclaw/gateway-protocol/connect-error-details";

package/dist/{readiness-rG6_5Ynk.mjs → readiness-CwRz4ZX8.mjs}

@@ -1,4 +1,4 @@
-import { d as resolveFiniteTimeoutDelayMs, u as resolveConnectChallengeTimeoutMs } from "./timeouts-CQTCye5U.mjs";
+import { d as resolveFiniteTimeoutDelayMs, u as resolveConnectChallengeTimeoutMs } from "./timeouts-F2UKsnjG.mjs";
 //#region packages/gateway-client/src/event-loop-ready.ts
 const DEFAULT_MAX_WAIT_MS = 1e4;
 const DEFAULT_INTERVAL_MS = 1;
@@ -19,11 +19,8 @@ async function waitForEventLoopReady(options = {}) {
 	let checks = 0;
 	let maxDriftMs = 0;
 	return await new Promise((resolve) => {
-		let settled = false;
 		let timer = null;
 		const finish = (ready, aborted = false) => {
-			if (settled) return;
-			settled = true;
 			if (timer) {
 				clearTimeout(timer);
 				timer = null;
@@ -46,10 +43,6 @@ async function waitForEventLoopReady(options = {}) {
 		}
 		signal?.addEventListener("abort", onAbort, { once: true });
 		const scheduleNext = () => {
-			if (signal?.aborted) {
-				finish(false, true);
-				return;
-			}
 			const elapsedMs = Math.max(0, Date.now() - startedAt);
 			const remainingMs = maxWaitMs - elapsedMs;
 			if (remainingMs <= 0) {

package/dist/readiness.mjs

@@ -1,2 +1,2 @@
-import { n as startGatewayClientWithReadinessWait, t as startGatewayClientWhenEventLoopReady } from "./readiness-rG6_5Ynk.mjs";
+import { n as startGatewayClientWithReadinessWait, t as startGatewayClientWhenEventLoopReady } from "./readiness-CwRz4ZX8.mjs";
 export { startGatewayClientWhenEventLoopReady, startGatewayClientWithReadinessWait };

package/dist/{session-subscriptions-DE0w2upu.mjs → session-subscriptions-hOI4k496.mjs}

@@ -1,4 +1,4 @@
-import { _ as normalizeOptionalString, c as clearGatewayConnectTimeout, g as normalizeNullableString, m as startGatewayConnectTimeout, p as resolveSafeTimeoutDelayMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS } from "./timeouts-CQTCye5U.mjs";
+import { _ as normalizeOptionalString, c as clearGatewayConnectTimeout, g as normalizeNullableString, m as startGatewayConnectTimeout, p as resolveSafeTimeoutDelayMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS } from "./timeouts-F2UKsnjG.mjs";
 import { ConnectErrorDetailCodes, readConnectErrorDetailCode, readConnectErrorRecoveryAdvice, readPairingConnectErrorDetails } from "@openclaw/gateway-protocol/connect-error-details";
 import { isGatewayEventFrame, isGatewayResponseFrame } from "@openclaw/gateway-protocol/frame-guards";
 import { GATEWAY_SUSPEND_IDENTITY_RETRY_AFTER_MS, isGatewayRestartUnavailableError, isGatewaySuspendUnavailableError } from "@openclaw/gateway-protocol/restart-unavailable";
@@ -333,14 +333,13 @@ async function sleepWithAbort(ms, abortSignal, options = {}) {
 	const delayMs = resolveSleepDelayMs(ms);
 	if (delayMs === 0) return;
 	await new Promise((resolve, reject) => {
-		let settled = false;
-		let timer = null;
 		const cleanup = () => abortSignal?.removeEventListener("abort", onAbort);
+		const timer = setTimeout(() => {
+			cleanup();
+			resolve();
+		}, delayMs);
 		const onAbort = () => {
-			if (settled) return;
-			settled = true;
-			if (timer) clearTimeout(timer);
-			timer = null;
+			clearTimeout(timer);
 			cleanup();
 			reject(createAbortError("aborted", { cause: abortSignal?.reason ?? /* @__PURE__ */ new Error("aborted") }));
 		};
@@ -349,14 +348,7 @@ async function sleepWithAbort(ms, abortSignal, options = {}) {
 			onAbort();
 			return;
 		}
-		timer = setTimeout(() => {
-			settled = true;
-			cleanup();
-			timer = null;
-			resolve();
-		}, delayMs);
 		if (options.ref === false) timer.unref?.();
-		if (abortSignal?.aborted) onAbort();
 	});
 }
 var RetrySupervisor = class {
@@ -1597,6 +1589,39 @@ function isUnsequencedLiveTerminal(current, run) {
 	return Boolean(current.live && current.identity?.role === "assistant" && !current.identity.id && current.identity.sequence === null && run && run.status !== "streaming" && readFinalContentIdentity(current.message) === readFinalContentIdentity(run.message));
 }
 //#endregion
+//#region packages/gateway-client/src/session-projection-order.ts
+function insertSessionProjectionEntry(entries, incoming, runs) {
+	const sequence = incoming.identity?.sequence;
+	let nextIndex = sequence === void 0 || sequence === null ? -1 : entries.findIndex((entry) => {
+		const candidate = entry.identity?.sequence;
+		return candidate !== void 0 && candidate !== null && candidate > sequence;
+	});
+	if (sequence !== void 0 && sequence !== null && nextIndex < 0) nextIndex = entries.length;
+	if (incoming.identity?.role === "user" && incoming.identity.runId) {
+		const runId = incoming.identity.runId;
+		const terminalMessage = runs?.[runId]?.message;
+		const belongsToRun = (entry) => entry.identity?.role === "assistant" && (entry.identity.runId === runId || entry.message === terminalMessage) || entry.pending && entry.identity?.role === "user" && !entry.identity.isImported && asNullableRecord(asNullableRecord(entry.message)?.["__openclaw"])?.steerTargetRunId === runId;
+		if (sequence !== void 0 && sequence !== null) {
+			const before = [];
+			const dependents = [];
+			for (const entry of entries.slice(0, nextIndex)) (entry.identity?.sequence === null && belongsToRun(entry) ? dependents : before).push(entry);
+			return [
+				...before,
+				incoming,
+				...dependents,
+				...entries.slice(nextIndex)
+			];
+		}
+		const terminalIndex = entries.findIndex(belongsToRun);
+		if (terminalIndex >= 0 && (nextIndex < 0 || terminalIndex < nextIndex)) nextIndex = terminalIndex;
+	}
+	return nextIndex < 0 ? [...entries, incoming] : [
+		...entries.slice(0, nextIndex),
+		incoming,
+		...entries.slice(nextIndex)
+	];
+}
+//#endregion
 //#region packages/gateway-client/src/session-projection-run-retention.ts
 /** Bounded retention for completed and active session projection runs. */
 const MAX_TRACKED_SESSION_RUNS = 200;
@@ -1721,37 +1746,6 @@ function withEntries(state, entries) {
 		messages: entries.map((entry) => entry.message)
 	};
 }
-function insertEntry(entries, incoming, runs) {
-	const sequence = incoming.identity?.sequence;
-	let nextIndex = sequence === void 0 || sequence === null ? -1 : entries.findIndex((entry) => {
-		const candidate = entry.identity?.sequence;
-		return candidate !== void 0 && candidate !== null && candidate > sequence;
-	});
-	if (sequence !== void 0 && sequence !== null && nextIndex < 0) nextIndex = entries.length;
-	if (incoming.identity?.role === "user" && incoming.identity.runId) {
-		const runId = incoming.identity.runId;
-		const terminalMessage = runs?.[runId]?.message;
-		const belongsToRun = (entry) => entry.identity?.role === "assistant" && (entry.identity.runId === runId || entry.message === terminalMessage);
-		if (sequence !== void 0 && sequence !== null) {
-			const before = [];
-			const replies = [];
-			for (const entry of entries.slice(0, nextIndex)) (entry.identity?.sequence === null && belongsToRun(entry) ? replies : before).push(entry);
-			return [
-				...before,
-				incoming,
-				...replies,
-				...entries.slice(nextIndex)
-			];
-		}
-		const terminalIndex = entries.findIndex(belongsToRun);
-		if (terminalIndex >= 0 && (nextIndex < 0 || terminalIndex < nextIndex)) nextIndex = terminalIndex;
-	}
-	return nextIndex < 0 ? [...entries, incoming] : [
-		...entries.slice(0, nextIndex),
-		incoming,
-		...entries.slice(nextIndex)
-	];
-}
 function projectLiveSessionMessage(initialState, message, envelope, scope = {}) {
 	let state = initialState;
 	if (!scopesMatch(state.scope, scope)) return state;
@@ -1767,11 +1761,11 @@ function projectLiveSessionMessage(initialState, message, envelope, scope = {})
 		const provisional = durable === existing ? incoming : existing;
 		if (durable && isToolUsePersistedFinalRow(durable.message)) {
 			const history = state.entries.filter((entry) => entry !== provisional);
-			const snapshot = durable === incoming ? insertEntry(history, durable) : history;
+			const snapshot = durable === incoming ? insertSessionProjectionEntry(history, durable) : history;
 			const runId = provisional.identity?.runId;
 			const run = runId ? state.runs[runId] : void 0;
 			const terminalMatch = findUniqueSnapshotTerminalMatch(provisional, [durable], run, snapshot);
-			if (!terminalMatch) return withEntries(state, insertEntry(state.entries, incoming, state.runs));
+			if (!terminalMatch) return withEntries(state, insertSessionProjectionEntry(state.entries, incoming, state.runs));
 			if (terminalMatch.inferred && durable.identity && runId && run) {
 				const inferredSnapshotTerminal = {
 					entry: provisional,
@@ -1790,14 +1784,14 @@ function projectLiveSessionMessage(initialState, message, envelope, scope = {})
 			}
 		}
 	}
-	if (!existing) return withEntries(state, insertEntry(state.entries, incoming, state.runs));
+	if (!existing) return withEntries(state, insertSessionProjectionEntry(state.entries, incoming, state.runs));
 	const existingIndex = state.entries.indexOf(existing);
 	if (existing.message === message && existing.live && !existing.pending) return state;
 	if (!existing.pending && existing.identity?.id && !incoming.identity.id) return state;
 	if (incoming.identity.sequence !== null && (existing.pending || existing.identity?.sequence === null)) {
 		const sequence = incoming.identity.sequence;
 		const violatesOrder = state.entries.some(({ identity }, index) => identity?.sequence != null && (index < existingIndex ? identity.sequence > sequence : identity.sequence < sequence));
-		return withEntries(state, violatesOrder ? insertEntry(state.entries.filter((_, index) => index !== existingIndex), incoming, state.runs) : state.entries.toSpliced(existingIndex, 1, incoming));
+		return withEntries(state, violatesOrder ? insertSessionProjectionEntry(state.entries.filter((_, index) => index !== existingIndex), incoming, state.runs) : state.entries.toSpliced(existingIndex, 1, incoming));
 	}
 	return withEntries(state, state.entries.toSpliced(existingIndex, 1, incoming));
 }
@@ -1823,7 +1817,7 @@ function reconcileSessionProjectionSnapshot(state, messages, scope = {}, options
 			};
 			continue;
 		}
-		entries = insertEntry(entries, current, runs);
+		entries = insertSessionProjectionEntry(entries, current, runs);
 	}
 	for (const [runId, run] of Object.entries(runs)) {
 		const inferred = run.inferredSnapshotTerminal;
@@ -1833,7 +1827,7 @@ function reconcileSessionProjectionSnapshot(state, messages, scope = {}, options
 		const matches = entries.filter((entry) => entryMatches(entry, inferred.entry, true));
 		const terminalMatch = findUniqueSnapshotTerminalMatch(inferred.entry, matches, run, entries);
 		if (candidateRemains && visible && terminalMatch?.inferred) continue;
-		if (candidateRemains && visible && !terminalMatch) entries = insertEntry(entries, inferred.entry, runs);
+		if (candidateRemains && visible && !terminalMatch) entries = insertSessionProjectionEntry(entries, inferred.entry, runs);
 		const { inferredSnapshotTerminal: _inferred, ...settledRun } = run;
 		runs[runId] = settledRun;
 	}
@@ -1931,7 +1925,7 @@ function reduceSessionProjection(state, event) {
 				pending: true,
 				pendingRunId
 			} : entry));
-			return seed || state.entries.some((entry) => entryMatches(entry, incoming)) ? state : withEntries(state, insertEntry(state.entries, incoming, state.runs));
+			return seed || state.entries.some((entry) => entryMatches(entry, incoming)) ? state : withEntries(state, insertSessionProjectionEntry(state.entries, incoming, state.runs));
 		}
 		case "sendAcknowledged": {
 			const runId = normalizeSessionProjectionRunId(event.idempotencyKey ?? event.runId);
@@ -2095,16 +2089,6 @@ var GatewaySessionMessageSubscriptionCoordinator = class {
 				if (includeApprovals) entry.ready = this.#trackApprovalRequest(entry, entry.ready);
 				entry.ready.catch(() => void 0);
 			}
-			if (entry.refreshRequired) {
-				entry.refreshRequired = false;
-				entry.plainFallback = null;
-				entry.approvalRequest = null;
-				const retainedApprovals = [...entry.handles].some((handle) => handle.includeApprovals);
-				entry.ready = this.#requestSubscribe(entry, retainedApprovals).catch((error) => {
-					entry.refreshRequired = true;
-					throw error;
-				});
-			}
 			const result = await this.#acquireCapability(entry, includeApprovals);
 			if (!narration && entry.mode === "narration") await this.#requestSubscribe(entry, false, "full");
 			if (this.#retired) throw new Error("Session message subscription completed on a replaced Gateway connection");
@@ -2153,10 +2137,7 @@ var GatewaySessionMessageSubscriptionCoordinator = class {
 			return tracked;
 		}
 		const removeEntry = entry.handles.size === 1;
-		const tracked = (removeEntry ? this.#requestMessages(entry).catch((error) => {
-			if (error instanceof GatewayProtocolRequestTimeoutError && error.requestSent) entry.refreshRequired = true;
-			throw error;
-		}) : this.#requestSubscribe(entry, false, "narration")).then(() => this.#finishRelease(subscription, owner, removeEntry)).finally(() => {
+		const tracked = (removeEntry ? this.#requestMessages(entry) : this.#requestSubscribe(entry, false, "narration")).then(() => this.#finishRelease(subscription, owner, removeEntry)).finally(() => {
 			if (entry.release === tracked) entry.release = null;
 		});
 		entry.release = tracked;
@@ -2186,7 +2167,6 @@ var GatewaySessionMessageSubscriptionCoordinator = class {
 			wireRequest: null,
 			includeApprovals: false,
 			canonicalSettled: false,
-			refreshRequired: false,
 			handles: /* @__PURE__ */ new Set(),
 			pendingOwners: 0,
 			pendingFullOwners: 0,
@@ -2248,21 +2228,6 @@ var GatewaySessionMessageSubscriptionCoordinator = class {
 		const result = await this.#requestMessages(entry, {
 			mode,
 			includeApprovals
-		}).catch(async (error) => {
-			if (!(error instanceof GatewayProtocolRequestTimeoutError) || !error.requestSent || this.#retired) throw error;
-			try {
-				const retainedApprovals = [...entry.handles].some((handle) => handle.includeApprovals);
-				const retainedMode = entry.handles.size > 0 && [...entry.handles].every((handle) => handle.mode === "narration") ? "narration" : void 0;
-				await this.#requestMessages(entry, entry.handles.size > 0 ? {
-					mode: retainedMode,
-					includeApprovals: retainedApprovals
-				} : void 0);
-				entry.mode = retainedMode;
-				entry.includeApprovals = retainedApprovals;
-			} catch (recoveryError) {
-				if (!this.#retired) throw new AggregateError([error, recoveryError], "session message subscription recovery failed", { cause: recoveryError });
-			}
-			throw error;
 		});
 		const response = result && typeof result === "object" ? result : null;
 		const responseKey = response && "key" in response ? response.key : void 0;

package/dist/{timeouts-CQTCye5U.mjs → timeouts-F2UKsnjG.mjs}

@@ -39,7 +39,7 @@ function isTestRuntimeEnv(env) {
 /** Maximum delay Node timers can represent without overflow warnings. */
 const MAX_SAFE_TIMEOUT_DELAY_MS = 2147483647;
 /** Default server-side window for gateway preauth handshakes. */
-const DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS = 15e3;
+const DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS = 3e4;
 /** Starts the browser-safe deadline that covers Gateway connect preparation and hello. */
 function startGatewayConnectTimeout(onTimeout) {
 	const timer = setTimeout(onTimeout, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS);

package/dist/timeouts.d.mts

@@ -2,7 +2,7 @@
 /** Maximum delay Node timers can represent without overflow warnings. */
 export declare const MAX_SAFE_TIMEOUT_DELAY_MS = 2147483647;
 /** Default server-side window for gateway preauth handshakes. */
-export declare const DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS = 15000;
+export declare const DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS = 30000;
 /** Starts the browser-safe deadline that covers Gateway connect preparation and hello. */
 export declare function startGatewayConnectTimeout(onTimeout: () => void): ReturnType<typeof setTimeout>;
 /** Clears either pending Gateway handshake phase without retaining its timer. */
@@ -12,7 +12,7 @@ export declare const DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS = 30000;
 /** Minimum client watchdog delay for connect challenge setup. */
 export declare const MIN_CONNECT_CHALLENGE_TIMEOUT_MS = 250;
 /** Default maximum client watchdog delay, aligned with the preauth server timeout. */
-export declare const MAX_CONNECT_CHALLENGE_TIMEOUT_MS = 15000;
+export declare const MAX_CONNECT_CHALLENGE_TIMEOUT_MS = 30000;
 /** Clamps arbitrary timer delays to Node's safe range and an optional floor. */
 export declare function resolveSafeTimeoutDelayMs(delayMs: number, opts?: {
   minMs?: number;

package/dist/timeouts.mjs

@@ -1,2 +1,2 @@
-import { a as MIN_CONNECT_CHALLENGE_TIMEOUT_MS, c as clearGatewayConnectTimeout, d as resolveFiniteTimeoutDelayMs, f as resolvePreauthHandshakeTimeoutMs, i as MAX_SAFE_TIMEOUT_DELAY_MS, l as getConnectChallengeTimeoutMsFromEnv, m as startGatewayConnectTimeout, n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, o as addSafeTimeoutDelayGraceMs, p as resolveSafeTimeoutDelayMs, r as MAX_CONNECT_CHALLENGE_TIMEOUT_MS, s as clampConnectChallengeTimeoutMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, u as resolveConnectChallengeTimeoutMs } from "./timeouts-CQTCye5U.mjs";
+import { a as MIN_CONNECT_CHALLENGE_TIMEOUT_MS, c as clearGatewayConnectTimeout, d as resolveFiniteTimeoutDelayMs, f as resolvePreauthHandshakeTimeoutMs, i as MAX_SAFE_TIMEOUT_DELAY_MS, l as getConnectChallengeTimeoutMsFromEnv, m as startGatewayConnectTimeout, n as DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, o as addSafeTimeoutDelayGraceMs, p as resolveSafeTimeoutDelayMs, r as MAX_CONNECT_CHALLENGE_TIMEOUT_MS, s as clampConnectChallengeTimeoutMs, t as DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, u as resolveConnectChallengeTimeoutMs } from "./timeouts-F2UKsnjG.mjs";
 export { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, MAX_CONNECT_CHALLENGE_TIMEOUT_MS, MAX_SAFE_TIMEOUT_DELAY_MS, MIN_CONNECT_CHALLENGE_TIMEOUT_MS, addSafeTimeoutDelayGraceMs, clampConnectChallengeTimeoutMs, clearGatewayConnectTimeout, getConnectChallengeTimeoutMsFromEnv, resolveConnectChallengeTimeoutMs, resolveFiniteTimeoutDelayMs, resolvePreauthHandshakeTimeoutMs, resolveSafeTimeoutDelayMs, startGatewayConnectTimeout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/gateway-client",
-  "version": "2026.10.5-beta.4",
+  "version": "2026.10.10-beta.1",
   "description": "Reference WebSocket client for the OpenClaw Gateway protocol",
   "keywords": [
     "client",
@@ -62,7 +62,7 @@
     }
   },
   "dependencies": {
-    "@openclaw/gateway-protocol": "2026.10.5-beta.4",
+    "@openclaw/gateway-protocol": "2026.10.10-beta.1",
     "ipaddr.js": "2.5.0",
     "ws": "8.22.0"
   },