@openclaw/gateway-client 2026.9.4 → 2026.9.6

package/dist/{session-subscriptions-DIcpqS8A.mjs → session-subscriptions-DUpRfWJb.mjs}

@@ -225,6 +225,19 @@ function gatewayCredentialScope(gatewayUrl) {
 	return normalizeGatewayScope(gatewayUrl, true);
 }
 //#endregion
+//#region packages/gateway-client/src/model-catalog-connect.ts
+const MODEL_CATALOG_SNAPSHOT = "model-catalog-snapshot";
+/** A requested snapshot opts in only after the server advertises its connect field. */
+function resolveModelCatalogConnect(params) {
+	const modelCatalog = params.serverCapabilities.includes(MODEL_CATALOG_SNAPSHOT) ? params.modelCatalog : void 0;
+	const caps = params.caps?.filter((cap) => cap !== MODEL_CATALOG_SNAPSHOT);
+	if (modelCatalog === void 0) return { caps };
+	return {
+		modelCatalog,
+		caps: [...caps ?? [], MODEL_CATALOG_SNAPSHOT]
+	};
+}
+//#endregion
 //#region packages/retry/src/index.ts
 const MAX_TIMER_TIMEOUT_MS = 2147e6;
 function computeBackoff(policy, attempt) {
@@ -306,9 +319,16 @@ const DEFAULT_RETRY_CONFIG = {
 	maxDelayMs: 3e4,
 	jitter: 0
 };
-const defaultSleep = (ms) => new Promise((resolve) => {
-	setTimeout(resolve, ms);
-});
+const defaultSleep = async (ms) => {
+	let remainingMs = ms;
+	do {
+		const delayMs = Math.min(remainingMs, MAX_TIMER_TIMEOUT_MS);
+		await new Promise((resolve) => {
+			setTimeout(resolve, delayMs);
+		});
+		remainingMs -= delayMs;
+	} while (remainingMs > 0);
+};
 function clampNumber(value, fallback, min, max) {
 	const next = Number.isFinite(value) ? value : void 0;
 	if (next === void 0) return fallback;
@@ -550,7 +570,7 @@ var GatewayPendingRequests = class {
 				}));
 				if (this.pending.get(id) !== pending) return;
 				requestSent = true;
-				this.invoke("sent", () => options?.onSent?.());
+				this.invoke("sent", () => options?.onSent?.(id));
 			} catch (error) {
 				if (retire("CLIENT_SEND_ERROR")) reject(error instanceof Error ? error : new Error(String(error)));
 			}
@@ -630,8 +650,10 @@ var GatewayProtocolClient = class {
 		this.listeners = new GatewayEventListeners();
 		this.stopped = true;
 		this.generation = 0;
+		this.connectionAbort = null;
 		this.lastSeq = null;
 		this.connectNonce = null;
+		this.serverCapabilities = [];
 		this.connectSent = false;
 		this.connectRequestSent = false;
 		this.handshakeTimer = null;
@@ -676,6 +698,7 @@ var GatewayProtocolClient = class {
 	}
 	stop() {
 		this.stopped = true;
+		this.connectionAbort?.abort();
 		this.clearHandshakeTimer();
 		this.reconnectSignal = null;
 		this.reconnectSupervisor.reset();
@@ -700,6 +723,7 @@ var GatewayProtocolClient = class {
 		return this.listeners.add(listener);
 	}
 	closeSocket(code, reason) {
+		this.connectionAbort?.abort();
 		this.socket?.close(code, reason);
 	}
 	resetReconnectBackoff(initialMs) {
@@ -731,6 +755,7 @@ var GatewayProtocolClient = class {
 		this.lastSeq = null;
 		this.connectNonce = null;
 		this.connectChallengeTs = void 0;
+		this.serverCapabilities = [];
 		this.connectSent = this.connectRequestSent = false;
 		this.socketOpened = false;
 		this.helloReceived = false;
@@ -756,6 +781,7 @@ var GatewayProtocolClient = class {
 			return;
 		}
 		this.generation = generation;
+		this.connectionAbort = new AbortController();
 		this.socket = socket;
 		const now = this.nowMs();
 		this.connectTiming = {
@@ -806,7 +832,9 @@ var GatewayProtocolClient = class {
 			planOrPromise = this.opts.buildConnectPlan({
 				nonce: this.connectNonce,
 				challengeTs: this.connectChallengeTs,
-				generation
+				serverCapabilities: this.serverCapabilities,
+				generation,
+				...this.connectAuthority(socket, generation)
 			});
 		} catch (error) {
 			this.handleConnectPlanError(socket, generation, error);
@@ -819,7 +847,7 @@ var GatewayProtocolClient = class {
 		this.sendConnectPlan(socket, generation, planOrPromise);
 	}
 	handleConnectPlanError(socket, generation, error) {
-		if (!this.isActive(socket, generation)) return;
+		if (!this.isConnectCurrent(socket, generation)) return;
 		const normalized = error instanceof Error ? error : new Error(String(error));
 		const outcome = this.opts.onConnectPlanError?.(normalized) ?? {
 			closeCode: 1008,
@@ -830,8 +858,9 @@ var GatewayProtocolClient = class {
 		socket.close(outcome.closeCode, outcome.closeReason);
 	}
 	sendConnectPlan(socket, generation, plan) {
-		if (!this.isActive(socket, generation) || !socket.isOpen()) return;
+		if (!this.isConnectCurrent(socket, generation)) return;
 		const context = {
+			...this.connectAuthority(socket, generation),
 			generation,
 			nonce: this.connectNonce,
 			challengeTs: this.connectChallengeTs,
@@ -841,27 +870,43 @@ var GatewayProtocolClient = class {
 		this.recordTiming("request-sent", generation, plan);
 		this.connectRequestSent = true;
 		this.request("connect", this.opts.buildConnectParams(plan)).then((hello) => {
-			if (!this.isActive(socket, generation) || !socket.isOpen()) return;
+			if (!this.isConnectCurrent(socket, generation)) return;
 			this.helloReceived = true;
 			this.clearHandshakeTimer();
 			this.connectFailure = void 0;
 			this.reconnectSupervisor.reset();
 			this.recordTiming("hello", generation, plan);
-			this.opts.onConnectHello?.(hello, context);
-			this.invoke("hello", () => this.opts.onHello?.(hello));
+			const publishHello = () => {
+				if (!this.isConnectCurrent(socket, generation)) return;
+				this.invoke("hello", () => this.opts.onHello?.(hello));
+			};
+			const accepted = this.opts.onConnectHello?.(hello, context);
+			if (accepted instanceof Promise) return accepted.then(publishHello);
+			return publishHello();
 		}).catch((error) => {
 			if (!this.isActive(socket, generation)) return;
 			const requestError = error instanceof GatewayProtocolRequestError ? error : new GatewayProtocolRequestError({ message: String(error) });
+			this.connectFailure = { error: requestError };
 			const outcome = this.opts.onConnectFailure?.(requestError, context) ?? {
 				closeCode: 1008,
 				closeReason: "connect failed"
 			};
-			this.connectFailure = {
-				error: requestError,
-				reconnectDelayMs: outcome.reconnectDelayMs
+			const applyFailure = (decision) => {
+				if (!this.isActive(socket, generation)) return;
+				this.connectFailure = {
+					error: requestError,
+					reconnectDelayMs: decision.reconnectDelayMs
+				};
+				if (decision.stop) this.stopped = true;
+				this.connectionAbort?.abort();
+				socket.close(decision.closeCode, decision.closeReason);
 			};
-			if (outcome.stop) this.stopped = true;
-			socket.close(outcome.closeCode, outcome.closeReason);
+			if (outcome instanceof Promise) return outcome.then(applyFailure);
+			return applyFailure(outcome);
+		}).catch((error) => {
+			if (!this.isConnectCurrent(socket, generation)) return;
+			this.opts.onConnectError?.(error instanceof Error ? error : new Error(String(error)));
+			this.closeSocket(1008, "connect failed");
 		});
 	}
 	handleMessage(socket, generation, raw) {
@@ -887,6 +932,7 @@ var GatewayProtocolClient = class {
 					return;
 				}
 				this.connectNonce = nonce;
+				this.serverCapabilities = Array.isArray(payload?.capabilities) ? payload.capabilities.filter((value) => typeof value === "string") : [];
 				const challengeTs = payload?.ts;
 				this.connectChallengeTs = typeof challengeTs === "number" && Number.isSafeInteger(challengeTs) && challengeTs >= 0 ? challengeTs : null;
 				this.recordTiming("challenge", generation);
@@ -934,6 +980,7 @@ var GatewayProtocolClient = class {
 			return;
 		}
 		this.socket = null;
+		this.connectionAbort?.abort();
 		this.clearHandshakeTimer();
 		const context = {
 			...this.closeContext(),
@@ -978,6 +1025,20 @@ var GatewayProtocolClient = class {
 			connectFailure: this.connectFailure
 		};
 	}
+	isConnectCurrent(socket, generation) {
+		return this.isActive(socket, generation) && socket.isOpen() && !this.connectionAbort?.signal.aborted;
+	}
+	connectAuthority(socket, generation) {
+		const signal = this.connectionAbort?.signal;
+		if (!signal) throw new Error("gateway connection authority is unavailable");
+		return {
+			signal,
+			assertCurrent: () => {
+				signal.throwIfAborted();
+				if (!this.isConnectCurrent(socket, generation)) throw new Error("gateway connection retired");
+			}
+		};
+	}
 	isActive(socket, generation) {
 		return !this.stopped && this.socket === socket && this.generation === generation;
 	}
@@ -1038,7 +1099,7 @@ const preserveString = (value) => value;
 function stableStringify(value, normalizeString = preserveString) {
 	return stringifyStableValue(value, /* @__PURE__ */ new WeakSet(), normalizeString);
 }
-function stringifyStableValue(value, stack, normalizeString) {
+function stringifyStableValue(value, stack, normalizeString, write) {
 	if (value === null || value === void 0) return String(value);
 	if (typeof value === "number" && !Number.isFinite(value)) return JSON.stringify(String(value));
 	if (typeof value === "bigint") return JSON.stringify(value.toString());
@@ -1047,39 +1108,73 @@ function stringifyStableValue(value, stack, normalizeString) {
 	if (stack.has(value)) return JSON.stringify("[Circular]");
 	stack.add(value);
 	try {
-		return stringifyObjectValue(value, stack, normalizeString);
+		return stringifyObjectValue(value, stack, normalizeString, write);
 	} finally {
 		stack.delete(value);
 	}
 }
-function stringifyObjectValue(value, stack, normalizeString) {
+function stringifyObjectValue(value, stack, normalizeString, write) {
 	if (value instanceof Error) return stringifyStableValue({
 		name: value.name,
 		message: value.message,
 		stack: value.stack
-	}, stack, normalizeString);
+	}, stack, normalizeString, write);
 	if (value instanceof Uint8Array) return stringifyStableValue({
 		type: "Uint8Array",
 		data: encodeBase64(value)
-	}, stack, normalizeString);
+	}, stack, normalizeString, write);
 	if (Array.isArray(value)) {
+		if (write) {
+			write("[");
+			let separator = "";
+			for (const entry of value) {
+				write(separator);
+				write(stringifyStableValue(entry, stack, normalizeString, write));
+				separator = ",";
+			}
+			write("]");
+			return "";
+		}
 		const serializedEntries = [];
 		for (const entry of value) serializedEntries.push(stringifyStableValue(entry, stack, normalizeString));
 		return `[${serializedEntries.join(",")}]`;
 	}
 	const record = value;
 	if (normalizeString === preserveString) {
-		const fields = [];
-		for (const key of Object.keys(record).toSorted()) fields.push(`${JSON.stringify(key)}:${stringifyStableValue(record[key], stack, normalizeString)}`);
+		const fields = Object.keys(record).sort();
+		if (write) {
+			write("{");
+			let separator = "";
+			for (const key of fields) {
+				write(`${separator}${JSON.stringify(key)}:`);
+				write(stringifyStableValue(record[key], stack, normalizeString, write));
+				separator = ",";
+			}
+			write("}");
+			return "";
+		}
+		let fieldIndex = 0;
+		for (const key of fields) fields[fieldIndex++] = `${JSON.stringify(key)}:${stringifyStableValue(record[key], stack, normalizeString)}`;
 		return `{${fields.join(",")}}`;
 	}
 	const entries = Object.keys(record).map((key) => ({
 		key,
 		normalizedKey: normalizeString(key)
-	})).toSorted((left, right) => {
+	})).sort((left, right) => {
 		return compareStableStrings(left.normalizedKey, right.normalizedKey) || compareStableStrings(left.key, right.key);
 	});
 	const serializedFields = [];
+	if (write) {
+		write("{");
+		let separator = "";
+		for (const { key, normalizedKey } of entries) {
+			write(`${separator}${JSON.stringify(normalizedKey)}:`);
+			write(stringifyStableValue(record[key], stack, normalizeString, write));
+			separator = ",";
+		}
+		write("}");
+		return "";
+	}
 	for (const { key, normalizedKey } of entries) serializedFields.push(`${JSON.stringify(normalizedKey)}:${stringifyStableValue(record[key], stack, normalizeString)}`);
 	return `{${serializedFields.join(",")}}`;
 }
@@ -1124,11 +1219,11 @@ function readSessionMessageIdentity(message, envelope) {
 	const persistedRunId = normalizeSessionProjectionRunId(idempotencyKey);
 	const envelopeRunId = normalizeSessionProjectionRunId(envelope?.runId);
 	const metadataRunId = normalizeSessionProjectionRunId(metadata?.runId);
+	const fallbackRunId = normalizeSessionProjectionRunId(asNullableRecord(record.openclawStreamFallback)?.runId);
 	const mirroredMessage = readSessionProjectionString(metadata?.mirrorOrigin) !== null;
 	const isCliAssistant = role === "assistant" && readSessionProjectionString(record.api)?.toLowerCase() === "cli";
 	const canonicalPersistedRunId = isCliAssistant && persistedRunId?.startsWith("cli-assistant:") ? readSessionProjectionString(persistedRunId.slice(14)) : persistedRunId;
-	const optimisticRunId = metadata && Object.keys(metadata).every((key) => key === "idempotencyKey") ? canonicalPersistedRunId : null;
-	const runId = role === "assistant" ? metadataRunId ?? envelopeRunId ?? (isCliAssistant || !mirroredMessage ? canonicalPersistedRunId : null) ?? optimisticRunId : metadataRunId ?? canonicalPersistedRunId ?? envelopeRunId;
+	const runId = role === "assistant" ? metadataRunId ?? envelopeRunId ?? fallbackRunId ?? (isCliAssistant || !mirroredMessage ? canonicalPersistedRunId : null) : metadataRunId ?? canonicalPersistedRunId ?? envelopeRunId;
 	return {
 		role,
 		id: readSessionProjectionString(metadata?.id) ?? readSessionProjectionString(envelope?.messageId),
@@ -1150,11 +1245,51 @@ function readAssistantStreamSegmentIdentity(message) {
 	if (readSessionProjectionString(record?.role)?.toLowerCase() !== "assistant") return;
 	const fallback = asNullableRecord(record?.openclawStreamFallback);
 	const itemId = readSessionProjectionString(fallback?.itemId);
+	if (!itemId) return;
 	const runId = readSessionMessageIdentity(message)?.runId ?? readSessionProjectionString(record?.runId) ?? readSessionProjectionString(fallback?.runId);
-	return itemId ? {
+	return {
 		itemId,
 		...runId ? { runId } : {}
-	} : void 0;
+	};
+}
+/** A saved occurrence can enrich its live projection, never another durable row. */
+function sameAssistantPersistenceReceipt(left, right) {
+	return Boolean(left?.role === "assistant" && right?.role === "assistant" && !left.isImported && !right.isImported && left.idempotencyKey && left.idempotencyKey === right.idempotencyKey && (!left.id && left.sequence === null || !right.id && right.sequence === null));
+}
+/** Local turns have no durable transcript metadata beyond their own optional send key. */
+function isLocallyOptimisticSessionMessage(message) {
+	const record = asNullableRecord(message);
+	const role = readSessionProjectionString(record?.role)?.toLowerCase();
+	if (role !== "user" && role !== "assistant") return false;
+	if (asNullableRecord(record?.openclawStreamFallback)) return false;
+	const metadata = asNullableRecord(record?.["__openclaw"]);
+	return !metadata || Object.keys(metadata).every((key) => key === "idempotencyKey");
+}
+function sameTranscriptIdentity(left, right) {
+	if (!left || !right || left.role !== right.role) return false;
+	if (left.isImported || right.isImported) {
+		if (!left.isImported || !right.isImported) return false;
+		if (left.externalSource || right.externalSource) return Boolean(left.externalSource && left.externalSource === right.externalSource);
+		return left.sequence !== null && right.sequence !== null && left.sequence === right.sequence;
+	}
+	if (left.id || right.id) return Boolean(left.id && right.id && left.id === right.id);
+	return left.sequence !== null && right.sequence !== null && left.sequence === right.sequence;
+}
+/** Normalize a message into its live, durable, or pending projection entry. */
+function createSessionProjectionEntry(message, options) {
+	const identity = readSessionMessageIdentity(message, options?.envelope);
+	const fallback = asNullableRecord(asNullableRecord(message)?.openclawStreamFallback);
+	const provisionalFallback = Boolean(fallback && identity?.role === "assistant" && !identity.id && identity.sequence === null);
+	const inferredPendingRunId = options?.live !== true && isLocallyOptimisticSessionMessage(message) ? identity?.runId : null;
+	const pendingRunId = normalizeSessionProjectionRunId(options?.pendingRunId ?? inferredPendingRunId);
+	return {
+		message,
+		identity,
+		afterSequence: options?.envelope?.afterSequence !== void 0 ? options.envelope.afterSequence : provisionalFallback && typeof fallback?.afterSequence === "number" ? fallback.afterSequence : void 0,
+		live: options?.live === true || provisionalFallback,
+		pending: pendingRunId !== null,
+		pendingRunId
+	};
 }
 //#endregion
 //#region packages/gateway-client/src/session-projection-message-content.ts
@@ -1180,6 +1315,18 @@ function readSessionMessageDisplayContent(message) {
 		usesFallbackText: fallback !== null
 	};
 }
+/** Status notices remain visible but do not define the terminal reply they accompany. */
+function projectSessionTerminalReplyMessage(message) {
+	const record = asNullableRecord(message);
+	if (!record || !Array.isArray(record.content)) return message;
+	const content = record.content.filter((block) => asNullableRecord(block)?.openclawStatusNotice !== true);
+	if (content.length === record.content.length || content.length === 0) return message;
+	return {
+		...record,
+		content,
+		text: void 0
+	};
+}
 /** Check whether a projected message has text or another displayable block. */
 function hasDisplayableSessionMessage(message) {
 	const { text, hasNonText } = readSessionMessageDisplayContent(message);
@@ -1199,11 +1346,30 @@ function isSessionProjectionErrorMessage(message, errorMessage) {
 //#endregion
 //#region packages/gateway-client/src/session-projection-final-identity.ts
 /** Terminal identity rules used to reconcile live and durable assistant projections. */
+/**
+* The class of rows the #148297 relaxation newly admits as finals: persisted
+* with the run's terminal tool stop reason while carrying no tool-call
+* content. Both adoption directions and every position rule scope to this
+* predicate, so pre-existing match semantics stay untouched.
+*/
+function isToolUsePersistedFinalRow(message) {
+	return asNullableRecord(message)?.["stopReason"] === "toolUse" && !isSessionProjectionToolContinuation(message);
+}
+/** Tool-bearing assistant rows are continuations even without a tool stop reason. */
+function isSessionProjectionToolContinuation(message) {
+	const record = asNullableRecord(message);
+	if (Array.isArray(record?.content) && record.content.some((block) => {
+		const type = asNullableRecord(block)?.type;
+		return type === "toolCall" || type === "toolUse" || type === "functionCall";
+	})) return true;
+	return record?.stopReason === "toolUse" && !hasDisplayableSessionMessage(message);
+}
 function readPersistedFinalIdentity(message) {
 	const identity = readSessionMessageIdentity(message);
 	if (identity?.externalSource) return `import:${identity.role}:${identity.externalSource}`;
 	if (identity?.id && !identity.isImported) return `id:${identity.role}:${identity.id}`;
 	if (identity?.sequence !== null && identity?.sequence !== void 0) return `seq:${identity.role}:${identity.sequence}`;
+	if (identity?.role === "assistant" && !identity.isImported && identity.idempotencyKey) return `key:assistant:${identity.idempotencyKey}`;
 	return null;
 }
 function hasCompatiblePersistedFinalIdentity(currentMessage, incomingMessage) {
@@ -1215,14 +1381,16 @@ function hasCompatiblePersistedFinalIdentity(currentMessage, incomingMessage) {
 		if (current.externalSource && incoming.externalSource) return current.externalSource === incoming.externalSource;
 		return current.sequence !== null && incoming.sequence !== null && current.sequence === incoming.sequence;
 	}
+	if (sameAssistantPersistenceReceipt(current, incoming)) return true;
 	if (current.id && incoming.id) return current.id === incoming.id;
 	return current.sequence !== null && incoming.sequence !== null && current.sequence === incoming.sequence;
 }
 function readFinalContentIdentity(message) {
-	const display = readSessionMessageDisplayContent(message);
+	const terminalMessage = projectSessionTerminalReplyMessage(message);
+	const display = readSessionMessageDisplayContent(terminalMessage);
 	if (!display.text && !display.hasNonText) return null;
 	const identity = readSessionMessageIdentity(message);
-	const record = asNullableRecord(message);
+	const record = asNullableRecord(terminalMessage);
 	const metadata = asNullableRecord(record?.["__openclaw"]);
 	try {
 		return `content:${stableStringify([
@@ -1244,14 +1412,6 @@ function hasTerminalStopReason(message) {
 	const stopReason = asNullableRecord(message)?.stopReason;
 	return stopReason === "stop" || stopReason === "length" || stopReason === "error" || stopReason === "aborted" || stopReason === "end_turn";
 }
-function hasCompletedRunSnapshotContext(entry, snapshot, runId) {
-	if (!runId || entry.identity?.runId !== runId) return false;
-	const entryIndex = snapshot.indexOf(entry);
-	if (entryIndex < 0) return false;
-	const hasEarlierUser = snapshot.slice(0, entryIndex).some((candidate) => candidate.identity?.role === "user" && candidate.identity.runId === runId);
-	const hasLaterAssistant = snapshot.slice(entryIndex + 1).some((candidate) => candidate.identity?.role === "assistant" && candidate.identity.runId === runId);
-	return hasEarlierUser && !hasLaterAssistant;
-}
 /** Read stable persisted identity first, falling back to canonical display content. */
 function readSessionProjectionFinalMessageIdentity(message) {
 	if (!hasDisplayableSessionMessage(message)) return null;
@@ -1269,11 +1429,41 @@ function hasSessionProjectionAcceptedFinal(run, message) {
 }
 /** Match an unsequenced live terminal to exactly one durable same-run terminal row. */
 function findUniqueSnapshotTerminalMatch(current, matches, run, snapshot) {
-	if (!current.live || current.identity?.role !== "assistant" || current.identity.id || current.identity.sequence !== null || !run || run.status === "streaming") return null;
+	if (!current.live || current.identity?.role !== "assistant" || current.identity.id || current.identity.sequence !== null || !run || run.status === "streaming" || matches.length === 0) return null;
 	const terminalContent = readFinalContentIdentity(current.message);
 	if (!terminalContent || readFinalContentIdentity(run.message) !== terminalContent) return null;
+	let snapshotIndexes;
+	let firstUserIndex = -1;
+	let lastAssistantIndex = -1;
+	const ensureRunIndexes = () => {
+		if (snapshotIndexes) return;
+		const runId = current.identity?.runId;
+		const indexes = /* @__PURE__ */ new Map();
+		if (runId) snapshot.forEach((candidate, index) => {
+			if (candidate.identity?.runId === runId) {
+				if (!indexes.has(candidate)) indexes.set(candidate, index);
+				if (candidate.identity.role === "user" && firstUserIndex < 0) firstUserIndex = index;
+				else if (candidate.identity.role === "assistant") lastAssistantIndex = index;
+			}
+		});
+		snapshotIndexes = indexes;
+	};
+	const hasCompletedRunSnapshotContext = (entry) => {
+		const runId = current.identity?.runId;
+		if (!runId || entry.identity?.runId !== runId) return false;
+		ensureRunIndexes();
+		const entryIndex = snapshotIndexes?.get(entry);
+		return entryIndex !== void 0 && firstUserIndex >= 0 && firstUserIndex < entryIndex && lastAssistantIndex <= entryIndex;
+	};
+	const isLastSameRunAssistantRow = (entry) => {
+		const runId = current.identity?.runId;
+		if (!runId || entry.identity?.runId !== runId) return false;
+		ensureRunIndexes();
+		const entryIndex = snapshotIndexes?.get(entry);
+		return entryIndex !== void 0 && lastAssistantIndex >= 0 && entryIndex >= lastAssistantIndex;
+	};
 	const durableTerminalMatches = matches.filter((entry) => {
-		return (asNullableRecord(asNullableRecord(entry.message)?.["__openclaw"])?.runTerminal === true || entry.identity?.runId === current.identity?.runId && hasTerminalStopReason(entry.message) || hasCompletedRunSnapshotContext(entry, snapshot, current.identity?.runId ?? null)) && readFinalContentIdentity(entry.message) === terminalContent;
+		return (asNullableRecord(asNullableRecord(entry.message)?.["__openclaw"])?.runTerminal === true || entry.identity?.runId === current.identity?.runId && (hasTerminalStopReason(entry.message) || asNullableRecord(entry.message)?.["stopReason"] === "toolUse" && !isSessionProjectionToolContinuation(entry.message) && isLastSameRunAssistantRow(entry)) || hasCompletedRunSnapshotContext(entry)) && readFinalContentIdentity(entry.message) === terminalContent;
 	});
 	const entry = durableTerminalMatches.length === 1 ? durableTerminalMatches[0] : void 0;
 	if (!entry) return null;
@@ -1352,35 +1542,15 @@ const SESSION_PROJECTION_SCOPE_KEYS = [
 	"lifecycleRevision",
 	"activeLeafEntryId"
 ];
-/** Local turns have no durable transcript metadata beyond their own optional send key. */
-function isLocallyOptimisticSessionMessage(message) {
-	const identity = readSessionMessageIdentity(message);
-	if (!identity || identity.role !== "user" && identity.role !== "assistant") return false;
-	const metadata = asNullableRecord(asNullableRecord(message)?.["__openclaw"]);
-	return !metadata || Object.keys(metadata).every((key) => key === "idempotencyKey");
-}
-function createEntry(message, options) {
-	const identity = readSessionMessageIdentity(message, options?.envelope);
-	const inferredPendingRunId = options?.live !== true && isLocallyOptimisticSessionMessage(message) ? identity?.runId : null;
-	const pendingRunId = normalizeSessionProjectionRunId(options?.pendingRunId ?? inferredPendingRunId);
-	return {
-		message,
-		identity,
-		afterSequence: options?.envelope?.afterSequence,
-		live: options?.live === true,
-		pending: pendingRunId !== null,
-		pendingRunId
-	};
-}
 function createProjectionEntries(messages) {
 	let pendingUserRunId = null;
 	return messages.map((message) => {
-		const entry = createEntry(message);
+		const entry = createSessionProjectionEntry(message);
 		if (entry.identity?.role === "user") {
 			pendingUserRunId = entry.pending ? entry.pendingRunId : null;
 			return entry;
 		}
-		if (pendingUserRunId && entry.identity?.role === "assistant" && !entry.pending && isLocallyOptimisticSessionMessage(message)) return createEntry(message, { pendingRunId: pendingUserRunId });
+		if (pendingUserRunId && entry.identity?.role === "assistant" && !entry.pending && isLocallyOptimisticSessionMessage(message)) return createSessionProjectionEntry(message, { pendingRunId: pendingUserRunId });
 		if (!isLocallyOptimisticSessionMessage(message)) pendingUserRunId = null;
 		return entry;
 	});
@@ -1403,26 +1573,21 @@ function readEventScope(event) {
 	for (const key of SESSION_PROJECTION_SCOPE_KEYS) if (event[key] !== void 0) Object.assign(scope, { [key]: event[key] });
 	return scope;
 }
-function sameTranscriptIdentity(left, right) {
-	if (!left || !right || left.role !== right.role) return false;
-	if (left.isImported || right.isImported) {
-		if (!left.isImported || !right.isImported) return false;
-		if (left.externalSource || right.externalSource) return Boolean(left.externalSource && left.externalSource === right.externalSource);
-		return left.sequence !== null && right.sequence !== null && left.sequence === right.sequence;
-	}
-	if (left.id || right.id) return Boolean(left.id && right.id && left.id === right.id);
-	return left.sequence !== null && right.sequence !== null && left.sequence === right.sequence;
-}
 function entryMatches(left, right, allowSnapshotPromotion = false) {
+	const leftSegment = readAssistantStreamSegmentIdentity(left.message);
+	const rightSegment = readAssistantStreamSegmentIdentity(right.message);
+	if (leftSegment?.itemId !== rightSegment?.itemId) return false;
 	if (sameTranscriptIdentity(left.identity, right.identity)) return true;
+	if (sameAssistantPersistenceReceipt(left.identity, right.identity)) return true;
+	if (left.identity?.role === "assistant" && right.identity?.role === "assistant" && left.identity.idempotencyKey && right.identity.idempotencyKey && left.identity.idempotencyKey !== right.identity.idempotencyKey) return false;
 	const durableEntry = left.identity?.id ? left : right.identity?.id ? right : null;
 	const provisionalEntry = durableEntry === left ? right : durableEntry === right ? left : null;
 	const durableMetadata = asNullableRecord(asNullableRecord(durableEntry?.message)?.["__openclaw"]);
 	if (durableEntry?.identity?.role === "assistant" && provisionalEntry?.identity?.role === "assistant" && !durableEntry.identity.isImported && !provisionalEntry.identity.isImported && !provisionalEntry.identity.id) {
-		const durableSegment = readAssistantStreamSegmentIdentity(durableEntry.message);
-		const provisionalSegment = readAssistantStreamSegmentIdentity(provisionalEntry.message);
+		const durableSegment = durableEntry === left ? leftSegment : rightSegment;
+		const provisionalSegment = durableEntry === left ? rightSegment : leftSegment;
 		if (provisionalEntry.identity.sequence === null && durableSegment?.runId && durableSegment.runId === provisionalSegment?.runId && durableSegment.itemId === provisionalSegment.itemId) return true;
-		if (provisionalEntry.live && provisionalEntry.identity.sequence === null && (provisionalEntry.afterSequence === void 0 || provisionalEntry.afterSequence !== null && durableEntry.identity.sequence !== null && durableEntry.identity.sequence > provisionalEntry.afterSequence) && durableEntry.identity.runId && durableEntry.identity.runId === provisionalEntry.identity.runId && (readSessionProjectionString(durableMetadata?.mirrorOrigin) === null || durableMetadata?.runTerminal === true)) return true;
+		if (provisionalEntry.live && !durableSegment && !isSessionProjectionToolContinuation(durableEntry.message) && (!isToolUsePersistedFinalRow(durableEntry.message) || readFinalContentIdentity(durableEntry.message) === readFinalContentIdentity(provisionalEntry.message)) && provisionalEntry.identity.sequence === null && (provisionalEntry.afterSequence === void 0 || provisionalEntry.afterSequence !== null && durableEntry.identity.sequence !== null && durableEntry.identity.sequence > provisionalEntry.afterSequence) && durableEntry.identity.runId && durableEntry.identity.runId === provisionalEntry.identity.runId && (readSessionProjectionString(durableMetadata?.mirrorOrigin) === null || durableMetadata?.runTerminal === true)) return true;
 	}
 	const persisted = left.identity;
 	const observed = right.identity;
@@ -1470,28 +1635,54 @@ function insertEntry(entries, incoming, runs) {
 		...entries.slice(nextIndex)
 	];
 }
-function projectLiveSessionMessage(state, message, envelope, scope = {}) {
+function projectLiveSessionMessage(initialState, message, envelope, scope = {}) {
+	let state = initialState;
 	if (!scopesMatch(state.scope, scope)) return state;
-	const incoming = createEntry(message, {
+	const incoming = createSessionProjectionEntry(message, {
 		envelope,
 		live: true
 	});
 	if (!incoming.identity) return state;
 	const matches = state.entries.filter((entry) => entryMatches(entry, incoming));
 	const existing = matches.find((entry) => sameTranscriptIdentity(entry.identity, incoming.identity)) ?? (matches.length === 1 ? matches[0] : void 0);
+	if (existing && !sameTranscriptIdentity(existing.identity, incoming.identity) && !sameAssistantPersistenceReceipt(existing.identity, incoming.identity)) {
+		const durable = existing.identity?.id ? existing : incoming.identity.id ? incoming : null;
+		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 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.inferred && durable.identity && runId && run) {
+				const inferredSnapshotTerminal = {
+					entry: provisional,
+					matchedIdentity: durable.identity
+				};
+				state = {
+					...state,
+					runs: {
+						...state.runs,
+						[runId]: {
+							...run,
+							inferredSnapshotTerminal
+						}
+					}
+				};
+			}
+		}
+	}
 	if (!existing) return withEntries(state, insertEntry(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;
-		return withEntries(state, state.entries.some(({ identity }, index) => identity?.sequence != null && (index < existingIndex ? identity.sequence > sequence : identity.sequence < sequence)) ? insertEntry(state.entries.filter((_, index) => index !== existingIndex), incoming, state.runs) : state.entries.toSpliced(existingIndex, 1, incoming));
+		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, [
-		...state.entries.slice(0, existingIndex),
-		incoming,
-		...state.entries.slice(existingIndex + 1)
-	]);
+	return withEntries(state, state.entries.toSpliced(existingIndex, 1, incoming));
 }
 /** Only observed live events and this client's pending turns may survive an older snapshot. */
 function reconcileSessionProjectionSnapshot(state, messages, scope = {}, options = {}) {
@@ -1502,9 +1693,10 @@ function reconcileSessionProjectionSnapshot(state, messages, scope = {}, options
 	for (const current of state.entries) {
 		if (!current.live && !current.pending || options.shouldIncludeMessage?.(current.message) === false) continue;
 		const matches = entries.filter((entry) => entryMatches(entry, current, true));
+		const uniqueMatch = matches.length === 1 ? matches[0] : void 0;
 		const run = current.identity?.runId ? runs[current.identity.runId] : void 0;
 		const terminalMatch = findUniqueSnapshotTerminalMatch(current, matches, run, entries);
-		if (matches.length === 1 && !isUnsequencedLiveTerminal(current, run) || terminalMatch) {
+		if (uniqueMatch && (sameAssistantPersistenceReceipt(uniqueMatch.identity, current.identity) || !isUnsequencedLiveTerminal(current, run)) || terminalMatch) {
 			if (terminalMatch?.inferred && terminalMatch.entry.identity && current.identity?.runId && run) runs[current.identity.runId] = {
 				...run,
 				inferredSnapshotTerminal: {
@@ -1614,7 +1806,7 @@ function reduceSessionProjection(state, event) {
 		case "messagePersisted": return projectLiveSessionMessage(state, event.message, event.envelope ?? event, scope);
 		case "sendPending": {
 			const pendingRunId = normalizeSessionProjectionRunId(event.idempotencyKey ?? event.runId);
-			const incoming = createEntry(event.message, { pendingRunId });
+			const incoming = createSessionProjectionEntry(event.message, { pendingRunId });
 			if (!pendingRunId || !incoming.identity) return state;
 			const seed = state.entries.find((entry) => entry.message === event.message);
 			if (seed && !seed.pending && incoming.identity.id === null && !incoming.identity.isImported && incoming.identity.runId === pendingRunId) return withEntries(state, state.entries.map((entry) => entry === seed ? {
@@ -1883,4 +2075,4 @@ function releaseGatewaySessionMessageSubscription(subscription) {
 	return sessionMessageSubscriptionOwners.get(subscription)?.coordinator.release(subscription) ?? Promise.resolve();
 }
 //#endregion
-export { shouldRetryGatewayWithDeviceToken as A, isGatewayProtocolResponseError as C, buildGatewayConnectAuth as D, GatewayBrowserDeviceAuthLifecycle as E, buildDeviceAuthPayloadV3 as M, normalizeDeviceMetadataForAuth as N, resolveGatewayConnectScopes as O, GatewayProtocolRequestTimeoutError as S, gatewayOriginScope as T, readSessionMessageSequence as _, createSessionProjection as a, GatewayProtocolClient as b, reconcileSessionProjectionSnapshot as c, hasSessionProjectionAcceptedFinal as d, readSessionProjectionFinalMessageIdentity as f, readSessionMessageIdentity as g, readAssistantStreamSegmentIdentity as h, resetGatewaySessionMessageSubscriptionCoordinator as i, buildDeviceAuthPayload as j, selectGatewayConnectAuth as k, reduceSessionProjection as l, normalizeSessionProjectionRunId as m, getGatewaySessionMessageSubscriptionCoordinator as n, isLocallyOptimisticSessionMessage as o, isSessionProjectionErrorMessage as p, releaseGatewaySessionMessageSubscription as r, projectLiveSessionMessage as s, GatewaySessionMessageSubscriptionCoordinator as t, reduceSessionProjectionRunEvent as u, isRecord as v, gatewayCredentialScope as w, GatewayProtocolRequestError as x, shouldPauseGatewayReconnect as y };
+export { resolveGatewayConnectScopes as A, GatewayProtocolRequestTimeoutError as C, gatewayOriginScope as D, gatewayCredentialScope as E, normalizeDeviceMetadataForAuth as F, shouldRetryGatewayWithDeviceToken as M, buildDeviceAuthPayload as N, GatewayBrowserDeviceAuthLifecycle as O, buildDeviceAuthPayloadV3 as P, GatewayProtocolRequestError as S, resolveModelCatalogConnect as T, readSessionMessageIdentity as _, createSessionProjection as a, shouldPauseGatewayReconnect as b, reduceSessionProjection as c, readSessionProjectionFinalMessageIdentity as d, isSessionProjectionErrorMessage as f, readAssistantStreamSegmentIdentity as g, normalizeSessionProjectionRunId as h, resetGatewaySessionMessageSubscriptionCoordinator as i, selectGatewayConnectAuth as j, buildGatewayConnectAuth as k, reduceSessionProjectionRunEvent as l, isLocallyOptimisticSessionMessage as m, getGatewaySessionMessageSubscriptionCoordinator as n, projectLiveSessionMessage as o, projectSessionTerminalReplyMessage as p, releaseGatewaySessionMessageSubscription as r, reconcileSessionProjectionSnapshot as s, GatewaySessionMessageSubscriptionCoordinator as t, hasSessionProjectionAcceptedFinal as u, readSessionMessageSequence as v, isGatewayProtocolResponseError as w, GatewayProtocolClient as x, isRecord as y };