@openclaw/gateway-client 2026.9.6 → 2026.9.8

package/README.md

@@ -163,9 +163,23 @@ 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
-connect-challenge timeout, and exponential reconnect delays from 1 second to 30
-seconds with a multiplier of 2. Server-provided startup retry hints may override
-the next delay.
+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.
+Retryable server hints remain minimum waits and can extend beyond the normal cap,
+with up to 20% additional spread. Adapter-owned startup retry hints retain their
+exact next delay without advancing normal backoff.
+
+Browser adapters can observe the shared client's `onReconnectScheduled(delayMs,
+signal)` callback to display the actual retry wait, including jitter and timer
+bounds. The signal aborts when the wait is canceled or superseded; adapters should
+clear their countdown when creating the next socket.
+
+A sequence gap calls `onGap` and retires the socket unless the callback already
+replaced it. A gap-revealing `chat` final, aborted, or error event is delivered
+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
 pre-handshake values are documented in the
@@ -175,6 +189,67 @@ Use the `./timeouts` entry point when a host must align readiness or watchdog
 budgets with these defaults. Use the `./readiness` entry point when startup must
 wait for an event-loop probe before opening the socket.
 
+## Streaming chat
+
+Event callbacks receive the wire payload unchanged. A `chat` delta's optional
+`message` is an authoritative snapshot that already includes `deltaText`.
+Without `message`, append `deltaText` to the run's existing text. `replace: true`
+replaces the text, including an empty replacement. The first frame received for
+a run and frames that change canvas or media content supply a snapshot.
+
+Both public entries export `mergeChatStreamMessage(previousMessage, payload)`
+for clients that own their run state. The helper preserves nontext content and
+message metadata and never appends a snapshot's delta twice. An append without
+a baseline returns `undefined`; recover the connection instead of displaying
+an incomplete answer. `reduceSessionProjectionRunEvent` uses the same merge
+operation for clients using the shared session projection.
+
+The high-level `@openclaw/sdk` retains reconstructed chat and assistant-item text
+in its normalized run-event replay, so late readers can recover the text after the initial wire
+snapshot is evicted. Its `rawEvents()` and each normalized event's `raw` field
+still expose the original wire event, including omitted `message` fields.
+Normalized assistant events retain cumulative `data.text` for their current item;
+`data.delta` keeps its wire meaning, and the raw event can omit `data.text`.
+Active chat baselines remain protected while their connection is current. The
+SDK's concrete Gateway transport reconciles outstanding owned or observed runs
+after reconnect through `agent.wait`. Active chat runs can recover display text
+from an exact `chat.history.inFlightRun` match; newer live text always wins over
+an older history response. Assistant-item text re-baselines on its next wire
+snapshot because history contains display text, not raw assistant-item text.
+
+SDK and ACP recovery share `recoverTerminalReply`: it collects all assistant
+items for the run in transcript order, preserves live item boundaries, and reads
+full messages when history truncated them. Recovered text preserves leading
+indentation and trailing whitespace. It scans at most ten 200-record pages;
+an incomplete scan reports unavailable instead of presenting a partial reply. The
+bounded `terminalReply.text` summary is never used as complete output. Local
+normalized recovery events have no `raw` field. Their `data.recovery.status`
+reports `rebaselined`, `recovered`, or `unavailable`; unavailable full text omits
+`outputText`. A bare wait timeout is not a run terminal. Terminal observations
+have finite retention, and sessionless or unavailable transcript occurrences
+cannot be reconstructed; unknown outcomes remain unsettled with a recovery
+notice. Automatic recovery stops after four consecutive unavailable observations
+(initial probe plus three waits), releases retention protection, and stays stopped
+across reconnects. Confirmed activity resets that budget; late terminal frames can
+still settle the run. Queued replies use exponential backoff with the Gateway
+client's positive 20% jitter and a 25–30 second cap. ACP reports unavailable full
+text explicitly instead of settling with a partial answer. Closing the client or
+returning a run iterator cancels its recovery work.
+
+Reconnect retires old text baselines. Ending the transport event stream also
+releases outstanding-run protection, retaining only bounded replay. Custom
+`OpenClawTransport` implementations must deliver terminal outcomes or end a
+retired event stream; the generic transport interface does not expose reconnect
+notifications and does not receive this automatic reconciliation.
+Confirmed session unsubscribe also releases that session's baseline protection;
+it also releases unobserved runs accepted before their first output. The
+acknowledgment cannot retire a newer acceptance or subscription's snapshot. The concrete
+Gateway transport preserves acknowledgment and event order. Custom transports
+must preserve that ordering or end their retired event stream.
+For raw `global` or `unknown` session keys, pass `agentId` when unsubscribing
+to identify an agent-owned baseline. An unscoped acknowledgment cannot retire
+a baseline with a known agent owner.
+
 ## Bundled internals
 
 The retry supervisor and the small `@openclaw/net-policy/ip` implementation are

package/dist/browser.d.mts

@@ -1,7 +1,7 @@
-import { A as normalizeSessionProjectionRunId, C as reduceSessionProjectionRunEvent, D as SessionMessageIdentity, E as SessionMessageEnvelope, F as gatewayOriginScope, I as buildDeviceAuthPayload, L as buildDeviceAuthPayloadV3, M as readSessionMessageIdentity, N as readSessionMessageSequence, O as SessionProjectionEntry, P as gatewayCredentialScope, R as normalizeDeviceMetadataForAuth, S as SessionProjectionRunTransition, T as readSessionProjectionFinalMessageIdentity, _ as reconcileSessionProjectionSnapshot, a as GatewaySessionMessageSubscriptionOptions, b as projectSessionTerminalReplyMessage, c as resetGatewaySessionMessageSubscriptionCoordinator, d as SessionProjectionRunStatus, f as SessionProjectionScope, g as projectLiveSessionMessage, h as createSessionProjection, i as GatewaySessionMessageSubscriptionCoordinatorOptions, j as readAssistantStreamSegmentIdentity, k as isLocallyOptimisticSessionMessage, l as SessionProjectionEvent, m as SessionProjectionState, n as GatewaySessionMessageSubscription, o as getGatewaySessionMessageSubscriptionCoordinator, p as SessionProjectionSnapshotOptions, r as GatewaySessionMessageSubscriptionCoordinator, s as releaseGatewaySessionMessageSubscription, t as GatewaySessionMessageRequestClient, u as SessionProjectionRun, v as reduceSessionProjection, w as hasSessionProjectionAcceptedFinal, x as SessionProjectionGatewayRunEvent, y as isSessionProjectionErrorMessage } from "./session-subscriptions-C91CEXwY.mjs";
+import { A as normalizeSessionProjectionRunId, C as reduceSessionProjectionRunEvent, D as SessionMessageIdentity, E as SessionMessageEnvelope, F as gatewayOriginScope, I as mergeChatStreamMessage, L as buildDeviceAuthPayload, M as readSessionMessageIdentity, N as readSessionMessageSequence, O as SessionProjectionEntry, P as gatewayCredentialScope, R as buildDeviceAuthPayloadV3, S as SessionProjectionRunTransition, T as readSessionProjectionFinalMessageIdentity, _ as reconcileSessionProjectionSnapshot, a as GatewaySessionMessageSubscriptionOptions, b as projectSessionTerminalReplyMessage, c as resetGatewaySessionMessageSubscriptionCoordinator, d as SessionProjectionRunStatus, f as SessionProjectionScope, g as projectLiveSessionMessage, h as createSessionProjection, i as GatewaySessionMessageSubscriptionCoordinatorOptions, j as readAssistantStreamSegmentIdentity, k as isLocallyOptimisticSessionMessage, l as SessionProjectionEvent, m as SessionProjectionState, n as GatewaySessionMessageSubscription, o as getGatewaySessionMessageSubscriptionCoordinator, p as SessionProjectionSnapshotOptions, r as GatewaySessionMessageSubscriptionCoordinator, s as releaseGatewaySessionMessageSubscription, t as GatewaySessionMessageRequestClient, u as SessionProjectionRun, v as reduceSessionProjection, w as hasSessionProjectionAcceptedFinal, x as SessionProjectionGatewayRunEvent, y as isSessionProjectionErrorMessage, z as normalizeDeviceMetadataForAuth } from "./session-subscriptions-Bcq6_wtR.mjs";
 import { a as GatewayBrowserDeviceTokenStore, c as resolveGatewayConnectScopes, i as GatewayBrowserDeviceTokenRecord, l as selectGatewayConnectAuth, n as GatewayBrowserDeviceAuthPlan, o as GatewayConnectAuthSelection, r as GatewayBrowserDeviceIdentity, s as buildGatewayConnectAuth, t as GatewayBrowserDeviceAuthLifecycle, u as shouldRetryGatewayWithDeviceToken } from "./browser-device-auth-DoPo-sPB.mjs";
 import { i as isGatewayProtocolResponseError, n as GatewayProtocolRequestOptions, r as GatewayProtocolRequestTimeoutError, t as GatewayProtocolRequestError } from "./protocol-request-CtVhe3Bj.mjs";
-import { a as GatewayProtocolSocketHandlers, i as GatewayProtocolSocket, n as GatewayProtocolCloseContext, o as GatewayProtocolTiming, r as GatewayProtocolConnectAuthority, s as GatewayProtocolRequestTiming, t as GatewayProtocolClient } from "./protocol-client-D6mJuY1_.mjs";
+import { a as GatewayProtocolConnectAuthority, c as GatewayProtocolTiming, i as GatewayProtocolCloseContext, l as GatewayProtocolRequestTiming, o as GatewayProtocolSocket, s as GatewayProtocolSocketHandlers, t as GatewayProtocolClient } from "./protocol-client-DT451Msj.mjs";
 import { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, resolveSafeTimeoutDelayMs } from "./timeouts.mjs";
 import { ConnectParams as ConnectParams$1, GATEWAY_SERVER_CAPS } from "@openclaw/gateway-protocol/frame-guards";
 import { ConnectParams, ErrorShape, EventFrame, HelloOk } from "@openclaw/gateway-protocol";
@@ -10,6 +10,26 @@ export * from "@openclaw/gateway-protocol/gateway-error-details";
 export * from "@openclaw/gateway-protocol/client-info";
 export * from "@openclaw/gateway-protocol/startup-unavailable";
 export * from "@openclaw/gateway-protocol/version";
+//#region packages/gateway-client/src/chat-stream-projection.d.ts
+type ChatStreamScope = {
+  sessionKey: string;
+  agentId: unknown;
+};
+type ChatStreamEvent = {
+  event: string;
+  payload?: unknown;
+};
+/** Connection-owned chat baselines, independent of the selected local view. */
+export declare class GatewayChatStreamProjection {
+  private readonly runs;
+  project<T extends ChatStreamEvent>(event: T): {
+    event: T;
+    missingBaseline: boolean;
+  };
+  retire(isRetired: (scope: ChatStreamScope) => boolean): void;
+  clear(): void;
+}
+//#endregion
 //#region packages/gateway-client/src/model-catalog-connect.d.ts
 /** A requested snapshot opts in only after the server advertises its connect field. */
 export declare function resolveModelCatalogConnect(params: {
@@ -27,4 +47,4 @@ export declare function shouldPauseGatewayReconnect(params: {
   clientVersionMismatchIsTerminal?: boolean;
 }): boolean;
 //#endregion
-export { type ConnectParams, DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, type ErrorShape, type EventFrame, GATEWAY_SERVER_CAPS, GatewayBrowserDeviceAuthLifecycle, GatewayBrowserDeviceAuthPlan, GatewayBrowserDeviceIdentity, GatewayBrowserDeviceTokenRecord, GatewayBrowserDeviceTokenStore, GatewayConnectAuthSelection, GatewayProtocolClient, type GatewayProtocolCloseContext, type GatewayProtocolConnectAuthority, GatewayProtocolRequestError, type GatewayProtocolRequestOptions, GatewayProtocolRequestTimeoutError, type GatewayProtocolRequestTiming, type GatewayProtocolSocket, type GatewayProtocolSocketHandlers, type GatewayProtocolTiming, GatewaySessionMessageRequestClient, GatewaySessionMessageSubscription, GatewaySessionMessageSubscriptionCoordinator, GatewaySessionMessageSubscriptionCoordinatorOptions, GatewaySessionMessageSubscriptionOptions, type HelloOk, type SessionMessageEnvelope, type SessionMessageIdentity, type SessionProjectionEntry, SessionProjectionEvent, type SessionProjectionGatewayRunEvent, SessionProjectionRun, SessionProjectionRunStatus, type SessionProjectionRunTransition, SessionProjectionScope, SessionProjectionSnapshotOptions, SessionProjectionState, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveGatewayConnectScopes, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken };
+export { type ConnectParams, DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, type ErrorShape, type EventFrame, GATEWAY_SERVER_CAPS, GatewayBrowserDeviceAuthLifecycle, GatewayBrowserDeviceAuthPlan, GatewayBrowserDeviceIdentity, GatewayBrowserDeviceTokenRecord, GatewayBrowserDeviceTokenStore, GatewayConnectAuthSelection, GatewayProtocolClient, type GatewayProtocolCloseContext, type GatewayProtocolConnectAuthority, GatewayProtocolRequestError, type GatewayProtocolRequestOptions, GatewayProtocolRequestTimeoutError, type GatewayProtocolRequestTiming, type GatewayProtocolSocket, type GatewayProtocolSocketHandlers, type GatewayProtocolTiming, GatewaySessionMessageRequestClient, GatewaySessionMessageSubscription, GatewaySessionMessageSubscriptionCoordinator, GatewaySessionMessageSubscriptionCoordinatorOptions, GatewaySessionMessageSubscriptionOptions, type HelloOk, type SessionMessageEnvelope, type SessionMessageIdentity, type SessionProjectionEntry, SessionProjectionEvent, type SessionProjectionGatewayRunEvent, SessionProjectionRun, SessionProjectionRunStatus, type SessionProjectionRunTransition, SessionProjectionScope, SessionProjectionSnapshotOptions, SessionProjectionState, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, mergeChatStreamMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveGatewayConnectScopes, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken };

package/dist/browser.mjs

@@ -1,4 +1,4 @@
-import { A as resolveGatewayConnectScopes, C as GatewayProtocolRequestTimeoutError, D as gatewayOriginScope, E as gatewayCredentialScope, F as normalizeDeviceMetadataForAuth, M as shouldRetryGatewayWithDeviceToken, N as buildDeviceAuthPayload, O as GatewayBrowserDeviceAuthLifecycle, P as buildDeviceAuthPayloadV3, S as GatewayProtocolRequestError, T as resolveModelCatalogConnect, _ as readSessionMessageIdentity, a as createSessionProjection, b as shouldPauseGatewayReconnect, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isSessionProjectionErrorMessage, g as readAssistantStreamSegmentIdentity, h as normalizeSessionProjectionRunId, i as resetGatewaySessionMessageSubscriptionCoordinator, j as selectGatewayConnectAuth, k as buildGatewayConnectAuth, l as reduceSessionProjectionRunEvent, m as isLocallyOptimisticSessionMessage, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as projectSessionTerminalReplyMessage, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as readSessionMessageSequence, w as isGatewayProtocolResponseError, x as GatewayProtocolClient } from "./session-subscriptions-DUpRfWJb.mjs";
+import { A as selectGatewayConnectAuth, C as isGatewayProtocolResponseError, D as GatewayBrowserDeviceAuthLifecycle, E as gatewayOriginScope, I as buildDeviceAuthPayload, L as buildDeviceAuthPayloadV3, M as mergeChatStreamMessage, N as asNullableRecord, O as buildGatewayConnectAuth, R as normalizeDeviceMetadataForAuth, S as GatewayProtocolRequestTimeoutError, T as gatewayCredentialScope, _ as readSessionMessageIdentity, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isSessionProjectionErrorMessage, g as readAssistantStreamSegmentIdentity, h as normalizeSessionProjectionRunId, i as resetGatewaySessionMessageSubscriptionCoordinator, j as shouldRetryGatewayWithDeviceToken, k as resolveGatewayConnectScopes, l as reduceSessionProjectionRunEvent, m as isLocallyOptimisticSessionMessage, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as projectSessionTerminalReplyMessage, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as readSessionMessageSequence, w as resolveModelCatalogConnect, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect } from "./session-subscriptions-LtlX9oRQ.mjs";
 import { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, resolveSafeTimeoutDelayMs } from "./timeouts.mjs";
 import { GATEWAY_SERVER_CAPS } from "@openclaw/gateway-protocol/frame-guards";
 export * from "@openclaw/gateway-protocol/connect-error-details";
@@ -6,4 +6,53 @@ export * from "@openclaw/gateway-protocol/gateway-error-details";
 export * from "@openclaw/gateway-protocol/client-info";
 export * from "@openclaw/gateway-protocol/startup-unavailable";
 export * from "@openclaw/gateway-protocol/version";
-export { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, GATEWAY_SERVER_CAPS, GatewayBrowserDeviceAuthLifecycle, GatewayProtocolClient, GatewayProtocolRequestError, GatewayProtocolRequestTimeoutError, GatewaySessionMessageSubscriptionCoordinator, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveGatewayConnectScopes, resolveModelCatalogConnect, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldPauseGatewayReconnect, shouldRetryGatewayWithDeviceToken };
+//#region packages/gateway-client/src/chat-stream-projection.ts
+/** Connection-owned chat baselines, independent of the selected local view. */
+var GatewayChatStreamProjection = class {
+	constructor() {
+		this.runs = /* @__PURE__ */ new Map();
+	}
+	project(event) {
+		if (event.event !== "chat") return {
+			event,
+			missingBaseline: false
+		};
+		const payload = asNullableRecord(event.payload);
+		if (!payload || typeof payload.runId !== "string" || typeof payload.sessionKey !== "string") return {
+			event,
+			missingBaseline: false
+		};
+		if (payload.state === "delta") {
+			const previous = this.runs.get(payload.runId);
+			const message = mergeChatStreamMessage(previous?.sessionKey === payload.sessionKey && previous.agentId === payload.agentId ? previous.message : void 0, payload);
+			if (message !== void 0) this.runs.set(payload.runId, {
+				sessionKey: payload.sessionKey,
+				agentId: payload.agentId,
+				message
+			});
+			return {
+				event: {
+					...event,
+					payload: {
+						...payload,
+						message
+					}
+				},
+				missingBaseline: message === void 0
+			};
+		}
+		if (payload.state === "final" || payload.state === "error" || payload.state === "aborted") this.runs.delete(payload.runId);
+		return {
+			event,
+			missingBaseline: false
+		};
+	}
+	retire(isRetired) {
+		for (const [runId, scope] of this.runs) if (isRetired(scope)) this.runs.delete(runId);
+	}
+	clear() {
+		this.runs.clear();
+	}
+};
+//#endregion
+export { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, GATEWAY_SERVER_CAPS, GatewayBrowserDeviceAuthLifecycle, GatewayChatStreamProjection, GatewayProtocolClient, GatewayProtocolRequestError, GatewayProtocolRequestTimeoutError, GatewaySessionMessageSubscriptionCoordinator, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, mergeChatStreamMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveGatewayConnectScopes, resolveModelCatalogConnect, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldPauseGatewayReconnect, shouldRetryGatewayWithDeviceToken };

package/dist/index.d.mts

@@ -1,9 +1,27 @@
-import { A as normalizeSessionProjectionRunId, C as reduceSessionProjectionRunEvent, D as SessionMessageIdentity, E as SessionMessageEnvelope, F as gatewayOriginScope, I as buildDeviceAuthPayload, L as buildDeviceAuthPayloadV3, M as readSessionMessageIdentity, N as readSessionMessageSequence, O as SessionProjectionEntry, P as gatewayCredentialScope, R as normalizeDeviceMetadataForAuth, S as SessionProjectionRunTransition, T as readSessionProjectionFinalMessageIdentity, _ as reconcileSessionProjectionSnapshot, a as GatewaySessionMessageSubscriptionOptions, b as projectSessionTerminalReplyMessage, c as resetGatewaySessionMessageSubscriptionCoordinator, d as SessionProjectionRunStatus, f as SessionProjectionScope, g as projectLiveSessionMessage, h as createSessionProjection, i as GatewaySessionMessageSubscriptionCoordinatorOptions, j as readAssistantStreamSegmentIdentity, k as isLocallyOptimisticSessionMessage, l as SessionProjectionEvent, m as SessionProjectionState, n as GatewaySessionMessageSubscription, o as getGatewaySessionMessageSubscriptionCoordinator, p as SessionProjectionSnapshotOptions, r as GatewaySessionMessageSubscriptionCoordinator, s as releaseGatewaySessionMessageSubscription, t as GatewaySessionMessageRequestClient, u as SessionProjectionRun, v as reduceSessionProjection, w as hasSessionProjectionAcceptedFinal, x as SessionProjectionGatewayRunEvent, y as isSessionProjectionErrorMessage } from "./session-subscriptions-C91CEXwY.mjs";
+import { A as normalizeSessionProjectionRunId, C as reduceSessionProjectionRunEvent, D as SessionMessageIdentity, E as SessionMessageEnvelope, F as gatewayOriginScope, I as mergeChatStreamMessage, L as buildDeviceAuthPayload, M as readSessionMessageIdentity, N as readSessionMessageSequence, O as SessionProjectionEntry, P as gatewayCredentialScope, R as buildDeviceAuthPayloadV3, S as SessionProjectionRunTransition, T as readSessionProjectionFinalMessageIdentity, _ as reconcileSessionProjectionSnapshot, a as GatewaySessionMessageSubscriptionOptions, b as projectSessionTerminalReplyMessage, c as resetGatewaySessionMessageSubscriptionCoordinator, d as SessionProjectionRunStatus, f as SessionProjectionScope, g as projectLiveSessionMessage, h as createSessionProjection, i as GatewaySessionMessageSubscriptionCoordinatorOptions, j as readAssistantStreamSegmentIdentity, k as isLocallyOptimisticSessionMessage, l as SessionProjectionEvent, m as SessionProjectionState, n as GatewaySessionMessageSubscription, o as getGatewaySessionMessageSubscriptionCoordinator, p as SessionProjectionSnapshotOptions, r as GatewaySessionMessageSubscriptionCoordinator, s as releaseGatewaySessionMessageSubscription, t as GatewaySessionMessageRequestClient, u as SessionProjectionRun, v as reduceSessionProjection, w as hasSessionProjectionAcceptedFinal, x as SessionProjectionGatewayRunEvent, y as isSessionProjectionErrorMessage, z as normalizeDeviceMetadataForAuth } from "./session-subscriptions-Bcq6_wtR.mjs";
 import { a as GatewayBrowserDeviceTokenStore, c as resolveGatewayConnectScopes, i as GatewayBrowserDeviceTokenRecord, l as selectGatewayConnectAuth, n as GatewayBrowserDeviceAuthPlan, o as GatewayConnectAuthSelection, r as GatewayBrowserDeviceIdentity, s as buildGatewayConnectAuth, t as GatewayBrowserDeviceAuthLifecycle, u as shouldRetryGatewayWithDeviceToken } from "./browser-device-auth-DoPo-sPB.mjs";
 import { i as isGatewayProtocolResponseError } from "./protocol-request-CtVhe3Bj.mjs";
+import { n as GatewayClientCloseInfo, r as GatewayClientConnectionMetadata } from "./protocol-client-DT451Msj.mjs";
 import { 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 } from "./timeouts.mjs";
-import { _ as GatewayReconnectPausedInfo, a as startGatewayClientWithReadinessWait, b as DeviceAuthTokenRecord, c as waitForEventLoopReady, d as GatewayClientCloseInfo, f as GatewayClientConnectionMetadata, g as GatewayClientRequestTimeoutError, h as GatewayClientRequestOptions, i as startGatewayClientWhenEventLoopReady, l as DeviceIdentity, m as GatewayClientOptions, n as GatewayClientStartReadinessOptions, o as EventLoopReadyOptions, p as GatewayClientHostDeps, r as GatewayClientStartable, s as EventLoopReadyResult, t as EventLoopReadyWaiter, u as GatewayClient, v as GatewayClientRequestError, y as isGatewayConnectAssemblyError } from "./readiness-ChxbBSMj.mjs";
+import { _ as isGatewayConnectAssemblyError, a as startGatewayClientWithReadinessWait, c as waitForEventLoopReady, d as GatewayClientHostDeps, f as GatewayClientOptions, g as GatewayClientRequestError, h as GatewayReconnectPausedInfo, i as startGatewayClientWhenEventLoopReady, l as DeviceIdentity, m as GatewayClientRequestTimeoutError, n as GatewayClientStartReadinessOptions, o as EventLoopReadyOptions, p as GatewayClientRequestOptions, r as GatewayClientStartable, s as EventLoopReadyResult, t as EventLoopReadyWaiter, u as GatewayClient, v as DeviceAuthTokenRecord } from "./readiness-Cj5C24o2.mjs";
 import { GatewayScopeUpgrade, ScopeUpgradeBinding, ScopeUpgradeOptions, ScopeUpgradeOutcome } from "./scope-upgrade.mjs";
+//#region packages/gateway-client/src/run-recovery-text.d.ts
+export type RecoveryRequest = (method: string, params: Record<string, unknown>, signal: AbortSignal) => Promise<unknown>;
+export declare function recoverTerminalReply(params: {
+  runId: string;
+  scope: {
+    sessionKey?: string;
+    agentId?: string;
+    sessionId?: string;
+  };
+  result: unknown;
+  request: RecoveryRequest;
+  signal: AbortSignal;
+}): Promise<{
+  outputText?: string;
+  unavailable?: string;
+}>;
+//#endregion
 //#region packages/gateway-client/src/cloudflare-access.d.ts
 export declare const CF_ACCESS_CLIENT_ID_HEADER = "CF-Access-Client-Id";
 export declare const CF_ACCESS_CLIENT_SECRET_HEADER = "CF-Access-Client-Secret";
@@ -14,4 +32,4 @@ export type CloudflareAccessCredentials = Readonly<{
 /** Build only the two headers Cloudflare Access defines for service-token auth. */
 export declare function buildCloudflareAccessHeaders(credentials: CloudflareAccessCredentials): Record<string, string>;
 //#endregion
-export { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, type DeviceAuthTokenRecord, DeviceIdentity, EventLoopReadyOptions, EventLoopReadyResult, EventLoopReadyWaiter, GatewayBrowserDeviceAuthLifecycle, GatewayBrowserDeviceAuthPlan, GatewayBrowserDeviceIdentity, GatewayBrowserDeviceTokenRecord, GatewayBrowserDeviceTokenStore, GatewayClient, GatewayClientCloseInfo, GatewayClientConnectionMetadata, GatewayClientHostDeps, GatewayClientOptions, GatewayClientRequestError, GatewayClientRequestOptions, GatewayClientRequestTimeoutError, GatewayClientStartReadinessOptions, GatewayClientStartable, GatewayConnectAuthSelection, GatewayReconnectPausedInfo, GatewayScopeUpgrade, GatewaySessionMessageRequestClient, GatewaySessionMessageSubscription, GatewaySessionMessageSubscriptionCoordinator, GatewaySessionMessageSubscriptionCoordinatorOptions, GatewaySessionMessageSubscriptionOptions, MAX_CONNECT_CHALLENGE_TIMEOUT_MS, MAX_SAFE_TIMEOUT_DELAY_MS, MIN_CONNECT_CHALLENGE_TIMEOUT_MS, ScopeUpgradeBinding, ScopeUpgradeOptions, ScopeUpgradeOutcome, type SessionMessageEnvelope, type SessionMessageIdentity, type SessionProjectionEntry, SessionProjectionEvent, type SessionProjectionGatewayRunEvent, SessionProjectionRun, SessionProjectionRunStatus, type SessionProjectionRunTransition, SessionProjectionScope, SessionProjectionSnapshotOptions, SessionProjectionState, addSafeTimeoutDelayGraceMs, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, clampConnectChallengeTimeoutMs, clearGatewayConnectTimeout, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getConnectChallengeTimeoutMsFromEnv, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayConnectAssemblyError, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveConnectChallengeTimeoutMs, resolveFiniteTimeoutDelayMs, resolveGatewayConnectScopes, resolvePreauthHandshakeTimeoutMs, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken, startGatewayClientWhenEventLoopReady, startGatewayClientWithReadinessWait, startGatewayConnectTimeout, waitForEventLoopReady };
+export { DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, type DeviceAuthTokenRecord, DeviceIdentity, EventLoopReadyOptions, EventLoopReadyResult, EventLoopReadyWaiter, GatewayBrowserDeviceAuthLifecycle, GatewayBrowserDeviceAuthPlan, GatewayBrowserDeviceIdentity, GatewayBrowserDeviceTokenRecord, GatewayBrowserDeviceTokenStore, GatewayClient, type GatewayClientCloseInfo, type GatewayClientConnectionMetadata, GatewayClientHostDeps, GatewayClientOptions, GatewayClientRequestError, GatewayClientRequestOptions, GatewayClientRequestTimeoutError, GatewayClientStartReadinessOptions, GatewayClientStartable, GatewayConnectAuthSelection, GatewayReconnectPausedInfo, GatewayScopeUpgrade, GatewaySessionMessageRequestClient, GatewaySessionMessageSubscription, GatewaySessionMessageSubscriptionCoordinator, GatewaySessionMessageSubscriptionCoordinatorOptions, GatewaySessionMessageSubscriptionOptions, MAX_CONNECT_CHALLENGE_TIMEOUT_MS, MAX_SAFE_TIMEOUT_DELAY_MS, MIN_CONNECT_CHALLENGE_TIMEOUT_MS, ScopeUpgradeBinding, ScopeUpgradeOptions, ScopeUpgradeOutcome, type SessionMessageEnvelope, type SessionMessageIdentity, type SessionProjectionEntry, SessionProjectionEvent, type SessionProjectionGatewayRunEvent, SessionProjectionRun, SessionProjectionRunStatus, type SessionProjectionRunTransition, SessionProjectionScope, SessionProjectionSnapshotOptions, SessionProjectionState, addSafeTimeoutDelayGraceMs, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, clampConnectChallengeTimeoutMs, clearGatewayConnectTimeout, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getConnectChallengeTimeoutMsFromEnv, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayConnectAssemblyError, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, mergeChatStreamMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveConnectChallengeTimeoutMs, resolveFiniteTimeoutDelayMs, resolveGatewayConnectScopes, resolvePreauthHandshakeTimeoutMs, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken, startGatewayClientWhenEventLoopReady, startGatewayClientWithReadinessWait, startGatewayConnectTimeout, waitForEventLoopReady };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { A as resolveGatewayConnectScopes, C as GatewayProtocolRequestTimeoutError, D as gatewayOriginScope, E as gatewayCredentialScope, F as normalizeDeviceMetadataForAuth, M as shouldRetryGatewayWithDeviceToken, N as buildDeviceAuthPayload, O as GatewayBrowserDeviceAuthLifecycle, P as buildDeviceAuthPayloadV3, S as GatewayProtocolRequestError, T as resolveModelCatalogConnect, _ as readSessionMessageIdentity, a as createSessionProjection, b as shouldPauseGatewayReconnect, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isSessionProjectionErrorMessage, g as readAssistantStreamSegmentIdentity, h as normalizeSessionProjectionRunId, i as resetGatewaySessionMessageSubscriptionCoordinator, j as selectGatewayConnectAuth, k as buildGatewayConnectAuth, l as reduceSessionProjectionRunEvent, m as isLocallyOptimisticSessionMessage, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as projectSessionTerminalReplyMessage, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as readSessionMessageSequence, w as isGatewayProtocolResponseError, x as GatewayProtocolClient, y as isRecord } from "./session-subscriptions-DUpRfWJb.mjs";
+import { A as selectGatewayConnectAuth, C as isGatewayProtocolResponseError, D as GatewayBrowserDeviceAuthLifecycle, E as gatewayOriginScope, F as isRecord, I as buildDeviceAuthPayload, L as buildDeviceAuthPayloadV3, M as mergeChatStreamMessage, O as buildGatewayConnectAuth, P as asRecord, R as normalizeDeviceMetadataForAuth, S as GatewayProtocolRequestTimeoutError, T as gatewayCredentialScope, _ as readSessionMessageIdentity, a as createSessionProjection, b as GatewayProtocolClient, c as reduceSessionProjection, d as readSessionProjectionFinalMessageIdentity, f as isSessionProjectionErrorMessage, g as readAssistantStreamSegmentIdentity, h as normalizeSessionProjectionRunId, i as resetGatewaySessionMessageSubscriptionCoordinator, j as shouldRetryGatewayWithDeviceToken, k as resolveGatewayConnectScopes, l as reduceSessionProjectionRunEvent, m as isLocallyOptimisticSessionMessage, n as getGatewaySessionMessageSubscriptionCoordinator, o as projectLiveSessionMessage, p as projectSessionTerminalReplyMessage, r as releaseGatewaySessionMessageSubscription, s as reconcileSessionProjectionSnapshot, t as GatewaySessionMessageSubscriptionCoordinator, u as hasSessionProjectionAcceptedFinal, v as readSessionMessageSequence, w as resolveModelCatalogConnect, x as GatewayProtocolRequestError, y as shouldPauseGatewayReconnect } from "./session-subscriptions-LtlX9oRQ.mjs";
 import { 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 } from "./timeouts.mjs";
 import { rawDataToString } from "./websocket-data.mjs";
 import { n as startGatewayClientWithReadinessWait, r as waitForEventLoopReady, t as startGatewayClientWhenEventLoopReady } from "./readiness-CrWxd4TI.mjs";
@@ -10,7 +10,8 @@ import { resolveGatewayStartupRetryAfterMs } from "@openclaw/gateway-protocol/st
 import { MIN_CLIENT_PROTOCOL_VERSION, MIN_NODE_PROTOCOL_VERSION, MIN_PROBE_PROTOCOL_VERSION, PROTOCOL_VERSION } from "@openclaw/gateway-protocol/version";
 import { randomUUID } from "node:crypto";
 import ipaddr from "ipaddr.js";
-import { TLSSocket } from "node:tls";
+import { isIP } from "node:net";
+import { TLSSocket, checkServerIdentity } from "node:tls";
 import path from "node:path";
 //#region packages/normalization-core/src/string-coerce.ts
 /** Trims string input and returns null for non-strings or empty strings. */
@@ -82,10 +83,7 @@ function normalizeUrlQueryParamName(name) {
 		try {
 			decoded = decodeURIComponent(current).replace(URL_QUERY_NAME_SEPARATOR_RE, "");
 		} catch {
-			return {
-				value: normalizeLowercaseStringOrEmpty(current).replaceAll("-", "_"),
-				unresolvedEncoding: current.includes("%")
-			};
+			break;
 		}
 		if (decoded === current) return {
 			value: normalizeLowercaseStringOrEmpty(current).replaceAll("-", "_"),
@@ -159,9 +157,7 @@ function redactQueryString(value, depth) {
 		redactedEntries.push([redactedKey, redactedValue]);
 	}
 	if (!mutated) return value;
-	const redactedParams = new URLSearchParams();
-	for (const [key, entryValue] of redactedEntries) redactedParams.append(key, entryValue);
-	return redactedParams.toString();
+	return new URLSearchParams(redactedEntries).toString();
 }
 function redactUrlLikeFallback(value) {
 	return redactSensitiveUrlPath(redactEmbeddedUrlUserInfo(value).replace(/([?&])([^=&]+)=([^&]*)/g, (match, prefix, key) => isSensitiveUrlQueryParamName$1(key) ? `${prefix}${key}=***` : match));
@@ -172,14 +168,14 @@ function redactAuthorityUserInfo(candidate, authorityStart) {
 	if (userInfoEnd < 0) return candidate;
 	return `${candidate.slice(0, authorityStart)}***:***@${authority.slice(userInfoEnd + 1)}`;
 }
+function skipAuthoritySeparators(candidate, start) {
+	let cursor = start;
+	while (candidate[cursor] === "/" || candidate[cursor] === "\\") cursor += 1;
+	return cursor;
+}
 function redactEmbeddedUrlUserInfo(value) {
-	return value.replace(SPECIAL_SCHEME_AUTHORITY_RE, (candidate) => {
-		let authorityStart = candidate.indexOf(":") + 1;
-		while (authorityStart < candidate.length && (candidate[authorityStart] === "/" || candidate[authorityStart] === "\\")) authorityStart += 1;
-		return redactAuthorityUserInfo(candidate, authorityStart);
-	}).replace(SPECIAL_SCHEME_SPILLED_USERINFO_RE, (candidate) => {
-		let authorityStart = candidate.indexOf(":") + 1;
-		while (authorityStart < candidate.length && (candidate[authorityStart] === "/" || candidate[authorityStart] === "\\")) authorityStart += 1;
+	return value.replace(SPECIAL_SCHEME_AUTHORITY_RE, (candidate) => redactAuthorityUserInfo(candidate, skipAuthoritySeparators(candidate, candidate.indexOf(":") + 1))).replace(SPECIAL_SCHEME_SPILLED_USERINFO_RE, (candidate) => {
+		const authorityStart = skipAuthoritySeparators(candidate, candidate.indexOf(":") + 1);
 		const userInfoEnd = candidate.lastIndexOf("@");
 		const firstReservedDelimiter = candidate.slice(authorityStart).search(/[\\/?#]/u);
 		if (userInfoEnd < 0 || firstReservedDelimiter < 0) return candidate;
@@ -191,11 +187,7 @@ function redactEmbeddedUrlUserInfo(value) {
 		const possiblePort = candidate.slice(credentialSeparator + 1, absoluteReservedDelimiter);
 		if (/^\d+$/u.test(possiblePort) || /^\[[^\]]+\](?::\d+)?$/u.test(authorityPrefix)) return candidate;
 		return `${candidate.slice(0, authorityStart)}***:***@${candidate.slice(userInfoEnd + 1)}`;
-	}).replace(PROTOCOL_RELATIVE_AUTHORITY_RE, (candidate) => {
-		let authorityStart = 0;
-		while (authorityStart < candidate.length && (candidate[authorityStart] === "/" || candidate[authorityStart] === "\\")) authorityStart += 1;
-		return redactAuthorityUserInfo(candidate, authorityStart);
-	});
+	}).replace(PROTOCOL_RELATIVE_AUTHORITY_RE, (candidate) => redactAuthorityUserInfo(candidate, skipAuthoritySeparators(candidate, 0)));
 }
 function hasUnresolvedEmbeddedUrlUserInfo(value) {
 	for (const match of value.matchAll(/(?:\b(?:https?|wss?|ftp):[\\/]{0,2}|[\\/]{2,})/giu)) {
@@ -219,16 +211,15 @@ function redactFragment(value, depth) {
 	if (depth > MAX_NESTED_URL_REDACTION_DEPTH && looksLikeNestedUrlValue(value)) return "***";
 	const wholeUrl = redactSensitiveUrlAtDepth(value, depth);
 	if (wholeUrl.parsedWholeUrl) return redactUrlLikeFallback(wholeUrl.value);
-	const candidate = value;
-	const firstQueryDelimiter = candidate.search(/[?&]/u);
-	const firstEquals = candidate.indexOf("=");
-	if (firstEquals >= 0 && (firstQueryDelimiter < 0 || firstEquals < firstQueryDelimiter)) return redactQueryString(candidate, depth);
-	const hashRouterQueryIndex = candidate.indexOf("?");
+	const firstQueryDelimiter = value.search(/[?&]/u);
+	const firstEquals = value.indexOf("=");
+	if (firstEquals >= 0 && (firstQueryDelimiter < 0 || firstEquals < firstQueryDelimiter)) return redactQueryString(value, depth);
+	const hashRouterQueryIndex = value.indexOf("?");
 	if (hashRouterQueryIndex >= 0) {
-		const redactedQuery = redactQueryString(candidate.slice(hashRouterQueryIndex + 1), depth);
-		return `${redactEncodedUrlLikeString(redactUrlLikeFallback(candidate.slice(0, hashRouterQueryIndex + 1)), depth + 1)}${redactedQuery}`;
+		const redactedQuery = redactQueryString(value.slice(hashRouterQueryIndex + 1), depth);
+		return `${redactEncodedUrlLikeString(redactUrlLikeFallback(value.slice(0, hashRouterQueryIndex + 1)), depth + 1)}${redactedQuery}`;
 	}
-	const fallback = redactUrlLikeFallback(candidate);
+	const fallback = redactUrlLikeFallback(value);
 	if (!looksLikeNestedUrlValue(fallback)) return fallback;
 	let decoded;
 	try {
@@ -350,9 +341,7 @@ function isIpv6Address(address) {
 	return address.kind() === "ipv6";
 }
 function normalizeIpv4MappedAddress(address) {
-	if (!isIpv6Address(address)) return address;
-	if (!address.isIPv4MappedAddress()) return address;
-	return address.toIPv4Address();
+	return isIpv6Address(address) && address.isIPv4MappedAddress() ? address.toIPv4Address() : address;
 }
 function normalizeIpParseInput(raw) {
 	const trimmed = normalizeOptionalString(raw);
@@ -629,6 +618,11 @@ function resolveGatewayWebSocketTransport(params) {
 	const expectedFingerprint = params.tlsFingerprint ? normalizeTlsFingerprint(params.tlsFingerprint) : void 0;
 	if (params.tlsFingerprint && !expectedFingerprint) throw new GatewayWebSocketTransportConfigurationError("gateway tls fingerprint must be a SHA-256 fingerprint");
 	const options = { ...params.options };
+	if (usesTls && params.tlsServerName) {
+		const peerName = params.tlsServerName;
+		options.servername = isIP(peerName) ? "" : peerName;
+		options.checkServerIdentity = (_hostname, certificate) => checkServerIdentity(peerName, certificate);
+	}
 	if (usesTls && expectedFingerprint) applyGatewayWebSocketTlsPin(options, expectedFingerprint, normalize);
 	return { options };
 }
@@ -812,6 +806,7 @@ var GatewayClient = class {
 			onParseError: (error) => this.logDebug(`gateway client parse error: ${formatGatewayClientErrorForLog(error)}`),
 			onEvent: (event) => this.opts.onEvent?.(event),
 			onGap: (info) => this.opts.onGap?.(info),
+			onRequestTiming: (timing) => this.opts.onRequestTiming?.(timing),
 			onActivity: () => {
 				this.lastTick = Date.now();
 			},
@@ -870,6 +865,7 @@ var GatewayClient = class {
 		const transport = resolveGatewayWebSocketTransport({
 			url,
 			tlsFingerprint: this.opts.tlsFingerprint,
+			tlsServerName: this.opts.tlsServerName,
 			env: this.opts.env,
 			normalizeTlsFingerprint: this.deps.normalizeTlsFingerprint,
 			options: {
@@ -1105,15 +1101,10 @@ var GatewayClient = class {
 		if (this.opts.role !== "node" || this.opts.mode !== GATEWAY_CLIENT_MODES.NODE || this.opts.clientName !== GATEWAY_CLIENT_NAMES.NODE_HOST) return false;
 		return (this.opts.minProtocol ?? MIN_NODE_PROTOCOL_VERSION) === MIN_NODE_PROTOCOL_VERSION && (this.opts.maxProtocol ?? PROTOCOL_VERSION) === PROTOCOL_VERSION;
 	}
-	shouldRetryWithLegacyNodeProtocol(error) {
-		if (this.useLegacyNodeProtocolEnvelope || !this.shouldNegotiateLegacyNodeProtocol() || !(error instanceof GatewayClientRequestError)) return false;
-		const detailCode = readConnectErrorDetailCode(error.details);
-		return error.details?.expectedProtocol === MIN_NODE_PROTOCOL_VERSION && (detailCode === ConnectErrorDetailCodes.PROTOCOL_MISMATCH || normalizeGatewayErrorText(error.message).includes("protocol mismatch"));
-	}
-	shouldRetryWithCurrentNodeProtocol(error) {
-		if (!this.useLegacyNodeProtocolEnvelope || !this.shouldNegotiateLegacyNodeProtocol() || !(error instanceof GatewayClientRequestError)) return false;
+	shouldRetryWithAlternateNodeProtocol(error) {
+		if (!this.shouldNegotiateLegacyNodeProtocol() || !(error instanceof GatewayClientRequestError)) return false;
 		const detailCode = readConnectErrorDetailCode(error.details);
-		return error.details?.expectedProtocol === PROTOCOL_VERSION && (detailCode === ConnectErrorDetailCodes.PROTOCOL_MISMATCH || normalizeGatewayErrorText(error.message).includes("protocol mismatch"));
+		return error.details?.expectedProtocol === (this.useLegacyNodeProtocolEnvelope ? PROTOCOL_VERSION : MIN_NODE_PROTOCOL_VERSION) && (detailCode === ConnectErrorDetailCodes.PROTOCOL_MISMATCH || normalizeGatewayErrorText(error.message).includes("protocol mismatch"));
 	}
 	buildDeviceConnectParams(params) {
 		if (!this.opts.deviceIdentity) return;
@@ -1207,23 +1198,12 @@ var GatewayClient = class {
 		return cleared instanceof Promise ? cleared.then(() => decision) : decision;
 	}
 	resolveConnectRequestFailure(error, assembled) {
-		if (this.shouldRetryWithCurrentNodeProtocol(error)) {
-			const resetBackoff = !this.nodeProtocolTransitionPending;
-			this.useLegacyNodeProtocolEnvelope = false;
-			this.nodeProtocolTransitionPending = true;
-			if (resetBackoff) this.protocol.resetReconnectBackoff(250);
-			this.logDebug("gateway rejected protocol v3; retrying node host with protocol v4");
-			return {
-				closeCode: 1008,
-				closeReason: "connect retry"
-			};
-		}
-		if (this.shouldRetryWithLegacyNodeProtocol(error)) {
+		if (this.shouldRetryWithAlternateNodeProtocol(error)) {
 			const resetBackoff = !this.nodeProtocolTransitionPending;
-			this.useLegacyNodeProtocolEnvelope = true;
+			this.useLegacyNodeProtocolEnvelope = !this.useLegacyNodeProtocolEnvelope;
 			this.nodeProtocolTransitionPending = true;
 			if (resetBackoff) this.protocol.resetReconnectBackoff(250);
-			this.logDebug("gateway rejected protocol v4; retrying node host with protocol v3");
+			this.logDebug(this.useLegacyNodeProtocolEnvelope ? "gateway rejected protocol v4; retrying node host with protocol v3" : "gateway rejected protocol v3; retrying node host with protocol v4");
 			return {
 				closeCode: 1008,
 				closeReason: "connect retry"
@@ -1252,10 +1232,7 @@ var GatewayClient = class {
 				reconnectDelayMs: startupRetryAfterMs
 			};
 		}
-		if (this.shouldFailClosedForUnsupportedAgentRuntimeIdentity({
-			error,
-			authAgentRuntimeIdentityToken: assembled.authAgentRuntimeIdentityToken
-		})) {
+		if (assembled.authAgentRuntimeIdentityToken && this.isUnsupportedConnectAuthField(error, "agentruntimeidentitytoken")) {
 			const unsupportedIdentityError = /* @__PURE__ */ new Error("gateway rejected required agent runtime identity auth field; refusing to retry without it");
 			this.stopped = true;
 			this.notifyConnectError(unsupportedIdentityError);
@@ -1266,10 +1243,7 @@ var GatewayClient = class {
 				stop: true
 			};
 		}
-		if (this.shouldRetryWithoutApprovalRuntimeToken({
-			error,
-			authApprovalRuntimeToken: assembled.authApprovalRuntimeToken
-		})) {
+		if (!this.approvalRuntimeTokenRetryBudgetUsed && assembled.authApprovalRuntimeToken && this.isUnsupportedConnectAuthField(error, "approvalruntimetoken")) {
 			this.approvalRuntimeTokenCompatibilityDisabled = true;
 			this.approvalRuntimeTokenRetryBudgetUsed = true;
 			this.protocol.resetReconnectBackoff(250);
@@ -1386,20 +1360,10 @@ var GatewayClient = class {
 			this.logDebug(`gateway client reconnect paused handler error: ${formatGatewayClientErrorForLog(err)}`);
 		}
 	}
-	shouldRetryWithoutApprovalRuntimeToken(params) {
-		if (this.approvalRuntimeTokenRetryBudgetUsed) return false;
-		if (!params.authApprovalRuntimeToken) return false;
-		if (!(params.error instanceof GatewayClientRequestError)) return false;
-		if (params.error.gatewayCode !== "INVALID_REQUEST") return false;
-		const message = normalizeGatewayErrorText(params.error.message);
-		return message.includes("invalid connect params") && message.includes("approvalruntimetoken");
-	}
-	shouldFailClosedForUnsupportedAgentRuntimeIdentity(params) {
-		if (!params.authAgentRuntimeIdentityToken) return false;
-		if (!(params.error instanceof GatewayClientRequestError)) return false;
-		if (params.error.gatewayCode !== "INVALID_REQUEST") return false;
-		const message = normalizeGatewayErrorText(params.error.message);
-		return message.includes("invalid connect params") && message.includes("agentruntimeidentitytoken");
+	isUnsupportedConnectAuthField(error, field) {
+		if (!(error instanceof GatewayClientRequestError) || error.gatewayCode !== "INVALID_REQUEST") return false;
+		const message = normalizeGatewayErrorText(error.message);
+		return message.includes("invalid connect params") && message.includes(field);
 	}
 	isTrustedDeviceRetryEndpoint() {
 		const rawUrl = this.opts.url ?? "ws://127.0.0.1:18789";
@@ -1459,6 +1423,89 @@ function createGatewayRequestAbortError(method) {
 	return err;
 }
 //#endregion
+//#region packages/gateway-client/src/run-recovery-text.ts
+async function recoverTerminalReply(params) {
+	const { runId, scope, request, signal } = params;
+	const result = asRecord(params.result);
+	const disposition = asRecord(result.terminalReply).disposition;
+	if (disposition === "silent" || disposition === "empty") return { outputText: "" };
+	if (!scope.sessionKey) return { unavailable: "session-unavailable" };
+	const receipt = asRecord(result.terminalReceipt);
+	if (receipt.runId !== void 0 && receipt.runId !== runId) return { unavailable: "terminal-receipt-mismatch" };
+	const expectedSessionId = typeof receipt.sessionId === "string" ? receipt.sessionId : scope.sessionId;
+	const idempotencyKey = typeof receipt.assistantTranscriptIdempotencyKey === "string" ? receipt.assistantTranscriptIdempotencyKey : void 0;
+	const matches = (message) => {
+		const metadata = asRecord(message["__openclaw"]);
+		return message.role === "assistant" && asRecord(message.openclawStreamFallback).source !== "segment" && (metadata.runId === runId || idempotencyKey !== void 0 && metadata.idempotencyKey === idempotencyKey);
+	};
+	const target = {
+		sessionKey: scope.sessionKey,
+		...scope.agentId ? { agentId: scope.agentId } : {}
+	};
+	let offset;
+	let sessionId = expectedSessionId;
+	const pages = [];
+	let complete = false;
+	try {
+		for (let pageIndex = 0; pageIndex < 10; pageIndex += 1) {
+			signal.throwIfAborted();
+			const page = asRecord(await request("chat.history", {
+				...target,
+				limit: 200,
+				...offset !== void 0 ? { offset } : {}
+			}, signal));
+			if (sessionId !== void 0 && page.sessionId !== sessionId) return { unavailable: "session-changed" };
+			if (typeof page.sessionId === "string") sessionId = page.sessionId;
+			const messages = Array.isArray(page.messages) ? page.messages.map(asRecord) : [];
+			pages.unshift(messages.filter(matches));
+			if (page.hasMore !== true) {
+				complete = true;
+				break;
+			}
+			if (typeof page.nextOffset !== "number" || !Number.isSafeInteger(page.nextOffset) || page.nextOffset <= (offset ?? 0)) break;
+			offset = page.nextOffset;
+		}
+		if (!complete) return { unavailable: "history-limit-reached" };
+		const messages = pages.flat();
+		if (messages.length === 0 || idempotencyKey !== void 0 && !messages.some((message) => asRecord(message["__openclaw"]).idempotencyKey === idempotencyKey)) return { unavailable: "reply-not-found" };
+		let outputText = "";
+		const seen = /* @__PURE__ */ new Set();
+		for (let message of messages) {
+			signal.throwIfAborted();
+			const metadata = asRecord(message["__openclaw"]);
+			if (typeof metadata.id === "string") {
+				if (seen.has(metadata.id)) continue;
+				seen.add(metadata.id);
+			}
+			if (metadata.truncated === true) {
+				if (typeof metadata.id !== "string") return { unavailable: "message-identity-unavailable" };
+				const full = asRecord(await request("chat.message.get", {
+					...target,
+					messageId: metadata.id
+				}, signal));
+				message = asRecord(full.message);
+				if (full.ok !== true || asRecord(message["__openclaw"]).id !== metadata.id || !matches(message) || asRecord(message["__openclaw"]).truncated === true) return { unavailable: "full-message-unavailable" };
+			}
+			const content = typeof message.text === "string" ? message.text : message.content;
+			if (typeof content !== "string" && !Array.isArray(content)) return { unavailable: "reply-text-unavailable" };
+			const text = typeof content === "string" ? content : content.flatMap((block) => {
+				const part = asRecord(block);
+				return (part.type === "text" || part.type === "input_text" || part.type === "output_text") && typeof part.text === "string" ? [part.text] : [];
+			}).join("\n");
+			if (outputText && text) {
+				const trailing = outputText.endsWith("\n\n") ? 2 : outputText.endsWith("\n") ? 1 : 0;
+				const leading = text.startsWith("\n\n") ? 2 : text.startsWith("\n") ? 1 : 0;
+				outputText += "\n".repeat(Math.max(0, 2 - trailing - leading));
+			}
+			outputText += text;
+		}
+		return { outputText };
+	} catch {
+		signal.throwIfAborted();
+		return { unavailable: "history-request-failed" };
+	}
+}
+//#endregion
 //#region packages/gateway-client/src/cloudflare-access.ts
 const CF_ACCESS_CLIENT_ID_HEADER = "CF-Access-Client-Id";
 const CF_ACCESS_CLIENT_SECRET_HEADER = "CF-Access-Client-Secret";
@@ -1470,4 +1517,4 @@ function buildCloudflareAccessHeaders(credentials) {
 	};
 }
 //#endregion
-export { CF_ACCESS_CLIENT_ID_HEADER, CF_ACCESS_CLIENT_SECRET_HEADER, DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, GatewayBrowserDeviceAuthLifecycle, GatewayClient, GatewayClientRequestError, GatewayClientRequestTimeoutError, GatewayScopeUpgrade, GatewaySessionMessageSubscriptionCoordinator, MAX_CONNECT_CHALLENGE_TIMEOUT_MS, MAX_SAFE_TIMEOUT_DELAY_MS, MIN_CONNECT_CHALLENGE_TIMEOUT_MS, addSafeTimeoutDelayGraceMs, buildCloudflareAccessHeaders, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, clampConnectChallengeTimeoutMs, clearGatewayConnectTimeout, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getConnectChallengeTimeoutMsFromEnv, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayConnectAssemblyError, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveConnectChallengeTimeoutMs, resolveFiniteTimeoutDelayMs, resolveGatewayConnectScopes, resolvePreauthHandshakeTimeoutMs, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken, startGatewayClientWhenEventLoopReady, startGatewayClientWithReadinessWait, startGatewayConnectTimeout, waitForEventLoopReady };
+export { CF_ACCESS_CLIENT_ID_HEADER, CF_ACCESS_CLIENT_SECRET_HEADER, DEFAULT_GATEWAY_REQUEST_TIMEOUT_MS, DEFAULT_PREAUTH_HANDSHAKE_TIMEOUT_MS, GatewayBrowserDeviceAuthLifecycle, GatewayClient, GatewayClientRequestError, GatewayClientRequestTimeoutError, GatewayScopeUpgrade, GatewaySessionMessageSubscriptionCoordinator, MAX_CONNECT_CHALLENGE_TIMEOUT_MS, MAX_SAFE_TIMEOUT_DELAY_MS, MIN_CONNECT_CHALLENGE_TIMEOUT_MS, addSafeTimeoutDelayGraceMs, buildCloudflareAccessHeaders, buildDeviceAuthPayload, buildDeviceAuthPayloadV3, buildGatewayConnectAuth, clampConnectChallengeTimeoutMs, clearGatewayConnectTimeout, createSessionProjection, gatewayCredentialScope, gatewayOriginScope, getConnectChallengeTimeoutMsFromEnv, getGatewaySessionMessageSubscriptionCoordinator, hasSessionProjectionAcceptedFinal, isGatewayConnectAssemblyError, isGatewayProtocolResponseError, isLocallyOptimisticSessionMessage, isSessionProjectionErrorMessage, mergeChatStreamMessage, normalizeDeviceMetadataForAuth, normalizeSessionProjectionRunId, projectLiveSessionMessage, projectSessionTerminalReplyMessage, readAssistantStreamSegmentIdentity, readSessionMessageIdentity, readSessionMessageSequence, readSessionProjectionFinalMessageIdentity, reconcileSessionProjectionSnapshot, recoverTerminalReply, reduceSessionProjection, reduceSessionProjectionRunEvent, releaseGatewaySessionMessageSubscription, resetGatewaySessionMessageSubscriptionCoordinator, resolveConnectChallengeTimeoutMs, resolveFiniteTimeoutDelayMs, resolveGatewayConnectScopes, resolvePreauthHandshakeTimeoutMs, resolveSafeTimeoutDelayMs, selectGatewayConnectAuth, shouldRetryGatewayWithDeviceToken, startGatewayClientWhenEventLoopReady, startGatewayClientWithReadinessWait, startGatewayConnectTimeout, waitForEventLoopReady };